Release 8.7.0

.github/docker-compose.e2e.yml

@@ -17,4 +17,4 @@ services:
       - PAYPAL_PASSWORD
     volumes:
       - ../../scripts/e2e.sh:/e2e.sh
-      - ../../../test-report:/tmp/test-report
+      - ../../../test-report:/tmp/test-report

.github/scripts/e2e.sh

@@ -8,7 +8,8 @@ cd adyen-integration-tools-tests;
 git checkout $INTEGRATION_TESTS_BRANCH;
 
 # Setup environment
-npm ci;
+rm -rf package-lock.json;
+npm i;
 npx playwright install --with-deps;
 
 # Run tests

.github/workflows/e2e.yml

@@ -0,0 +1,64 @@
+name: E2E Tests
+run-name: Headless E2E test run for adyen-integration-tools-tests repo ${{inputs.testBranch}}
+
+on:
+  workflow_dispatch:
+    inputs:
+      testBranch:
+        description: "Test Branch from Integration Tools Repo"
+        required: true
+        default: "develop"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      PHP_VERSION: "8.1"
+      MAGENTO_VERSION: "2.4.5"
+      ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}}
+      ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Magento
+        run: docker-compose -f .github/workflows/templates/docker-compose.yml run --rm web make magento
+
+      - name: Start web server in background
+        run: docker-compose -f .github/workflows/templates/docker-compose.yml up -d web
+        env:
+          DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}}
+          ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
+          ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
+          ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
+
+      - name: Setup permissions
+        run: docker exec magento2-container make fs
+
+      - name: Check install
+        run: docker exec magento2-container make sys-check
+
+      - name: Install plugin
+        run: docker exec -u www-data magento2-container make plugin
+
+      - name: Switch to production mode
+        run: docker exec -u www-data magento2-container make production
+
+      - name: Setup permissions
+        run: docker exec magento2-container make fs
+
+      - name: Run E2E tests
+        continue-on-error: true
+        run: docker-compose -f .github/workflows/templates/docker-compose.yml run --rm playwright /e2e.sh
+        env:
+          INTEGRATION_TESTS_BRANCH: ${{inputs.testBranch}}
+          MAGENTO_ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}}
+          MAGENTO_ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}}
+          MAGENTO_BASE_URL: ${{secrets.MAGENTO_BASE_URL}}
+          PAYPAL_USERNAME: ${{secrets.PLAYWRIGHT_PAYPAL_USERNAME}}
+          PAYPAL_PASSWORD: ${{secrets.PLAYWRIGHT_PAYPAL_PASSWORD}}
+
+      - name: Archive test result artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: html-report
+          path: test-report

.github/workflows/integration-test.yml

@@ -5,11 +5,11 @@ jobs:
   build:
     strategy:
       matrix:
-        php-version: ['7.4']
-        magento-version: ['2.3.7', '2.4.2']
+        php-version: ["7.4"]
+        magento-version: ["2.3.7", "2.4.2"]
         include:
-          - php-version: '8.1'
-            magento-version: '2.4.5'
+          - php-version: "8.1"
+            magento-version: "2.4.5"
     runs-on: ubuntu-latest
     env:
       PHP_VERSION: ${{ matrix.php-version }}

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

@@ -59,7 +59,7 @@ services:
         aliases:
           - magento2.test.com
   playwright:
-    image: mcr.microsoft.com/playwright:v1.20.0-focal
+    image: mcr.microsoft.com/playwright:v1.25.0-focal
     shm_size: 1gb
     ipc: host
     cap_add:

Api/Data/OrderPaymentInterface.php

@@ -104,7 +104,7 @@ public function setPaymentId($paymentId);
     /**
      * Gets the Paymentmethod for the payment.
      *
-     * @return int|null PaymentMethod.
+     * @return string|null PaymentMethod.
      */
     public function getPaymentMethod();
 

Block/Customer/CardRenderer.php

@@ -37,14 +37,16 @@ public function __construct(
     }
 
     /**
-     * Can render specified token
+     * Returns true if methodCode = adyen_cc OR (methodCode = adyen_hpp AND maskedCC exists in details. For googlepay)
      *
      * @param PaymentTokenInterface $token
      * @return boolean
      */
