Merge pull request #858 from Adyen/develop-4

Release version 4.6.6

Author: MarijaIv

.github/workflows/templates/docker-compose.playwright.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   playwright:
-    image: mcr.microsoft.com/playwright:v1.61.1-noble
+    image: mcr.microsoft.com/playwright:v1.62.1-noble
     networks:
       - localnetwork
     shm_size: 1gb

composer.json

@@ -6,7 +6,7 @@
         }
     ],
     "description": "Official Shopware 6 Plugin to connect to Payment Service Provider Adyen",
-    "version": "4.6.5",
+    "version": "4.6.6",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "require": {

src/Controller/AdminController.php

@@ -276,7 +276,8 @@ public function isCaptureAllowed(string $orderId): JsonResponse
             $isFullAmountAuthorised = $this->adyenPaymentService->isFullAmountAuthorized($orderTransaction);
             $isRequiredAmountCaptured = $this->captureService->isRequiredAmountCaptured($orderTransaction);
             $isPaymentMethodSupportsManualCapture = $this->captureService->isManualCapture(
-                $orderTransaction->getPaymentMethod()->getHandlerIdentifier()
+                $orderTransaction->getPaymentMethod()->getHandlerIdentifier(),
+                $orderTransaction->getOrder()->getSalesChannelId()
             );
 
             if ($isPaymentMethodSupportsManualCapture && $isFullAmountAuthorised && !$isRequiredAmountCaptured) {
@@ -312,7 +313,10 @@ public function isManualCaptureEnabled(string $orderId): JsonResponse
             $paymentMethodHandlerIdentifier = $orderTransaction->getPaymentMethod()->getHandlerIdentifier();
 
             return new JsonResponse(
-                $this->captureService->isManualCapture($paymentMethodHandlerIdentifier)
+                $this->captureService->isManualCapture(
+                    $paymentMethodHandlerIdentifier,
+                    $orderTransaction->getOrder()->getSalesChannelId()
+                )
             );
         } catch (Throwable $t) {
             return new JsonResponse(false);

src/Handlers/AbstractPaymentMethodHandler.php

@@ -520,7 +520,8 @@ protected function getAdyenPaymentRequest(
                 isOpenInvoice: static::$isOpenInvoice,
                 shopperInteraction: static::class === OneClickPaymentMethodHandler::class
                     ? PaymentRequestService::SHOPPER_INTERACTION_CONTAUTH
-                    : PaymentRequestService::SHOPPER_INTERACTION_ECOMMERCE
+                    : PaymentRequestService::SHOPPER_INTERACTION_ECOMMERCE,
+                paymentMethodHandler: static::class
             );
         } catch (PaymentException $exception) {
             $this->logger->error($exception->getMessage());

src/Handlers/PaymentResponseHandler.php

@@ -248,8 +248,10 @@ public function handleShopwareApis(
         }
 
         $stateTechnicalName = $stateMachineState->getTechnicalName();
-        $requiresManualCapture = $this->captureService
-            ->isManualCapture($transaction->getOrderTransaction()->getPaymentMethod()->getHandlerIdentifier());
+        $requiresManualCapture = $this->captureService->isManualCapture(
+            $transaction->getOrderTransaction()->getPaymentMethod()->getHandlerIdentifier(),
+            $salesChannelContext->getSalesChannelId()
+        );
 
         // Get already stored transaction custom fields
         $storedTransactionCustomFields = $transaction->getOrderTransaction()->getCustomFields() ?: [];

src/Resources/config/services.xml

@@ -124,6 +124,7 @@
         <service id="Adyen\Shopware\Service\PaymentRequest\PaymentRequestService">
             <argument type="service" id="Adyen\Shopware\Service\ClientService"/>
             <argument type="service" id="Adyen\Shopware\Service\ConfigurationService"/>
+            <argument type="service" id="Adyen\Shopware\Service\CaptureService"/>
             <argument type="service" id="Adyen\Shopware\Util\Currency"/>
             <argument type="service" id="Adyen\Shopware\Util\CheckoutStateDataValidator"/>
             <argument type="service" id="Adyen\Shopware\Util\RatePayDeviceFingerprintParamsProvider"/>

src/ScheduledTask/Webhook/AuthorisationWebhookHandler.php

@@ -130,7 +130,10 @@ private function handleSuccessfulNotification(
             $paymentMethodHandler = $orderTransaction->getPaymentMethod()->getHandlerIdentifier();
         }
 
-        $isManualCapture = $this->captureService->isManualCapture($paymentMethodHandler);
+        $isManualCapture = $this->captureService->isManualCapture(
+            $paymentMethodHandler,
+            $orderTransaction->getOrder()->getSalesChannelId()
+        );
         $currencyUtil = new Currency();
         $totalPrice = $orderTransaction->getAmount()->getTotalPrice();
         $isoCode = $orderTransaction->getOrder()->getCurrency()->getIsoCode();
@@ -141,9 +144,7 @@ private function handleSuccessfulNotification(
             $this->adyenPaymentService->insertAdyenPayment($notification, $orderTransaction, $isManualCapture);
         }
 
-        // check for partial payments
-        $merchantOrderReference = isset(json_decode($notification->getAdditionalData())->merchantOrderReference);
-        if ($merchantOrderReference) {
+        if ($this->isPartialPayment($notification)) {
             return;
         }
 
@@ -175,6 +176,26 @@ private function handleSuccessfulNotification(
         }
     }
 
+    /**
+     * A payment is only part of an Adyen order if the merchant order reference differs from the
+     * merchant reference of the payment.
+     *
+     * @param NotificationEntity $notification
+     *
+     * @return bool
+     */
+    private function isPartialPayment(NotificationEntity $notification): bool
+    {
+        $additionalData = json_decode($notification->getAdditionalData() ?? '');
+        $merchantOrderReference = $additionalData->merchantOrderReference ?? null;
+
+        if (is_null($merchantOrderReference)) {
+            return false;
+        }
+
+        return $merchantOrderReference !== $notification->getMerchantReference();
+    }
+
     /**
      * @param OrderTransactionEntity $orderTransactionEntity
      * @param Context $context

src/ScheduledTask/Webhook/OrderClosedWebhookHandler.php

@@ -110,7 +110,10 @@ private function handleSuccessfulNotification(
         Context $context
     ): void {
         $paymentMethodHandler = $orderTransactionEntity->getPaymentMethod()->getHandlerIdentifier();
-        if ($this->captureService->isManualCapture($paymentMethodHandler)) {
+        if ($this->captureService->isManualCapture(
+            $paymentMethodHandler,
+            $orderTransactionEntity->getOrder()->getSalesChannelId()
+        )) {
             $this->logger->info(
                 'Manual capture required. Setting payment to `authorised` state.',
                 ['notification' => $notificationEntity->getVars()]

src/Service/CaptureService.php

@@ -124,7 +124,7 @@ public function doOpenInvoiceCapture(string $orderNumber, $captureAmount, Contex
 
         $paymentMethodHandler = $orderTransaction->getPaymentMethod()->getHandlerIdentifier();
 
-        if ($this->isManualCapture($paymentMethodHandler)) {
+        if ($this->isManualCapture($paymentMethodHandler, $order->getSalesChannelId())) {
             $this->logger->info('Capture for order_number ' . $orderNumber . ' start.');
 
             $customFields = $orderTransaction->getCustomFields();
@@ -209,22 +209,20 @@ public function getRescheduleNotificationTime(): \DateTime
 
     /**
      * @param $handlerIdentifier
+     * @param string|null $salesChannelId
      *
      * @return bool
      */
-    public function isManualCapture($handlerIdentifier): bool
+    public function isManualCapture($handlerIdentifier, ?string $salesChannelId = null): bool
     {
         if ($handlerIdentifier::$isOpenInvoice) {
-            if ($this->configurationService->isAutoCaptureActiveForOpenInvoices()) {
-                // Open invoice payment methods can be auto capture if the merchant account is authorised.
-                return false;
-            } else {
-                // Open invoice payment methods are manual capture by default.
-                return true;
-            }
-        } else {
-            return $this->configurationService->isManualCaptureActive() && $handlerIdentifier::$supportsManualCapture;
+            // Open invoice payment methods are manual capture unless the merchant account is
+            // authorised for auto capture.
+            return !$this->configurationService->isAutoCaptureActiveForOpenInvoices($salesChannelId);
         }
+
+        return $handlerIdentifier::$supportsManualCapture &&
+            (bool)$this->configurationService->isManualCaptureActive($salesChannelId);
     }
 
     /**

src/Service/PaymentRequest/PaymentRequestService.php

@@ -36,9 +36,11 @@
 use Adyen\Model\Checkout\Name;
 use Adyen\Model\Checkout\PaymentResponse;
 use Adyen\Service\Checkout\PaymentsApi;
+use Adyen\Shopware\Handlers\AbstractPaymentMethodHandler;
 use Adyen\Shopware\Models\PaymentRequest as IntegrationPaymentRequest;
 use Adyen\Shopware\PaymentMethods\RatepayDirectdebitPaymentMethod;
 use Adyen\Shopware\PaymentMethods\RatepayPaymentMethod;
+use Adyen\Shopware\Service\CaptureService;
 use Adyen\Shopware\Service\ClientService;
 use Adyen\Shopware\Service\ConfigurationService;
 use Adyen\Shopware\Service\Repository\SalesChannelRepository;
@@ -86,6 +88,7 @@ class PaymentRequestService
     /**
      * @param ClientService $clientService
      * @param ConfigurationService $configurationService
+     * @param CaptureService $captureService
      * @param Currency $currency
      * @param CheckoutStateDataValidator $checkoutStateDataValidator
      * @param RatePayDeviceFingerprintParamsProvider $ratePayFingerprintParamsProvider
@@ -97,6 +100,7 @@ class PaymentRequestService
     public function __construct(
         private readonly ClientService $clientService,
         private readonly ConfigurationService $configurationService,
+        private readonly CaptureService $captureService,
         private readonly Currency $currency,
         private readonly CheckoutStateDataValidator $checkoutStateDataValidator,
         private readonly RatePayDeviceFingerprintParamsProvider $ratePayFingerprintParamsProvider,
@@ -119,6 +123,7 @@ public function __construct(
      * @param array $adyenOrderData
      * @param bool $isOpenInvoice
      * @param string $shopperInteraction
+     * @param string $paymentMethodHandler
      *
      * @return IntegrationPaymentRequest
      */
@@ -131,7 +136,8 @@ public function buildPaymentRequestFromOrder(
         ?int $partialAmount = null,
         array $adyenOrderData = [],
         bool $isOpenInvoice = false,
-        string $shopperInteraction = self::SHOPPER_INTERACTION_ECOMMERCE
+        string $shopperInteraction = self::SHOPPER_INTERACTION_ECOMMERCE,
+        string $paymentMethodHandler = AbstractPaymentMethodHandler::class
     ): IntegrationPaymentRequest {
         $paymentRequest = new IntegrationPaymentRequest($stateData);
 
@@ -209,12 +215,15 @@ public function buildPaymentRequestFromOrder(
             $this->salesChannelRepository->getCurrentDomainUrl($salesChannelContext);
 
         $paymentRequest->setOrigin($origin);
-        $paymentRequest->setAdditionalData([
-            'allow3DS2' => true,
-            'manualCapture' => (bool)$this->configurationService->isManualCaptureActive(
+
+        $this->setAdditionalRequestData(
+            $paymentRequest,
+            $this->captureService->isManualCapture(
+                $paymentMethodHandler,
                 $salesChannelContext->getSalesChannel()->getId()
             ),
-        ]);
+            $isOpenInvoice
+        );
         $paymentRequest->setChannel('Web');
 
         // Set order data for multi-payment scenarios
@@ -290,12 +299,14 @@ public function buildPaymentRequestFromCart(
         }
 
         $paymentRequest->setOrigin($this->salesChannelRepository->getCurrentDomainUrl($salesChannelContext));
-        $paymentRequest->setAdditionalData([
-            'allow3DS2' => true,
-            'manualCapture' => (bool)$this->configurationService->isManualCaptureActive(
+
+        // Express checkout never uses an open invoice method, so the manual capture setting decides on its own.
+        $this->setAdditionalRequestData(
+            $paymentRequest,
+            (bool)$this->configurationService->isManualCaptureActive(
                 $salesChannelContext->getSalesChannel()->getId()
-            ),
-        ]);
+            )
+        );
         $paymentRequest->setChannel('Web');
         $paymentRequest->setShopperInteraction(self::SHOPPER_INTERACTION_ECOMMERCE);
 
@@ -349,6 +360,29 @@ public function executePayment(
         }
     }
 
+    /**
+     * @param IntegrationPaymentRequest $paymentRequest
+     * @param bool $isManualCapture
+     * @param bool $isOpenInvoice
+     *
+     * @return void
+     */
+    protected function setAdditionalRequestData(
+        IntegrationPaymentRequest $paymentRequest,
+        bool $isManualCapture,
+        bool $isOpenInvoice = false
+    ): void {
+        $additionalData = ['allow3DS2' => true];
+
+        if ($isManualCapture) {
+            $additionalData['manualCapture'] = true;
+        } elseif ($isOpenInvoice) {
+            $paymentRequest->setCaptureDelayHours(0);
+        }
+
+        $paymentRequest->setAdditionalData($additionalData);
+    }
+
     /**
      * Set browser info on payment request
      *