AC-7886::Subtotal (Excl. Tax) condition for Cart rule is not working for FREE Shipping - changes updated to fix integration tests

Author: mahesh-singh-rajawat

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

@@ -222,6 +222,8 @@ public function collect(
         $total->setBaseSubtotalWithDiscount($total->getBaseSubtotal() + $total->getBaseDiscountAmount());
         $address->setDiscountAmount($total->getDiscountAmount());
         $address->setBaseDiscountAmount($total->getBaseDiscountAmount());
+        $address->setBaseSubtotalWithDiscount($total->getBaseSubtotal() + $total->getBaseDiscountAmount());
+        $address->setSubtotalWithDiscount($total->getSubtotal() + $total->getDiscountAmount());
         return $this;
     }
 

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

@@ -274,8 +274,8 @@ public function canApplyRules(AbstractItem $item)
     public function reset(Address $address)
     {
         $this->validatorUtility->resetRoundingDeltas();
-        $address->setBaseSubtotalWithDiscount($address->getBaseSubtotalWithDiscount());
-        $address->setSubtotalWithDiscount($address->getSubtotalWithDiscount());
+        $address->setBaseSubtotalWithDiscount($address->getBaseSubtotal());
+        $address->setSubtotalWithDiscount($address->getSubtotal());
         $this->rulesApplier->resetDiscountAggregator();
         if ($this->_isFirstTimeResetRun) {
             $address->setAppliedRuleIds('');