Merge pull request #778 from mollie/release/2.38.0

Release/2.38.0
mollie · May 16, 2024 · 0380bb3 · 0380bb3
2 parents f2ac6c2 + 7ecbcf1
commit 0380bb3
Show file tree

Hide file tree

Showing 76 changed files with 625 additions and 87 deletions.
diff --git a/.github/workflows/templates/magento/configure-mollie.sh b/.github/workflows/templates/magento/configure-mollie.sh
@@ -1,3 +1,8 @@
+#
+# Copyright Magmodules.eu. All rights reserved.
+# See COPYING.txt for license details.
+#
+
 if [ -z "$MOLLIE_API_KEY_TEST" ]; then
     echo "Variable \$MOLLIE_API_KEY_TEST is not set"
     exit 1
@@ -23,6 +28,7 @@ bin/magento config:set payment/mollie_methods_paypal/active 1 &
 bin/magento config:set payment/mollie_methods_przelewy24/active 1 &
 bin/magento config:set payment/mollie_methods_alma/active 1 &
 bin/magento config:set payment/mollie_methods_bancontact/active 1 &
+bin/magento config:set payment/mollie_methods_bancomatpay/active 1 &
 bin/magento config:set payment/mollie_methods_belfius/active 1 &
 bin/magento config:set payment/mollie_methods_eps/active 1 &
 bin/magento config:set payment/mollie_methods_giropay/active 1 &

diff --git a/Config.php b/Config.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  * Copyright Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -59,6 +59,7 @@ class Config
     const PAYMENT_CREDITCARD_USE_COMPONENTS = 'payment/mollie_methods_creditcard/use_components';
     const PAYMENT_CREDITCARD_ENABLE_CUSTOMERS_API = 'payment/mollie_methods_creditcard/enable_customers_api';
     const PAYMENT_BANKTRANSFER_STATUS_PENDING = 'payment/mollie_methods_banktransfer/order_status_pending';
+    const PAYMENT_METHOD_API_METHOD = 'payment/mollie_methods_%s/method';
     const PAYMENT_METHOD_ISSUER_LIST_TYPE = 'payment/mollie_methods_%s/issuer_list_type';
     const PAYMENT_METHOD_PAYMENT_ACTIVE = 'payment/mollie_methods_%s/active';
     const PAYMENT_METHOD_PAYMENT_DESCRIPTION = 'payment/mollie_methods_%s/payment_description';
@@ -781,6 +782,14 @@ public function encryptPaymentDetails($storeId = null): bool
         return $this->isSetFlag(static::GENERAL_ENCRYPT_PAYMENT_DETAILS, $storeId);
     }
 
