From fd36dd713008eae4e7fb56ede03fc6645caffcb6 Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Thu, 5 Jul 2012 12:59:57 +0000 Subject: [PATCH] // Fix bug: undefined variable git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16237 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/front/OrderOpcController.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index bf50e8441..b08129f70 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -474,8 +474,18 @@ class OrderOpcControllerCore extends ParentOrderController else $link_conditions .= '&content_only=1'; + // If a rule offer free-shipping, force hidding shipping prices + $free_shipping = false; + foreach ($this->context->cart->getCartRules() as $rule) + if ($rule['free_shipping']) + { + $free_shipping = true; + break; + } + $carriers = $this->context->cart->simulateCarriersOutput(); $vars = array( + 'free_shipping' => $free_shipping, 'checkedTOS' => (int)($this->context->cookie->checkedTOS), 'recyclablePackAllowed' => (int)(Configuration::get('PS_RECYCLABLE_PACK')), 'giftAllowed' => (int)(Configuration::get('PS_GIFT_WRAPPING')),