-    public function canRender(PaymentTokenInterface $token)
+    public function canRender(PaymentTokenInterface $token): bool
     {
-        return $token->getPaymentMethodCode() === AdyenCcConfigProvider::CODE;
+        $details = json_decode($token->getTokenDetails() ?: '{}', true);
+        return $token->getPaymentMethodCode() === AdyenCcConfigProvider::CODE ||
+            ($token->getPaymentMethodCode() === AdyenHppConfigProvider::CODE && array_key_exists('maskedCC', $details));
     }
 
     /**

Block/Customer/PaymentMethodRenderer.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2019 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Block\Customer;
+
+use Adyen\Payment\Exception\PaymentMethodException;
+use Adyen\Payment\Helper\Data;
+use Adyen\Payment\Helper\PaymentMethods\PaymentMethodFactory;
+use Adyen\Payment\Helper\PaymentMethods\PaymentMethodInterface;
+use Adyen\Payment\Model\Ui\AdyenHppConfigProvider;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Block\AbstractTokenRenderer;
+
+class PaymentMethodRenderer extends AbstractTokenRenderer
+{
+    /** @var Data */
+    private $dataHelper;
+
+    /** @var PaymentMethodFactory */
+    private $paymentMethodFactory;
+
+
+    public function __construct(
+        Context $context,
+        Data $dataHelper,
+        PaymentMethodFactory $paymentMethodFactory,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->dataHelper = $dataHelper;
+        $this->paymentMethodFactory = $paymentMethodFactory;
+    }
+
+    public function getText(): string
+    {
+        try {
+            $paymentMethod = $this->paymentMethodFactory::createAdyenPaymentMethod($this->getTokenDetails()['type']);
+            $text = $paymentMethod->getPaymentMethodName();
+        } catch (PaymentMethodException $exception) {
+            $text = '';
+        }
+
+        return $text;
+    }
+
+    public function getIconUrl(): string
+    {
+        return $this->dataHelper->getVariantIcon($this->getTokenDetails()['type'])['url'];
+    }
+
+    public function getIconHeight(): int
+    {
+        return $this->dataHelper->getVariantIcon($this->getTokenDetails()['type'])['height'];
+    }
+
+    public function getIconWidth(): int
+    {
+        return $this->dataHelper->getVariantIcon($this->getTokenDetails()['type'])['width'];
+    }
+
+    public function canRender(PaymentTokenInterface $token): bool
+    {
+        return $token->getPaymentMethodCode() === AdyenHppConfigProvider::CODE;
+    }
+}

Block/Form/Cc.php

@@ -15,6 +15,7 @@
 use Adyen\Payment\Helper\Config;
 use Adyen\Payment\Helper\Data;
 use Adyen\Payment\Helper\Installments;
+use Adyen\Payment\Helper\PaymentMethods;
 use Adyen\Payment\Helper\Recurring;
 use Adyen\Payment\Helper\Vault;
 use Adyen\Payment\Logger\AdyenLogger;
@@ -80,6 +81,9 @@ class Cc extends \Magento\Payment\Block\Form\Cc
      */
     private $vaultHelper;
 
+    /** @var PaymentMethods */
+    private $paymentMethodsHelper;
+
     /**
      * Cc constructor.
      *
@@ -108,6 +112,7 @@ public function __construct(
         Config $configHelper,
         Session $customerSession,
         Vault $vaultHelper,
+        PaymentMethods $paymentMethodsHelper,
         array $data = []
     ) {
         parent::__construct($context, $paymentConfig);
@@ -121,6 +126,7 @@ public function __construct(
         $this->configHelper = $configHelper;
         $this->customerSession = $customerSession;
         $this->vaultHelper = $vaultHelper;
+        $this->paymentMethodsHelper = $paymentMethodsHelper;
     }
 
     /**
@@ -163,26 +169,14 @@ public function getLocale()
     }
 
     /**
-     * Retrieve available credit card type codes by alt code
+     * Retrieve available credit card type codes by alt code. Function is required so that it can be called
+     * from block form
      *
      * @return array
      */
-    public function getCcAvailableTypesByAlt()
+    public function getCcAvailableTypesByAlt(): array
     {
-        $types = [];
-        $ccTypes = $this->adyenHelper->getAdyenCcTypes();
-
-        $availableTypes = $this->adyenHelper->getAdyenCcConfigData('cctypes');
-        if ($availableTypes) {
-            $availableTypes = explode(',', $availableTypes);
-            foreach (array_keys($ccTypes) as $code) {
-                if (in_array($code, $availableTypes)) {
-                    $types[$ccTypes[$code]['code_alt']] = $code;
-                }
-            }
-        }
-
-        return $types;
+        return $this->paymentMethodsHelper->getCcAvailableTypesByAlt();
     }
 
     /**

Controller/Process/Result.php

@@ -268,10 +268,10 @@ protected function validateResponse($response)
         if (!empty($response['additionalData']['recurring.recurringDetailReference']) &&
             $this->payment->getMethodInstance()->getCode() !== \Adyen\Payment\Model\Ui\AdyenOneclickConfigProvider::CODE) {
             if ($this->vaultHelper->isCardVaultEnabled()) {
-                $this->vaultHelper->saveRecurringDetails($this->payment, $response['additionalData']);
+                $this->vaultHelper->saveRecurringCardDetails($this->payment, $response['additionalData']);
             } else {
                 $order = $this->payment->getOrder();
-                $this->recurringHelper->createAdyenBillingAgreement($order, $response['additionalData'], $this->payment->getAdditionalInformation());
+                $this->recurringHelper->createAdyenBillingAgreement($order, $response['additionalData']);
             }
             $this->orderResourceModel->save($order);
         }

Exception/InvalidAdditionalDataException.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ *
+ * Adyen Payment Module
+ *
+ * @author Adyen BV <support@adyen.com>
+ * @copyright (c) 2022 Adyen B.V.
+ * @license https://opensource.org/licenses/MIT MIT license
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ */
+
+namespace Adyen\Payment\Exception;
+
+class InvalidAdditionalDataException extends AbstractAdyenException
+{
+
+}

Exception/PaymentMethodException.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ *
+ * Adyen Payment Module
+ *
+ * @author Adyen BV <support@adyen.com>
+ * @copyright (c) 2022 Adyen B.V.
+ * @license https://opensource.org/licenses/MIT MIT license
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ */
+
+namespace Adyen\Payment\Exception;
+
+class PaymentMethodException extends AbstractAdyenException
+{
+
+}