From da91bd1886f580fabaa93293a77237f082daa9cb Mon Sep 17 00:00:00 2001 From: dMetzger Date: Mon, 21 May 2012 16:17:53 +0000 Subject: [PATCH] // typo --- classes/Cart.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/Cart.php b/classes/Cart.php index 9c7b5c14e..ce4f25af8 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -1443,13 +1443,13 @@ class CartCore extends ObjectModel $cart_rules[] = $tmp_cart_rule; } } - + // Then, calculate the contextual value for each one foreach ($cart_rules as $cart_rule) { // If the cart rule offers free shipping, add the shipping cost 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 ((int)$cart_rule['obj']->gift_product) @@ -1474,7 +1474,7 @@ class CartCore extends ObjectModel $order_total_discount += Tools::ps_round($cart_rule['obj']->getContextualValue($with_taxes, $virtual_context, CartRule::FILTER_ACTION_REDUCTION, $package), 2); } } - + $order_total_discount = min(Tools::ps_round($order_total_discount, 2), $wrapping_fees + $order_total_products + $shipping_fees); $order_total -= $order_total_discount; }