Merge pull request #748 from mollie/release/2.35.0

Release/2.35.0
mollie · Feb 22, 2024 · fa60d53 · fa60d53
2 parents ac30d84 + a722cc9
commit fa60d53
Show file tree

Hide file tree

Showing 63 changed files with 1,683 additions and 213 deletions.
diff --git a/Api/Data/PaymentLinkRedirectResultInterface.php b/Api/Data/PaymentLinkRedirectResultInterface.php
@@ -0,0 +1,20 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Api\Data;
+
+interface PaymentLinkRedirectResultInterface
+{
+    /**
+     * @return bool
+     */
+    public function isAlreadyPaid(): bool;
+
+    /**
+     * @return string|null
+     */
+    public function getRedirectUrl(): ?string;
+}
diff --git a/Api/Data/TransactionToOrderInterface.php b/Api/Data/TransactionToOrderInterface.php
@@ -11,6 +11,7 @@ interface TransactionToOrderInterface extends ExtensibleDataInterface
     public const TRANSACTION_ID = 'transaction_id';
     public const ORDER_ID = 'order_id';
     public const SKIPPED = 'skipped';
+    public const REDIRECTED = 'redirected';
     public const CREATED_AT = 'created_at';
 
     /**
@@ -47,7 +48,7 @@ public function getCreatedAt(): ?string;
     public function setCreatedAt(string $created_at): \Mollie\Payment\Api\Data\TransactionToOrderInterface;
 
     /**
-     * @return string|null
+     * @return int|null
      */
     public function getSkipped(): ?int;
 
@@ -57,6 +58,17 @@ public function getSkipped(): ?int;
      */
     public function setSkipped(int $skipped): \Mollie\Payment\Api\Data\TransactionToOrderInterface;
 
+    /**
+     * @return int|null
+     */
+    public function getRedirected(): ?int;
+
+    /**
+     * @param int $redirected
+     * @return \Mollie\Payment\Api\Data\TransactionToOrderInterface
+     */
+    public function setRedirected(int $redirected): \Mollie\Payment\Api\Data\TransactionToOrderInterface;
+
     /**
      * @return \Mollie\Payment\Api\Data\TransactionToOrderExtensionInterface|null
      */

diff --git a/Api/Data/TransactionToProcessInterface.php b/Api/Data/TransactionToProcessInterface.php
@@ -0,0 +1,32 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Api\Data;
+
+interface TransactionToProcessInterface
+{
+    /**
+     * @param string $id
+     * @return \Mollie\Payment\Api\Data\TransactionToProcessInterface
+     */
+    public function setTransactionId(string $id): TransactionToProcessInterface;
+
+    /**
+     * @return string
+     */
+    public function getTransactionId(): ?string;
+
+    /**
+     * @param int $id
+     * @return \Mollie\Payment\Api\Data\TransactionToProcessInterface
+     */
+    public function setOrderId(int $id): TransactionToProcessInterface;
+
+    /**
+     * @return int|null
+     */
+    public function getOrderId(): ?int;
+}
diff --git a/Api/Webapi/GetPaymentLinkRedirectInterface.php b/Api/Webapi/GetPaymentLinkRedirectInterface.php
@@ -0,0 +1,18 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Api\Webapi;
+
+use Mollie\Payment\Api\Data\PaymentLinkRedirectResultInterface;
+
+interface GetPaymentLinkRedirectInterface
+{
+    /**
+     * @param string $hash
+     * @return \Mollie\Payment\Api\Data\PaymentLinkRedirectResultInterface
+     */
+    public function byHash(string $hash): PaymentLinkRedirectResultInterface;
+}
diff --git a/Block/Adminhtml/System/Config/Form/DisabledInput.php b/Block/Adminhtml/System/Config/Form/DisabledInput.php
@@ -0,0 +1,24 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Mollie\Payment\Block\Adminhtml\System\Config\Form;
+
+use Magento\Config\Block\System\Config\Form\Field;
+
+class DisabledInput extends Field
+{
+    /**
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        $element->setReadonly(true, true);
+        return parent::_getElementHtml($element);
+    }
+}
diff --git a/Block/Form/Pointofsale.php b/Block/Form/Pointofsale.php
@@ -8,9 +8,7 @@
 
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Payment\Block\Form;
-use Mollie\Api\Exceptions\ApiException;
-use Mollie\Api\Resources\Terminal;
-use Mollie\Payment\Service\Mollie\MollieApiClient;
+use Mollie\Payment\Service\Mollie\AvailableTerminals;
 
 /**
  * Class Pointofsale
@@ -20,22 +18,23 @@
 class Pointofsale extends Form
 {
     /**
-     * @var string
+     * @var AvailableTerminals
      */
-    protected $_template = 'Mollie_Payment::form/pointofsale.phtml';
+    private $availableTerminals;
+
     /**
-     * @var MollieApiClient
+     * @var string
      */
-    private $mollieApiClient;
+    protected $_template = 'Mollie_Payment::form/pointofsale.phtml';
 
     public function __construct(
         Context $context,
-        MollieApiClient $mollieApiClient,
+        AvailableTerminals $availableTerminals,
         array $data = []
     ) {
         parent::__construct($context, $data);
 
-        $this->mollieApiClient = $mollieApiClient;
+        $this->availableTerminals = $availableTerminals;
     }
 
     /**
@@ -46,36 +45,11 @@ public function __construct(
      *     serialNumber: string|null,
      *     description: string
      * }
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getTerminals(): array
     {
         $storeId = $this->_storeManager->getStore()->getId();
 
-        try {
-            $mollieApiClient = $this->mollieApiClient->loadByStore((int)$storeId);
-            $terminals = $mollieApiClient->terminals->page();
-        } catch (ApiException $exception) {
-            return [];
-        }
-
-        $output = [];
-        /** @var Terminal $terminal */
-        foreach ($terminals as $terminal) {
-            if (!$terminal->isActive()) {
-                continue;
-            }
-
-            $output[] = [
-                'id' => $terminal->id,
-                'brand' => $terminal->brand,
-                'model' => $terminal->model,
-                'serialNumber' => $terminal->serialNumber,
-                'description' => $terminal->description,
-            ];
-        }
-
-        return $output;
+        return $this->availableTerminals->execute((int)$storeId);
     }
 }
