Merge branch 'main' into bugfix/check-payment-method-response-before-…

…using
Adyen · Feb 5, 2025 · b0a1e2d · b0a1e2d
2 parents d13c568 + a230cef
commit b0a1e2d
Show file tree

Hide file tree

Showing 24 changed files with 172 additions and 44 deletions.
diff --git a/.github/docker-compose.e2e.yml b/.github/docker-compose.e2e.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   playwright:
-    image: mcr.microsoft.com/playwright:v1.49.1
+    image: mcr.microsoft.com/playwright:v1.50.1
     shm_size: 1gb
     ipc: host
     cap_add:

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -133,7 +133,7 @@ jobs:
 
       - name: Archive test result artifacts
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: html-report
           path: test-report
diff --git a/Controller/Adminhtml/Configuration/DownloadApplePayDomainAssociationFile.php b/Controller/Adminhtml/Configuration/DownloadApplePayDomainAssociationFile.php
@@ -13,9 +13,7 @@
 
 use Adyen\Payment\Logger\AdyenLogger;
 use Exception;
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultInterface;
-use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem\DirectoryList;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Controller\ResultFactory;
@@ -30,7 +28,7 @@ class DownloadApplePayDomainAssociationFile extends Action
     const WELL_KNOWN_PATH = '.well-known';
 
     public function __construct(
-        private readonly Context $context,
+        Context $context,
         private readonly DirectoryList $directoryList,
         private readonly File $fileIo,
         private readonly AdyenLogger $adyenLogger
@@ -39,10 +37,9 @@ public function __construct(
     }
 
     /**
-     * @return ResultInterface|ResponseInterface
-     * @throws FileSystemException
+     * @return ResultInterface
      */
-    public function execute(): ResultInterface|ResponseInterface
+    public function execute(): ResultInterface
     {
         $redirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $redirect->setUrl($this->_redirect->getRefererUrl());

diff --git a/Controller/Webhook/Index.php b/Controller/Webhook/Index.php
@@ -213,10 +213,12 @@ private function isAuthorised(array $response)
     {
         // Add CGI support
         $this->fixCgiHttpAuthentication();
+        $merchantAccount = $this->configHelper->getMerchantAccount()
+            ?? $this->configHelper->getMotoMerchantAccounts();
 
         $authResult = $this->notificationReceiver->isAuthenticated(
             $response,
-            $this->configHelper->getMerchantAccount(),
+            $merchantAccount,
             $this->configHelper->getNotificationsUsername(),
             $this->configHelper->getNotificationsPassword()
         );

diff --git a/Gateway/Response/CheckoutPaymentsDetailsHandler.php b/Gateway/Response/CheckoutPaymentsDetailsHandler.php
@@ -56,6 +56,15 @@ public function handle(array $handlingSubject, array $responseCollection)
             $payment->setCcTransId($response['pspReference']);
             $payment->setLastTransId($response['pspReference']);
 
+            //set CC Type
+            $ccType = $payment->getAdditionalInformation('cc_type');
+
+            if (!empty($response['additionalData']['paymentMethod']) && $ccType == null) {
+                $ccType = $response['additionalData']['paymentMethod'];
+                $payment->setAdditionalInformation('cc_type', $ccType);
+                $payment->setCcType($ccType);
+            }
+
             // set transaction
             $payment->setTransactionId($response['pspReference']);
         }

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -272,7 +272,8 @@ public function getCheckoutFrontendRegions()
             'eu' => 'Default (EU - Europe)',
             'au' => 'AU - Australasia',
             'us' => 'US - United States',
-            'in' => 'IN - India'
+            'in' => 'IN - India',
+            'apse' => 'APSE - Asia Pacific Southeast'
         ];
     }
 

diff --git a/Helper/Invoice.php b/Helper/Invoice.php
@@ -334,9 +334,11 @@ public function isFullInvoiceAmountManuallyCaptured(InvoiceModel $invoice): bool
             }
         }
 
