From cb1d41c82a7e206beb723e6b8e2accd876d5143a Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Fri, 30 Mar 2012 09:46:29 +0000 Subject: [PATCH] [-] BO : fixed bug #PSFV-751 - Carrier - Rule of free shipping does not work --- classes/Cart.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/classes/Cart.php b/classes/Cart.php index 11cc353e7..ba75a861e 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -2344,6 +2344,9 @@ class CartCore extends ObjectModel $free_fees_price = 0; if (isset($configuration['PS_SHIPPING_FREE_PRICE'])) $free_fees_price = Tools::convertPrice((float)$configuration['PS_SHIPPING_FREE_PRICE'], Currency::getCurrencyInstance((int)$this->id_currency)); + $orderTotalwithDiscounts = $this->getOrderTotal(true, Cart::BOTH_WITHOUT_SHIPPING); + if ($orderTotalwithDiscounts >= (float)($free_fees_price) && (float)($free_fees_price) > 0) + return $shipping_cost; if (isset($configuration['PS_SHIPPING_FREE_WEIGHT']) && $this->getTotalWeight() >= (float)$configuration['PS_SHIPPING_FREE_WEIGHT']