Merge pull request #706 from mollie/release/2.32.1

Release/2.32.1
mollie · Oct 24, 2023 · 8a25f25 · 8a25f25
2 parents 7d0333d + e411130
commit 8a25f25
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/Plugin/Tax/Helper/Data.php b/Plugin/Tax/Helper/Data.php
@@ -58,10 +58,20 @@ public function afterGetCalculatedTaxes(Subject $subject, array $result, $source
         $this->result = $result;
 
         $order = $source->getOrder();
+        if (!$order->getPayment() ||
+            strstr($order->getPayment()->getMethod(), 'mollie_methods_') === false
+        ) {
+            return $result;
+        }
+
         $amount = $order->getMolliePaymentFee();
         $taxAmount = $order->getMolliePaymentFeeTax();
         $baseTaxAmount = $order->getMolliePaymentFee();
-        $rate = round(($taxAmount / $amount) * 100);
+
+        $rate = 0;
+        if ((float)$order->getMolliePaymentFeeTax()) {
+            $rate = round(($taxAmount / $amount) * 100);
+        }
 
         $taxClassId = $this->config->paymentSurchargeTaxClass(
             $order->getPayment()->getMethod(),

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "mollie/magento2",
   "description": "Mollie Payment Module for Magento 2",
-  "version": "2.32.0",
+  "version": "2.32.1",
   "keywords": [
     "mollie",
     "payment",

diff --git a/etc/config.xml b/etc/config.xml
@@ -3,7 +3,7 @@
     <default>
         <payment>
             <mollie_general>
-                <version>v2.32.0</version>
+                <version>v2.32.1</version>
                 <active>0</active>
                 <enabled>0</enabled>
                 <type>test</type>