From 0ce18fa9e52c67d947d42e2157537731b2c9ca2f Mon Sep 17 00:00:00 2001
From: Michiel Gerritsen <michiel@controlaltdelete.nl>
Date: Fri, 28 Jul 2023 13:52:41 +0200
Subject: [PATCH 1/2] Bugfix: Handle the new transaction ID format for orders

---
 app/code/community/Mollie/Mpm/Model/Client/Payments.php | 2 +-
 app/code/community/Mollie/Mpm/Model/Mollie.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/community/Mollie/Mpm/Model/Client/Payments.php b/app/code/community/Mollie/Mpm/Model/Client/Payments.php
index 32fd15b..afd764f 100644
--- a/app/code/community/Mollie/Mpm/Model/Client/Payments.php
+++ b/app/code/community/Mollie/Mpm/Model/Client/Payments.php
@@ -66,7 +66,7 @@ public function startTransaction(Mage_Sales_Model_Order $order)
         $additionalData = $order->getPayment()->getAdditionalInformation();
 
         $transactionId = $order->getMollieTransactionId();
-        if (!empty($transactionId) && !preg_match('/^ord_\w+$/', $transactionId)) {
+        if (!empty($transactionId) && substr($transactionId, 0, 4) != 'ord_') {
             $payment = $mollieApi->payments->get($transactionId);
             return $payment->getCheckoutUrl();
         }
diff --git a/app/code/community/Mollie/Mpm/Model/Mollie.php b/app/code/community/Mollie/Mpm/Model/Mollie.php
index da361dc..4b5eef1 100644
--- a/app/code/community/Mollie/Mpm/Model/Mollie.php
+++ b/app/code/community/Mollie/Mpm/Model/Mollie.php
@@ -162,7 +162,7 @@ public function processTransaction($orderId, $type = 'webhook', $paymentToken =
         try {
             $connection->beginTransaction();
 
-            if ($method == 'order' && preg_match('/^ord_\w+$/', $transactionId)) {
+            if ($method == 'order' && substr($transactionId, 0, 4) == 'ord_') {
                 return $this->ordersApi->processTransaction($order, $type, $paymentToken);
             } else {
                 return $this->paymentsApi->processTransaction($order, $type, $paymentToken);

From 6b841fafc0f6483d693b8e689589b64f6791597b Mon Sep 17 00:00:00 2001
From: Marvin Besselsen <marvin@magmodules.eu>
Date: Fri, 28 Jul 2023 14:18:55 +0200
Subject: [PATCH 2/2] Version bump

---
 app/code/community/Mollie/Mpm/etc/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/community/Mollie/Mpm/etc/config.xml b/app/code/community/Mollie/Mpm/etc/config.xml
index 2013fb4..0f1dbc7 100644
--- 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.8.1</version>
+            <version>5.8.2</version>
         </Mollie_Mpm>
     </modules>
     <global>