From 6447a6f628b02218f6c050bfb2bc06d83838f39d Mon Sep 17 00:00:00 2001
From: Zenit Shkreli <69572953+zenit2001@users.noreply.github.com>
Date: Mon, 12 Aug 2024 10:13:17 +0200
Subject: [PATCH] Remove conditional cardholdername logic (#1137)

* fix: removing conditional cardholder name logic and metadata as it is not required anymore

* chore: updated the unit test
---
 .../meta/system-objecttype-extensions.xml          |  8 --------
 .../cartridge/client/default/js/adyenCheckout.js   |  4 ----
 .../checkout/billing/adyenComponentForm.isml       |  1 -
 .../adyenSettings/settingCards/cardSettings.isml   | 14 --------------
 .../cartridge/adyen/utils/adyenConfigs.js          |  4 ----
 .../__tests__/__snapshots__/begin.test.js.snap     |  2 --
 .../controllers/middlewares/checkout/begin.js      |  2 --
 7 files changed, 35 deletions(-)

diff --git a/metadata/site_import/meta/system-objecttype-extensions.xml b/metadata/site_import/meta/system-objecttype-extensions.xml
index 3d08ae711..c8614e6e1 100644
--- a/metadata/site_import/meta/system-objecttype-extensions.xml
+++ b/metadata/site_import/meta/system-objecttype-extensions.xml
@@ -407,13 +407,6 @@
                 <externally-managed-flag>false</externally-managed-flag>
                 <default-value>true</default-value>
             </attribute-definition>
-            <attribute-definition attribute-id="AdyenCardHolderName_enabled">
-                <display-name xml:lang="x-default">Show input field for card holder name</display-name>
-                <type>boolean</type>
-                <mandatory-flag>false</mandatory-flag>
-                <externally-managed-flag>false</externally-managed-flag>
-                <default-value>true</default-value>
-            </attribute-definition>
             <attribute-definition attribute-id="AdyenLevel23DataEnabled">
                 <display-name xml:lang="x-default">Level 2/3 Data Authorisation Enabled</display-name>
                 <type>boolean</type>
@@ -704,7 +697,6 @@
                 <attribute attribute-id="AdyenCreditCardInstallments"/>
                 <attribute attribute-id="AdyenBasketFieldsEnabled"/>
                 <attribute attribute-id="AdyenLevel23DataEnabled"/>
-                <attribute attribute-id="AdyenCardHolderName_enabled"/>
                 <attribute attribute-id="AdyenLevel23_CommodityCode"/>
                 <attribute attribute-id="AdyenSalePaymentMethods"/>
                 <attribute attribute-id="AdyenInstallments_enabled"/>
diff --git a/src/cartridges/app_adyen_SFRA/cartridge/client/default/js/adyenCheckout.js b/src/cartridges/app_adyen_SFRA/cartridge/client/default/js/adyenCheckout.js
index 7b867e691..d571b2101 100644
--- a/src/cartridges/app_adyen_SFRA/cartridge/client/default/js/adyenCheckout.js
+++ b/src/cartridges/app_adyen_SFRA/cartridge/client/default/js/adyenCheckout.js
@@ -31,10 +31,6 @@ $('#dwfrm_billing').submit(function apiRequest(e) {
 });
 
 setCheckoutConfiguration();
-if (window.cardholderNameBool !== 'null') {
-  store.checkoutConfiguration.paymentMethodsConfiguration.card.hasHolderName = true;
-  store.checkoutConfiguration.paymentMethodsConfiguration.card.holderNameRequired = true;
-}
 
 if (
   window.googleMerchantID !== 'null' &&
diff --git a/src/cartridges/app_adyen_SFRA/cartridge/templates/default/checkout/billing/adyenComponentForm.isml b/src/cartridges/app_adyen_SFRA/cartridge/templates/default/checkout/billing/adyenComponentForm.isml
index 5a27ed48f..b0e84e55c 100644
--- a/src/cartridges/app_adyen_SFRA/cartridge/templates/default/checkout/billing/adyenComponentForm.isml
+++ b/src/cartridges/app_adyen_SFRA/cartridge/templates/default/checkout/billing/adyenComponentForm.isml
@@ -58,7 +58,6 @@
     <script>
          window.installments = '${pdict.adyen.installments}';
          window.googleMerchantID = '${pdict.adyen.googleMerchantID}';
-         window.cardholderNameBool = '${pdict.adyen.cardholderNameBool}';
          window.merchantAccount = '${pdict.adyen.merchantAccount}';
          window.customerEmail = '${customer && customer.profile && customer.profile.email ? customer.profile.email : ''}';
          var showStoreDetails = ${customer.authenticated && adyenRecurringPaymentsEnabled};
diff --git a/src/cartridges/bm_adyen/cartridge/templates/default/adyenSettings/settingCards/cardSettings.isml b/src/cartridges/bm_adyen/cartridge/templates/default/adyenSettings/settingCards/cardSettings.isml
index b967bab5b..99c924e5d 100644
--- a/src/cartridges/bm_adyen/cartridge/templates/default/adyenSettings/settingCards/cardSettings.isml
+++ b/src/cartridges/bm_adyen/cartridge/templates/default/adyenSettings/settingCards/cardSettings.isml
@@ -12,20 +12,6 @@
          <div class="first-subtitle">Choose additional payment features you want to offer to your shoppers.</div>
       </h7>
       <div class="mt-2">
-         <div class="form-group">
-            <label class="form-title mb-0" for="cardHolderNameEnabled">Cardholder’s name</label>
-            <small id="cardHolderNameEnabledHelp" class="form-text mb-1">This allows you to show the input field for the cardholder’s name. </small>
-            <div class="radio-buttons">
-               <div class="form-check form-check-inline">
-                  <input class="form-check-input" type="radio" name="AdyenCardHolderName_enabled" id="cardHolderYes" value=true ${AdyenConfigs.getAdyenCardholderNameEnabled() ? 'checked': ''}>
-                  <label class="form-check-label" for="cardHolderYes">Enable</label>
-               </div>
-               <div class="form-check form-check-inline">
-                  <input class="form-check-input" type="radio" name="AdyenCardHolderName_enabled" id="cardHolderNo" value=false ${!AdyenConfigs.getAdyenCardholderNameEnabled() ? 'checked': ''}>
-                  <label class="form-check-label" for="cardHolderNo">Disable</label>
-               </div>
-            </div>
-         </div>
          <div class="form-group">
             <div class='row'>
                <div class="switch-button">
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/utils/adyenConfigs.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/utils/adyenConfigs.js
index 574935192..e5dfe9597 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/adyen/utils/adyenConfigs.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/adyen/utils/adyenConfigs.js
@@ -113,10 +113,6 @@ const adyenConfigsObj = {
     return getCustomPreference('AdyenBasketFieldsEnabled');
   },
 
-  getAdyenCardholderNameEnabled: function () {
-    return getCustomPreference('AdyenCardHolderName_enabled');
-  },
-
   getAdyenLevel23DataEnabled: function () {
     return getCustomPreference('AdyenLevel23DataEnabled');
   },
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout/__tests__/__snapshots__/begin.test.js.snap b/src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout/__tests__/__snapshots__/begin.test.js.snap
index e9e38b08c..7a5b4c17c 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout/__tests__/__snapshots__/begin.test.js.snap
+++ b/src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout/__tests__/__snapshots__/begin.test.js.snap
@@ -7,7 +7,6 @@ exports[`Begin should not attempt to restore cart when no order number is cached
       "adyen": {
         "SFRA6Enabled": false,
         "adyenClientKey": "mocked_client_key",
-        "cardholderNameBool": true,
         "clientKey": "mocked_client_key",
         "environment": "test",
         "googleMerchantID": "mocked_google_merchant_id",
@@ -26,7 +25,6 @@ exports[`Begin should set view data 1`] = `
       "adyen": {
         "SFRA6Enabled": false,
         "adyenClientKey": "mocked_client_key",
-        "cardholderNameBool": true,
         "clientKey": "mocked_client_key",
         "environment": "test",
         "googleMerchantID": "mocked_google_merchant_id",
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout/begin.js b/src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout/begin.js
index a3e56cec2..40694dcc5 100644
--- a/src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout/begin.js
+++ b/src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout/begin.js
@@ -67,7 +67,6 @@ function begin(req, res, next) {
   const adyenClientKey = AdyenConfigs.getAdyenClientKey();
   const googleMerchantID = AdyenConfigs.getGoogleMerchantID();
   const merchantAccount = AdyenConfigs.getAdyenMerchantAccount();
-  const cardholderNameBool = AdyenConfigs.getAdyenCardholderNameEnabled();
   const SFRA6Enabled = AdyenConfigs.getAdyenSFRA6Compatibility();
 
   const viewData = res.getViewData();
@@ -77,7 +76,6 @@ function begin(req, res, next) {
     installments,
     googleMerchantID,
     merchantAccount,
-    cardholderNameBool,
     adyenClientKey,
     SFRA6Enabled,
   };