ACP2E-3139: Sales Rule with Discount Qty Step (Buy X) attribute causes other rules to not be applied

veloraven · veloraven · commit 889a3b6cbc3f · 2024-07-09T05:46:51.000-05:00
diff --git a/app/code/Magento/SalesRule/Model/Quote/Discount.php b/app/code/Magento/SalesRule/Model/Quote/Discount.php
@@ -198,7 +198,7 @@ public function collect(
                     continue;
                 }
 
-               switch ($rule->getSimpleAction()) {
+                 switch ($rule->getSimpleAction()) {
                     case Rule::BY_PERCENT_ACTION:
                     case Rule::BY_FIXED_ACTION:
                         if ($rule->getDiscountStep() > $item->getQty()) {
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Quote/DiscountTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Quote/DiscountTest.php
@@ -656,7 +656,8 @@ public function testFixedAmountDiscountForWholeCartOnSimpleProductWhenStepQtyIsS
                 'price' => 123,
                 'sku' => 'p1',
                 'category_ids' => ['$c1.id$']
-            ], 'p1'
+            ],
+            'p1'
         ),
         DataFixture(
             RuleFixture::class,

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ public function collect(`
`198`	`198`	`continue;`
`199`	`199`	`}`
`200`	`200`
`201`		`- switch ($rule->getSimpleAction()) {`
	`201`	`+ switch ($rule->getSimpleAction()) {`
`202`	`202`	`case Rule::BY_PERCENT_ACTION:`
`203`	`203`	`case Rule::BY_FIXED_ACTION:`
`204`	`204`	`if ($rule->getDiscountStep() > $item->getQty()) {`