Merge pull request #96 from Adyen/develop

Release 1.2.3

Author: candemiralp

.github/docker-compose.e2e.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   playwright:
-    image: mcr.microsoft.com/playwright:v1.40.1
+    image: mcr.microsoft.com/playwright:v1.50.1
     shm_size: 1gb
     ipc: host
     cap_add:

.github/workflows/e2e-test.yml

@@ -1,6 +1,6 @@
 name: Magento-Hyva E2E Pipeline
 run-name: Adyen Magento 2 Payment Plugin E2E tests
-on: [pull_request, workflow_dispatch]
+on: [pull_request, pull_request_target, workflow_dispatch]
 
 jobs:
   build:
@@ -23,6 +23,9 @@ jobs:
       DEPLOY_SAMPLEDATA: 1
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}
+          fetch-depth: 0
 
       - name: Set Branch Name
         run: |

.github/workflows/main.yml

@@ -2,6 +2,7 @@ name: Main CI workflow
 
 on:
   pull_request:
+  pull_request_target:
   workflow_dispatch:
 
 jobs:
@@ -17,6 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}
           fetch-depth: 0
 
       - name: Use PHP ${{ matrix.php-version }}
@@ -42,7 +44,7 @@ jobs:
           ssh-keyscan gitlab.hyva.io >> ~/.ssh/known_hosts
           echo "${HYVA_GITLAB_SSH_KEY}" > ~/.ssh/hyva_id_rsa
           chmod 600 ~/.ssh/hyva_id_rsa
-          ssh-agent -a ${SSH_AUTH_SOCK} > /dev/null	
+          ssh-agent -a ${SSH_AUTH_SOCK} > /dev/null
           ssh-add ~/.ssh/hyva_id_rsa
 
       - name: Install the plugin

Magewire/Payment/Method/AdyenPaymentComponent.php

@@ -11,7 +11,7 @@
 use Adyen\Hyva\Model\PaymentMethod\PaymentMethods;
 use Adyen\Payment\Api\AdyenOrderPaymentStatusInterface;
 use Adyen\Payment\Api\AdyenPaymentsDetailsInterface;
-use Adyen\Payment\Gateway\Request\HeaderDataBuilder;
+use Adyen\Payment\Gateway\Request\Header\HeaderDataBuilderInterface;
 use Adyen\Payment\Helper\StateData;
 use Adyen\Payment\Helper\Util\CheckoutStateDataValidator;
 use Hyva\Checkout\Model\Magewire\Component\Evaluation\EvaluationResult;
@@ -20,6 +20,7 @@
 use Magento\Checkout\Api\GuestPaymentInformationManagementInterface;
 use Magento\Checkout\Api\PaymentInformationManagementInterface;
 use Magento\Checkout\Model\Session;
+use Magento\Quote\Api\Data\PaymentExtensionFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magewirephp\Magewire\Component;
 use Psr\Log\LoggerInterface;
