Upgrade Checkout components and add telemetry info (#1063)

Adyen · Apr 5, 2024 · cc5d044 · cc5d044
1 parent d809507
commit cc5d044
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/client/default/js/amazonPayExpressPart1.js b/src/cartridges/int_adyen_SFRA/cartridge/client/default/js/amazonPayExpressPart1.js
@@ -9,12 +9,15 @@ const AMAZON_PAY = 'amazonpay';
 async function mountAmazonPayComponent() {
   try {
     const data = await getPaymentMethods();
-    const paymentMethodsResponse = data.AdyenPaymentMethods;
-
+    const paymentMethodsResponse = data?.AdyenPaymentMethods;
+    const applicationInfo = data?.applicationInfo;
     const checkout = await AdyenCheckout({
       environment: window.environment,
       clientKey: window.clientKey,
       locale: window.locale,
+      analytics: {
+        analyticsData: { applicationInfo },
+      },
     });
 
     const amazonPayConfig = paymentMethodsResponse?.paymentMethods.find(
@@ -27,6 +30,7 @@ async function mountAmazonPayComponent() {
       productType: 'PayAndShip',
       configuration: amazonPayConfig,
       returnUrl: window.returnUrl,
+      isExpress: true,
     };
 
     const amazonPayButton = checkout.create(AMAZON_PAY, amazonPayButtonConfig);

diff --git a/src/cartridges/int_adyen_SFRA/cartridge/client/default/js/amazonPayExpressPart2.js b/src/cartridges/int_adyen_SFRA/cartridge/client/default/js/amazonPayExpressPart2.js
@@ -74,12 +74,19 @@ function showAddressDetails(shopperDetails) {
 }
 
 async function mountAmazonPayComponent() {
-  const amazonPayNode = document.getElementById('amazon-container');
-  const checkout = await AdyenCheckout(window.Configuration);
-
   try {
+    const amazonPayNode = document.getElementById('amazon-container');
     const data = await getPaymentMethods();
-    const paymentMethodsResponse = data.AdyenPaymentMethods;
+    const paymentMethodsResponse = data?.AdyenPaymentMethods;
+    const applicationInfo = data?.applicationInfo;
+    const checkout = await AdyenCheckout({
+      environment: window.Configuration.environment,
+      clientKey: window.Configuration.clientKey,
+      locale: window.Configuration.locale,
+      analytics: {
+        analyticsData: { applicationInfo },
+      },
+    });
     const amazonPayConfig = paymentMethodsResponse?.paymentMethods.find(
       (pm) => pm.type === 'amazonpay',
     )?.configuration;

diff --git a/src/cartridges/int_adyen_SFRA/cartridge/client/default/js/applePayExpress.js b/src/cartridges/int_adyen_SFRA/cartridge/client/default/js/applePayExpress.js
@@ -11,10 +11,14 @@ async function initializeCheckout() {
   paymentMethodsResponse = await getPaymentMethods();
   const shippingMethods = await fetch(window.shippingMethodsUrl);
   shippingMethodsData = await shippingMethods.json();
+  const applicationInfo = paymentMethodsResponse?.applicationInfo;
   checkout = await AdyenCheckout({
     environment: window.environment,
     clientKey: window.clientKey,
     locale: window.locale,
+    analytics: {
+      analyticsData: { applicationInfo },
+    },
   });
 }
 
@@ -137,6 +141,7 @@ initializeCheckout()
 
     const applePayButtonConfig = {
       showPayButton: true,
+      isExpress: true,
       configuration: applePayConfig,
       amount: JSON.parse(window.basketAmount),
       requiredShippingContactFields: ['postalAddress', 'email', 'phone'],

diff --git a/..._SFRA/cartridge/controllers/middlewares/adyen/__tests__/getCheckoutPaymentMethods.test.js b/..._SFRA/cartridge/controllers/middlewares/adyen/__tests__/getCheckoutPaymentMethods.test.js
@@ -46,6 +46,11 @@ describe('getCheckoutPaymentMethods', () => {
           },
           imagePath: "mocked_loading_contextimages/logos/medium/",
           countryCode: "NL",
+		  applicationInfo: {
+			externalPlatform: {
+				"version" : "SFRA",
+			}
+		  }
       });
       expect(next).toHaveBeenCalled();
    });

diff --git a/...idges/int_adyen_SFRA/cartridge/controllers/middlewares/adyen/getCheckoutPaymentMethods.js b/...idges/int_adyen_SFRA/cartridge/controllers/middlewares/adyen/getCheckoutPaymentMethods.js
@@ -59,6 +59,7 @@ function getCheckoutPaymentMethods(req, res, next) {
       adyenConnectedTerminals: connectedTerminals,
       amount: { value: paymentAmount.value, currency },
       countryCode,
+      applicationInfo: AdyenHelper.getApplicationInfo(),
     });
   } catch (err) {
     AdyenLogs.fatal_log(

diff --git a/src/cartridges/int_adyen_overlay/cartridge/adyenConstants/constants.js b/src/cartridges/int_adyen_overlay/cartridge/adyenConstants/constants.js
@@ -95,6 +95,6 @@ module.exports = {
   EXTERNAL_PLATFORM_NAME : 'SalesforceCommerceCloud',
   EXTERNAL_PLATFORM_VERSION : 'SFRA',
 
-  CHECKOUT_COMPONENT_VERSION: '5.56.0',
+  CHECKOUT_COMPONENT_VERSION: '5.61.0',
   VERSION: '24.1.0',
 };