Merge pull request #1131 from Adyen/release/24.3.1

Release/24.3.1
Adyen · Aug 1, 2024 · 756e0b4 · 756e0b4
2 parents ae4aad6 + 5c9924f
commit 756e0b4
Show file tree

Hide file tree

Showing 38 changed files with 177 additions and 157 deletions.
diff --git a/cartridges/app_adyen_SFRA/.project b/cartridges/app_adyen_SFRA/.project
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
     <projectDescription>
       <name>app_adyen_SFRA</name>
-      <comment>v24.3.0</comment>
+      <comment>v24.3.1</comment>
       <projects></projects>
       <buildSpec>
         <buildCommand>

diff --git a/cartridges/app_adyen_SFRA/cartridge/client/default/js/adyen_checkout/helpers.js b/cartridges/app_adyen_SFRA/cartridge/client/default/js/adyen_checkout/helpers.js
@@ -89,7 +89,10 @@ function displaySelectedMethod(type) {
   store.brand = (_document$querySelect2 = document.querySelector("#component_".concat(type, " .brand"))) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.value;
 }
 function displayValidationErrors() {
-  store.selectedPayment.node.showValidation();
+  var _store$selectedMethod;
+  if ((_store$selectedMethod = store.selectedMethod) !== null && _store$selectedMethod !== void 0 && _store$selectedMethod.node) {
+    store.selectedPayment.node.showValidation();
+  }
   return false;
 }
 var selectedMethods = {};

diff --git a/cartridges/app_adyen_SFRA/cartridge/static/default/js/adyenAccount.js b/cartridges/app_adyen_SFRA/cartridge/static/default/js/adyenAccount.js
diff --git a/cartridges/app_adyen_SFRA/cartridge/static/default/js/adyenCheckout.js b/cartridges/app_adyen_SFRA/cartridge/static/default/js/adyenCheckout.js
diff --git a/cartridges/app_adyen_SFRA/cartridge/static/default/js/amazonPayCheckout.js b/cartridges/app_adyen_SFRA/cartridge/static/default/js/amazonPayCheckout.js
diff --git a/cartridges/app_adyen_SFRA/cartridge/static/default/js/amazonPayExpressPart1.js b/cartridges/app_adyen_SFRA/cartridge/static/default/js/amazonPayExpressPart1.js
diff --git a/cartridges/app_adyen_SFRA/cartridge/static/default/js/amazonPayExpressPart2.js b/cartridges/app_adyen_SFRA/cartridge/static/default/js/amazonPayExpressPart2.js
diff --git a/cartridges/app_adyen_SFRA/cartridge/static/default/js/applePayExpress.js b/cartridges/app_adyen_SFRA/cartridge/static/default/js/applePayExpress.js
diff --git a/cartridges/app_adyen_SFRA/cartridge/static/default/js/checkout.js b/cartridges/app_adyen_SFRA/cartridge/static/default/js/checkout.js
diff --git a/cartridges/app_adyen_SFRA/cartridge/static/default/js/checkoutReviewButtons.js b/cartridges/app_adyen_SFRA/cartridge/static/default/js/checkoutReviewButtons.js
diff --git a/cartridges/app_adyen_SFRA/cartridge/static/default/js/expressPaymentMethodsVisibility.js b/cartridges/app_adyen_SFRA/cartridge/static/default/js/expressPaymentMethodsVisibility.js
diff --git a/cartridges/app_adyen_SFRA/cartridge/static/default/js/paypalExpress.js b/cartridges/app_adyen_SFRA/cartridge/static/default/js/paypalExpress.js
diff --git a/cartridges/app_adyen_SFRA/cartridge/store/index.js b/cartridges/app_adyen_SFRA/cartridge/store/index.js
@@ -66,6 +66,9 @@ var Store = (_class = /*#__PURE__*/function () {
   }, {
     key: "updateSelectedPayment",
     value: function updateSelectedPayment(method, key, val) {
+      if (!this.componentsObj[method]) {
+        this.componentsObj[method] = {};
+      }
       this.componentsObj[method][key] = val;
     }
   }]);

