diff --git a/classes/Module.php b/classes/Module.php index af603e46d..17cc42271 100644 --- a/classes/Module.php +++ b/classes/Module.php @@ -1237,24 +1237,6 @@ abstract class ModuleCore return ($overloaded ? _PS_THEME_DIR_.'modules/'.$this->name : _PS_MODULE_DIR_.$this->name).'/'.$template; } - /** - * Assign a smarty vars (same syntax as smarty->assign) but prefix all keys with module name - * - * @since 1.5.0 - * @param string $key Variable key (can be an array) - * @param mixed $value Variable value - */ - public function templateAssign($key, $value = null) - { - if (is_array($key)) - { - foreach ($key as $k => $v) - $this->context->smarty->assign($this->name.'_'.$k, $v); - } - else - $this->context->smarty->assign($this->name.'_'.$key, $value); - } - protected function _getApplicableTemplateDir($template) { return $this->_isTemplateOverloaded($template) ? _PS_THEME_DIR_ : _PS_MODULE_DIR_.$this->name.'/'; diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php index b2e6a9994..25c84420f 100644 --- a/modules/blockcart/blockcart.php +++ b/modules/blockcart/blockcart.php @@ -77,10 +77,10 @@ class BlockCart extends Module if ($useTax AND Configuration::get('PS_TAX_DISPLAY') == 1) { $totalToPayWithoutTaxes = $params['cart']->getOrderTotal(false); - $this->templateAssign('tax_cost', Tools::displayPrice($totalToPay - $totalToPayWithoutTaxes, $currency)); + $this->smarty->assign('tax_cost', Tools::displayPrice($totalToPay - $totalToPayWithoutTaxes, $currency)); } - $this->templateAssign(array( + $this->smarty->assign(array( 'products' => $products, 'customizedDatas' => Product::getAllCustomizedDatas((int)($params['cart']->id)), 'CUSTOMIZE_FILE' => _CUSTOMIZE_FILE_, @@ -97,9 +97,9 @@ class BlockCart extends Module 'ajax_allowed' => (int)(Configuration::get('PS_BLOCK_CART_AJAX')) == 1 ? true : false )); if (sizeof($errors)) - $this->templateAssign('errors', $errors); + $this->smarty->assign('errors', $errors); if(isset($this->context->cookie->ajax_blockcart_display)) - $this->templateAssign('colapseExpandStatus', $this->context->cookie->ajax_blockcart_display); + $this->smarty->assign('colapseExpandStatus', $this->context->cookie->ajax_blockcart_display); } public function getContent() @@ -159,7 +159,7 @@ class BlockCart extends Module return; // @todo this variable seems not used - $this->templateAssign('order_page', strpos($_SERVER['PHP_SELF'], 'order') !== false); + $this->smarty->assign('order_page', strpos($_SERVER['PHP_SELF'], 'order') !== false); $this->assignContentVars($params); return $this->display(__FILE__, 'blockcart.tpl'); } diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl index c634821b7..9aaef9a6f 100644 --- a/modules/blockcart/blockcart.tpl +++ b/modules/blockcart/blockcart.tpl @@ -27,9 +27,9 @@ {*************************************************************************************************************************************} {* IMPORTANT : If you change some data here, you have to report these changes in the ./blockcart-json.js (to let ajaxCart available) *} {*************************************************************************************************************************************} -{if $blockcart_ajax_allowed} +{if $ajax_allowed} @@ -38,15 +38,15 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart'

- {l s='Cart' mod='blockcart'} - {if $blockcart_ajax_allowed} -   -   + {l s='Cart' mod='blockcart'} + {if $ajax_allowed} +   +   {/if}

-
+
{$cart_qties} {l s='products' mod='blockcart'} 1}style="display:none"{/if}>{l s='product' mod='blockcart'} @@ -54,17 +54,17 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart' {l s='(empty)' mod='blockcart'}
-
- {if $blockcart_products} +
+ {if $products}
- {foreach from=$blockcart_products item='product' name='myLoop'} + {foreach from=$products item='product' name='myLoop'} {assign var='productId' value=$product.id_product} {assign var='productAttributeId' value=$product.id_product_attribute}
{$product.cart_quantity}x {$product.name|truncate:13:'...'|escape:html:'UTF-8'} - {if !isset($blockcart_customizedDatas.$productId.$productAttributeId)} {/if} + {if !isset($customizedDatas.$productId.$productAttributeId)} {/if} {if $priceDisplay == $smarty.const.PS_TAX_EXC}{displayWtPrice p="`$product.total`"}{else}{displayWtPrice p="`$product.total_wt`"}{/if}
{if isset($product.attributes_small)} @@ -76,11 +76,11 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart' {if isset($customizedDatas.$productId.$productAttributeId)} {if !isset($product.attributes_small)}
{/if}
    - {foreach from=$blockcart_customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] key='id_customization' item='customization' name='customizations'} + {foreach from=$customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] key='id_customization' item='customization' name='customizations'}
  • - {$customization.quantity}x{if isset($customization.datas.$blockcart_CUSTOMIZE_TEXTFIELD.0)} - {$customization.datas.$blockcart_CUSTOMIZE_TEXTFIELD.0.value|escape:html:'UTF-8'|replace:"
    ":" "|truncate:28} + {$customization.quantity}x{if isset($customization.datas.$CUSTOMIZE_TEXTFIELD.0)} + {$customization.datas.$CUSTOMIZE_TEXTFIELD.0.value|escape:html:'UTF-8'|replace:"
    ":" "|truncate:28} {else} {l s='Customization #' mod='blockcart'}{$id_customization|intval}{l s=':' mod='blockcart'} {/if} @@ -95,15 +95,15 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart' {/foreach}
{/if} -

{l s='No products' mod='blockcart'}

+

{l s='No products' mod='blockcart'}

- {if $blockcart_discounts|@count > 0} + {if $discounts|@count > 0}
- {foreach from=$blockcart_discounts item=discount} + {foreach from=$discounts item=discount} - + {/foreach} @@ -112,23 +112,23 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart'

{l s='Shipping' mod='blockcart'} - {$blockcart_shipping_cost} + {$shipping_cost}
- {if $blockcart_show_wrapping} - {assign var='blockcart_cart_flag' value='Cart::ONLY_WRAPPING'|constant} + {if $show_wrapping} + {assign var='cart_flag' value='Cart::ONLY_WRAPPING'|constant} {l s='Wrapping' mod='blockcart'} - {if $priceDisplay == 1}{convertPrice price=$cart->getOrderTotal(false, $blockcart_cart_flag)}{else}{convertPrice price=$cart->getOrderTotal(true, $blockcart_cart_flag)}{/if} + {if $priceDisplay == 1}{convertPrice price=$cart->getOrderTotal(false, $cart_flag)}{else}{convertPrice price=$cart->getOrderTotal(true, $cart_flag)}{/if}
{/if} - {if $blockcart_show_tax && isset($blockcart_tax_cost)} + {if $show_tax && isset($tax_cost)} {l s='Tax' mod='blockcart'} - {$blockcart_tax_cost} + {$tax_cost}
{/if} {l s='Total' mod='blockcart'} - {$blockcart_total} + {$total}

- {if $use_taxes && $display_tax_label == 1 && $blockcart_show_tax} + {if $use_taxes && $display_tax_label == 1 && $show_tax} {if $priceDisplay == 0}

{l s='Prices are tax included' mod='blockcart'} @@ -141,8 +141,8 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart' {/if} {/if}

- {if $blockcart_order_process == 'order'}{l s='Cart' mod='blockcart'}{/if} - {l s='Check out' mod='blockcart'} + {if $order_process == 'order'}{l s='Cart' mod='blockcart'}{/if} + {l s='Check out' mod='blockcart'}

diff --git a/modules/blockcms/blockcms.php b/modules/blockcms/blockcms.php index fdab801a2..ea8e505fd 100755 --- a/modules/blockcms/blockcms.php +++ b/modules/blockcms/blockcms.php @@ -791,7 +791,7 @@ class BlockCms extends Module public function displayBlockCMS($column) { $cms_titles = self::getCMStitles($column); - $this->templateAssign(array( + $this->smarty->assign(array( 'block' => 1, 'cms_titles' => $cms_titles, )); @@ -814,7 +814,7 @@ class BlockCms extends Module if (Configuration::get('FOOTER_BLOCK_ACTIVATION')) { $cms_titles = self::getCMStitlesFooter(); - $this->templateAssign(array( + $this->smarty->assign(array( 'block' => 0, 'cmslinks' => $cms_titles, 'display_stores_footer' => Configuration::get('PS_STORES_DISPLAY_FOOTER'), diff --git a/modules/blockcms/blockcms.tpl b/modules/blockcms/blockcms.tpl index 388bcd815..5b0d132ea 100755 --- a/modules/blockcms/blockcms.tpl +++ b/modules/blockcms/blockcms.tpl @@ -24,9 +24,9 @@ * International Registered Trademark & Property of PrestaShop SA *} -{if $blockcms_block == 1} +{if $block == 1} - {foreach from=$blockcms_cms_titles key=cms_key item=cms_title} + {foreach from=$cms_titles key=cms_key item=cms_title}

{if !empty($cms_title.name)}{$cms_title.name}{else}{$cms_title.category_name}{/if}

- {$blockcms_footer_text} + {$footer_text}
{/if} diff --git a/modules/blocklanguages/blocklanguages.php b/modules/blocklanguages/blocklanguages.php index 371d5cf08..86adb7ef1 100644 --- a/modules/blocklanguages/blocklanguages.php +++ b/modules/blocklanguages/blocklanguages.php @@ -92,7 +92,7 @@ class BlockLanguages extends Module } } if (count($default_rewrite)) - $this->templateAssign('lang_rewrite_urls', $default_rewrite); + $this->smarty->assign('lang_rewrite_urls', $default_rewrite); } return $this->display(__FILE__, 'blocklanguages.tpl'); diff --git a/modules/blocklanguages/blocklanguages.tpl b/modules/blocklanguages/blocklanguages.tpl index 76921b247..585bf7858 100644 --- a/modules/blocklanguages/blocklanguages.tpl +++ b/modules/blocklanguages/blocklanguages.tpl @@ -52,7 +52,7 @@ {if $language.iso_code != $lang_iso} {assign var=indice_lang value=$language.id_lang} {if isset($lang_rewrite_urls.$indice_lang)} - + {else} diff --git a/modules/blockmanufacturer/blockmanufacturer.php b/modules/blockmanufacturer/blockmanufacturer.php index afcf1a2a0..278ee3744 100644 --- a/modules/blockmanufacturer/blockmanufacturer.php +++ b/modules/blockmanufacturer/blockmanufacturer.php @@ -54,7 +54,7 @@ class BlockManufacturer extends Module function hookLeftColumn($params) { - $this->templateAssign(array( + $this->smarty->assign(array( 'manufacturers' => Manufacturer::getManufacturers(), 'text_list' => Configuration::get('MANUFACTURER_DISPLAY_TEXT'), 'text_list_nb' => Configuration::get('MANUFACTURER_DISPLAY_TEXT_NB'), diff --git a/modules/blockmanufacturer/blockmanufacturer.tpl b/modules/blockmanufacturer/blockmanufacturer.tpl index 40dfda2d9..81b1caaa7 100644 --- a/modules/blockmanufacturer/blockmanufacturer.tpl +++ b/modules/blockmanufacturer/blockmanufacturer.tpl @@ -26,24 +26,24 @@
-

{if $blockmanufacturer_display_link_manufacturer}{/if}{l s='Manufacturers' mod='blockmanufacturer'}{if $blockmanufacturer_display_link_manufacturer}{/if}

+

{if $display_link_manufacturer}{/if}{l s='Manufacturers' mod='blockmanufacturer'}{if $display_link_manufacturer}{/if}

-{if $blockmanufacturer_manufacturers} - {if $blockmanufacturer_text_list} +{if $manufacturers} + {if $text_list}
    - {foreach from=$blockmanufacturer_manufacturers item=manufacturer name=manufacturer_list} - {if $smarty.foreach.manufacturer_list.iteration <= $blockmanufacturer_text_list_nb} + {foreach from=$manufacturers item=manufacturer name=manufacturer_list} + {if $smarty.foreach.manufacturer_list.iteration <= $text_list_nb}
  • {$manufacturer.name|escape:'htmlall':'UTF-8'}
    • {/if} {/foreach}
{/if} - {if $blockmanufacturer_form_list} + {if $form_list}

diff --git a/modules/blockmyaccount/blockmyaccount.php b/modules/blockmyaccount/blockmyaccount.php index 5214eb2a7..6313ad592 100644 --- a/modules/blockmyaccount/blockmyaccount.php +++ b/modules/blockmyaccount/blockmyaccount.php @@ -61,7 +61,7 @@ class BlockMyAccount extends Module if (!$this->context->customer->isLogged()) return false; - $this->templateAssign(array( + $this->smarty->assign(array( 'voucherAllowed' => (int)Configuration::get('PS_VOUCHERS'), 'returnAllowed' => (int)Configuration::get('PS_ORDER_RETURN'), 'HOOK_BLOCK_MY_ACCOUNT' => Hook::exec('myAccountBlock'), diff --git a/modules/blockmyaccount/blockmyaccount.tpl b/modules/blockmyaccount/blockmyaccount.tpl index 133342a4e..15055498a 100644 --- a/modules/blockmyaccount/blockmyaccount.tpl +++ b/modules/blockmyaccount/blockmyaccount.tpl @@ -30,12 +30,12 @@

{l s='Sign out' mod='blockmyaccount'}

diff --git a/modules/blocknewproducts/blocknewproducts.php b/modules/blocknewproducts/blocknewproducts.php index b5cacfe4d..2a402f9f5 100644 --- a/modules/blocknewproducts/blocknewproducts.php +++ b/modules/blocknewproducts/blocknewproducts.php @@ -100,7 +100,7 @@ class BlockNewProducts extends Module if (!$newProducts AND !Configuration::get('PS_BLOCK_NEWPRODUCTS_DISPLAY')) return; - $this->templateAssign(array( + $this->smarty->assign(array( 'new_products' => $newProducts, 'mediumSize' => Image::getSize('medium'), )); diff --git a/modules/blocknewproducts/blocknewproducts.tpl b/modules/blocknewproducts/blocknewproducts.tpl index 0ff1f3790..428d6453b 100644 --- a/modules/blocknewproducts/blocknewproducts.tpl +++ b/modules/blocknewproducts/blocknewproducts.tpl @@ -28,16 +28,16 @@

{l s='New products' mod='blocknewproducts'}

- {if $blocknewproducts_new_products !== false} + {if $new_products !== false}
    - {foreach from=$blocknewproducts_new_products item='product' name='newProducts'} + {foreach from=$new_products item='product' name='newProducts'} {if $smarty.foreach.newProducts.index < 2} - {$product.legend|escape:html:'UTF-8'} + {$product.legend|escape:html:'UTF-8'} {/if} {/foreach}
- {foreach from=$blocknewproducts_new_products item=newproduct name=myLoop} + {foreach from=$new_products item=newproduct name=myLoop}
{$newproduct.name|strip_tags|escape:html:'UTF-8'}
{if $newproduct.description_short}
{$newproduct.description_short|strip_tags:'UTF-8'|truncate:75:'...'}
{l s='Read more'}
{/if} {/foreach} diff --git a/modules/blockspecials/blockspecials.php b/modules/blockspecials/blockspecials.php index 06b08c1e5..2b3e5d81a 100644 --- a/modules/blockspecials/blockspecials.php +++ b/modules/blockspecials/blockspecials.php @@ -90,7 +90,7 @@ class BlockSpecials extends Module if (!$special = Product::getRandomSpecial((int)$params['cookie']->id_lang) AND !Configuration::get('PS_BLOCK_SPECIALS_DISPLAY')) return; - $this->templateAssign(array( + $this->smarty->assign(array( 'special' => $special, 'priceWithoutReduction_tax_excl' => Tools::ps_round($special['price_without_reduction'], 2), 'mediumSize' => Image::getSize('medium'), diff --git a/modules/blockspecials/blockspecials.tpl b/modules/blockspecials/blockspecials.tpl index e7a7a6e5c..6d7b0ad4e 100644 --- a/modules/blockspecials/blockspecials.tpl +++ b/modules/blockspecials/blockspecials.tpl @@ -29,22 +29,22 @@

{l s='Specials' mod='blockspecials'}

-{if $blockspecials_special} +{if $special}
  • - {$blockspecials_special.legend|escape:html:'UTF-8'} + {$special.legend|escape:html:'UTF-8'}
  • - {if $blockspecials_special.specific_prices} - {assign var='specific_prices' value=$blockspecials_special.specific_prices} + {if $special.specific_prices} + {assign var='specific_prices' value=$special.specific_prices} {if $specific_prices.reduction_type == 'percentage' && ($specific_prices.from == $specific_prices.to OR ($smarty.now|date_format:'%Y-%m-%d %H:%M:%S' <= $specific_prices.to && $smarty.now|date_format:'%Y-%m-%d %H:%M:%S' >= $specific_prices.from))} -{$specific_prices.reduction*100|floatval}% {/if} {/if} -
    {$blockspecials_special.name|escape:html:'UTF-8'}
    - {if !$priceDisplay}{displayWtPrice p=$blockspecials_special.price_without_reduction}{else}{displayWtPrice p=$priceWithoutReduction_tax_excl}{/if} - {if !$priceDisplay}{displayWtPrice p=$blockspecials_special.price}{else}{displayWtPrice p=$blockspecials_special.price_tax_exc}{/if} +
    {$special.name|escape:html:'UTF-8'}
    + {if !$priceDisplay}{displayWtPrice p=$special.price_without_reduction}{else}{displayWtPrice p=$priceWithoutReduction_tax_excl}{/if} + {if !$priceDisplay}{displayWtPrice p=$special.price}{else}{displayWtPrice p=$special.price_tax_exc}{/if}

diff --git a/modules/blockuserinfo/blockuserinfo.php b/modules/blockuserinfo/blockuserinfo.php index c6b2c2ed8..5b5db6631 100644 --- a/modules/blockuserinfo/blockuserinfo.php +++ b/modules/blockuserinfo/blockuserinfo.php @@ -60,7 +60,7 @@ class BlockUserInfo extends Module if (!$this->active) return; - $this->templateAssign(array( + $this->smarty->assign(array( 'cart' => $this->context->cart, 'cart_qties' => $this->context->cart->nbProducts(), 'logged' => $this->context->customer->isLogged(), diff --git a/modules/blockuserinfo/blockuserinfo.tpl b/modules/blockuserinfo/blockuserinfo.tpl index d4bf9eb8f..df9a4482f 100644 --- a/modules/blockuserinfo/blockuserinfo.tpl +++ b/modules/blockuserinfo/blockuserinfo.tpl @@ -29,22 +29,22 @@

    {if !$PS_CATALOG_MODE}
  • - {l s='Cart:' mod='blockuserinfo'} - {$blockuserinfo_cart_qties} - {l s='product' mod='blockuserinfo'} - {l s='products' mod='blockuserinfo'} - {if $blockuserinfo_cart_qties >= 0} - + {l s='Cart:' mod='blockuserinfo'} + {$cart_qties} + {l s='product' mod='blockuserinfo'} + {l s='products' mod='blockuserinfo'} + {if $cart_qties >= 0} + {if $priceDisplay == 1} {assign var='blockuser_cart_flag' value='Cart::BOTH_WITHOUT_SHIPPING'|constant} - {convertPrice price=$blockuserinfo_cart->getOrderTotal(false, $blockuser_cart_flag)} + {convertPrice price=$cart->getOrderTotal(false, $blockuser_cart_flag)} {else} {assign var='blockuser_cart_flag' value='Cart::BOTH_WITHOUT_SHIPPING'|constant} - {convertPrice price=$blockuserinfo_cart->getOrderTotal(true, $blockuser_cart_flag)} + {convertPrice price=$cart->getOrderTotal(true, $blockuser_cart_flag)} {/if} {/if} - {l s='(empty)' mod='blockuserinfo'} + {l s='(empty)' mod='blockuserinfo'}
    • {/if}
  • {l s='Your Account' mod='blockuserinfo'}
    • diff --git a/modules/blockviewed/blockviewed.php b/modules/blockviewed/blockviewed.php index e9fdd7713..55088a873 100644 --- a/modules/blockviewed/blockviewed.php +++ b/modules/blockviewed/blockviewed.php @@ -166,7 +166,7 @@ class BlockViewed extends Module if (!sizeof($productsViewedObj)) return ; - $this->templateAssign(array( + $this->smarty->assign(array( 'productsViewedObj' => $productsViewedObj, 'mediumSize' => Image::getSize('medium'))); diff --git a/modules/blockviewed/blockviewed.tpl b/modules/blockviewed/blockviewed.tpl index ece796008..c6e5d48ff 100644 --- a/modules/blockviewed/blockviewed.tpl +++ b/modules/blockviewed/blockviewed.tpl @@ -29,9 +29,9 @@

    {l s='Viewed products' mod='blockviewed'}

      - {foreach from=$blockviewed_productsViewedObj item=viewedProduct name=myLoop} + {foreach from=$productsViewedObj item=viewedProduct name=myLoop}
    • - {$viewedProduct->legend|escape:html:'UTF-8'} + {$viewedProduct->legend|escape:html:'UTF-8'}
      {$viewedProduct->name|truncate:14:'...'|escape:html:'UTF-8'}

      {$viewedProduct->description_short|strip_tags:'UTF-8'|truncate:44}

      diff --git a/modules/homefeatured/homefeatured.php b/modules/homefeatured/homefeatured.php index 9f6e06dea..ac63cd014 100644 --- a/modules/homefeatured/homefeatured.php +++ b/modules/homefeatured/homefeatured.php @@ -101,7 +101,7 @@ class HomeFeatured extends Module $nb = (int)(Configuration::get('HOME_FEATURED_NBR')); $products = $category->getProducts($params['cookie']->id_lang, 1, ($nb ? $nb : 10)); - $this->templateAssign(array( + $this->smarty->assign(array( 'products' => $products, 'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'), 'homeSize' => Image::getSize('home'), diff --git a/modules/homefeatured/homefeatured.tpl b/modules/homefeatured/homefeatured.tpl index f23d9b070..c4a12d264 100644 --- a/modules/homefeatured/homefeatured.tpl +++ b/modules/homefeatured/homefeatured.tpl @@ -27,17 +27,17 @@
{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|escape:'htmlall':'UTF-8'} -{if $discount.value_real != '!'}{if $priceDisplay == 1}{convertPrice price=$discount.value_tax_exc}{else}{convertPrice price=$discount.value_real}{/if}{/if}{l s='Delete'}{l s='Delete'}