+    public function getApiMethod(string $method, int $storeId = null): string
+    {
+        return (string)$this->getPath(
+            $this->addMethodToPath(static::PAYMENT_METHOD_API_METHOD, $method),
+            $storeId
+        );
+    }
+
     /**
      * @param string $method
      * @param null|int|string $storeId

diff --git a/Controller/ApplePay/PlaceOrder.php b/Controller/ApplePay/PlaceOrder.php
@@ -86,7 +86,13 @@ public function execute()
 
         $cart->setCustomerEmail($this->getRequest()->getParam('shippingAddress')['emailAddress']);
 
-        $shippingAddress->setShippingMethod($this->getRequest()->getParam('shippingMethod')['identifier']);
+        $shippingAddress->setShippingMethod(
+            str_replace(
+                '__SPLIT__',
+                '_',
+                $this->getRequest()->getParam('shippingMethod')['identifier']
+            )
+        );
 
         $cart->setPaymentMethod('mollie_methods_applepay');
         $cart->setCustomerIsGuest(true);

diff --git a/Controller/ApplePay/ShippingMethods.php b/Controller/ApplePay/ShippingMethods.php
@@ -87,7 +87,9 @@ public function execute()
         return $response->setData([
             'shipping_methods' => array_map(function ($method) {
                 return [
-                    'identifier' => $method->getCarrierCode() . '_' . $method->getMethodCode(),
+                    // Magento uses an _ (underscore) to separate the carrier and method, but those can have an
+                    // underscore as well. So separate by a different divider to prevent errors.
+                    'identifier' => $method->getCarrierCode() . '__SPLIT__' . $method->getMethodCode(),
                     'label' => $method->getMethodTitle() . ' - ' . $method->getCarrierTitle(),
                     'amount' => number_format($method->getPriceInclTax() ?: 0.0, 2, '.', ''),
                     'detail' => '',

diff --git a/Helper/General.php b/Helper/General.php
@@ -381,7 +381,7 @@ public function getMethodCode($order): string
      */
     public function getApiMethod(OrderInterface $order)
     {
-        $method = $order->getPayment()->getMethodInstance()->getCode();
+        $method = $order->getPayment()->getMethod();
         $method = str_replace('_vault', '', $method);
         $methodXpath = str_replace('%method%', $method, self::XML_PATH_API_METHOD);
         return $this->getStoreConfig($methodXpath, $order->getStoreId());
@@ -621,6 +621,7 @@ public function getAllActiveMethods($storeId)
         $methodCodes = [
             'mollie_methods_applepay',
             'mollie_methods_alma',
+            'mollie_methods_bancomatpay',
             'mollie_methods_bancontact',
             'mollie_methods_banktransfer',
             'mollie_methods_belfius',

diff --git a/Model/Client/Orders.php b/Model/Client/Orders.php
@@ -1,6 +1,6 @@
 <?php
-/**
- * Copyright © 2018 Magmodules.eu. All rights reserved.
+/*
+ * Copyright Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
 
@@ -35,6 +35,7 @@
 use Mollie\Payment\Service\Mollie\Order\Transaction\Expires;
 use Mollie\Payment\Service\Order\BuildTransaction;
 use Mollie\Payment\Service\Order\Invoice\ShouldEmailInvoice;
+use Mollie\Payment\Service\Order\Lines\Order as OrderOrderLines;
 use Mollie\Payment\Service\Order\Lines\StoreCredit;
 use Mollie\Payment\Service\Order\MethodCode;
 use Mollie\Payment\Service\Order\OrderCommentHistory;
@@ -61,6 +62,10 @@ class Orders extends AbstractModel
      * @var OrderLines
      */
     private $orderLines;
+    /**
+     * @var OrderOrderLines
+     */
+    private $orderOrderLines;
     /**
      * @var OrderRepository
      */
@@ -113,6 +118,7 @@ class Orders extends AbstractModel
      * @var Transaction
      */
     private $transaction;
+
     /**
      * @var BuildTransaction
      */
@@ -147,7 +153,6 @@ class Orders extends AbstractModel
      * @var LinkTransactionToOrder
      */
     private $linkTransactionToOrder;
-
     /**
      * @var ShouldEmailInvoice
      */
@@ -159,6 +164,7 @@ class Orders extends AbstractModel
 
     public function __construct(
         OrderLines $orderLines,
+        OrderOrderLines $orderOrderLines,
         InvoiceSender $invoiceSender,
         OrderRepository $orderRepository,
         CheckoutSession $checkoutSession,
@@ -184,6 +190,7 @@ public function __construct(
         MethodCode $methodCode
     ) {
         $this->orderLines = $orderLines;
+        $this->orderOrderLines = $orderOrderLines;
         $this->invoiceSender = $invoiceSender;
         $this->orderRepository = $orderRepository;
         $this->checkoutSession = $checkoutSession;
@@ -224,8 +231,10 @@ public function startTransaction(OrderInterface $order, $mollieApi)
         $additionalData = $order->getPayment()->getAdditionalInformation();
 
         $transactionId = $order->getMollieTransactionId();
-        if (!empty($transactionId)) {
-            return $this->getCheckoutUrl($mollieApi, $order);
+        if (!empty($transactionId) &&
+            $checkoutUrl = $this->getCheckoutUrl($mollieApi, $order)
+        ) {
+            return $checkoutUrl;
         }
 
         $paymentToken = $this->paymentTokenForOrder->execute($order);
@@ -236,7 +245,7 @@ public function startTransaction(OrderInterface $order, $mollieApi)
             'orderNumber'         => $order->getIncrementId(),
             'billingAddress'      => $this->getAddressLine($order->getBillingAddress()),
             'consumerDateOfBirth' => null,
-            'lines'               => $this->orderLines->getOrderLines($order),
+            'lines'               => $this->orderOrderLines->get($order),
             'redirectUrl'         => $this->transaction->getRedirectUrl($order, $paymentToken),
             'webhookUrl'          => $this->transaction->getWebhookUrl([$order]),
             'locale'              => $this->mollieHelper->getLocaleCode($storeId, self::CHECKOUT_TYPE),
@@ -308,7 +317,7 @@ public function getAddressLine($address)
      *
      * @throws LocalizedException
      */
-    public function processResponse(Order $order, $mollieOrder)
+    public function processResponse(OrderInterface $order, MollieOrder $mollieOrder): void
     {
         $eventData = [
             'order' => $order,

diff --git a/Model/Client/Payments.php b/Model/Client/Payments.php
@@ -1,6 +1,6 @@
 <?php
-/**
- * Copyright © 2018 Magmodules.eu. All rights reserved.
+/*
+ * Copyright Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
 
@@ -202,9 +202,11 @@ public function startTransaction(OrderInterface $order, $mollieApi)
         $orderId = $order->getEntityId();
 
         $transactionId = $order->getMollieTransactionId();
-        if (!empty($transactionId) && substr($transactionId, 0, 4) != 'ord_') {
-            $payment = $mollieApi->payments->get($transactionId);
-            return $payment->getCheckoutUrl();
+        if (!empty($transactionId) &&
+            substr($transactionId, 0, 4) != 'ord_' &&
+            $checkoutUrl = $this->getCheckoutUrl($mollieApi, $transactionId)
+        ) {
+            return $checkoutUrl;
         }
 
         $paymentToken = $this->paymentTokenForOrder->execute($order);
@@ -537,4 +539,16 @@ 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
+    {
+        $payment = $mollieApi->payments->get($transactionId);
+        return $payment->getCheckoutUrl();
+    }
 }
diff --git a/Model/Methods/Bancomatpay.php b/Model/Methods/Bancomatpay.php
@@ -0,0 +1,24 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Model\Mollie;
+
+/**
+ * Class Bancomatpay
+ *
+ * @package Mollie\Payment\Model\Methods
+ */
+class Bancomatpay extends Mollie
+{
+    /**
+     * Payment method code
+     *
+     * @var string
+     */
+    const CODE = 'mollie_methods_bancomatpay';
+}
diff --git a/Model/Methods/Paymentlink.php b/Model/Methods/Paymentlink.php
@@ -6,6 +6,7 @@
 
 namespace Mollie\Payment\Model\Methods;
 
+use Magento\Sales\Model\Order;
 use Mollie\Payment\Model\Mollie;
 use Magento\Framework\DataObject;
 
@@ -39,6 +40,8 @@ public function initialize($paymentAction, $stateObject)
         $order = $payment->getOrder();
         $order->setCanSendNewEmailFlag(false);
 
+        $stateObject->setState(Order::STATE_PENDING_PAYMENT);
+
         if ($status = $this->config->statusNewPaymentLink($order->getStoreId())) {
             $stateObject->setStatus($status);
         }

diff --git a/Model/Methods/Reorder.php b/Model/Methods/Reorder.php
@@ -1,6 +1,6 @@
 <?php
-/**
- * Copyright © 2018 Magmodules.eu. All rights reserved.
+/*
+ * Copyright Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
 
@@ -27,6 +27,7 @@
 use Mollie\Payment\Model\Client\Orders\ProcessTransaction;
 use Mollie\Payment\Model\Client\Payments as PaymentsApi;
 use Mollie\Payment\Model\Mollie;
+use Mollie\Payment\Service\Mollie\GetApiMethod;
 use Mollie\Payment\Service\OrderLockService;
 use Mollie\Payment\Service\Mollie\MollieApiClient;
 use Mollie\Payment\Service\Mollie\Timeout;
@@ -70,6 +71,7 @@ public function __construct(
         OrderLockService $orderLockService,
         MollieApiClient $mollieApiClient,
         TransactionToOrderRepositoryInterface $transactionToOrderRepository,
+        GetApiMethod $getApiMethod,
         RequestInterface $request,
         $formBlockType,
         $infoBlockType,
@@ -97,6 +99,7 @@ public function __construct(
             $orderLockService,
             $mollieApiClient,
             $transactionToOrderRepository,
+            $getApiMethod,
             $formBlockType,
             $infoBlockType,
             $commandPool,

diff --git a/Model/Methods/Voucher.php b/Model/Methods/Voucher.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  * Copyright Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -27,6 +27,7 @@
 use Mollie\Payment\Model\Client\Orders\ProcessTransaction;
 use Mollie\Payment\Model\Client\Payments as PaymentsApi;
 use Mollie\Payment\Model\Mollie;
+use Mollie\Payment\Service\Mollie\GetApiMethod;
 use Mollie\Payment\Service\OrderLockService;
 use Mollie\Payment\Service\Mollie\MollieApiClient;
 use Mollie\Payment\Service\Mollie\Timeout;
@@ -66,6 +67,7 @@ public function __construct(
         OrderLockService $orderLockService,
         MollieApiClient $mollieApiClient,
         TransactionToOrderRepositoryInterface $transactionToOrderRepository,
+        GetApiMethod $getApiMethod,
         $formBlockType,
         $infoBlockType,
         QuoteHasMealVoucherProducts $quoteHasMealVoucherProducts,
@@ -93,6 +95,7 @@ public function __construct(
             $orderLockService,
             $mollieApiClient,
             $transactionToOrderRepository,
+            $getApiMethod,
             $formBlockType,
             $infoBlockType,
             $commandPool,

diff --git a/Model/Mollie.php b/Model/Mollie.php
@@ -1,6 +1,6 @@
 <?php
-/**
- * Copyright © 2018 Magmodules.eu. All rights reserved.
+/*
+ * Copyright Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
 
@@ -34,6 +34,7 @@
 use Mollie\Payment\Model\Client\Orders\ProcessTransaction;
 use Mollie\Payment\Model\Client\Payments as PaymentsApi;
 use Mollie\Payment\Model\Client\ProcessTransactionResponse;
+use Mollie\Payment\Service\Mollie\GetApiMethod;
 use Mollie\Payment\Service\OrderLockService;
 use Mollie\Payment\Service\Mollie\Timeout;
 use Mollie\Payment\Service\Mollie\Wrapper\MollieApiClientFallbackWrapper;
@@ -115,6 +116,10 @@ class Mollie extends Adapter
      * @var TransactionToOrderRepositoryInterface
      */
     private $transactionToOrderRepository;
+    /**
+     * @var GetApiMethod
+     */
+    private $getApiMethod;
 
     public function __construct(
         ManagerInterface $eventManager,
@@ -135,6 +140,7 @@ public function __construct(
         OrderLockService $orderLockService,
         \Mollie\Payment\Service\Mollie\MollieApiClient $mollieApiClient,
         TransactionToOrderRepositoryInterface $transactionToOrderRepository,
+        GetApiMethod $getApiMethod,
         $formBlockType,
         $infoBlockType,
         CommandPoolInterface $commandPool = null,
@@ -171,6 +177,7 @@ public function __construct(
         $this->orderLockService = $orderLockService;
         $this->mollieApiClient = $mollieApiClient;
         $this->transactionToOrderRepository = $transactionToOrderRepository;
+        $this->getApiMethod = $getApiMethod;
     }
 
     public function getCode()
@@ -258,7 +265,7 @@ public function startTransaction(Order $order)
 
         return $this->orderLockService->execute($order, function (OrderInterface $order) use ($apiKey) {
             $mollieApi = $this->loadMollieApi($apiKey);
-            $method = $this->mollieHelper->getApiMethod($order);
+            $method = $this->getApiMethod->execute($order);
 
             // When clicking the back button from the hosted payment we need a way to verify if the order was paid or not.
             // If this is not the case, we restore the quote. This flag is used to determine if it was paid or not.

diff --git a/Model/MollieConfigProvider.php b/Model/MollieConfigProvider.php
@@ -35,6 +35,7 @@ class MollieConfigProvider implements ConfigProviderInterface
     private $methodCodes = [
         'mollie_methods_applepay',
         'mollie_methods_alma',
+        'mollie_methods_bancomatpay',
         'mollie_methods_bancontact',
         'mollie_methods_banktransfer',
         'mollie_methods_belfius',