dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// typo

Browse Source
This commit is contained in:
dMetzger
2012-05-21 16:17:53 +00:00
parent 16773c9e23
commit da91bd1886
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+3 -3
View File
@@ -1443,13 +1443,13 @@ class CartCore extends ObjectModel
$cart_rules[] = $tmp_cart_rule; $cart_rules[] = $tmp_cart_rule;
} }
} }
// Then, calculate the contextual value for each one // Then, calculate the contextual value for each one
foreach ($cart_rules as $cart_rule) foreach ($cart_rules as $cart_rule)
{ {
// 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)
@@ -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 += 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_discount = min(Tools::ps_round($order_total_discount, 2), $wrapping_fees + $order_total_products + $shipping_fees);
$order_total -= $order_total_discount; $order_total -= $order_total_discount;
} }