Merge pull request #225 from mollie/5.7.1

5.7.1
mollie · Jul 29, 2022 · 1a54fae · 1a54fae
2 parents 76f2978 + 011ef7b
commit 1a54fae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/code/community/Mollie/Mpm/Model/Totals/PaymentFee/InvoiceTax.php b/app/code/community/Mollie/Mpm/Model/Totals/PaymentFee/InvoiceTax.php
@@ -4,6 +4,12 @@ class Mollie_Mpm_Model_Totals_PaymentFee_InvoiceTax extends Mage_Sales_Model_Ord
 {
     public function collect(Mage_Sales_Model_Order_Invoice $invoice)
     {
+        // When this is the last invoice, Magento will use the tax from the order, which already includes the payment
+        // fee tax minus the already invoiced tax. So don't add it again.
+        if ($invoice->isLast()) {
+            return $this;
+        }
+
         $invoice->setGrandTotal($invoice->getGrandTotal() + $invoice->getMollieMpmPaymentFeeTax());
         $invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() + $invoice->getBaseMollieMpmPaymentFeeTax());
 

diff --git a/app/code/community/Mollie/Mpm/etc/config.xml b/app/code/community/Mollie/Mpm/etc/config.xml
@@ -33,7 +33,7 @@
 <config>
     <modules>
         <Mollie_Mpm>
-            <version>5.7.0</version>
+            <version>5.7.1</version>
         </Mollie_Mpm>
     </modules>
     <global>