+        $invoiceChargedCurrency = $this->chargedCurrencyHelper->getInvoiceAmountCurrency($invoice);
+
         $invoiceAmountCents = $this->adyenDataHelper->formatAmount(
-            $invoice->getGrandTotal(),
-            $invoice->getOrderCurrencyCode()
+            $invoiceChargedCurrency->getAmount(),
+            $invoiceChargedCurrency->getCurrencyCode()
         );
 
         $invoiceCapturedAmountCents = $this->adyenDataHelper->formatAmount(

diff --git a/Helper/PaymentMethods.php b/Helper/PaymentMethods.php
@@ -54,6 +54,7 @@ class PaymentMethods extends AbstractHelper
     const ADYEN_ONE_CLICK = 'adyen_oneclick';
     const ADYEN_PAY_BY_LINK = 'adyen_pay_by_link';
     const ADYEN_PREFIX = 'adyen_';
+    const ADYEN_CC_VAULT = 'adyen_cc_vault';
     const METHODS_WITH_BRAND_LOGO = [
         "giftcard"
     ];
@@ -958,7 +959,7 @@ public function compareOrderAndWebhookPaymentMethods(Order $order, Notification
 
         // Returns if the payment method is wallet like wechatpayWeb, amazonpay, applepay, paywithgoogle
         $isWalletPaymentMethod = $this->isWalletPaymentMethod($paymentMethodInstance);
-        $isCardPaymentMethod = $order->getPayment()->getMethod() === 'adyen_cc' || $order->getPayment()->getMethod() === 'adyen_oneclick';
+        $isCardPaymentMethod = $order->getPayment()->getMethod() === self::ADYEN_CC || $order->getPayment()->getMethod() === self::ADYEN_ONE_CLICK;
 
         // If it is a wallet method OR a card OR the methods match exactly, return true
         if ($isWalletPaymentMethod || $isCardPaymentMethod || strcmp($notificationPaymentMethod, $orderPaymentMethod) === 0) {

diff --git a/Helper/PaymentResponseHandler.php b/Helper/PaymentResponseHandler.php
@@ -12,7 +12,6 @@
 namespace Adyen\Payment\Helper;
 
 use Adyen\Model\Checkout\CancelOrderRequest;
-use Adyen\Payment\Helper\Config;
 use Adyen\Payment\Logger\AdyenLogger;
 use Adyen\Payment\Model\ResourceModel\PaymentResponse\CollectionFactory as PaymentResponseCollectionFactory;
 use Exception;
@@ -24,7 +23,6 @@
 use Magento\Sales\Model\OrderRepository;
 use Magento\Sales\Model\ResourceModel\Order;
 use Magento\Sales\Model\Order as OrderModel;
-use Adyen\Payment\Helper\Data;
 use Magento\Framework\Mail\Exception\InvalidArgumentException;
 use Adyen\Client;
 
@@ -65,6 +63,7 @@ class PaymentResponseHandler
     private StateData $stateDataHelper;
     private PaymentResponseCollectionFactory $paymentResponseCollectionFactory;
     private Config $configHelper;
+    private PaymentMethods $paymentMethodsHelper;
 
     public function __construct(
         AdyenLogger $adyenLogger,
@@ -77,7 +76,8 @@ public function __construct(
         HistoryFactory $orderHistoryFactory,
         StateData $stateDataHelper,
         PaymentResponseCollectionFactory $paymentResponseCollectionFactory,
-        Config $configHelper
+        Config $configHelper,
+        PaymentMethods $paymentMethodsHelper
     ) {
         $this->adyenLogger = $adyenLogger;
         $this->vaultHelper = $vaultHelper;
@@ -90,6 +90,7 @@ public function __construct(
         $this->stateDataHelper = $stateDataHelper;
         $this->paymentResponseCollectionFactory = $paymentResponseCollectionFactory;
         $this->configHelper = $configHelper;
+        $this->paymentMethodsHelper = $paymentMethodsHelper;
     }
 
     public function formatPaymentResponse(
@@ -159,6 +160,12 @@ public function handlePaymentsDetailsResponse(
         $this->adyenLogger->addAdyenResult('Updating the order');
         $payment = $order->getPayment();
 
+        //Check magento Payment Method
+        $paymentMethodInstance = $payment->getMethodInstance();
+        $isWalletPaymentMethod = $this->paymentMethodsHelper->isWalletPaymentMethod($paymentMethodInstance);
+        $isCardPaymentMethod = $payment->getMethod() === PaymentMethods::ADYEN_CC ||
+            $payment->getMethod() === PaymentMethods::ADYEN_CC_VAULT;
+
         $authResult = $paymentsDetailsResponse['authResult'] ?? $paymentsDetailsResponse['resultCode'] ?? null;
         if (is_null($authResult)) {
             // In case the result is unknown we log the request and don't update the history
@@ -211,6 +218,17 @@ public function handlePaymentsDetailsResponse(
             $payment->setAdditionalInformation('donationToken', $paymentsDetailsResponse['donationToken']);
         }
 
+        $ccType = $payment->getAdditionalInformation('cc_type');
+
+        if (!empty($paymentsDetailsResponse['additionalData']['paymentMethod']) &&
+            is_null($ccType) &&
+            ($isWalletPaymentMethod || $isCardPaymentMethod)
+        ) {
+            $ccType = $paymentsDetailsResponse['additionalData']['paymentMethod'];
+            $payment->setAdditionalInformation('cc_type', $ccType);
+            $payment->setCcType($ccType);
+        }
+
         // Handle recurring details
         $this->vaultHelper->handlePaymentResponseRecurringDetails($payment, $paymentsDetailsResponse);
 

diff --git a/Model/Api/PaymentRequest.php b/Model/Api/PaymentRequest.php
@@ -7,6 +7,8 @@
  * See LICENSE.txt for license details.
  *
  * Author: Adyen <[email protected]>
+ * @deprecated This class is deprecated and will be removed in a future release.
+ *              Use an alternative service or class for similar requests.
  */
 
 namespace Adyen\Payment\Model\Api;
@@ -87,8 +89,10 @@ public function __construct(
     }
 
     /**
+     * @deprecated This method is deprecated and will be removed in a future release.
+     *
      * @param Payment $payment
-     * @return mixed
+     * @return array
      * @throws LocalizedException
      * @throws NoSuchEntityException
      */
@@ -134,6 +138,7 @@ public function authorise3d(Payment $payment): array
     }
 
     /**
+     * @deprecated This method is redundant and no more used with the current flow. Will be deleted in the future releases.
      * @param string $shopperReference
      * @param int $storeId
      * @return array
@@ -182,6 +187,7 @@ public function getRecurringContractsForShopper(string $shopperReference, int $s
     }
 
     /**
+     * @deprecated This method is a part of deprecated parent and will be removed in the future releases.
      * @param string $shopperReference
      * @param int $storeId
      * @param string $recurringType
@@ -208,6 +214,7 @@ public function listRecurringContractByType(string $shopperReference, int $store
     }
 
     /**
+     * @deprecated This method is redundant and will be removed in the coming major release.
      * @param string $recurringDetailReference
      * @param string $shopperReference
      * @param int $storeId

diff --git a/Model/Ui/AdyenCcConfigProvider.php b/Model/Ui/AdyenCcConfigProvider.php
@@ -16,6 +16,7 @@
 use Adyen\Payment\Helper\PaymentMethods;
 use Adyen\Payment\Helper\Vault;
 use Magento\Checkout\Model\ConfigProviderInterface;
+use Magento\Framework\App\Request\Http;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\UrlInterface;
@@ -38,6 +39,7 @@ class AdyenCcConfigProvider implements ConfigProviderInterface
     private Config $configHelper;
     private PaymentMethods $paymentMethodsHelper;
     private Vault $vaultHelper;
+    private Http $httpRequest;
 
     public function __construct(
         Data $adyenHelper,
@@ -49,7 +51,8 @@ public function __construct(
         SerializerInterface $serializer,
         Config $configHelper,
         PaymentMethods $paymentMethodsHelper,
-        Vault $vaultHelper
+        Vault $vaultHelper,
+        Http $httpRequest
     ) {
         $this->adyenHelper = $adyenHelper;
         $this->request = $request;
@@ -61,6 +64,7 @@ public function __construct(
         $this->configHelper = $configHelper;
         $this->paymentMethodsHelper = $paymentMethodsHelper;
         $this->vaultHelper = $vaultHelper;
+        $this->httpRequest = $httpRequest;
     }
 
     public function getConfig(): array
@@ -111,6 +115,7 @@ public function getConfig(): array
         $config['payment']['adyenCc']['isCardRecurringEnabled'] = $cardRecurringEnabled;
         $config['payment']['adyenCc']['icons'] = $this->getIcons();
         $config['payment']['adyenCc']['isClickToPayEnabled'] = $this->configHelper->isClickToPayEnabled($storeId);
+        $config['payment']['adyenCc']['controllerName'] = $this->httpRequest->getControllerName();
 
         // has installments by default false
         $config['payment']['adyenCc']['hasInstallments'] = false;

diff --git a/Test/Unit/Gateway/Response/CheckoutPaymentsDetailsHandlerTest.php b/Test/Unit/Gateway/Response/CheckoutPaymentsDetailsHandlerTest.php
@@ -109,13 +109,15 @@ public function testIfPartialPaymentHandlesLastPaymentResponse()
                 ]
             ],
             1 => [
-                'additionalData' => [],
+                'additionalData' => [
+                    'paymentMethod' => 'VI',
+                ],
                 'amount' => [],
                 'resultCode' => 'Authorised',
                 'pspReference' => 'ABC12345',
                 'paymentMethod' => [
                     'name' => 'card',
-                    'type' => 'CreditCard',
+                    'type' => 'VI',
                 ]
             ]
         ];
@@ -146,6 +148,22 @@ public function testIfPartialPaymentHandlesLastPaymentResponse()
             ->method('setTransactionId')
             ->with('ABC12345');
 
+        $this->paymentMock
+            ->expects($this->once())
+            ->method('getAdditionalInformation')
+            ->with('cc_type')
+            ->willReturn(null);
+
+        $this->paymentMock
+            ->expects($this->once())
+            ->method('setAdditionalInformation')
+            ->with('cc_type', 'VI');
+
+        $this->paymentMock
+            ->expects($this->once())
+            ->method('setCcType')
+            ->with('VI');
+
         $this->applyGenericMockExpectations();
 
         $this->checkoutPaymentsDetailsHandler->handle($this->handlingSubject, $responseCollection);

diff --git a/Test/Unit/Helper/DataTest.php b/Test/Unit/Helper/DataTest.php
@@ -202,7 +202,8 @@ public function testGetCheckoutFrontendRegions()
             'eu' => 'Default (EU - Europe)',
             'au' => 'AU - Australasia',
             'us' => 'US - United States',
-            'in' => 'IN - India'
+            'in' => 'IN - India',
+            'apse' => 'APSE - Asia Pacific Southeast'
         ];
 
         $actualResult = $this->dataHelper->getCheckoutFrontendRegions();
@@ -1803,7 +1804,8 @@ public function getCheckoutFrontendRegionsShouldReturnAnArray()
             'eu' => 'Default (EU - Europe)',
             'au' => 'AU - Australasia',
             'us' => 'US - United States',
-            'in' => 'IN - India'
+            'in' => 'IN - India',
+            'apse' => 'APSE - Asia Pacific Southeast'
         ], $this->dataHelper->getRecurringTypes());
     }
 

diff --git a/Test/Unit/Helper/InvoiceTest.php b/Test/Unit/Helper/InvoiceTest.php
@@ -168,8 +168,11 @@ public function testHandleCaptureWebhook()
         $adyenAmountCurrencyMock->method('getAmount')->willReturn(10);
         $adyenAmountCurrencyMock->method('getCurrencyCode')->willReturn('EUR');
 
+        $invoiceAmountCurrency = $this->createMock(AdyenAmountCurrency::class);
+
         $chargedCurrencyMock = $this->createMock(ChargedCurrency::class);
         $chargedCurrencyMock->method('getOrderAmountCurrency')->willReturn($adyenAmountCurrencyMock);
+        $chargedCurrencyMock->method('getInvoiceAmountCurrency')->willReturn($invoiceAmountCurrency);
 
         $invoiceHelper = $this->createInvoiceHelper(
             $contextMock,
@@ -277,6 +280,17 @@ public function testIsFullInvoiceAmountManuallyCaptured()
             ],
         ]);
 
+        $invoiceAmountCurrency = $this->createMock(AdyenAmountCurrency::class);
+        $invoiceAmountCurrency->expects($this->once())
+            ->method('getAmount')
+            ->willReturn(1000);
+        $invoiceAmountCurrency->expects($this->once())
+            ->method('getCurrencyCode')
+            ->willReturn('EUR');
+
+        $chargedCurrencyMock = $this->createMock(ChargedCurrency::class);
+        $chargedCurrencyMock->method('getInvoiceAmountCurrency')->willReturn($invoiceAmountCurrency);
+
         $invoiceHelper = $this->createInvoiceHelper(
             null,
             null,
@@ -286,7 +300,13 @@ public function testIsFullInvoiceAmountManuallyCaptured()
             null,
             null,
             null,
-            $adyenInvoiceCollectionMock
+            $adyenInvoiceCollectionMock,
+            null,
+            null,
+            null,
+            null,
+            null,
+            $chargedCurrencyMock
         );
 
         $invoiceMock = $this->createConfiguredMock(InvoiceModel::class, [