diff --git a/cartridges/bm_adyen/.project b/cartridges/bm_adyen/.project
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
     <projectDescription>
       <name>bm_adyen</name>
-      <comment>v24.3.0</comment>
+      <comment>v24.3.1</comment>
       <projects></projects>
       <buildSpec>
         <buildCommand>

diff --git a/cartridges/int_adyen_SFRA/.project b/cartridges/int_adyen_SFRA/.project
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
     <projectDescription>
       <name>int_adyen_SFRA</name>
-      <comment>v24.3.0</comment>
+      <comment>v24.3.1</comment>
       <projects></projects>
       <buildSpec>
         <buildCommand>

diff --git a/cartridges/int_adyen_SFRA/cartridge/adyen/config/constants.js b/cartridges/int_adyen_SFRA/cartridge/adyen/config/constants.js
@@ -86,5 +86,5 @@ module.exports = {
   EXTERNAL_PLATFORM_VERSION: 'SFRA',
   APPLE_DOMAIN_URL: '/.well-known/apple-developer-merchantid-domain-association',
   CHECKOUT_COMPONENT_VERSION: '5.65.0',
-  VERSION: '24.3.0'
+  VERSION: '24.3.1'
 };
diff --git a/cartridges/int_custom_cartridge/.project b/cartridges/int_custom_cartridge/.project
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
     <projectDescription>
       <name>int_custom_cartridge</name>
-      <comment>v24.3.0</comment>
+      <comment>v24.3.1</comment>
       <projects></projects>
       <buildSpec>
         <buildCommand>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app_adyen_SFRA",
