ACP2E-2651: Incorrect subtotal in order when FPT is used

Author: veloraven

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

@@ -177,8 +177,7 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
         // 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
-        $includeInSubtotal = $this->_weeeData->includeInSubtotal($store);
-        if ($invoice->isLast() && $includeInSubtotal) {
+        if ($invoice->isLast() && $this->_weeeData->includeInSubtotal($store)) {
             $invoice->setSubtotal($invoice->getSubtotal() - $totalWeeeAmount);
             $invoice->setBaseSubtotal($invoice->getBaseSubtotal() - $baseTotalWeeeAmount);
             $invoice->setGrandTotal($invoice->getGrandTotal() - $totalWeeeAmountInclTax);
@@ -196,7 +195,7 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
         $invoice->setBaseTaxAmount($invoice->getBaseTaxAmount() + $baseTotalWeeeTaxAmount);
 
         // Add FPT to subtotal and grand total
-        if ($includeInSubtotal) {
+        if ($this->_weeeData->includeInSubtotal($store)) {
             $order = $invoice->getOrder();
             $allowedSubtotal = $order->getSubtotal() - $order->getSubtotalInvoiced() - $invoice->getSubtotal();
             $allowedBaseSubtotal = $order->getBaseSubtotal() -

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,
                 ],
             ],
         ];