From 853d41201039cd0aad5fdaf0f2080b1f2ee191c8 Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Mon, 21 May 2012 08:52:45 +0000 Subject: [PATCH] // Fix bug with multishipping and gift products --- controllers/front/OrderController.php | 1 + controllers/front/OrderOpcController.php | 2 ++ themes/default/order-address-multishipping-products.tpl | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php index 2606c1cd8..1b1d4343c 100644 --- a/controllers/front/OrderController.php +++ b/controllers/front/OrderController.php @@ -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 diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index 35ea329b3..d167e9fd4 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -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 diff --git a/themes/default/order-address-multishipping-products.tpl b/themes/default/order-address-multishipping-products.tpl index a72d310ff..a26af99c5 100644 --- a/themes/default/order-address-multishipping-products.tpl +++ b/themes/default/order-address-multishipping-products.tpl @@ -42,7 +42,7 @@ - {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}