Merge pull request #2588 from Adyen/develop

Release v9.5.0
Adyen · Apr 19, 2024 · d63a399 · d63a399
2 parents f80d67c + 9f49097
commit d63a399
Show file tree

Hide file tree

Showing 52 changed files with 1,301 additions and 85 deletions.
diff --git a/Api/AdyenPosCloudInterface.php b/Api/AdyenPosCloudInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2024 Adyen N.V. (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <[email protected]>
+ */
+
+namespace Adyen\Payment\Api;
+interface AdyenPosCloudInterface
+{
+    /**
+     * @param int $orderId
+     * @return void
+     */
+    public function pay(int $orderId): void;
+}
diff --git a/Api/GuestAdyenPosCloudInterface.php b/Api/GuestAdyenPosCloudInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2024 Adyen N.V. (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <[email protected]>
+ */
+
+namespace Adyen\Payment\Api;
+
+interface GuestAdyenPosCloudInterface
+{
+    /**
+     * @param string $cartId
+     * @return void
+     */
+    public function payByCart(string $cartId): void;
+}
diff --git a/Gateway/Response/PaymentPosCloudHandler.php b/Gateway/Response/PaymentPosCloudHandler.php
@@ -13,23 +13,32 @@
 namespace Adyen\Payment\Gateway\Response;
 
 use Adyen\AdyenException;
+use Adyen\Payment\Helper\PaymentResponseHandler;
+use Adyen\Payment\Helper\Quote;
 use Adyen\Payment\Helper\Vault;
 use Adyen\Payment\Logger\AdyenLogger;
-use Adyen\Payment\Model\Order\Payment;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\StatusResolver;
 use Magento\Payment\Gateway\Helper\SubjectReader;
 use Magento\Payment\Gateway\Response\HandlerInterface;
 
 class PaymentPosCloudHandler implements HandlerInterface
 {
     private AdyenLogger $adyenLogger;
     private Vault $vaultHelper;
+    private StatusResolver $statusResolver;
+    private Quote $quoteHelper;
 
     public function __construct(
         AdyenLogger $adyenLogger,
-        Vault $vaultHelper
+        Vault $vaultHelper,
+        StatusResolver $statusResolver,
+        Quote $quoteHelper
     ) {
         $this->adyenLogger = $adyenLogger;
         $this->vaultHelper = $vaultHelper;
+        $this->statusResolver = $statusResolver;
+        $this->quoteHelper = $quoteHelper;
     }
 
     public function handle(array $handlingSubject, array $response)
@@ -44,9 +53,11 @@ public function handle(array $handlingSubject, array $response)
 
         // do not send order confirmation mail
         $payment->getOrder()->setCanSendNewEmailFlag(false);
+        $resultCode = null;
 
         if (!empty($paymentResponse) && isset($paymentResponse['Response']['Result'])) {
-            $payment->setAdditionalInformation('resultCode', $paymentResponse['Response']['Result']);
+            $resultCode = $paymentResponse['Response']['Result'];
+            $payment->setAdditionalInformation('resultCode', $resultCode);
         }
 
         if (!empty($paymentResponse['Response']['AdditionalResponse']))
@@ -81,5 +92,19 @@ public function handle(array $handlingSubject, array $response)
         // do not close transaction so you can do a cancel() and void
         $payment->setIsTransactionClosed(false);
         $payment->setShouldCloseParentTransaction(false);
+
+        if ($resultCode === PaymentResponseHandler::POS_SUCCESS) {
+            $order = $payment->getOrder();
+            $status = $this->statusResolver->getOrderStatusByState(
+                $payment->getOrder(),
+                Order::STATE_NEW
+            );
+            $order->setState(Order::STATE_NEW);
+            $order->setStatus($status);
+            $message = __("Pos payment authorized");
+            $order->addCommentToStatusHistory($message, $status);
+            $order->save();
+            $this->quoteHelper->disableQuote($order->getQuoteId());
+        }
     }
 }
diff --git a/Helper/Config.php b/Helper/Config.php
@@ -51,6 +51,7 @@ class Config
     const XML_MOTO_MERCHANT_ACCOUNTS = 'moto_merchant_accounts';
     const XML_CONFIGURATION_MODE = 'configuration_mode';
     const XML_ADYEN_POS_CLOUD = 'adyen_pos_cloud';
+    const XML_PAYMENT_ACTION = 'payment_action';
     const XML_WEBHOOK_NOTIFICATION_PROCESSOR = 'webhook_notification_processor';
     const AUTO_CAPTURE_OPENINVOICE = 'auto';
     const XML_RECURRING_CONFIGURATION = 'recurring_configuration';
@@ -465,6 +466,11 @@ public function getAdyenPosCloudConfigData(string $field, int $storeId = null, b
         return $this->getConfigData($field, self::XML_ADYEN_POS_CLOUD, $storeId, $flag);
     }
 
+    public function getAdyenPosCloudPaymentAction(int $storeId): string
+    {
+        return $this->getAdyenPosCloudConfigData(self::XML_PAYMENT_ACTION, $storeId);
+    }
+
     public function useQueueProcessor($storeId = null): bool
     {
         return $this->getConfigData(

diff --git a/Helper/Order.php b/Helper/Order.php
@@ -676,8 +676,9 @@ public function refundOrder(MagentoOrder $order, Notification $notification): Ma
             );
         }
 
-        $order->addStatusHistoryComment(__('Refund Webhook successfully handled'), $order->getStatus());
-
+        $order->addStatusHistoryComment(__(sprintf(
+            '%s Webhook successfully handled',
+            $notification->getEventCode())), $order->getStatus());
         return $order;
     }
 

