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

[*] FO : cart summary is adapted to cart rules with a special "friendly" display

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15442 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-05-19 13:26:21 +00:00
parent 59717088d1
commit 7fdea61289
5 changed files with 79 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/CartRule.php
+9 -1
View File
@@ -733,7 +733,14 @@ class CartRuleCore extends ObjectModel
{
// Discount (%) on the whole order
if ($this->reduction_percent && $this->reduction_product == 0)
$reduction_value += $context->cart->getOrderTotal($useTax, Cart::ONLY_PRODUCTS) * $this->reduction_percent / 100;
{
// Do not give a reduction on free products!
$order_total = $context->cart->getOrderTotal($useTax, Cart::ONLY_PRODUCTS);
foreach ($context->cart->getCartRules(CartRule::FILTER_ACTION_GIFT) as $cart_rule)
$order_total -= Tools::ps_round($cart_rule['obj']->getContextualValue($useTax, $context, CartRule::FILTER_ACTION_GIFT), 2);
$reduction_value += $order_total * $this->reduction_percent / 100;
}
// Discount (%) on a specific product
if ($this->reduction_percent && $this->reduction_product > 0)
@@ -822,6 +829,7 @@ class CartRuleCore extends ObjectModel
{
$cart_amount_ti = $context->cart->getOrderTotal(true, Cart::ONLY_PRODUCTS);
$cart_amount_te = $context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS);
$cart_vat_amount = $cart_amount_ti - $cart_amount_te;
if ($cart_vat_amount == 0 || $cart_amount_te == 0)