[SFI-516] Different live prefixes can be used accross sites (#1032)

Adyen · Jan 10, 2024 · a171f7b · a171f7b
1 parent a2adb52
commit a171f7b
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 1 deletion.
diff --git a/metadata/site_import/meta/system-objecttype-extensions.xml b/metadata/site_import/meta/system-objecttype-extensions.xml
@@ -620,6 +620,14 @@
                 <externally-managed-flag>false</externally-managed-flag>
                 <min-length>0</min-length>
             </attribute-definition>
+            <attribute-definition attribute-id="Adyen_LivePrefix">
+                <display-name xml:lang="x-default">Your Adyen Live Prefix. Required to accept live payments</display-name>
+                <description xml:lang="x-default">Retrieve this value from Customer Area</description>
+                <type>string</type>
+                <mandatory-flag>false</mandatory-flag>
+                <externally-managed-flag>false</externally-managed-flag>
+                <min-length>0</min-length>
+            </attribute-definition>
             <attribute-definition attribute-id="Adyen_GooglePayMerchantID">
                 <display-name xml:lang="x-default">Your Google MerchantID (required in production only)</display-name>
                 <description xml:lang="x-default">As described in https://developers.google.com/pay/api/web/guides/test-and-deploy/deploy-production-environment#obtain-your-merchantID</description>

diff --git a/src/cartridges/bm_adyen/cartridge/static/default/js/adyenSettings.js b/src/cartridges/bm_adyen/cartridge/static/default/js/adyenSettings.js
@@ -36,6 +36,9 @@ document.addEventListener('DOMContentLoaded', () => {
   const infoLogCheckbox = document.getElementById('infoLogs');
   const errorLogCheckbox = document.getElementById('errorLogs');
   const fatalLogCheckbox = document.getElementById('fatalLogs');
+  const testRadio = document.getElementById('testRadio');
+  const productionRadio = document.getElementById('productionRadio');
+  const livePrefix = document.getElementById('livePrefix');
   const troubleshootingCheckboxes = [
     debugLogCheckbox,
     infoLogCheckbox,
@@ -465,6 +468,14 @@ document.addEventListener('DOMContentLoaded', () => {
     }
   });
 
+  productionRadio.addEventListener('click', () => {
+    livePrefix.disabled = false;
+  });
+
+  testRadio.addEventListener('click', () => {
+    livePrefix.disabled = true;
+  });
+
   adyenGivingBackground.addEventListener('click', saveAndHideAlerts);
 
   adyenGivingLogo.addEventListener('click', saveAndHideAlerts);

diff --git a/...ges/bm_adyen/cartridge/templates/default/adyenSettings/settingCards/requiredSettings.isml b/...ges/bm_adyen/cartridge/templates/default/adyenSettings/settingCards/requiredSettings.isml
@@ -24,6 +24,16 @@
                </div>
             </div>
          </div>
+         <div class="form-group">
+            <label class="form-title mb-0" for="livePrefix">Adyen Live Prefix</label>
+            <small id="livePrefixHelp" class="form-text mb-1">
+               This is the LIVE prefix you can retrieve from the <a class="text-primary" href="https://ca-live.adyen.com/" target="_blank">Customer Area.</a>
+               Different sites can use different prefixes depending in the selected datacenter.
+            </small>
+            <div class="input-fields">
+               <input type="text" class="form-control" name="Adyen_LivePrefix" id="livePrefix" aria-describedby="livePrefixHelp" placeholder="" value="${AdyenConfigs.getLivePrefix() || ''}" ${AdyenConfigs.getAdyenEnvironment() === 'TEST' ? 'disabled' : ''}>
+            </div>
+         </div>
          <div class="form-group">
             <label class="form-title mb-0" for="clienKey">Adyen Client Key</label>
             <small id="clienKeyHelp" class="form-text mb-1">

diff --git a/src/cartridges/int_adyen_overlay/cartridge/scripts/util/adyenConfigs.js b/src/cartridges/int_adyen_overlay/cartridge/scripts/util/adyenConfigs.js
@@ -77,6 +77,10 @@ const adyenConfigsObj = {
     return getCustomPreference('Adyen_ClientKey');
   },
 
+  getLivePrefix() {
+    return getCustomPreference('Adyen_LivePrefix');
+  },
+
   getGoogleMerchantID() {
     return getCustomPreference('Adyen_GooglePayMerchantID');
   },

diff --git a/src/cartridges/int_adyen_overlay/cartridge/scripts/util/adyenHelper.js b/src/cartridges/int_adyen_overlay/cartridge/scripts/util/adyenHelper.js
@@ -881,6 +881,13 @@ var adyenHelperObj = {
     if (service === null) {
       throw new Error(`Could not create ${serviceType} service object`);
     }
+
+    if (AdyenConfigs.getAdyenEnvironment() === constants.MODE.LIVE) {
+      const livePrefix = AdyenConfigs.getLivePrefix();
+      const serviceUrl = service.getURL().replace(`[YOUR_LIVE_PREFIX]`, livePrefix);
+      service.setURL(serviceUrl);
+    }
+
     const maxRetries = constants.MAX_API_RETRIES;
     const apiKey = AdyenConfigs.getAdyenApiKey();
     const uuid = UUIDUtils.createUUID();

diff --git a/tests/playwright/pages/PaymentMethodsPage.mjs b/tests/playwright/pages/PaymentMethodsPage.mjs
@@ -441,7 +441,7 @@ export default class PaymentMethodsPage {
     this.klarnaIframe = this.page.frameLocator(
       '#klarna-apf-iframe',
     );
-    this.firstCancelButton = this.klarnaIframe.locator('#newCollectPhone__navbar__right-icon__icon-wrapper');
+    this.firstCancelButton = this.klarnaIframe.locator('#collectPhonePurchaseFlow__nav-bar__right-icon-wrapper');
     this.secondCancelButton = this.klarnaIframe.locator("button[title='Close']");
     await this.firstCancelButton.waitFor({
       state: 'visible',