Merge branch 'main' into ECP-9542

Adyen · Feb 4, 2025 · 26d5d68 · 26d5d68
2 parents 41f13e9 + ebadb3a
commit 26d5d68
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 13 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/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/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, [

diff --git a/view/frontend/web/js/view/payment/method-renderer/adyen-pm-method.js b/view/frontend/web/js/view/payment/method-renderer/adyen-pm-method.js
@@ -263,8 +263,6 @@ define(
                     request = state.data;
                 }
 
-                request.cancelled = true;
-
                 adyenPaymentService.paymentDetails(request, self.orderId).done(function() {
                     $.mage.redirect(
                         window.checkoutConfig.payment.adyen.successPage