ACP2E-10: Incorrect Discount: Two Cart rules with and without coupon

Author: victor-v-rad

app/code/Magento/SalesRule/Model/Quote/Discount.php

@@ -160,6 +160,9 @@ public function collect(
         $quote->setCartFixedRules([]);
         foreach ($items as $item) {
             $this->rulesApplier->setAppliedRuleIds($item, []);
+            if ($item->getExtensionAttributes()) {
+                $item->getExtensionAttributes()->setDiscounts(null);
+            }
             $item->setDiscountAmount(0);
             $item->setBaseDiscountAmount(0);
             $item->setDiscountPercent(0);

app/code/Magento/SalesRule/Model/RulesApplier.php

@@ -108,9 +108,6 @@ public function applyRules($item, $rules, $skipValidation, $couponCode)
     {
         $address = $item->getAddress();
         $appliedRuleIds = [];
-        if ($item->getExtensionAttributes()) {
-            $item->getExtensionAttributes()->setDiscounts(null);
-        }
         /* @var $rule Rule */
         foreach ($rules as $rule) {
             if (!$this->validatorUtility->canProcessRule($rule, $address)) {