From ad370ee93ce15b11094829291a165812fcac59e3 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Fri, 13 Jul 2012 10:12:25 +0000 Subject: [PATCH] [-] FO: Fix PSCFV-3114 bad quantity discount applied with specific price rules git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16409 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/SpecificPrice.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/SpecificPrice.php b/classes/SpecificPrice.php index 8334e4781..4a89d0508 100644 --- a/classes/SpecificPrice.php +++ b/classes/SpecificPrice.php @@ -230,7 +230,7 @@ class SpecificPriceCore extends ObjectModel (`to` = \'0000-00-00 00:00:00\' OR \''.$now.'\' <= `to`) ) AND id_cart IN (0, '.(int)$id_cart.') - ORDER BY `id_specific_price_rule` ASC, `id_product_attribute` DESC, `from_quantity` DESC, `score` DESC'); + ORDER BY `id_product_attribute` DESC, `from_quantity` DESC, `id_specific_price_rule` ASC, `score` DESC'); } return self::$_specificPriceCache[$key]; } @@ -291,7 +291,7 @@ class SpecificPriceCore extends ObjectModel AND (`to` = \'0000-00-00 00:00:00\' OR \''.$now.'\' <= `to`) ) - ORDER BY `id_product_attribute` DESC, `from_quantity` DESC, `score` DESC + ORDER BY `id_product_attribute` DESC, `from_quantity` DESC, `id_specific_price_rule` ASC, `score` DESC '); $targeted_prices = array();