From 14896df71e1ee6ee648a5e0482336a34b4b102d5 Mon Sep 17 00:00:00 2001 From: dMetzger Date: Wed, 2 May 2012 13:01:02 +0000 Subject: [PATCH] [-] FO : cart rules did not use specific prices in the calculations #PSCFV-702 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14999 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/CartRule.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/classes/CartRule.php b/classes/CartRule.php index c45b1fff8..0e0fc3fd5 100644 --- a/classes/CartRule.php +++ b/classes/CartRule.php @@ -518,14 +518,12 @@ class CartRuleCore extends ObjectModel $this->gift_product, $this->minimum_amount_tax, $this->gift_product_attribute, - null, null, null, null, null, null, + null, null, false, true, 1, null, $context->cart->id_customer ? $context->cart->id_customer : null, $context->cart->id, (int)$context->cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')} ? (int)$context->cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')} : null, - $ref, null, null, - $context, null + $ref, true, true, $context, true ); - $cartTotal -= $product_price; } } @@ -912,6 +910,7 @@ class CartRuleCore extends ObjectModel { if ($error = $cart_rule['obj']->checkValidity($context, true)) { + file_put_contents('zzzploplop.txt', $error."\n", FILE_APPEND); $context->cart->removeCartRule($cart_rule['obj']->id); $context->cart->update(); $errors[] = $error; @@ -987,7 +986,7 @@ class CartRuleCore extends ObjectModel foreach ($cartRules as $cartRule) if ($cartRule->checkValidity($context, true, false)) - $context->cart->addCartRule($cartRule->id); + $context->cart->addCartRule($cartRule->id); } /**