dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix smarty variable conflict

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11531 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2011-12-21 17:43:34 +00:00
parent a4956730c3
commit cfd6918b70
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/cheque/cheque.php
+2 -3
View File
@@ -214,7 +214,6 @@ class Cheque extends PaymentModule
$cart = $this->context->cart; $cart = $this->context->cart;
if (!$this->_checkCurrency($cart)) if (!$this->_checkCurrency($cart))
Tools::redirect('index.php?controller=order'); Tools::redirect('index.php?controller=order');
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'nbProducts' => $cart->nbProducts(), 'nbProducts' => $cart->nbProducts(),
'cust_currency' => $cart->id_currency, 'cust_currency' => $cart->id_currency,
@@ -223,8 +222,8 @@ class Cheque extends PaymentModule
'isoCode' => $this->context->language->iso_code, 'isoCode' => $this->context->language->iso_code,
'chequeName' => $this->chequeName, 'chequeName' => $this->chequeName,
'chequeAddress' => Tools::nl2br($this->address), 'chequeAddress' => Tools::nl2br($this->address),
'this_path' => $this->_path, 'cheque_path' => $this->_path,
'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->name.'/' 'cheque_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->name.'/'
)); ));
if (!$direct_call) if (!$direct_call)
modules/cheque/payment_execution.tpl
+1 -1
View File
@@ -39,7 +39,7 @@
<h3>{l s='Cheque payment' mod='cheque'}</h3> <h3>{l s='Cheque payment' mod='cheque'}</h3>
<form action="{$link->getModuleLink('cheque', 'validation', true)}" method="post"> <form action="{$link->getModuleLink('cheque', 'validation', true)}" method="post">
<p> <p>
<img src="{$this_path}cheque.jpg" alt="{l s='cheque' mod='cheque'}" width="86" height="49" style="float:left; margin: 0px 10px 5px 0px;" /> <img src="{$cheque_path}cheque.jpg" alt="{l s='cheque' mod='cheque'}" width="86" height="49" style="float:left; margin: 0px 10px 5px 0px;" />
{l s='You have chosen to pay by cheque.' mod='cheque'} {l s='You have chosen to pay by cheque.' mod='cheque'}
<br/><br /> <br/><br />
{l s='Here is a short summary of your order:' mod='cheque'} {l s='Here is a short summary of your order:' mod='cheque'}