Merge branch 'ACP2E-2651' of https://github.com/magento-l3/magento2ce into Tier4-PR-01-02-2024

Author: thiaramus

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

@@ -12,7 +12,7 @@
 class Weee extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal
 {
     /**
-     * Weee data
+     * Weee data object
      *
      * @var WeeeHelper
      */
@@ -174,6 +174,18 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
             $baseTotalWeeeAmountInclTax += $baseWeeeAmountInclTax;
         }
 
+        // If FPT is configured to be included in the subtotal,
+        // we need to subtract it from the subtotal and the grand total,
+        // as Collect function from Catalog module knows nothing about FPT and that it is already included in Subtotal
+        if ($invoice->isLast() && $this->_weeeData->includeInSubtotal($store)) {
+            $invoice->setSubtotal($invoice->getSubtotal() - $totalWeeeAmount);
+            $invoice->setBaseSubtotal($invoice->getBaseSubtotal() - $baseTotalWeeeAmount);
+            $invoice->setGrandTotal($invoice->getGrandTotal() - $totalWeeeAmountInclTax);
+            $invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() - $baseTotalWeeeAmountInclTax);
+            $invoice->setTaxAmount($invoice->getTaxAmount() - $totalWeeeTaxAmount);
+            $invoice->setBaseTaxAmount($invoice->getBaseTaxAmount() - $baseTotalWeeeTaxAmount);
+        }
+
         $allowedTax = $order->getTaxAmount() - $order->getTaxInvoiced() - $invoice->getTaxAmount();
         $allowedBaseTax = $order->getBaseTaxAmount() - $order->getBaseTaxInvoiced() - $invoice->getBaseTaxAmount();
         $totalWeeeTaxAmount = min($totalWeeeTaxAmount, $allowedTax);
@@ -196,15 +208,9 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
             $invoice->setBaseSubtotal($invoice->getBaseSubtotal() + $baseTotalWeeeAmount);
         }
 
-        if (!$invoice->isLast()) {
             // need to add the Weee amounts including all their taxes
             $invoice->setSubtotalInclTax($invoice->getSubtotalInclTax() + $totalWeeeAmountInclTax);
             $invoice->setBaseSubtotalInclTax($invoice->getBaseSubtotalInclTax() + $baseTotalWeeeAmountInclTax);
-        } else {
-            // since the Subtotal Incl Tax line will already have the taxes on Weee, just add the non-taxable amounts
-            $invoice->setSubtotalInclTax($invoice->getSubtotalInclTax() + $totalWeeeAmount);
-            $invoice->setBaseSubtotalInclTax($invoice->getBaseSubtotalInclTax() + $baseTotalWeeeAmount);
-        }
 
         $invoice->setGrandTotal($invoice->getGrandTotal() + $totalWeeeAmount + $totalWeeeTaxAmount);
         $invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() + $baseTotalWeeeAmount + $baseTotalWeeeTaxAmount);

app/code/Magento/Weee/Test/Unit/Model/Total/Invoice/WeeeTest.php

@@ -115,7 +115,7 @@ public function testCollect($orderData, $invoiceData, $expectedResults)
         $this->setupOrder($orderData);
 
         //Set up weeeData mock
-        $this->weeeData->expects($this->once())
+        $this->weeeData->expects($this->atLeastOnce())
             ->method('includeInSubtotal')
             ->willReturn($invoiceData['include_in_subtotal']);
 
@@ -284,8 +284,8 @@ public function collectDataProvider()
                     'base_tax_amount' => 16.09,
                     'subtotal' => 300,
                     'base_subtotal' => 300,
-                    'subtotal_incl_tax' => 344.85,
-                    'base_subtotal_incl_tax' => 344.85,
+                    'subtotal_incl_tax' => 347.32,
+                    'base_subtotal_incl_tax' => 347.32,
                 ],
             ],
         ];
@@ -590,8 +590,8 @@ public function collectDataProvider()
                     'base_tax_amount' => 4.95,
                     'subtotal' => 100,
                     'base_subtotal' => 100,
-                    'subtotal_incl_tax' => 114.95,
-                    'base_subtotal_incl_tax' => 114.95,
+                    'subtotal_incl_tax' => 115.77,
+                    'base_subtotal_incl_tax' => 115.77,
                 ],
             ],
         ];