Merge pull request #161 from mollie/5.5.5

5.5.5
mollie · Feb 26, 2020 · 18a6b25 · 18a6b25
2 parents f3e6c8d + af6abe8
commit 18a6b25
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/app/code/community/Mollie/Mpm/Model/Client/Payments.php b/app/code/community/Mollie/Mpm/Model/Client/Payments.php
@@ -105,7 +105,7 @@ public function startTransaction(Mage_Sales_Model_Order $order)
         $paymentData = $this->mollieHelper->validatePaymentData($paymentData);
         $this->mollieHelper->addTolog('request', $paymentData);
 
-        $payment = $mollieApi->payments->create($paymentData, array('include' => 'details.qrCode'));
+        $payment = $mollieApi->payments->create($paymentData);
         $this->processResponse($order, $payment);
 
         return $payment->getCheckoutUrl();

diff --git a/app/code/community/Mollie/Mpm/Model/Mollie.php b/app/code/community/Mollie/Mpm/Model/Mollie.php
@@ -171,6 +171,7 @@ public function processTransaction($orderId, $type = 'webhook', $paymentToken =
             $connection->rollback();
             throw $exception;
         } finally {
+            $order->save();
             $this->commitOrder($order);
             $connection->commit();
         }

diff --git a/app/code/community/Mollie/Mpm/controllers/ApiController.php b/app/code/community/Mollie/Mpm/controllers/ApiController.php
@@ -108,7 +108,7 @@ public function paymentAction()
             $this->mollieHelper->setError(self::KLARNA_REJECTION_ERR_MSG);
             $this->mollieHelper->addToLog('error', $exception->getMessage());
             $this->mollieHelper->restoreCart();
-            $this->_cancelUnprocessedOrder($order, $exception->getMessage());
+            $this->_cancelUnprocessedOrder($order, $exception->getMessage(), true);
             $this->_redirect('checkout/cart');
             return;
         } catch (\Exception $e) {
@@ -126,11 +126,12 @@ public function paymentAction()
      *
      * @param Mage_Sales_Model_Order $order
      * @param string $message  If provided, add this message to the order status history comment
+     * @param bool $forceCancel
      * @return void
      */
-    protected function _cancelUnprocessedOrder($order, $message = null)
+    protected function _cancelUnprocessedOrder($order, $message = null, $forceCancel = false)
     {
-        if (empty($order) || empty($order->getMollieTransactionId())) {
+        if (empty($order) || (empty($order->getMollieTransactionId()) && !$forceCancel)) {
             return;
         }
 
@@ -139,7 +140,7 @@ protected function _cancelUnprocessedOrder($order, $message = null)
             $order->getStoreId()
         );
 
-        if (!$cancelFailedOrders) {
+        if (!$forceCancel && !$cancelFailedOrders) {
             return;
         }
 

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.5.4</version>
+            <version>5.5.5</version>
         </Mollie_Mpm>
     </modules>
     <global>