diff --git a/Helper/Webhook.php b/Helper/Webhook.php
@@ -25,6 +25,7 @@
 use Adyen\Webhook\Processor\ProcessorFactory;
 use DateTime;
 use Exception;
+use Adyen\Payment\Model\Notification as NotificationEntity;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Sales\Model\Order;
@@ -39,7 +40,8 @@ class Webhook
         Order::STATE_PROCESSING => PaymentStates::STATE_IN_PROGRESS,
         Order::STATE_COMPLETE => PaymentStates::STATE_PAID,
         Order::STATE_CANCELED => PaymentStates::STATE_CANCELLED,
-        Order::STATE_CLOSED => PaymentStates::STATE_REFUNDED
+        Order::STATE_CLOSED => PaymentStates::STATE_REFUNDED,
+        NotificationEntity::STATE_ADYEN_AUTHORIZED => PaymentStates::STATE_PENDING
     ];
 
     /**
@@ -271,7 +273,7 @@ private function getTransitionState(Notification $notification, $currentOrderSta
             'additionalData' => !empty($notification->getAdditionalData())
                 ? $this->serializer->unserialize($notification->getAdditionalData()) : null,
         ]);
-        $processor = ProcessorFactory::create($webhookNotificationItem, $currentOrderState, $this->logger);
+        $processor = ProcessorFactory::create($webhookNotificationItem, $currentOrderState);
 
         return $processor->process();
     }

diff --git a/Helper/Webhook/AbstractDisputeWebhookHandler.php b/Helper/Webhook/AbstractDisputeWebhookHandler.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ *
+ * Adyen Payment Module
+ *
+ * Copyright (c) 2024 Adyen N.V.
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ *
+ * Author: Adyen <[email protected]>
+ */
+
+namespace Adyen\Payment\Helper\Webhook;
+
+use Adyen\Payment\Helper\Order;
+use Adyen\Payment\Model\Notification;
+use Adyen\Webhook\PaymentStates;
+use Magento\Sales\Model\Order as MagentoOrder;
+use Adyen\Payment\Logger\AdyenLogger;
+use Adyen\Payment\Helper\Config;
+
+
+abstract class AbstractDisputeWebhookHandler implements WebhookHandlerInterface
+{
+    /** @var Order */
+    private $orderHelper;
+
+    /** @var AdyenLogger */
+    private $adyenLogger;
+
+    /** @var Config */
+    private $configHelper;
+
+    public function __construct(Order $orderHelper, AdyenLogger $adyenLogger, Config $configHelper)
+    {
+        $this->orderHelper = $orderHelper;
+        $this->adyenLogger = $adyenLogger;
+        $this->configHelper = $configHelper;
+    }
+
+    public function handleWebhook(MagentoOrder $order, Notification $notification, string $transitionState): MagentoOrder
+    {
+        $ignoreDisputeNotifications = $this->configHelper->getConfigData(
+            'ignore_dispute_notification',
+            'adyen_abstract',
+            $order->getStoreId()
+        );
+
+        if ($transitionState === PaymentStates::STATE_REFUNDED && !$ignoreDisputeNotifications){
+            $order = $this->orderHelper->refundOrder($order, $notification);
+            $this->adyenLogger->addAdyenNotification(sprintf(
+                'The order has been updated by the %s notification. ',
+                $notification->getEventCode(),
+            ), [
+                'pspReference' => $order->getPayment()->getData('adyen_psp_reference'),
+                'merchantReference' => $order->getPayment()->getData('entity_id')
+            ]);
+        }
+        elseif ($ignoreDisputeNotifications){
+            $this->adyenLogger->addAdyenNotification(sprintf(
+                'Config to ignore dispute notification is enabled. Notification %s will be ignored',
+                $notification->getId()
+            ), [
+                'pspReference' => $notification->getPspreference(),
+                'merchantReference' => $notification->getMerchantReference()
+                ]);
+        }
+        else {
+            $this->orderHelper->addWebhookStatusHistoryComment($order, $notification);
+            $this->adyenLogger->addAdyenNotification(sprintf(
+                'There is a %s notification for the order.',
+                $notification->getEventCode(),
+            ), [
+                'pspReference' => $order->getPayment()->getData('adyen_psp_reference'),
+                'merchantReference' => $order->getPayment()->getData('entity_id')
+            ]);
+        }
+        return $order;
+    }
+
+}
diff --git a/Helper/Webhook/ChargebackReversedWebhookHandler.php b/Helper/Webhook/ChargebackReversedWebhookHandler.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ *
+ * Adyen Payment Module
+ *
+ * Copyright (c) 2024 Adyen N.V.
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ *
+ * Author: Adyen <[email protected]>
+ */
+
+namespace Adyen\Payment\Helper\Webhook;
+
+use Adyen\Payment\Helper\Order;
+use Adyen\Payment\Model\Notification;
+use Magento\Sales\Model\Order as MagentoOrder;
+
+
+class ChargebackReversedWebhookHandler extends AbstractDisputeWebhookHandler implements WebhookHandlerInterface
+{
+
+}
diff --git a/Helper/Webhook/ChargebackWebhookHandler.php b/Helper/Webhook/ChargebackWebhookHandler.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ *
+ * Adyen Payment Module
+ *
+ * Copyright (c) 2024 Adyen N.V.
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ *
+ * Author: Adyen <[email protected]>
+ */
+
+namespace Adyen\Payment\Helper\Webhook;
+
+use Adyen\Payment\Helper\Order;
+use Adyen\Payment\Model\Notification;
+use Magento\Sales\Model\Order as MagentoOrder;
+
+
+class ChargebackWebhookHandler extends AbstractDisputeWebhookHandler implements WebhookHandlerInterface
+{
+
+}
diff --git a/Helper/Webhook/NotificationOfChargebackWebhookHandler.php b/Helper/Webhook/NotificationOfChargebackWebhookHandler.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ *
+ * Adyen Payment Module
+ *
+ * Copyright (c) 2024 Adyen N.V.
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ *
+ * Author: Adyen <[email protected]>
+ */
+
+namespace Adyen\Payment\Helper\Webhook;
+
+use Adyen\Payment\Helper\Order;
+use Adyen\Payment\Model\Notification;
+use Magento\Sales\Model\Order as MagentoOrder;
+
+
+class NotificationOfChargebackWebhookHandler extends AbstractDisputeWebhookHandler implements WebhookHandlerInterface
+{
+
+}
diff --git a/Helper/Webhook/RequestForInformationWebhookHandler.php b/Helper/Webhook/RequestForInformationWebhookHandler.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ *
+ * Adyen Payment Module
+ *
+ * Copyright (c) 2024 Adyen N.V.
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ *
+ * Author: Adyen <[email protected]>
+ */
+
+namespace Adyen\Payment\Helper\Webhook;
+
+use Adyen\Payment\Helper\Order;
+use Adyen\Payment\Model\Notification;
+use Magento\Sales\Model\Order as MagentoOrder;
+
+
+class RequestForInformationWebhookHandler extends AbstractDisputeWebhookHandler implements WebhookHandlerInterface
+{
+
+}
diff --git a/Helper/Webhook/SecondChargebackWebhookHandler.php b/Helper/Webhook/SecondChargebackWebhookHandler.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ *
+ * Adyen Payment Module
+ *
+ * Copyright (c) 2024 Adyen N.V.
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ *
+ * Author: Adyen <[email protected]>
+ */
+
+namespace Adyen\Payment\Helper\Webhook;
+
+use Adyen\Payment\Helper\Order;
+use Adyen\Payment\Model\Notification;
+use Magento\Sales\Model\Order as MagentoOrder;
+
+
+class SecondChargebackWebhookHandler extends AbstractDisputeWebhookHandler implements WebhookHandlerInterface
+{
+
+}