From f4f6055bc3751aae4c94000624defd70b4a86631 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Thu, 14 Feb 2013 10:32:21 +0100 Subject: [PATCH] [-] FO : deprecated free_shipping var set to "false" --- controllers/front/OrderController.php | 13 ++----------- controllers/front/OrderOpcController.php | 11 +---------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php index de8de6ba5..49927ce98 100644 --- a/controllers/front/OrderController.php +++ b/controllers/front/OrderController.php @@ -340,19 +340,10 @@ class OrderControllerCore extends ParentOrderController parent::_assignCarrier(); // Assign wrapping and TOS $this->_assignWrappingAndTOS(); - - // 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; - } - + $this->context->smarty->assign( array( - 'free_shipping' => $free_shipping, + '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 0098850b3..42254f911 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -480,15 +480,6 @@ 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(); $delivery_option = $this->context->cart->getDeliveryOption(null, false, false); @@ -496,7 +487,7 @@ class OrderOpcControllerCore extends ParentOrderController $wrapping_fees_tax_inc = $wrapping_fees = $this->context->cart->getGiftWrappingPrice(); $vars = array( - 'free_shipping' => $free_shipping, + 'free_shipping' => false, // Deprecated since a cart rule can be applied the specific carriers only 'checkedTOS' => (int)($this->context->cookie->checkedTOS), 'recyclablePackAllowed' => (int)(Configuration::get('PS_RECYCLABLE_PACK')), 'giftAllowed' => (int)(Configuration::get('PS_GIFT_WRAPPING')),