Merge rc-v2 into develop

.github/workflows/e2e.yml

@@ -0,0 +1,17 @@
+name: Adyen Magento 2 Express Checkout Plugin E2E Trigger Workflow
+run-name: Headless E2E tests for ${{ github.event.pull_request.head.ref}}
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    branches: [main, develop]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor != 'renovate[bot]' || github.actor != 'lgtm-com[bot]' }}
+    env:
+      GITHUB_TOKEN: ${{ secrets.ADYEN_AUTOMATION_BOT_TEST_ACCESS_TOKEN }}
+    steps:
+      - name: Run E2E Tests
+        run: gh workflow run e2e-test-express-checkout.yml -R Adyen/adyen-magento2

.github/workflows/main.yml

@@ -1,4 +1,6 @@
-on: ["push", "pull_request"]
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
 name: Main Workflow
 
 jobs:

Model/ConfigurationInterface.php

@@ -22,9 +22,9 @@
  */
 interface ConfigurationInterface
 {
-    public const SHOW_APPLE_PAY_ON_CONFIG_PATH = 'payment/adyen_hpp/show_apple_pay_on';
-    public const SHOW_GOOGLE_PAY_ON_CONFIG_PATH = 'payment/adyen_hpp/show_google_pay_on';
-    public const APPLE_PAY_BUTTON_COLOR_CONFIG_PATH = 'payment/adyen_hpp/apple_pay_button_color';
+    public const SHOW_APPLE_PAY_ON_CONFIG_PATH = 'payment/adyen_express/show_apple_pay_on';
+    public const SHOW_GOOGLE_PAY_ON_CONFIG_PATH = 'payment/adyen_express/show_google_pay_on';
+    public const APPLE_PAY_BUTTON_COLOR_CONFIG_PATH = 'payment/adyen_express/apple_pay_button_color';
 
     /**
      * Returns configuration value for where to show apple pay

README.md

@@ -23,8 +23,8 @@ bin/magento cache:clean
 
 ## Configuration Steps
 1. Add the payment method in your [Customer Area](https://docs.adyen.com/payment-methods#add-payment-methods-to-your-account).
-2. Make sure that Alternative payment methods are activated in your [Magento configuration](https://docs.adyen.com/plugins/magento-2/set-up-the-payment-methods-in-magento#alternative-payment-methods).
-3. In the Magento admin page, go to Alternative payment methods > Express Payments > Show Google Pay on > Select one or all of your desired options.
+2. Make sure that Payment methods are activated in your [Magento configuration](https://docs.adyen.com/plugins/adobe-commerce/set-up-the-payment-methods-in-adobe-commerce/).
+3. In the Magento admin page, go to Accepting Payments > Online Checkout > Express Payments > Show Google Pay on > Select one or all of your desired options.
 4. For Apple Pay: [Use Adyen's Apple Pay Certificate to go live](https://docs.adyen.com/payment-methods/apple-pay/web-component#going-live), without designing your Apple Pay integration.
 5. For Google Pay: Set up [Google Pay](https://docs.adyen.com/payment-methods/google-pay/web-component#before-you-go-live).
 

Setup/Patch/Data/UpdateExpressDBPaths.php

@@ -0,0 +1,121 @@
+<?php
+/**
+ *
+ * Adyen ExpressCheckout Module
+ *
+ * Copyright (c) 2023 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]>
+ */
+declare(strict_types=1);
+
+namespace Adyen\ExpressCheckout\Setup\Patch\Data;
+
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+class UpdateExpressDBPaths implements DataPatchInterface, PatchVersionInterface
+{
+    private ModuleDataSetupInterface $moduleDataSetup;
+    private WriterInterface $configWriter;
+    private ReinitableConfigInterface $reinitableConfig;
+
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        WriterInterface $configWriter,
+        ReinitableConfigInterface $reinitableConfig
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->configWriter = $configWriter;
+        $this->reinitableConfig = $reinitableConfig;
+    }
+
+    public function apply(): void
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+
+        // Update Apple Pay config path
+        $this->updateConfigValue(
+            $this->moduleDataSetup,
+            'payment/adyen_hpp/show_apple_pay_on',
+            'payment/adyen_express/show_apple_pay_on'
+        );
+
+        // Update Google Pay config path
+        $this->updateConfigValue(
+            $this->moduleDataSetup,
+            'payment/adyen_hpp/show_google_pay_on',
+            'payment/adyen_express/show_google_pay_on'
+        );
+
+        // Update Google Pay config path
+        $this->updateConfigValue(
+            $this->moduleDataSetup,
+            'payment/adyen_hpp/apple_pay_button_color',
+            'payment/adyen_express/apple_pay_button_color'
+        );
+
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    private function updateConfigValue(
+        ModuleDataSetupInterface $setup,
+        string $oldPath,
+        string $newPath
+    ): void {
+        $config = $this->findConfig($setup, $oldPath);
+
+        if ($config !== false) {
+            $this->configWriter->save(
+                $newPath,
+                $config['value'],
+                $config['scope'],
+                $config['scope_id']
+            );
+        }
+
+        $this->reinitableConfig->reinit();
+    }
+
+    private function findConfig(ModuleDataSetupInterface $setup, string $path): mixed
+    {
+        $configDataTable = $setup->getTable('core_config_data');
+        $connection = $setup->getConnection();
+
+        $select = $connection->select()
+            ->from($configDataTable)
+            ->where(
+                'path = ?',
+                $path
+            );
+
+        $matchingConfigs = $connection->fetchAll($select);
+        return reset($matchingConfigs);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies(): array
+    {
+        return [];
+    }
+
+    public static function getVersion(): string
+    {
+        return '2.0.0';
+    }
+}

composer.json

@@ -2,7 +2,7 @@
   "name": "adyen/adyen-magento2-expresscheckout",
   "description": "Official Adyen Magento2 plugin to add express payment method shortcuts.",
   "type": "magento2-module",
-  "version": "1.2.0",
+  "version": "2.0.0",
   "license": "MIT",
   "repositories": [
     {
@@ -11,7 +11,7 @@
     }
   ],
   "require": {
-    "adyen/module-payment": "^8"
+    "adyen/module-payment": "^9"
   },
   "require-dev": {
     "phpunit/phpunit": "*",

etc/adminhtml/system.xml

@@ -14,8 +14,8 @@
     <system>
         <section id="payment">
             <group id="adyen_group_all_in_one">
-                <group id="adyen_configure_payment_methods">
-                    <include path="Adyen_ExpressCheckout::system/adyen_hpp.xml"/>
+                <group id="adyen_accepting_payments">
+                    <include path="Adyen_ExpressCheckout::system/adyen_online_checkout.xml"/>
                 </group>
             </group>
         </section>

etc/adminhtml/system/adyen_hpp.xml → etc/adminhtml/system/adyen_online_checkout.xml

@@ -11,33 +11,33 @@
  */
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="adyen_hpp">
-        <group id="adyen_hpp_express" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="200">
+    <group id="adyen_online_checkout">
+        <group id="adyen_express" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
             <label>Express Payments</label>
             <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
             <group id="google_pay" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
                 <label>GooglePay</label>
                 <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
                 <field id="show_google_pay_on" translate="label" type="multiselect" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Show on</label>
+                    <label>Show GooglePay on</label>
                     <source_model>Adyen\ExpressCheckout\Model\Config\Source\ShortcutAreas</source_model>
                     <can_be_empty>1</can_be_empty>
-                    <config_path>payment/adyen_hpp/show_google_pay_on</config_path>
+                    <config_path>payment/adyen_express/show_google_pay_on</config_path>
                 </field>
             </group>
             <group id="apple_pay" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                 <label>Apple Pay</label>
                 <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-                <field id="show_apple_pay_on" translate="label" type="multiselect" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Show on</label>
+                <field id="show_apple_pay_on" translate="label" type="multiselect" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Show ApplePay on</label>
                     <source_model>Adyen\ExpressCheckout\Model\Config\Source\ShortcutAreas</source_model>
                     <can_be_empty>1</can_be_empty>
-                    <config_path>payment/adyen_hpp/show_apple_pay_on</config_path>
+                    <config_path>payment/adyen_express/show_apple_pay_on</config_path>
                 </field>
                 <field id="apple_pay_button_color" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Button color</label>
                     <source_model>Adyen\ExpressCheckout\Model\Config\Source\ApplePay\ButtonColor</source_model>
-                    <config_path>payment/adyen_hpp/apple_pay_button_color</config_path>
+                    <config_path>payment/adyen_express/apple_pay_button_color</config_path>
                     <comment><![CDATA[More details here: <a href="https://developer.apple.com/design/human-interface-guidelines/apple-pay#Button-styles" target="_blank">Apple Pay documentation</a>.]]></comment>
                 </field>
             </group>

etc/module.xml

@@ -11,7 +11,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Adyen_ExpressCheckout" setup_version="1.2.0">
+    <module name="Adyen_ExpressCheckout" setup_version="2.0.0">
         <sequence>
             <module name="Adyen_Payment"/>
         </sequence>

view/frontend/web/js/applepay/button.js

@@ -481,7 +481,7 @@ define([
                     const postData = {
                         email: shippingContact.emailAddress,
                         paymentMethod: {
-                            method: 'adyen_hpp',
+                            method: 'adyen_applepay',
                             additional_data: {
                                 brand_code: 'applepay',
                                 stateData: JSON.stringify(componentData)

view/frontend/web/js/googlepay/button.js

@@ -380,7 +380,7 @@ define([
                             shippingAddress: this.mapAddress(paymentData.shippingAddress),
                             billingAddress: this.mapAddress(paymentData.paymentMethodData.info.billingAddress),
                             paymentMethod: {
-                                method: 'adyen_hpp',
+                                method: 'adyen_googlepay',
                                 additional_data: {
                                     brand_code: self.googlePayComponent.props.type,
                                     stateData: JSON.stringify(componentData)