File tree Expand file tree Collapse file tree 1 file changed +1
-6
lines changed
app/code/Magento/Weee/Model/Total/Invoice Expand file tree Collapse file tree 1 file changed +1
-6
lines changed Original file line number Diff line number Diff line change @@ -207,15 +207,10 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
207
207
$ invoice ->setSubtotal ($ invoice ->getSubtotal () + $ totalWeeeAmount );
208
208
$ invoice ->setBaseSubtotal ($ invoice ->getBaseSubtotal () + $ baseTotalWeeeAmount );
209
209
}
210
-
211
- if (!$ invoice ->isLast ()) {
210
+
212
211
// need to add the Weee amounts including all their taxes
213
212
$ invoice ->setSubtotalInclTax ($ invoice ->getSubtotalInclTax () + $ totalWeeeAmountInclTax );
214
213
$ invoice ->setBaseSubtotalInclTax ($ invoice ->getBaseSubtotalInclTax () + $ baseTotalWeeeAmountInclTax );
215
- // since the Subtotal Incl Tax line will already have the taxes on Weee, just add the non-taxable amounts
216
- $ invoice ->setSubtotalInclTax ($ invoice ->getSubtotalInclTax () + $ totalWeeeAmount );
217
- $ invoice ->setBaseSubtotalInclTax ($ invoice ->getBaseSubtotalInclTax () + $ baseTotalWeeeAmount );
218
- }
219
214
220
215
$ invoice ->setGrandTotal ($ invoice ->getGrandTotal () + $ totalWeeeAmount + $ totalWeeeTaxAmount );
221
216
$ invoice ->setBaseGrandTotal ($ invoice ->getBaseGrandTotal () + $ baseTotalWeeeAmount + $ baseTotalWeeeTaxAmount );
You can’t perform that action at this time.
0 commit comments