// Merge -> revision 8507
This commit is contained in:
rMalie
@@ -2,7 +2,7 @@
|
||||
<module>
|
||||
<name>trustedshops</name>
|
||||
<displayName><![CDATA[Trusted Shops trust solutions]]></displayName>
|
||||
<version><![CDATA[1.3]]></version>
|
||||
<version><![CDATA[1.3.1]]></version>
|
||||
<description><![CDATA[Build confidence in your online shop with the Trusted Shops quality seal, buyer protection and customer rating.]]></description>
|
||||
<author><![CDATA[]]></author>
|
||||
<tab><![CDATA[payment_security]]></tab>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
global $_MODULE;
|
||||
$_MODULE = array();
|
||||
$_MODULE['<{trustedshops}prestashop>display_products_02ecb4a4709d9bcc590f1a25fc82c0e2'] = 'Trusted Shops Käuferschutz (empfohlen)';
|
||||
$_MODULE['<{trustedshops}prestashop>display_products_b55aab8932a39ca85bb0a1b6eb83f83f'] = 'Käuferschutz ab';
|
||||
$_MODULE['<{trustedshops}prestashop>display_products_1107bf75ac50728edbeb497ab803a104'] = 'Käuferschutz bis';
|
||||
$_MODULE['<{trustedshops}prestashop>display_products_69db1ddc2a15253abb0a11beb1eae734'] = 'inkl. MwSt.';
|
||||
$_MODULE['<{trustedshops}prestashop>display_products_b3c25d2f94cf87ece3dbb2907318520c'] = 'Die im Käuferschutz enthaltene Trusted Shops Garantie sichert Ihren Online-Kauf ab. Mit der Übermittlung und';
|
||||
$_MODULE['<{trustedshops}prestashop>display_products_536a056b710e94b16169efd17a4a657b'] = 'Speicherung';
|
||||
|
||||
@@ -78,7 +78,7 @@ var TS = (function()
|
||||
</div>
|
||||
<div id="ts-list-items">
|
||||
{foreach from=$buyer_protection_items item=product}
|
||||
<p><input id="ts-product-{$product.id_product}" type="checkbox" value="{$product.id_product}" name="item_product"> {l s='Buyer protection from' mod='trustedshops'} {$product.protected_amount_decimal} {$currency_iso_code} ({$price|round:2} {$currency_iso_code} {l s='incl. VAT' mod='trustedshops'})</p>
|
||||
<p><input id="ts-product-{$product.id_product}" type="checkbox" value="{$product.id_product}" name="item_product"> {l s='Buyer protection up to' mod='trustedshops'} {$product.protected_amount_decimal} {$currency_iso_code} ({$price|round:2} {$currency_iso_code} {l s='incl. VAT' mod='trustedshops'})</p>
|
||||
{/foreach}
|
||||
<div id="content_checkout" style="margin-left:100px">
|
||||
<p>{l s='The Trusted Shops Buyer Protection secures your online purchase. I agree to my email address being transferred and' mod='trustedshops'} <b><a href="http://www.trustedshops.com/shop/data_privacy.php?shop_id={$shop_id}" target="_blank">{l s='saved' mod='trustedshops'}</a></b> {l s='for the purposes of Buyer Protection processing by Trusted Shops.' mod='trustedshops'} <b><a href="http://www.trustedshops.com/shop/protection_conditions.php?shop_id={$shop_id}" target="_blank">{l s='Conditions' mod='trustedshops'}</a></b> {l s='for Buyer Protection.' mod='trustedshops'}</p></div>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
global $_MODULE;
|
||||
$_MODULE = array();
|
||||
$_MODULE['<{trustedshops}prestashop>display_products_02ecb4a4709d9bcc590f1a25fc82c0e2'] = 'Trusted Shops protection acheteur (recommandée)';
|
||||
$_MODULE['<{trustedshops}prestashop>display_products_b55aab8932a39ca85bb0a1b6eb83f83f'] = 'Protection acheteur jusqu\'à';
|
||||
$_MODULE['<{trustedshops}prestashop>display_products_1107bf75ac50728edbeb497ab803a104'] = 'Protection acheteur jusqu\'à';
|
||||
$_MODULE['<{trustedshops}prestashop>display_products_69db1ddc2a15253abb0a11beb1eae734'] = 'TVA incluse';
|
||||
$_MODULE['<{trustedshops}prestashop>display_products_b3c25d2f94cf87ece3dbb2907318520c'] = 'La protection acheteur Trusted Shops sécurise votre achat en ligne. J’accepte le transfert et la';
|
||||
$_MODULE['<{trustedshops}prestashop>display_products_536a056b710e94b16169efd17a4a657b'] = 'sauvegarde';
|
||||
|
||||
@@ -1207,6 +1207,17 @@ class TSBuyerProtection extends AbsTrustedShops
|
||||
TSBuyerProtection::$smarty->assign('onlineshop_name', ConfigurationCore::get('PS_SHOP_NAME'));
|
||||
$url = str_replace(array('#shop_id#', '#shop_name#'), array(TSBuyerProtection::$CERTIFICATE[$lang]['tsID'], urlencode(str_replace('_', '-', ConfigurationCore::get('PS_SHOP_NAME')))), TSBuyerProtection::$certificate_link[$lang]);
|
||||
TSBuyerProtection::$smarty->assign('trusted_shops_url', $url);
|
||||
|
||||
$displayWidget = false;
|
||||
foreach (TSBuyerProtection::$CERTIFICATE as $lang => $certificate)
|
||||
{
|
||||
$certificate = (array)$certificate;
|
||||
if (isset($certificate['tsID']) && $certificate['tsID'] !== '' && $certificate['user'] != '')
|
||||
$displayWidget = true;
|
||||
}
|
||||
if ($displayWidget == false)
|
||||
return '';
|
||||
|
||||
return $this->display(TSBuyerProtection::$module_name, 'seal_of_approval.tpl');
|
||||
}
|
||||
}
|
||||
@@ -1233,6 +1244,8 @@ class TSBuyerProtection extends AbsTrustedShops
|
||||
// If login parameters missing for the certificate an error occurred
|
||||
if ((TSBuyerProtection::$CERTIFICATE[$lang]['user'] == '' OR TSBuyerProtection::$CERTIFICATE[$lang]['password'] == '') AND TSBuyerProtection::$CERTIFICATE[$lang]['typeEnum'] == 'EXCELLENCE')
|
||||
{
|
||||
return '';
|
||||
// Display here has been deprecated by Trusted Shop
|
||||
return '
|
||||
<p style="color:red;text-align:center;font-size:14px;font-weight:bold;">'
|
||||
.$this->l('The Trusted Shop Buyer Protection needs a login to succeed. Please contact the shop administrator.')
|
||||
@@ -1347,8 +1360,8 @@ class TSBuyerProtection extends AbsTrustedShops
|
||||
$return = '';
|
||||
if (!empty($this->errors))
|
||||
$return = '<p style="color:red">'.implode('<br />', $this->errors).'</p>';
|
||||
else
|
||||
$return = '<p>'.$this->l('You will receive an e-mail by Trusted Shops about your guarantee number.').'</p>';
|
||||
//else
|
||||
// $return = '<p>'.$this->l('You will receive an e-mail by Trusted Shops about your guarantee number.').'</p>';
|
||||
return $return;
|
||||
}
|
||||
|
||||
|
||||
@@ -360,11 +360,11 @@ class TrustedShopsRating extends AbsTrustedShops
|
||||
{
|
||||
$link = '';
|
||||
if (strtolower(Context::getContext()->language->iso_code) == 'de')
|
||||
$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="https://www.trustedshops.de/shopbetreiber/kundenbewertung_anmeldung.html?partnerPackage=PrestaShop&ratingProduct=RATING_PRO&et_cid=14en&et_lid=29069" target="_blank">Jetzt bei Trusted Shops anmelden!</a></b></p><br />';
|
||||
$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="https://www.trustedshops.de/shopbetreiber/kundenbewertung_anmeldung.html?shopsw=PRESTA&partnerPackage=PrestaShop&ratingProduct=RATING_PRO&et_cid=14en&et_lid=29069" target="_blank">Jetzt bei Trusted Shops anmelden!</a></b></p><br />';
|
||||
if (strtolower(Context::getContext()->language->iso_code) == 'en')
|
||||
$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="http://www.trustedshops.com/merchants/membership.html?shopsw=PRESTA&et_cid=53&et_lid=3361" target="_blank">Apply now!</a></b></p><br />';
|
||||
$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="http://www.trustedshops.com/merchants/membership.html?shopsw=PRESTA&partnerPackage=PrestaShop&et_cid=53&et_lid=3361" target="_blank">Apply now!</a></b></p><br />';
|
||||
if (strtolower(Context::getContext()->language->iso_code) == 'fr')
|
||||
$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="http://www.trustedshops.fr/marchands/tarifs.html?shopsw=PRESTA&et_cid=53&et_lid=3362" target="_blank">Enregistrement Trusted Shops</a></b></p><br />';
|
||||
$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="http://www.trustedshops.fr/marchands/tarifs.html?shopsw=PRESTA&partnerPackage=PrestaShop&et_cid=53&et_lid=3362" target="_blank">Enregistrement Trusted Shops</a></b></p><br />';
|
||||
|
||||
return '<fieldset>
|
||||
<legend><img src="'.__PS_BASE_URI__.'modules/'.self::$module_name.'/logo.gif" alt="" />'.$this->l('Learn More').'</legend>
|
||||
@@ -444,6 +444,16 @@ class TrustedShopsRating extends AbsTrustedShops
|
||||
if (Configuration::get('TS_TAB0_DISPLAY_RATING_FRONT_END'))
|
||||
self::$smarty->assign(array('rating_url' => $this->getRatingUrl(), 'language' => Language::getIsoById((int)($params['cookie']->id_lang))));
|
||||
|
||||
$displayWidget = false;
|
||||
foreach (TSBuyerProtection::$CERTIFICATE as $lang => $certificate)
|
||||
{
|
||||
$certificate = (array)$certificate;
|
||||
if (isset($certificate['tsID']) && $certificate['tsID'] !== '' && $certificate['user'] != '')
|
||||
$displayWidget = true;
|
||||
}
|
||||
if ($displayWidget == false)
|
||||
return '';
|
||||
|
||||
return $this->display(self::$module_name, 'widget.tpl');
|
||||
}
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ class TrustedShops extends Module
|
||||
{
|
||||
$this->name = 'trustedshops';
|
||||
$this->tab = 'payment_security';
|
||||
$this->version = 1.3;
|
||||
$this->version = '1.3.1';
|
||||
|
||||
parent::__construct();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user