git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15539 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger committed 2012-05-21 16:17:53 +00:00
1 parent 1fc014d107
commit 8428e228e3
1 file changed
+1 -1
+1 -1
View File
@@ -1449,7 +1449,7 @@ class CartCore extends ObjectModel
{ {
// If the cart rule offers free shipping, add the shipping cost // If the cart rule offers free shipping, add the shipping cost
if ($with_shipping && $cart_rule['obj']->free_shipping) if ($with_shipping && $cart_rule['obj']->free_shipping)
$order_total_discount += Tools::ps_round($cart_rule['obj']->getContextualValue($with_taxes, $virtual_context, CartRule::FILTER_ACTION_ALL), 2); $order_total_discount += Tools::ps_round($cart_rule['obj']->getContextualValue($with_taxes, $virtual_context, CartRule::FILTER_ACTION_SHIPPING), 2);
// If the cart rule is a free gift, then add the free gift value only if the gift is in this package // If the cart rule is a free gift, then add the free gift value only if the gift is in this package
if ((int)$cart_rule['obj']->gift_product) if ((int)$cart_rule['obj']->gift_product)