ACP2E-3463: Invalid discount calculation with priority

Author: aplapana

app/code/Magento/SalesRule/Helper/CartFixedDiscount.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -137,9 +137,9 @@ public function getDiscountedAmountProportionally(
     ): float {
         $baseItemPriceTotal = $baseItemPrice * $qty - $baseItemDiscountAmount;
         $ratio = $baseRuleTotalsDiscount != 0 ? $baseItemPriceTotal / $baseRuleTotalsDiscount : 0;
-        $discountAmount = $this->deltaPriceRound->round($ruleDiscount * $ratio, $discountType);
+        $ratio = min($ratio, 1);
 
-        return $discountAmount;
+        return $this->deltaPriceRound->round($ruleDiscount * $ratio, $discountType);
     }
 
     /**

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

@@ -133,9 +133,7 @@ public function calculate($rule, $item, $qty)
                         $qty,
                         $baseItemPrice,
                         $baseItemDiscountAmount,
-                        //$baseRuleTotals - $ruleTotals['base_items_discount_amount'],
-                        //$baseRuleTotals - $address->getBaseDiscountAmount(),
-                        $baseRuleTotals,
+                        $baseRuleTotals - $address->getBaseDiscountAmount(),
                         $discountType
                     );
             }