Bugfix: Prevent new transactions when the previous one is already paid #791 and #786

Author: michielgerritsen

Exceptions/PaymentAborted.php

@@ -0,0 +1,16 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Mollie\Payment\Exceptions;
+
+use Magento\Framework\Exception\LocalizedException;
+
+class PaymentAborted extends LocalizedException
+{
+
+}

Model/Client/Orders.php

@@ -26,6 +26,7 @@
 use Mollie\Api\Resources\Payment;
 use Mollie\Api\Types\OrderStatus;
 use Mollie\Payment\Config;
+use Mollie\Payment\Exceptions\PaymentAborted;
 use Mollie\Payment\Helper\General as MollieHelper;
 use Mollie\Payment\Model\Adminhtml\Source\InvoiceMoment;
 use Mollie\Payment\Model\Client\Orders\ProcessTransaction;
@@ -916,6 +917,15 @@ private function getCheckoutUrl(MollieApiClient $mollieApi, OrderInterface $orde
             return $checkoutUrl;
         }
 
+        if ($mollieOrder->status == 'paid') {
+            $this->config->addToLog('error', [
+                'message' => 'This order already has been paid.',
+                'order' => $order->getEntityId(),
+            ]);
+
+            throw new PaymentAborted(__('This order already has been paid.'));
+        }
+
         // There is no checkout URL, the transaction is either canceled or expired. Create a new transaction.
         $order->setMollieTransactionId(null);
         return $this->startTransaction($order, $mollieApi);

Model/Client/Payments.php

@@ -545,14 +545,12 @@ public function checkCheckoutSession(Order $order, $paymentToken, $paymentData,
         }
     }
 
-    /**
-     * @param MollieApiClient $mollieApi
-     * @param $transactionId
-     * @return string|null
-     * @throws \Mollie\Api\Exceptions\ApiException
-     */
-    public function getCheckoutUrl(MollieApiClient $mollieApi, $transactionId): ?string
+    private function getCheckoutUrl(MollieApiClient $mollieApi, ?string $transactionId): ?string
     {
+        if ($transactionId === null) {
+            return null;
+        }
+
         $payment = $mollieApi->payments->get($transactionId);
         return $payment->getCheckoutUrl();
     }

Model/Mollie.php

@@ -29,6 +29,7 @@
 use Mollie\Payment\Api\Data\TransactionToOrderInterface;
 use Mollie\Payment\Api\TransactionToOrderRepositoryInterface;
 use Mollie\Payment\Config;
+use Mollie\Payment\Exceptions\PaymentAborted;
 use Mollie\Payment\Helper\General as MollieHelper;
 use Mollie\Payment\Model\Client\Orders as OrdersApi;
 use Mollie\Payment\Model\Client\Orders\ProcessTransaction;
@@ -293,7 +294,7 @@ private function startTransactionUsingTheOrdersApi(OrderInterface $order, Mollie
 
         $methodCode = $this->mollieHelper->getMethodCode($order);
         $methods = ['billie', 'klarna', 'klarnapaylater', 'klarnapaynow', 'klarnasliceit', 'voucher', 'in3'];
-        if (in_array($methodCode, $methods)) {
+        if (in_array($methodCode, $methods) || $exception instanceof PaymentAborted) {
             throw new LocalizedException(__($exception->getMessage()));
         }