Skip to content

Commit 09c565c

Browse files
committed
ACP2E-3498: Incorrect discount value when multiple cart price rules are applied simultaneously with discounted/special priced products
1 parent b2e17a9 commit 09c565c

File tree

2 files changed

+6
-4
lines changed
  • app/code/Magento/SalesRule/Model/Rule/Action/Discount
  • dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount

2 files changed

+6
-4
lines changed

app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@ public function calculate($rule, $item, $qty)
201201
}
202202

203203
/**
204+
* Get existing discount applied to affected items
205+
*
204206
* @param int $ruleId
205207
* @param array $affectedItems
206208
* @return float

dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2018 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -701,7 +701,7 @@ public function testFixedAmountToWholeCart2productsAfterPercent1Product(): void
701701
'discount_amount' => 153,
702702
'apply_to_shipping' => 0,
703703
'stop_rules_processing' => 0,
704-
'sort_order' => 1,
704+
'sort_order' => 0,
705705
'conditions' => ['$cond111$'],
706706
'actions' => ['$applyCond1$']
707707
]
@@ -733,7 +733,7 @@ public function testFixedAmountToWholeCart2productsAfterPercent1Product(): void
733733
'discount_amount' => 14,
734734
'apply_to_shipping' => 0,
735735
'stop_rules_processing' => 0,
736-
'sort_order' => 2,
736+
'sort_order' => 0,
737737
'conditions' => ['$cond222$'],
738738
'actions' => ['$applyCond2$']
739739
]

0 commit comments

Comments
 (0)