fix: added front-end region, google merchant ID and made some content…

… changes to the config page (#885)
Adyen · Mar 27, 2023 · c8ccb8d · c8ccb8d
1 parent 4e73405
commit c8ccb8d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 6 deletions.
diff --git a/src/cartridges/bm_adyen/cartridge/static/default/css/configurationSettings.css b/src/cartridges/bm_adyen/cartridge/static/default/css/configurationSettings.css
@@ -175,7 +175,7 @@
 
 .switch-button{
     position: absolute;
-    left: 90%;
+    left: 80%;
     right: auto;
     top: auto;
     bottom: auto;
@@ -460,3 +460,12 @@ ul{
 .draggable .title .logo {
     margin-left: 10px;
 }
+
+.form-select {
+    font-family: 'Fakt';
+    font-style: normal;
+    font-weight: 250;
+    font-size: 14px;
+    line-height: 24px;
+    color: #69778C;
+}
diff --git a/...rtridges/bm_adyen/cartridge/templates/default/adyenSettings/settingCards/epmSettings.isml b/...rtridges/bm_adyen/cartridge/templates/default/adyenSettings/settingCards/epmSettings.isml
@@ -15,21 +15,21 @@
          Express checkout <small class="text-secondary">(optional)</small>
       </h5>
       <h7 class="card-subtitle">
-         <div class="first-subtitle">To activate the Express Checkout Module, make sure you have enabled the payment methods in Adyen Customer Area.</div>
+         <div class="first-subtitle">Allow your shoppers to pay instantly with the payment methods they trust across multiple stores.</div>
       </h7>
       <div class="mt-2">
          <div class="form-group">
             <label class="form-title mb-0" for="expressPaymentsButton">Express Checkout</label>
+            <small id="expressPaymentsButtonHelp" class="form-text mb-1">Make sure the payment methods are also enabled in the Customer Area.</small>
             <div class="row">
-               <div class="col-sm-9">
-                  <small id="expressPaymentsButtonHelp" class="form-text mb-1">&#8198;Express Checkout is available for Apple Pay and Amazon Pay.</small>
-               </div>
                <div class="switch-button">
                   <div class="form-check form-switch">
                      <input class="form-check-input" type="checkbox" name="ExpressPayments_enabled" id="expressPaymentsEnabledChecked" data-bs-toggle="collapse" data-bs-target=".express-settings" ${AdyenConfigs.areExpressPaymentsEnabled() ? 'checked': 'unchecked'}>
                   </div>
                </div>
             </div>
+            <label class="form-title mb-0" for="expressCheckoutHelp">Buttons display</label>
+            <small class="form-text mb-1">Customize the order that you would like to place the express buttons in the checkout.</small>
          </div>
          <div class="express-settings collapse ${AdyenConfigs.areExpressPaymentsEnabled() ? 'show': ''}">
             <div class="form-group">

diff --git a/...rtridges/bm_adyen/cartridge/templates/default/adyenSettings/settingCards/lpmSettings.isml b/...rtridges/bm_adyen/cartridge/templates/default/adyenSettings/settingCards/lpmSettings.isml
@@ -23,6 +23,13 @@
                <input type="text" class="form-control" name="AdyenRatePayID" id="ratePayId" aria-describedby="ratePayIdHelp" placeholder="e.g. oj9GsQ" value="${AdyenConfigs.getRatePayMerchantID() || ''}">    
             </div>
          </div>
+         <div class="form-group">
+            <label class="form-title mb-0" for="googlePayMerchantID">Google Merchant ID</label>
+            <small id="googlePayMerchantHelp" class="form-text mb-1">Google Pay is enabled by default in the Test environment. If you also want to activate it in the Live environment, enter your <a class="text-primary" href="https://developers.google.com/pay/api/web/guides/test-and-deploy/deploy-production-environment#obtain-your-merchantID" target="_blank">Google Merchant ID</a></small>
+            <div class="input-fields">
+               <input type="text" class="form-control" name="Adyen_GooglePayMerchantID" id="googlePayMerchantID" aria-describedby="googlePayMerchantHelp" value="${AdyenConfigs.getGoogleMerchantID() || ''}">    
+            </div>
+         </div>
          <div class="form-group">
             <label class="form-title mb-0" for="oneClick">Store shopper details with one-click <small class="text-secondary">(optional)</small></label>
             <small id="oneClickHelp" class="form-text mb-1"><a class="text-primary" href="https://docs.adyen.com/plugins/salesforce-commerce-cloud/set-up-the-cartridge#step-6-store-shopper-details" target="_blank">One-click</a> stores payment details of your shoppers securely. It allows you to offer subscriptions, automatic top-ups to shoppers’ accounts, and give them a faster checkout experience.</small>

diff --git a/...ges/bm_adyen/cartridge/templates/default/adyenSettings/settingCards/requiredSettings.isml b/...ges/bm_adyen/cartridge/templates/default/adyenSettings/settingCards/requiredSettings.isml
@@ -47,12 +47,26 @@
                </div>
             </div>
          </div>
+         <div class="form-group">
+            <label class="form-title mb-0" for="frontendRegion">Front-end resources region</label>
+            <small id="frontendRegionHelp" class="form-text mb-1">
+            Enter the closest regions to your shoppers. This setup influences the speed of the Adyen Checkout Component during checkout.
+            <a class="text-primary" href="https://docs.adyen.com/online-payments/android/components#testing-your-integration" target="_blank">Check the list of regions</a></small>
+            <div class='input-fields' id="dropdown-options">
+               <select name="Adyen_Frontend_Region" class="form-select" required>
+                  <option class="dropdown-option" value="US" id="regionUS" ${AdyenConfigs.getAdyenFrontendRegion() === 'US' ? 'selected': ''}>US - United States</option>
+                  <option class="dropdown-option" value="EU" id="regionEU" ${AdyenConfigs.getAdyenFrontendRegion() === 'EU' ? 'selected': ''}>EU - Europe (Default)</option>
+                  <option class="dropdown-option" value="AU" id="regionAU" ${AdyenConfigs.getAdyenFrontendRegion() === 'AU' ? 'selected': ''}>AU - Australia</option>
+                  <option class="dropdown-option" value="IN" id="regionIN" ${AdyenConfigs.getAdyenFrontendRegion() === 'IN' ? 'selected': ''}>IN - India</option>
+               </select>
+            </div>
+         </div>
          <div class="line-divider">
             <hr class="divider">
          </div>
          <div class="form-group">
             <label class="form-title mb-0" for="merchantAccount">Merchant Account</label>
-            <small id="merchantAccountHelp" class="form-text mb-1">This is your Adyen merchant account. You can only select one merchant account for each storefront.</small>
+            <small id="merchantAccountHelp" class="form-text mb-1">Please note that you can enter only one merchant account per storefront.</small>
             <div class="input-fields">
                <input type="text" class="form-control required" name="Adyen_merchantCode" id="merchantAccount" onchange="testConnectionButton.disabled=false;" aria-describedby="merchantAccountHelp" placeholder="" value="${AdyenConfigs.getAdyenMerchantAccount() || ''}">
                <div class="valid-feedback"></div>