Merge branch 'feature/async-captures-for-applepay' into release-week-38

mollie · Sep 18, 2023 · 48cffdf · 48cffdf
2 parents 1bc286d + 672cf13
commit 48cffdf
Show file tree

Hide file tree

Showing 9 changed files with 118 additions and 38 deletions.
diff --git a/Observer/SalesOrderInvoiceRegister/CaptureInvoice.php b/Observer/SalesOrderInvoiceRegister/CaptureInvoice.php
@@ -14,6 +14,8 @@
 use Magento\Sales\Api\Data\OrderInterface;
 use Mollie\Payment\Config;
 use Mollie\Payment\Model\Client\Payments\CapturePayment;
+use Mollie\Payment\Service\Mollie\Order\CanUseManualCapture;
+use Mollie\Payment\Service\Mollie\Order\UsedMollieApi;
 
 class CaptureInvoice implements ObserverInterface
 {
@@ -25,22 +27,34 @@ class CaptureInvoice implements ObserverInterface
      * @var CapturePayment
      */
     private $capturePayment;
+    /**
+     * @var CanUseManualCapture
+     */
+    private $canUseManualCapture;
+    /**
+     * @var UsedMollieApi
+     */
+    private $usedMollieApi;
 
     public function __construct(
         Config $config,
-        CapturePayment $capturePayment
+        CapturePayment $capturePayment,
+        CanUseManualCapture $canUseManualCapture,
+        UsedMollieApi $usedMollieApi
     ) {
         $this->capturePayment = $capturePayment;
         $this->config = $config;
+        $this->canUseManualCapture = $canUseManualCapture;
+        $this->usedMollieApi = $usedMollieApi;
     }
 
     public function execute(Observer $observer)
     {
         /** @var OrderInterface $order */
         $order = $observer->getData('order');
-        $transactionId = $order->getMollieTransactionId() ?? '';
-        $useOrdersApi = substr($transactionId, 0, 4) == 'ord_';
-        if ($useOrdersApi || !$this->config->useManualCapture((int)$order->getStoreId())) {
+        if ($this->usedMollieApi->execute($order) == UsedMollieApi::TYPE_ORDERS ||
+            !$this->canUseManualCapture->execute($order)
+        ) {
             return;
         }
 

diff --git a/Service/Mollie/Order/CanRegisterCaptureNotification.php b/Service/Mollie/Order/CanRegisterCaptureNotification.php
@@ -10,27 +10,23 @@
 
 use Magento\Sales\Api\Data\OrderInterface;
 use Mollie\Api\Resources\Payment;
-use Mollie\Payment\Config;
-use Mollie\Payment\Model\Methods\Creditcard;
 
 class CanRegisterCaptureNotification
 {
     /**
-     * @var Config
+     * @var CanUseManualCapture
      */
-    private $config;
+    private $canUseManualCapture;
 
     public function __construct(
-        Config $config
+        CanUseManualCapture $canUseManualCapture
     ) {
-        $this->config = $config;
+        $this->canUseManualCapture = $canUseManualCapture;
     }
 
     public function execute(OrderInterface $order, Payment $molliePayment): bool
     {
-        if (!$this->config->useManualCapture($order->getStoreId()) ||
-            $order->getPayment()->getMethod() != Creditcard::CODE
-        ) {
+        if (!$this->canUseManualCapture->execute($order)) {
             return true;
         }
 

diff --git a/Service/Mollie/Order/CanUseManualCapture.php b/Service/Mollie/Order/CanUseManualCapture.php
@@ -0,0 +1,43 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Mollie\Payment\Service\Mollie\Order;
+
+use Magento\Sales\Api\Data\OrderInterface;
+use Mollie\Payment\Config;
+use Mollie\Payment\Model\Methods\ApplePay;
+use Mollie\Payment\Model\Methods\Creditcard;
+
+class CanUseManualCapture
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    public function __construct(
+        Config $config
+    ) {
+        $this->config = $config;
+    }
+
+    public function execute(OrderInterface $order): bool
+    {
+        if (!$this->config->useManualCapture((int)$order->getStoreId())) {
+            return false;
+        }
+
+        $method = $order->getPayment()->getMethod();
+        $supportedMethods = [ApplePay::CODE, Creditcard::CODE];
+        if (!in_array($method, $supportedMethods)) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Service/Mollie/Order/CreateInvoiceOnShipment.php b/Service/Mollie/Order/CreateInvoiceOnShipment.php
@@ -3,19 +3,24 @@
 namespace Mollie\Payment\Service\Mollie\Order;
 
 use Magento\Sales\Api\Data\OrderInterface;
-use Mollie\Payment\Config;
 
 class CreateInvoiceOnShipment
 {
     /**
-     * @var Config
+     * @var CanUseManualCapture
      */
-    private $config;
+    private $canUseManualCapture;
+    /**
+     * @var UsedMollieApi
+     */
+    private $usedMollieApi;
 
     public function __construct(
-        Config $config
+        CanUseManualCapture $canUseManualCapture,
+        UsedMollieApi $usedMollieApi
     ) {
-        $this->config = $config;
+        $this->canUseManualCapture = $canUseManualCapture;
+        $this->usedMollieApi = $usedMollieApi;
     }
 
     public function execute(OrderInterface $order): bool
@@ -32,13 +37,10 @@ public function execute(OrderInterface $order): bool
             return true;
         }
 
-        $transactionId = $order->getMollieTransactionId() ?? '';
-        $api = substr($transactionId, 0, 4) == 'ord_' ? 'orders' : 'payments';
-        if ($methodCode == 'mollie_methods_creditcard' &&
-            $this->config->useManualCapture($order->getStoreId()) &&
-            $api == 'payments'
+        if ($this->usedMollieApi->execute($order) == UsedMollieApi::TYPE_PAYMENTS &&
+            $this->canUseManualCapture->execute($order)
         ) {
-            return false;
+            return true;
         }
 
         return false;

diff --git a/Service/Mollie/Order/UsedMollieApi.php b/Service/Mollie/Order/UsedMollieApi.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Mollie\Payment\Service\Mollie\Order;
+
+use Magento\Sales\Api\Data\OrderInterface;
+
+class UsedMollieApi
+{
+    const TYPE_ORDERS = 'orders';
+    const TYPE_PAYMENTS = 'payments';
+
+    public function execute(OrderInterface $order): string
+    {
+        $transactionId = $order->getMollieTransactionId() ?? '';
+        return substr($transactionId, 0, 4) == 'ord_' ? self::TYPE_ORDERS : self::TYPE_PAYMENTS;
+    }
+}
diff --git a/Service/Order/TransactionPart/CaptureMode.php b/Service/Order/TransactionPart/CaptureMode.php
@@ -3,22 +3,21 @@
 namespace Mollie\Payment\Service\Order\TransactionPart;
 
 use Magento\Sales\Api\Data\OrderInterface;
-use Mollie\Payment\Config;
 use Mollie\Payment\Model\Client\Orders;
-use Mollie\Payment\Model\Client\Payments;
+use Mollie\Payment\Service\Mollie\Order\CanUseManualCapture;
 use Mollie\Payment\Service\Order\TransactionPartInterface;
 
 class CaptureMode implements TransactionPartInterface
 {
     /**
-     * @var Config
+     * @var CanUseManualCapture
      */
-    private $config;
+    private $canUseManualCapture;
 
     public function __construct(
-        Config $config
+        CanUseManualCapture $canUseManualCapture
     ) {
-        $this->config = $config;
+        $this->canUseManualCapture = $canUseManualCapture;
     }
 
     public function process(OrderInterface $order, $apiMethod, array $transaction)
@@ -27,9 +26,7 @@ public function process(OrderInterface $order, $apiMethod, array $transaction)
             return $transaction;
         }
 
-        if ($order->getPayment()->getMethod() != 'mollie_methods_creditcard' ||
-            !$this->config->useManualCapture($order->getStoreId())
-        ) {
+        if (!$this->canUseManualCapture->execute($order)) {
             return $transaction;
         }
 

diff --git a/Test/Integration/Service/Mollie/Order/CanRegisterCaptureNotificationTest.php b/Test/Integration/Service/Mollie/Order/CanRegisterCaptureNotificationTest.php
@@ -64,7 +64,8 @@ public function testCanCaptureWhenEnabledButNotCreditcard(): void
     public function testCannotCaptureWhenEnabledAndCreditcard(): void
     {
         $order = $this->loadOrderById('100000001');
-        $order->getPayment()->setMethod('mollie_methods_creditcard');
+        $methods = ['mollie_methods_applepay', 'mollie_methods_creditcard'];
+        $order->getPayment()->setMethod($methods[array_rand($methods)]);
 
         /** @var CanRegisterCaptureNotification $instance */
         $instance = $this->objectManager->create(CanRegisterCaptureNotification::class);

diff --git a/Test/Integration/Service/Mollie/Order/CreateInvoiceOnShipmentTest.php b/Test/Integration/Service/Mollie/Order/CreateInvoiceOnShipmentTest.php
@@ -44,7 +44,8 @@ public function testIsEnabledByMethod(string $method): void
     public function testIsDisabledWhenCreatePaymentAuthorizationIsEnabledAndApiIsPayments(): void
     {
         $order = $this->loadOrderById('100000001');
-        $order->getPayment()->setMethod('mollie_methods_creditcard');
+        $methods = ['mollie_methods_applepay', 'mollie_methods_creditcard'];
+        $order->getPayment()->setMethod($methods[array_rand($methods)]);
         $order->setMollieTransactionId('tr_1234567890');
 
         /** @var CreateInvoiceOnShipment $instance */
@@ -62,7 +63,8 @@ public function testIsDisabledWhenCreatePaymentAuthorizationIsEnabledAndApiIsPay
     public function testIsDisabledWhenCreatePaymentAuthorizationIsEnabledAndApiIsOrders(): void
     {
         $order = $this->loadOrderById('100000001');
-        $order->getPayment()->setMethod('mollie_methods_creditcard');
+        $methods = ['mollie_methods_applepay', 'mollie_methods_creditcard'];
+        $order->getPayment()->setMethod($methods[array_rand($methods)]);
         $order->setMollieTransactionId('ord_1234567890');
 
         /** @var CreateInvoiceOnShipment $instance */

diff --git a/Test/Integration/Service/Order/TransactionPart/CaptureModeTest.php b/Test/Integration/Service/Order/TransactionPart/CaptureModeTest.php
@@ -4,6 +4,7 @@
 
 use Mollie\Payment\Model\Client\Orders;
 use Mollie\Payment\Model\Client\Payments;
+use Mollie\Payment\Model\Methods\ApplePay;
 use Mollie\Payment\Model\Methods\Creditcard;
 use Mollie\Payment\Model\Methods\Ideal;
 use Mollie\Payment\Service\Order\TransactionPart\CaptureMode;
@@ -32,7 +33,7 @@ public function testDoesNothingWhenTheApiMethodIsOrders(): void
      * @magentoDataFixture Magento/Sales/_files/order.php
      * @return void
      */
-    public function testDoesNothingWhenThePaymentMethodIsNotCreditcard(): void
+    public function testDoesNothingWhenThePaymentMethodIsNotCreditCardOrApplePay(): void
     {
         $order = $this->loadOrderById('100000001');
         $order->getPayment()->setMethod(Ideal::CODE);
@@ -72,7 +73,8 @@ public function testDoesNothingWhenNotEnabled(): void
     public function testSetsTheModeWhenApplicable(): void
     {
         $order = $this->loadOrderById('100000001');
-        $order->getPayment()->setMethod(Creditcard::CODE);
+        $methods = [ApplePay::CODE, Creditcard::CODE];
+        $order->getPayment()->setMethod($methods[array_rand($methods)]);
 
         /** @var CaptureMode $instance */
         $instance = $this->objectManager->create(CaptureMode::class);