diff --git a/Config.php b/Config.php
@@ -31,6 +31,7 @@ class Config
     const GENERAL_DASHBOARD_URL_PAYMENTS_API = 'payment/mollie_general/dashboard_url_payments_api';
     const GENERAL_ENABLE_MAGENTO_VAULT = 'payment/mollie_general/enable_magento_vault';
     const GENERAL_ENABLE_SECOND_CHANCE_EMAIL = 'payment/mollie_general/enable_second_chance_email';
+    const GENERAL_PROCESS_TRANSACTION_IN_THE_QUEUE =  'payment/mollie_general/process_transactions_in_the_queue';
     const GENERAL_ENCRYPT_PAYMENT_DETAILS = 'payment/mollie_general/encrypt_payment_details';
     const GENERAL_INCLUDE_SHIPPING_IN_SURCHARGE = 'payment/mollie_general/include_shipping_in_surcharge';
     const GENERAL_INVOICE_NOTIFY = 'payment/mollie_general/invoice_notify';
@@ -209,20 +210,35 @@ public function getApiKey($storeId = null)
         }
 
         if (!$this->isProductionMode($storeId)) {
-            $apiKey = trim($this->getPath(static::GENERAL_APIKEY_TEST, $storeId) ?? '');
-            if (empty($apiKey)) {
-                $this->addToLog('error', 'Mollie API key not set (test modus)');
-            }
-
-            if (!preg_match('/^test_\w+$/', $apiKey)) {
-                $this->addToLog('error', 'Mollie set to test modus, but API key does not start with "test_"');
-            }
+            $apiKey = $this->getTestApiKey($storeId === null ? null : (int)$storeId);
 
             $keys[$storeId] = $apiKey;
             return $apiKey;
         }
 
-        $apiKey = trim($this->getPath(static::GENERAL_APIKEY_LIVE, $storeId) ?? '');
+        $apiKey = $this->getLiveApiKey($storeId === null ? null : (int)$storeId);
+
+        $keys[$storeId] = $apiKey;
+        return $apiKey;
+    }
+
+    public function getTestApiKey(int $storeId = null): string
+    {
+        $apiKey = trim((string)$this->getPath(static::GENERAL_APIKEY_TEST, $storeId) ?? '');
+        if (empty($apiKey)) {
+            $this->addToLog('error', 'Mollie API key not set (test modus)');
+        }
+
+        if (!preg_match('/^test_\w+$/', $apiKey)) {
+            $this->addToLog('error', 'Mollie set to test modus, but API key does not start with "test_"');
+        }
+
+        return $apiKey;
+    }
+
+    public function getLiveApiKey(int $storeId = null): string
+    {
+        $apiKey = trim((string)$this->getPath(static::GENERAL_APIKEY_LIVE, $storeId) ?? '');
         if (empty($apiKey)) {
             $this->addToLog('error', 'Mollie API key not set (live modus)');
         }
@@ -231,7 +247,6 @@ public function getApiKey($storeId = null)
             $this->addToLog('error', 'Mollie set to live modus, but API key does not start with "live_"');
         }
 
-        $keys[$storeId] = $apiKey;
         return $apiKey;
     }
 
@@ -756,6 +771,11 @@ public function isMultishippingEnabled(): bool
         return $this->moduleManager->isEnabled('Mollie_Multishipping');
     }
 
+    public function processTransactionsInTheQueue(int $storeId = null): bool
+    {
+        return $this->isSetFlag(static::GENERAL_PROCESS_TRANSACTION_IN_THE_QUEUE, $storeId);
+    }
+
     public function encryptPaymentDetails($storeId = null): bool
     {
         return $this->isSetFlag(static::GENERAL_ENCRYPT_PAYMENT_DETAILS, $storeId);