-  "version": "24.3.0",
+  "version": "24.3.1",
   "description": "Adyen's official cartridge for SFRA",
   "main": "index.js",
   "paths": {

diff --git a/...ridges/app_adyen_SFRA/cartridge/client/default/js/adyen_checkout/checkoutConfiguration.js b/...ridges/app_adyen_SFRA/cartridge/client/default/js/adyen_checkout/checkoutConfiguration.js
@@ -187,8 +187,9 @@ function getGiftCardConfig() {
         async: false,
         success: (data) => {
           giftcardBalance = data.balance;
-          document.querySelector('button[value="submit-payment"]').disabled =
-            false;
+          document.querySelector(
+            'button[value="submit-payment"]',
+          ).disabled = false;
           if (data.resultCode === constants.SUCCESS) {
             const {
               giftCardsInfoMessageContainer,
@@ -214,8 +215,9 @@ function getGiftCardConfig() {
                 initialPartialObject.totalDiscountedAmount;
             });
 
-            document.querySelector('button[value="submit-payment"]').disabled =
-              true;
+            document.querySelector(
+              'button[value="submit-payment"]',
+            ).disabled = true;
             giftCardsInfoMessageContainer.innerHTML = '';
             giftCardsInfoMessageContainer.classList.remove(
               'gift-cards-info-message-container',

diff --git a/src/cartridges/app_adyen_SFRA/cartridge/client/default/js/adyen_checkout/helpers.js b/src/cartridges/app_adyen_SFRA/cartridge/client/default/js/adyen_checkout/helpers.js
@@ -88,7 +88,9 @@ function displaySelectedMethod(type) {
 }
 
 function displayValidationErrors() {
-  store.selectedPayment.node.showValidation();
+  if (store.selectedMethod?.node) {
+    store.selectedPayment.node.showValidation();
+  }
   return false;
 }
 

diff --git a/...dges/app_adyen_SFRA/cartridge/client/default/js/adyen_checkout/renderGiftcardComponent.js b/...dges/app_adyen_SFRA/cartridge/client/default/js/adyen_checkout/renderGiftcardComponent.js
@@ -96,8 +96,9 @@ function removeGiftCards() {
         giftCardsInfoMessageContainer.classList.remove(
           'gift-cards-info-message-container',
         );
-        document.querySelector('button[value="submit-payment"]').disabled =
-          false;
+        document.querySelector(
+          'button[value="submit-payment"]',
+        ).disabled = false;
 
         if (res.resultCode === constants.RECEIVED) {
           document

diff --git a/src/cartridges/app_adyen_SFRA/cartridge/store/index.js b/src/cartridges/app_adyen_SFRA/cartridge/store/index.js
@@ -54,6 +54,9 @@ class Store {
   }
 
   updateSelectedPayment(method, key, val) {
+    if (!this.componentsObj[method]) {
+      this.componentsObj[method] = {};
+    }
     this.componentsObj[method][key] = val;
   }
 }

diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/config/constants.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/config/constants.js
@@ -101,5 +101,5 @@ module.exports = {
     '/.well-known/apple-developer-merchantid-domain-association',
 
   CHECKOUT_COMPONENT_VERSION: '5.65.0',
-  VERSION: '24.3.0',
+  VERSION: '24.3.1',
 };
diff --git a/tests/playwright/fixtures/BRL.spec.mjs b/tests/playwright/fixtures/BRL.spec.mjs
@@ -26,7 +26,7 @@ for (const environment of environments) {
       await checkoutPage.setShopperDetails(shopperData.BR);
       if (environment.name.indexOf('v5') !== -1) {
         await checkoutPage.setEmail();
-      };
+      }
     });
 
     test('Card payment 3DS2 installments success @quick', async () => {

diff --git a/tests/playwright/fixtures/DKK.spec.mjs b/tests/playwright/fixtures/DKK.spec.mjs
@@ -19,7 +19,7 @@ for (const environment of environments) {
       await checkoutPage.setShopperDetails(shopperData.DK);
       if (environment.name.indexOf('v5') !== -1) {
         await checkoutPage.setEmail();
-      };
+      }
     });
 
     test('MobilePay', async ({ page }) => {

diff --git a/tests/playwright/fixtures/INR.spec.mjs b/tests/playwright/fixtures/INR.spec.mjs
@@ -19,7 +19,7 @@ for (const environment of environments) {
       await checkoutPage.setShopperDetails(shopperData.IN);
       if (environment.name.indexOf('v5') !== -1) {
         await checkoutPage.setEmail();
-      };
+      }
     });
 
     test('UPI Success', async ({ page }) => {

diff --git a/tests/playwright/fixtures/JPY.spec.mjs b/tests/playwright/fixtures/JPY.spec.mjs
@@ -18,7 +18,7 @@ for (const environment of environments) {
       await checkoutPage.setShopperDetails(shopperData.JP);
       if (environment.name.indexOf('v5') !== -1) {
         await checkoutPage.setEmail();
-      };
+      }
     });
 
     test('konbini Success', async ({ page }) => {

diff --git a/tests/playwright/fixtures/NOK.spec.mjs b/tests/playwright/fixtures/NOK.spec.mjs
@@ -19,7 +19,7 @@ for (const environment of environments) {
       await checkoutPage.setShopperDetails(shopperData.NO);
       if (environment.name.indexOf('v5') !== -1) {
         await checkoutPage.setEmail();
-      };
+      }
     });
 
     test('Vipps Success', async ({ page }) => {

diff --git a/tests/playwright/fixtures/SEK.spec.mjs b/tests/playwright/fixtures/SEK.spec.mjs
@@ -22,7 +22,7 @@ for (const environment of environments) {
       await checkoutPage.setShopperDetails(shopperData.SE);
       if (environment.name.indexOf('v5') !== -1) {
         await checkoutPage.setEmail();
-      };
+      }
     });
     test('Swish success', async ({ page }) => {
       pendingPaymentsPage = new PendingPayments(page);