Release/2.43.0

.github/workflows/end-2-end-test.yml

@@ -79,7 +79,7 @@ jobs:
       - name: Start the Magento container
         run: |
           openssl req -x509 -newkey rsa:4096 -keyout .github/workflows/templates/nginx-proxy/magento.test.key -out .github/workflows/templates/nginx-proxy/magento.test.crt -days 365 -nodes -subj "/CN=magento.test" && \
-          docker compose -f .github/workflows/templates/docker-compose.yml up -d
+          docker compose -f .github/workflows/templates/docker-compose.yml up -d --quiet-pull
           # Get the URL from ngrok
           docker compose -f .github/workflows/templates/docker-compose.yml logs ngrok
           MAGENTO_URL=$(docker exec magento-project-community-edition /bin/bash -c "curl -s ngrok:4040/api/tunnels |jq -r \".tunnels[0].public_url\"")

.github/workflows/templates/e2e/Dockerfile

@@ -1,4 +1,4 @@
-FROM cypress/included:13.6.2
+FROM cypress/included:14.0.1
 
 WORKDIR /e2e
 

Controller/Checkout/Process.php

@@ -7,8 +7,6 @@
 namespace Mollie\Payment\Controller\Checkout;
 
 use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\DataObject;
-use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Mollie\Payment\Model\Mollie as MollieModel;
@@ -18,6 +16,7 @@
 use Magento\Framework\App\Action\Context;
 use Magento\Checkout\Model\Session;
 use Mollie\Payment\Service\Mollie\GetMollieStatusResult;
+use Mollie\Payment\Service\Mollie\Order\AddResultMessage;
 use Mollie\Payment\Service\Mollie\Order\SuccessPageRedirect;
 use Mollie\Payment\Service\Mollie\ProcessTransaction;
 use Mollie\Payment\Service\Mollie\ValidateProcessRequest;
@@ -53,11 +52,6 @@ class Process extends Action
      */
     private $orderRepository;
 
-    /**
-     * @var ManagerInterface
-     */
-    private $eventManager;
-
     /**
      * @var RedirectOnError
      */
@@ -74,6 +68,10 @@ class Process extends Action
      * @var SuccessPageRedirect
      */
     private $successPageRedirect;
