// Cart rule display in cart summary

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15755 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-30 09:29:55 +00:00
parent a2326a1dde
commit 04985181e3
4 changed files with 12 additions and 23 deletions
@@ -2665,7 +2665,8 @@ class CartCore extends ObjectModel
 		// The cart content is altered for display
 		foreach ($cart_rules as &$cart_rule)
 		{
-			if ($cart_rule['free_shipping'])
+			// If the cart rule is automatic (wihtout any code) and include free shipping, it should not be displayed as a cart rule but only set the shipping cost to 0
+			if ($cart_rule['free_shipping'] && empty($cart_rule['code']))
 			{
 				$cart_rule['value_real'] -= $total_shipping;
 				$cart_rule['value_tax_exc'] = $total_shipping_tax_exc;