// Remove Module->templateAssign() from modules (use $this->smarty->assign() instead)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10914 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-12-05 14:04:35 +00:00
parent 2644f4b88d
commit d56cb00d8d
21 changed files with 86 additions and 104 deletions
+1 -1
View File
@@ -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(),
+9 -9
View File
@@ -29,22 +29,22 @@
<ul id="header_nav">
{if !$PS_CATALOG_MODE}
<li id="shopping_cart">
<a href="{$link->getPageLink("$blockuserinfo_order_process", true)}" title="{l s='Your Shopping Cart' mod='blockuserinfo'}">{l s='Cart:' mod='blockuserinfo'}</a>
<span class="ajax_cart_quantity{if $blockuserinfo_cart_qties == 0} hidden{/if}">{$blockuserinfo_cart_qties}</span>
<span class="ajax_cart_product_txt{if $blockuserinfo_cart_qties != 1} hidden{/if}">{l s='product' mod='blockuserinfo'}</span>
<span class="ajax_cart_product_txt_s{if $blockuserinfo_cart_qties < 2} hidden{/if}">{l s='products' mod='blockuserinfo'}</span>
{if $blockuserinfo_cart_qties >= 0}
<span class="ajax_cart_total{if $blockuserinfo_cart_qties == 0} hidden{/if}">
<a href="{$link->getPageLink("$order_process", true)}" title="{l s='Your Shopping Cart' mod='blockuserinfo'}">{l s='Cart:' mod='blockuserinfo'}</a>
<span class="ajax_cart_quantity{if $cart_qties == 0} hidden{/if}">{$cart_qties}</span>
<span class="ajax_cart_product_txt{if $cart_qties != 1} hidden{/if}">{l s='product' mod='blockuserinfo'}</span>
<span class="ajax_cart_product_txt_s{if $cart_qties < 2} hidden{/if}">{l s='products' mod='blockuserinfo'}</span>
{if $cart_qties >= 0}
<span class="ajax_cart_total{if $cart_qties == 0} hidden{/if}">
{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}
</span>
{/if}
<span class="ajax_cart_no_product{if $blockuserinfo_cart_qties > 0} hidden{/if}">{l s='(empty)' mod='blockuserinfo'}</span>
<span class="ajax_cart_no_product{if $cart_qties > 0} hidden{/if}">{l s='(empty)' mod='blockuserinfo'}</span>
</li>
{/if}
<li id="your_account"><a href="{$link->getPageLink('my-account', true)}" title="{l s='Your Account' mod='blockuserinfo'}">{l s='Your Account' mod='blockuserinfo'}</a></li>