From 26d5ad39a2c34334c893d29c8fcc768ecf1af7fa Mon Sep 17 00:00:00 2001 From: dMetzger Date: Fri, 9 Nov 2012 16:41:29 +0000 Subject: [PATCH] [-] FO : shipping should not be free because the products in cart cart are free #PSCFV-5303 --- classes/Cart.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/classes/Cart.php b/classes/Cart.php index 46f46c3c7..35a500abb 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -2486,12 +2486,7 @@ class CartCore extends ObjectModel // Start with shipping cost at 0 $shipping_cost = 0; // If no product added, return 0 - if ($order_total <= 0 - && ( - !(Cart::getNbProducts($this->id) && is_null($product_list)) - || - (count($product_list) && !is_null($product_list)) - )) + if (!count($products)) { Cache::store($cache_id, $shipping_cost); return $shipping_cost;