{l s='Pay with cash on delivery (COD)' mod='cashondelivery'}
{l s='You pay for the merchandise upon delivery' mod='cashondelivery'}
diff --git a/modules/cheque/views/templates/front/payment_execution.tpl b/modules/cheque/views/templates/front/payment_execution.tpl
index effc1b066..a359168ae 100644
--- a/modules/cheque/views/templates/front/payment_execution.tpl
+++ b/modules/cheque/views/templates/front/payment_execution.tpl
@@ -36,7 +36,7 @@
{else}
{l s='Check payment' mod='cheque'}
-
{/if}
diff --git a/modules/cheque/views/templates/hook/payment.tpl b/modules/cheque/views/templates/hook/payment.tpl
index 1c7654854..bb62047b6 100644
--- a/modules/cheque/views/templates/hook/payment.tpl
+++ b/modules/cheque/views/templates/hook/payment.tpl
@@ -24,7 +24,7 @@
*}
-
+
{l s='Pay by check (order processing will take more time).' mod='cheque'}
diff --git a/modules/cheque/views/templates/hook/payment_return.tpl b/modules/cheque/views/templates/hook/payment_return.tpl
index fe3f58aad..dc62a7670 100644
--- a/modules/cheque/views/templates/hook/payment_return.tpl
+++ b/modules/cheque/views/templates/hook/payment_return.tpl
@@ -37,11 +37,11 @@
{/if}
{l s='An email has been sent to you with this information.' mod='cheque'}
{l s='Your order will be sent as soon as we receive your payment.' mod='cheque'}
-
{l s='For any questions or for further information, please contact our' mod='cheque'} {l s='customer service department.' mod='cheque'}.
+
{l s='For any questions or for further information, please contact our' mod='cheque'} {l s='customer service department.' mod='cheque'}.
{else}
{l s='We have noticed that there is a problem with your order. If you think this is an error, you can contact our' mod='cheque'}
- {l s='customer service department.' mod='cheque'}.
+ {l s='customer service department.' mod='cheque'}.
{/if}
diff --git a/modules/editorial/EditorialClass.php b/modules/editorial/EditorialClass.php
index ca0b4db60..5b3d05349 100755
--- a/modules/editorial/EditorialClass.php
+++ b/modules/editorial/EditorialClass.php
@@ -68,10 +68,7 @@ class EditorialClass extends ObjectModel
static public function getByIdShop($id_shop)
{
$id = Db::getInstance()->getValue('SELECT `id_editorial` FROM `'._DB_PREFIX_.'editorial` WHERE `id_shop` ='.(int)$id_shop);
- if ($id)
- return new EditorialClass((int)$id);
- else
- return false;
+ return new EditorialClass($id);
}
public function copyFromPost()
diff --git a/modules/editorial/editorial.tpl b/modules/editorial/editorial.tpl
index 00cea23d3..7393327ab 100644
--- a/modules/editorial/editorial.tpl
+++ b/modules/editorial/editorial.tpl
@@ -26,7 +26,7 @@
{if $editorial->body_home_logo_link}
{/if}
- {if $homepage_logo}})
{/if}
+ {if $homepage_logo}|escape:'html'})
{/if}
{if $editorial->body_home_logo_link}{/if}
{if $editorial->body_logo_subheading}
{$editorial->body_logo_subheading|stripslashes}
{/if}
{if $editorial->body_title}
{$editorial->body_title|stripslashes}
{/if}
diff --git a/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl b/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
index a23dbd6ed..8d389b032 100644
--- a/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
+++ b/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
@@ -32,7 +32,7 @@ $('document').ready(function()
var parent = $(this).parent().parent();
$.ajax({
- url: "{$link->getModuleLink('favoriteproducts', 'actions', ['process' => 'remove'], true)}",
+ url: "{$link->getModuleLink('favoriteproducts', 'actions', ['process' => 'remove'], true)|escape:'html'}",
type: "POST",
data: {
'id_product': idFavoriteProduct,
diff --git a/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl b/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl
index dd7bad133..8dffafcb4 100755
--- a/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl
+++ b/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl
@@ -23,8 +23,8 @@
* International Registered Trademark & Property of PrestaShop SA
*}
@@ -274,12 +275,12 @@ class Loyalty extends Module
+ $this->html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'voucher_details', true);
+ $this->html .= '
@@ -299,12 +300,12 @@ class Loyalty extends Module
+ $this->html .= '
@@ -312,12 +313,12 @@ class Loyalty extends Module
+ $this->html .= '
';
@@ -325,67 +326,67 @@ class Loyalty extends Module
$indexedCategories = isset($_POST['categoryBox']) ? $_POST['categoryBox'] : $index;
$helper = new Helper();
- $html .= ''.$helper->renderCategoryTree(null, $indexedCategories).'
';
- $html .= '
+ $this->html .= ''.$helper->renderCategoryTree(null, $indexedCategories).'
';
+ $this->html .= '
'.$this->l('Mark the box(es) of categories in which loyalty vouchers are usable.').'
'.$this->l('Loyalty points progression').'
+ $this->html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'default_loyalty_state', true);
+ $this->html .= '
+ $this->html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'none_award_loyalty_state', true);
+ $this->html .= '
+ $this->html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'convert_loyalty_state', true);
+ $this->html .= '
+ $this->html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'validation_loyalty_state', true);
+ $this->html .= '
+ $this->html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'cancel_loyalty_state', true);
+ $this->html .= '