From f2bdb73d39723b939071a670f3c625c1d6bd6894 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Tue, 16 Apr 2013 11:28:22 +0200 Subject: [PATCH] [-] FO : Undefined free_shipping in POC when updateQty --- controllers/front/OrderController.php | 1 - controllers/front/OrderOpcController.php | 12 +++++++++++- themes/default/order-carrier.tpl | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php index 80b4775bb..37b5d90b8 100644 --- a/controllers/front/OrderController.php +++ b/controllers/front/OrderController.php @@ -347,7 +347,6 @@ class OrderControllerCore extends ParentOrderController $this->context->smarty->assign( array( - // 'free_shipping' => false, // Deprecated since a cart rule can be applied the specific carriers only 'is_guest' => (isset($this->context->customer->is_guest) ? $this->context->customer->is_guest : 0) )); } diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index 9b90e22a4..225f0e30a 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -498,9 +498,19 @@ class OrderOpcControllerCore extends ParentOrderController $wrapping_fees = $this->context->cart->getGiftWrappingPrice(false); $wrapping_fees_tax_inc = $wrapping_fees = $this->context->cart->getGiftWrappingPrice(); $oldMessage = Message::getMessageByCartId((int)($this->context->cart->id)); + + $free_shipping = false; + foreach ($this->context->cart->getCartRules() as $rule) + { + if ($rule['free_shipping'] && !$rule['carrier_restriction']) + { + $free_shipping = true; + break; + } + } $vars = array( - // 'free_shipping' => false, // Deprecated since a cart rule can be applied the specific carriers only + 'free_shipping' => $free_shipping, 'checkedTOS' => (int)($this->context->cookie->checkedTOS), 'recyclablePackAllowed' => (int)(Configuration::get('PS_RECYCLABLE_PACK')), 'giftAllowed' => (int)(Configuration::get('PS_GIFT_WRAPPING')), diff --git a/themes/default/order-carrier.tpl b/themes/default/order-carrier.tpl index 25e164044..a8b9c2f2f 100644 --- a/themes/default/order-carrier.tpl +++ b/themes/default/order-carrier.tpl @@ -170,7 +170,7 @@
- {if $option.total_price_with_tax && !$free_shipping} + {if $option.total_price_with_tax && (!isset($free_shipping) || (isset($free_shipping) && !$free_shipping))} {if $use_taxes == 1} {convertPrice price=$option.total_price_with_tax} {l s='(tax incl.)'} {else}