Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove conditional cardholdername logic #1137

Merged
merged 2 commits into from
Aug 12, 2024
Merged

Remove conditional cardholdername logic #1137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bdbf15
fix: removing conditional cardholder name logic and metadata as it is…
zenit2001 Aug 12, 2024
1d7ebda
chore: updated the unit test
zenit2001 Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions metadata/site_import/meta/system-objecttype-extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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"/>
Expand Down
4 changes: 0 additions & 4 deletions src/cartridges/app_adyen_SFRA/cartridge/client/default/js/adyenCheckout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' &&
Expand Down
1 change: 0 additions & 1 deletion ...idges/app_adyen_SFRA/cartridge/templates/default/checkout/billing/adyenComponentForm.isml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
14 changes: 0 additions & 14 deletions ...tridges/bm_adyen/cartridge/templates/default/adyenSettings/settingCards/cardSettings.isml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 0 additions & 4 deletions src/cartridges/int_adyen_SFRA/cartridge/adyen/utils/adyenConfigs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,6 @@ const adyenConfigsObj = {
return getCustomPreference('AdyenBasketFieldsEnabled');
},

getAdyenCardholderNameEnabled: function () {
return getCustomPreference('AdyenCardHolderName_enabled');
},

getAdyenLevel23DataEnabled: function () {
return getCustomPreference('AdyenLevel23DataEnabled');
},
Expand Down
2 changes: 0 additions & 2 deletions ...FRA/cartridge/controllers/middlewares/checkout/__tests__/__snapshots__/begin.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 0 additions & 2 deletions src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout/begin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -77,7 +76,6 @@ function begin(req, res, next) {
installments,
googleMerchantID,
merchantAccount,
cardholderNameBool,
adyenClientKey,
SFRA6Enabled,
};
Expand Down
Loading