@@ -61,7 +62,8 @@ abstract class AdyenPaymentComponent extends Component implements EvaluationInte
     const FRONTENDTYPE_HYVA = 'hyva';
 
     public function __construct(
-        private readonly Context $context
+        private readonly Context $context,
+        private readonly PaymentExtensionFactory $paymentExtensionFactory
     ) {
         $this->checkoutStateDataValidator = $context->getCheckoutStateDataValidator();
         $this->configuration = $context->getConfiguration();
@@ -102,7 +104,19 @@ public function placeOrder(array $data): void
             $this->handleSessionVariables($data);
             $quoteId = $this->session->getQuoteId();
             $payment = $this->session->getQuote()->getPayment();
-            $payment->setAdditionalInformation(HeaderDataBuilder::FRONTENDTYPE, self::FRONTENDTYPE_HYVA);
+            
+            $payment->setAdditionalInformation(
+                HeaderDataBuilderInterface::ADDITIONAL_DATA_FRONTEND_TYPE_KEY,
+                self::FRONTENDTYPE_HYVA
+            );
+
+            if (!empty($data['extension_attributes']['agreement_ids'])) {
+                $paymentExtension = $this->paymentExtensionFactory->create();
+                $paymentExtension->setAgreementIds($data['extension_attributes']['agreement_ids']);
+
+                $payment->setExtensionAttributes($paymentExtension);
+            }
+            
             $stateDataReceived = $this->collectValidatedStateData($data);
             //Temporary (per request) storage of state data
             $this->stateData->setStateData($stateDataReceived, (int) $quoteId);

Magewire/Payment/Method/CreditCard.php

@@ -9,6 +9,7 @@
 use Adyen\Hyva\Model\CreditCard\InstallmentsManager;
 use Hyva\Checkout\Model\Magewire\Component\Evaluation\EvaluationResult;
 use Hyva\Checkout\Model\Magewire\Component\EvaluationResultFactory;
+use Magento\Quote\Api\Data\PaymentExtensionFactory;
 
 class CreditCard extends AdyenPaymentComponent
 {
@@ -18,9 +19,13 @@ class CreditCard extends AdyenPaymentComponent
     public function __construct(
         private readonly Context $context,
         private readonly BrandsManager $brandsManager,
-        private readonly InstallmentsManager $installmentsManager
+        private readonly InstallmentsManager $installmentsManager,
+        private readonly PaymentExtensionFactory $paymentExtensionFactory
     ) {
-        parent::__construct($this->context);
+        parent::__construct(
+            $this->context,
+            $this->paymentExtensionFactory
+        );
     }
 
     /**

Magewire/Payment/Method/StoredCards.php

@@ -10,6 +10,7 @@
 use Exception;
 use Hyva\Checkout\Model\Magewire\Component\Evaluation\EvaluationResult;
 use Hyva\Checkout\Model\Magewire\Component\EvaluationResultFactory;
+use Magento\Quote\Api\Data\PaymentExtensionFactory;
 
 class StoredCards extends AdyenPaymentComponent
 {
@@ -18,9 +19,13 @@ class StoredCards extends AdyenPaymentComponent
     public function __construct(
         private readonly Context $context,
         private readonly InstallmentsManager $installmentsManager,
+        private readonly PaymentExtensionFactory $paymentExtensionFactory
 
     ) {
-        parent::__construct($this->context);
+        parent::__construct(
+            $this->context,
+            $this->paymentExtensionFactory
+        );
     }
 
     /**

Plugin/ViewModel/Checkout/Payment/MethodList.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Adyen\Hyva\Plugin\ViewModel\Checkout\Payment;
+
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Adyen\Payment\Helper\PaymentMethodsFilter;
+use Hyva\Checkout\ViewModel\Checkout\Payment\MethodList as HyvaMethodList;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+class MethodList
+{
+    /**
+     * @param CheckoutSession $checkoutSession
+     * @param PaymentMethodsFilter $paymentMethodsFilterHelper
+     */
+    public function __construct(
+        private readonly CheckoutSession $checkoutSession,
+        private readonly PaymentMethodsFilter $paymentMethodsFilterHelper
+    ) { }
+
+    /**
+     * This plugin changes the sorting order of the payment methods on the checkout
+     * based on the sorting order of the payment methods on Adyen Customer Area.
+     *
+     * @param HyvaMethodList $subject
+     * @param $result
+     * @return array
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    public function afterGetList(HyvaMethodList $subject, $result): array
+    {
+        list($sortedMagentoPaymentMethods, $adyenPaymentMethodsResponse) = $this->paymentMethodsFilterHelper
+            ->sortAndFilterPaymentMethods($result, $this->checkoutSession->getQuote());
+
+        return $sortedMagentoPaymentMethods ?? $result;
+    }
+}

README.md

@@ -14,7 +14,7 @@ This module depends on:
 The dependencies may be obtained like for example
 
 ```
-    "adyen/module-payment": "^9.6.1",
+    "adyen/module-payment": "^9.13.0",
     "hyva-themes/magento2-default-theme": "^1.3",
     "hyva-themes/magento2-hyva-checkout": "^1.1",
 ```

Test/Unit/Magewire/Payment/Method/CreditCardTest.php

@@ -17,6 +17,8 @@
 use Magento\Checkout\Api\GuestPaymentInformationManagementInterface;
 use Magento\Checkout\Api\PaymentInformationManagementInterface;
 use Magento\Checkout\Model\Session;
+use Magento\Quote\Api\Data\PaymentExtensionInterface;
+use Magento\Quote\Api\Data\PaymentExtensionFactory;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Sales\Model\Order;
@@ -43,6 +45,8 @@ class CreditCardTest extends AbstractAdyenTestCase
     private MockObject $brandsManager;
     private MockObject $installmentsManager;
     private MockObject $quoteIdToMaskedQuoteIdMock;
+    private MockObject $paymentExtensionFactoryMock;
+    private MockObject $paymentExtensionMock;
 
     private CreditCard $creditCard;
 
@@ -93,6 +97,14 @@ public function setUp(): void
         $this->quoteIdToMaskedQuoteIdMock = $this->getMockBuilder(QuoteIdToMaskedQuoteIdInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->paymentExtensionFactoryMock = $this->createGeneratedMock(
+            PaymentExtensionFactory::class,
+            ['create']
+        );
+        $this->paymentExtensionMock = $this->createGeneratedMock(
+            PaymentExtensionInterface::class,
+            ['setAgreementIds']
+        );
 
         $this->context = new Context(
             $this->checkoutStateDataValidator,
@@ -120,7 +132,8 @@ public function setUp(): void
         $this->creditCard = new CreditCard(
             $this->context,
             $this->brandsManager,
-            $this->installmentsManager
+            $this->installmentsManager,
+            $this->paymentExtensionFactoryMock
         );
     }
 
@@ -155,7 +168,12 @@ public function testGetConfiguration()
 
     public function testPlaceOrder()
     {
-        $data = ['stateData' => []];
+        $data = [
+            'stateData' => [],
+            'extension_attributes' => [
+                'agreement_ids' => ['1', '2']
+            ]
+        ];
         $paymentStatus = 'success';
         $quoteId = '111';
         $orderId = '123';
@@ -264,6 +282,10 @@ private function setPlaceOrderCommonExpectations($quoteId)
         $this->quote->expects($this->once())
             ->method('getPayment')
             ->willReturn($this->payment);
+
+        $this->paymentExtensionFactoryMock
+            ->method('create')
+            ->willReturn($this->paymentExtensionMock);
     }
 
     public function testEvaluateCompletion()