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

// Fix bug with multishipping and gift products

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15476 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-05-21 08:52:45 +00:00
parent c22c0d97f7
commit aed3c8c6f3
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/OrderController.php
+1
View File
@@ -131,6 +131,7 @@ class OrderControllerCore extends ParentOrderController
if (Tools::getValue('multi-shipping') == 1)
{
$this->_assignSummaryInformations();
$this->context->smarty->assign('product_list', $this->context->cart->getProducts());
$this->setTemplate(_PS_THEME_DIR_.'order-address-multishipping.tpl');
}
else
controllers/front/OrderOpcController.php
+2
View File
@@ -223,6 +223,8 @@ class OrderOpcControllerCore extends ParentOrderController
case 'multishipping':
$this->_assignSummaryInformations();
$this->context->smarty->assign('product_list', $this->context->cart->getProducts());
if ($this->context->customer->id)
$this->context->smarty->assign('address_list', $this->context->customer->getAddresses($this->context->language->id));
else
themes/default/order-address-multishipping-products.tpl
+1 -1
View File
@@ -42,7 +42,7 @@
</tr>
</thead>
<tbody>
{foreach from=$products item=product name=productLoop}
{foreach from=$product_list item=product name=productLoop}
{assign var='productId' value=$product.id_product}
{assign var='productAttributeId' value=$product.id_product_attribute}
{assign var='quantityDisplayed' value=0}