+    /**
+     * @var AddResultMessage
+     */
+    private $addResultMessage;
 
     public function __construct(
         Context $context,
@@ -83,21 +81,21 @@ public function __construct(
         MollieHelper $mollieHelper,
         OrderRepositoryInterface $orderRepository,
         RedirectOnError $redirectOnError,
-        ManagerInterface $eventManager,
         ValidateProcessRequest $validateProcessRequest,
         ProcessTransaction $processTransaction,
-        SuccessPageRedirect $successPageRedirect
+        SuccessPageRedirect $successPageRedirect,
+        AddResultMessage $addResultMessage
     ) {
         $this->checkoutSession = $checkoutSession;
         $this->paymentHelper = $paymentHelper;
         $this->mollieModel = $mollieModel;
         $this->mollieHelper = $mollieHelper;
         $this->orderRepository = $orderRepository;
         $this->redirectOnError = $redirectOnError;
-        $this->eventManager = $eventManager;
         $this->validateProcessRequest = $validateProcessRequest;
         $this->processTransaction = $processTransaction;
         $this->successPageRedirect = $successPageRedirect;
+        $this->addResultMessage = $addResultMessage;
 
         parent::__construct($context);
     }
@@ -144,31 +142,11 @@ protected function handleNonSuccessResult(GetMollieStatusResult $result, array $
     {
         $this->checkIfLastRealOrder($orderIds);
         $this->checkoutSession->restoreQuote();
-        $this->addResultMessage($result);
+        $this->addResultMessage->execute($result);
 
         return $this->_redirect($this->redirectOnError->getUrl());
     }
 
-    protected function addResultMessage(GetMollieStatusResult $result)
-    {
-        if ($result->getStatus() == 'canceled') {
-            $this->messageManager->addNoticeMessage(__('Payment canceled, please try again.'));
-            return;
-        }
-
-        if ($result->getStatus() == 'failed' && $result->getMethod()) {
-            $this->messageManager->addErrorMessage(
-                __(
-                    'Payment of type %1 has been rejected. Decision is based on order and outcome of risk assessment.',
-                    $result->getMethod()
-                )
-            );
-            return;
-        }
-
-        $this->messageManager->addErrorMessage(__('Transaction failed. Please verify your billing information and payment method, and try again.'));
-    }
-
     /**
      * @param array $orderIds
      */

Model/Adminhtml/Source/CustomerGroup.php

@@ -24,6 +24,9 @@ public function toOptionArray(): array
     {
         $groups = $this->groupManagement->getLoggedInGroups();
 
+        $notLoggedInGroup = $this->groupManagement->getNotLoggedInGroup();
+        array_unshift($groups, $notLoggedInGroup);
+
         $output = [];
         foreach ($groups as $group) {
             $output[] = [

Model/Client/Payments.php

@@ -233,12 +233,12 @@ public function startTransaction(OrderInterface $order, $mollieApi)
         }
 
         if ($method == 'banktransfer') {
-            $paymentData['billingEmail'] = $order->getCustomerEmail();
+            $paymentData['billingAddress']['email'] = $order->getCustomerEmail();
             $paymentData['dueDate'] = $this->mollieHelper->getBanktransferDueDate($storeId);
         }
 
         if ($method == 'przelewy24') {
-            $paymentData['billingEmail'] = $order->getCustomerEmail();
+            $paymentData['billingAddress']['email'] = $order->getCustomerEmail();
         }
 
         $paymentData = $this->buildTransaction->execute($order, static::CHECKOUT_TYPE, $paymentData);

Model/Methods/MbWay.php

@@ -0,0 +1,17 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Model\Methods;
+
+class MbWay extends \Mollie\Payment\Model\Mollie
+{
+    /**
+     * Payment method code
+     *
+     * @var string
+     */
+    const CODE = 'mollie_methods_mbway';
+}

Model/Methods/Multibanco.php

@@ -0,0 +1,17 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Model\Methods;
+
+class Multibanco extends \Mollie\Payment\Model\Mollie
+{
+    /**
+     * Payment method code
+     *
+     * @var string
+     */
+    const CODE = 'mollie_methods_multibanco';
+}

Model/Methods/Reorder.php

@@ -28,6 +28,7 @@
 use Mollie\Payment\Model\Client\Payments as PaymentsApi;
 use Mollie\Payment\Model\Mollie;
 use Mollie\Payment\Service\Mollie\GetApiMethod;
+use Mollie\Payment\Service\Mollie\LogException;
 use Mollie\Payment\Service\OrderLockService;
 use Mollie\Payment\Service\Mollie\MollieApiClient;
 use Mollie\Payment\Service\Mollie\Timeout;
@@ -72,6 +73,7 @@ public function __construct(
         MollieApiClient $mollieApiClient,
         TransactionToOrderRepositoryInterface $transactionToOrderRepository,
         GetApiMethod $getApiMethod,
+        LogException $logException,
         RequestInterface $request,
         $formBlockType,
         $infoBlockType,
@@ -100,6 +102,7 @@ public function __construct(
             $mollieApiClient,
             $transactionToOrderRepository,
             $getApiMethod,
+            $logException,
             $formBlockType,
             $infoBlockType,
             $commandPool,

Model/Methods/Voucher.php

@@ -28,6 +28,7 @@
 use Mollie\Payment\Model\Client\Payments as PaymentsApi;
 use Mollie\Payment\Model\Mollie;
 use Mollie\Payment\Service\Mollie\GetApiMethod;
+use Mollie\Payment\Service\Mollie\LogException;
 use Mollie\Payment\Service\OrderLockService;
 use Mollie\Payment\Service\Mollie\MollieApiClient;
 use Mollie\Payment\Service\Mollie\Timeout;
@@ -68,6 +69,7 @@ public function __construct(
         MollieApiClient $mollieApiClient,
         TransactionToOrderRepositoryInterface $transactionToOrderRepository,
         GetApiMethod $getApiMethod,
+        LogException $logException,
         $formBlockType,
         $infoBlockType,
         QuoteHasMealVoucherProducts $quoteHasMealVoucherProducts,
@@ -96,6 +98,7 @@ public function __construct(
             $mollieApiClient,
             $transactionToOrderRepository,
             $getApiMethod,
+            $logException,
             $formBlockType,
             $infoBlockType,
             $commandPool,

Model/Mollie.php

@@ -36,6 +36,7 @@
 use Mollie\Payment\Model\Client\Payments as PaymentsApi;
 use Mollie\Payment\Model\Client\ProcessTransactionResponse;
 use Mollie\Payment\Service\Mollie\GetApiMethod;
+use Mollie\Payment\Service\Mollie\LogException;
 use Mollie\Payment\Service\OrderLockService;
 use Mollie\Payment\Service\Mollie\Timeout;
 use Mollie\Payment\Service\Mollie\Wrapper\MollieApiClientFallbackWrapper;
@@ -121,6 +122,10 @@ class Mollie extends Adapter
      * @var GetApiMethod
      */
     private $getApiMethod;
+    /**
+     * @var LogException
+     */
+    private $logException;
 
     public function __construct(
         ManagerInterface $eventManager,
@@ -142,6 +147,7 @@ public function __construct(
         \Mollie\Payment\Service\Mollie\MollieApiClient $mollieApiClient,
         TransactionToOrderRepositoryInterface $transactionToOrderRepository,
         GetApiMethod $getApiMethod,
+        LogException $logException,
         $formBlockType,
         $infoBlockType,
         CommandPoolInterface $commandPool = null,
@@ -179,6 +185,7 @@ public function __construct(
         $this->mollieApiClient = $mollieApiClient;
         $this->transactionToOrderRepository = $transactionToOrderRepository;
         $this->getApiMethod = $getApiMethod;
+        $this->logException = $logException;
     }
 
     public function getCode()
@@ -280,7 +287,7 @@ private function startTransactionUsingTheOrdersApi(OrderInterface $order, Mollie
                 return $this->ordersApi->startTransaction($order, $mollieApi);
             });
         } catch (\Exception $exception) {
-            $this->mollieHelper->addTolog('error', $exception->getMessage());
+            $this->logException->execute($exception);
         }
 
         $methodCode = $this->mollieHelper->getMethodCode($order);

Observer/LockUnlockOrder.php

@@ -1,4 +1,8 @@
 <?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 
 namespace Mollie\Payment\Observer;
 
@@ -7,7 +11,6 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\ShipmentInterface;
-use Mollie\Payment\Config;
 use Mollie\Payment\Service\LockService;
 
 class LockUnlockOrder implements ObserverInterface
@@ -18,16 +21,14 @@ class LockUnlockOrder implements ObserverInterface
     private $lockService;
 
     /**
-     * @var Config
+     * @var string
      */
-    private $config;
+    private $reason = '';
 
     public function __construct(
-        Config $config,
         LockService $lockService
     ) {
         $this->lockService = $lockService;
-        $this->config = $config;
     }
 
     public function execute(Observer $observer)
@@ -41,7 +42,7 @@ public function execute(Observer $observer)
                 throw new LocalizedException(__('Unable to get lock for %1', $key));
             }
 
-            $this->lockService->lock($key);
+            $this->lockService->lock($key, -1, $this->reason);
         }
 
         if (strpos($name, 'save_after') !== false) {
@@ -54,6 +55,13 @@ private function getOrder(string $name, Observer $observer): OrderInterface
         /** @var ShipmentInterface $shipment */
         $shipment = $observer->getEvent()->getData('shipment');
 
-        return $shipment->getOrder();
+        if ($shipment) {
+            $this->reason = 'shipment';
+            return $shipment->getOrder();
+        }
+
+        $this->reason = 'shipment tracking';
+        $track = $observer->getEvent()->getData('track');
+        return $track->getShipment()->getOrder();
     }
 }

Service/LockService.php

@@ -61,16 +61,18 @@ public function __construct(
      *
      * @param string $name lock name
      * @param int $timeout How long to wait lock acquisition in seconds, negative value means infinite timeout
+     * @param ?string $reason Reason for locking, will be logged only
      * @return bool
      */
-    public function lock(string $name, int $timeout = -1): bool
+    public function lock(string $name, int $timeout = -1, ?string $reason = null): bool
     {
         // Make sure we only lock once per request.
         if ($this->alreadyLocked) {
             return true;
         }
 
-        $this->config->addToLog('info', 'Locking: ' . $name);
+        $message = 'Locking: ' . $name . ($reason ? ' - Reason: ' . $reason : '');
+        $this->config->addToLog('info', $message);
         if ($this->isLockManagerAvailable()) {
             return $this->alreadyLocked = $this->lockManager->lock($name, $timeout);
         }

Service/Mollie/LogException.php

@@ -0,0 +1,44 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Mollie\Payment\Service\Mollie;
+
+use Mollie\Payment\Config;
+
+class LogException
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    private $messagesToSkip = [
+        'The \'billingAddress.familyName\' field contains characters that are not allowed'
+    ];
+
+    public function __construct(
+        Config $config,
+        array $messagesToSkip = []
+    ) {
+        $this->config = $config;
+        $this->messagesToSkip = array_merge($this->messagesToSkip, $messagesToSkip);
+    }
+
+    public function execute(\Exception $exception): void
+    {
+        $message = method_exists($exception, 'getPlainMessage') ?
+            $exception->getPlainMessage() :
+            $exception->getMessage();
+
+        if (in_array($message, $this->messagesToSkip)) {
+            return;
+        }
+
+        $this->config->addTolog('error', $message);
+    }
+}