ACP2E-1076: Discount (Cart price rules) ignore Weee tax amount included in subtotal cart

Author: Chhandak.Barua

app/code/Magento/Quote/Model/Quote/TotalsCollector.php

@@ -269,7 +269,7 @@ public function collectAddressTotals(
                 'total' => $total
             ]
         );
-
+        $total->setBaseSubtotalTotalInclTax($total->getBaseSubtotalInclTax());
         $address->addData($total->getData());
         $address->setAppliedTaxes($total->getAppliedTaxes());
         return $total;

app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php

@@ -627,6 +627,7 @@ protected function processProductItems(
         $address = $shippingAssignment->getShipping()->getAddress();
         $address->setBaseTaxAmount($baseTax);
         $address->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);
+        $address->setSubtotalInclTax($subtotalInclTax);
         $address->setSubtotal($total->getSubtotal());
         $address->setBaseSubtotal($total->getBaseSubtotal());
 

app/code/Magento/Weee/Model/Total/Quote/Weee.php

@@ -242,10 +242,10 @@ protected function process(
             ->setBaseWeeeTaxAppliedAmountInclTax($baseTotalValueInclTax)
             ->setWeeeTaxAppliedRowAmountInclTax($totalRowValueInclTax)
             ->setBaseWeeeTaxAppliedRowAmntInclTax($baseTotalRowValueInclTax);
-        $address->setBaseSubtotalTotalInclTax($address->getBaseSubtotalTotalInclTax() + $baseTotalRowValueInclTax);
 
         $this->processTotalAmount(
             $total,
+            $address,
             $totalRowValueExclTax,
             $baseTotalRowValueExclTax,
             $totalRowValueInclTax,
@@ -259,6 +259,7 @@ protected function process(
      * Process row amount based on FPT total amount configuration setting
      *
      * @param Total $total
+     * @param Address $address
      * @param float $rowValueExclTax
      * @param float $baseRowValueExclTax
      * @param float $rowValueInclTax
@@ -267,6 +268,7 @@ protected function process(
      */
     protected function processTotalAmount(
         $total,
+        $address,
         $rowValueExclTax,
         $baseRowValueExclTax,
         $rowValueInclTax,
@@ -285,6 +287,8 @@ protected function processTotalAmount(
         $total->setBaseSubtotalInclTax(
             $total->getBaseSubtotalInclTax() + $this->priceCurrency->round($baseRowValueInclTax)
         );
+        $address->setBaseSubtotalTotalInclTax($total->getBaseSubtotalInclTax());
+        $address->setSubtotalInclTax($total->getSubtotalInclTax());
         return $this;
     }
 

app/code/Magento/Weee/Model/Total/Quote/WeeeTax.php

@@ -18,7 +18,7 @@ class WeeeTax extends Weee
      * Collect Weee taxes amount and prepare items prices for taxation and discount
      *
      * @param Quote $quote
-     * @param ShippingAssignmentInterface|Address $shippingAssignment
+     * @param ShippingAssignmentInterface $shippingAssignment
      * @param Total $total
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -30,6 +30,7 @@ public function collect(
         Total $total
     ) {
         AbstractTotal::collect($quote, $shippingAssignment, $total);
+        $address = $shippingAssignment->getShipping()->getAddress();
         $this->_store = $quote->getStore();
         if (!$this->weeeData->isEnabled($this->_store)) {
             return $this;
@@ -47,7 +48,7 @@ public function collect(
             $weeeBaseTotal = $total->getWeeeBaseTotalExclTax();
 
             //Add to appropriate 'subtotal' or 'weee' accumulators
-            $this->processTotalAmount($total, $weeeTotal, $weeeBaseTotal, $weeeTotal, $weeeBaseTotal);
+            $this->processTotalAmount($total, $address, $weeeTotal, $weeeBaseTotal, $weeeTotal, $weeeBaseTotal);
             return $this;
         }
 
@@ -141,6 +142,7 @@ public function collect(
 
                 $this->processTotalAmount(
                     $total,
+                    $address,
                     $totalRowValueExclTax,
                     $baseTotalRowValueExclTax,
                     $totalRowValueInclTax,
@@ -204,6 +206,7 @@ protected function createItemToWeeeCodeMapping($weeeCodeToItemMap)
      * Process row amount based on FPT total amount configuration setting
      *
      * @param Total $total
+     * @param Address $address
      * @param float $rowValueExclTax
      * @param float $baseRowValueExclTax
      * @param float $rowValueInclTax
@@ -212,6 +215,7 @@ protected function createItemToWeeeCodeMapping($weeeCodeToItemMap)
      */
     protected function processTotalAmount(
         $total,
+        $address,
         $rowValueExclTax,
         $baseRowValueExclTax,
         $rowValueInclTax,
@@ -227,6 +231,8 @@ protected function processTotalAmount(
 
         $total->setSubtotalInclTax($total->getSubtotalInclTax() + $rowValueInclTax);
         $total->setBaseSubtotalInclTax($total->getBaseSubtotalInclTax() + $baseRowValueInclTax);
+        $address->setBaseSubtotalTotalInclTax($total->getBaseSubtotalInclTax());
+        $address->setSubtotalInclTax($total->getSubtotalInclTax());
         return $this;
     }