ACP2E-3349: Cart rules "Fixed amount discount for whole cart" Action applies discounts incorrectly

aplapana · aplapana · commit 1555265e9c34 · 2024-09-24T10:51:31.000+03:00
diff --git a/app/code/Magento/SalesRule/Model/Quote/Discount.php b/app/code/Magento/SalesRule/Model/Quote/Discount.php
@@ -188,7 +188,7 @@ public function collect(
         $items = $this->calculator->sortItemsByPriority($items, $address);
         $itemsToApplyRules = $items;
         $rules = $this->calculator->getRules($address);
-        $totalDiscount = 0;
+        $totalDiscount = [];
         $address->setBaseDiscountAmount(0);
         /** @var Rule $rule */
         foreach ($rules as $rule) {
@@ -221,9 +221,9 @@ public function collect(
                     unset($itemsToApplyRules[$key]);
                 }
 
-                $totalDiscount += $item->getBaseDiscountAmount();
+                $totalDiscount[$item->getId()] = $item->getBaseDiscountAmount();
             }
-            $address->setBaseDiscountAmount($totalDiscount);
+            $address->setBaseDiscountAmount(array_sum(array_values($totalDiscount)));
         }
         $this->calculator->initTotals($items, $address);
         foreach ($items as $item) {

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ public function collect(`
`188`	`188`	`$items = $this->calculator->sortItemsByPriority($items, $address);`
`189`	`189`	`$itemsToApplyRules = $items;`
`190`	`190`	`$rules = $this->calculator->getRules($address);`
`191`		`- $totalDiscount = 0;`
	`191`	`+ $totalDiscount = [];`
`192`	`192`	`$address->setBaseDiscountAmount(0);`
`193`	`193`	`/** @var Rule $rule */`
`194`	`194`	`foreach ($rules as $rule) {`
`@@ -221,9 +221,9 @@ public function collect(`
`221`	`221`	`unset($itemsToApplyRules[$key]);`
`222`	`222`	`}`
`223`	`223`
`224`		`- $totalDiscount += $item->getBaseDiscountAmount();`
	`224`	`+ $totalDiscount[$item->getId()] = $item->getBaseDiscountAmount();`
`225`	`225`	`}`
`226`		`- $address->setBaseDiscountAmount($totalDiscount);`
	`226`	`+ $address->setBaseDiscountAmount(array_sum(array_values($totalDiscount)));`
`227`	`227`	`}`
`228`	`228`	`$this->calculator->initTotals($items, $address);`
`229`	`229`	`foreach ($items as $item) {`