Skip to content

[EPC-9586] Fix card form validation after payment method switching #2943

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

Merged
candemiralp merged 3 commits into from
Apr 30, 2025
Merged

[EPC-9586] Fix card form validation after payment method switching #2943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d956758
[EPC-9586] Fix CC form validation
candemiralp Apr 22, 2025
d8258e7
Merge branch 'main' into ECP-9586
candemiralp Apr 22, 2025
5754730
Merge branch 'main' into ECP-9586
candemiralp Apr 30, 2025
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
20 changes: 10 additions & 10 deletions view/frontend/web/js/view/payment/method-renderer/adyen-cc-method.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,16 +166,16 @@ define(
* set up the installments
*/
renderCCPaymentMethod: function() {
let componentConfig = this.buildComponentConfiguration();

this.cardComponent = adyenCheckout.mountPaymentMethodComponent(
this.checkoutComponent,
'card',
componentConfig,
'#cardContainer'
)

return true
if (!this.cardComponent) {
let componentConfig = this.buildComponentConfiguration();

this.cardComponent = adyenCheckout.mountPaymentMethodComponent(
this.checkoutComponent,
'card',
componentConfig,
'#cardContainer'
)
}
},

buildComponentConfiguration: function () {
Expand Down
14 changes: 11 additions & 3 deletions view/frontend/web/js/view/payment/method-renderer/multishipping/adyen-cc-method.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ define([
$("#payment-continue").on("click", function () {
paymentComponent.showValidation();
});

if (paymentComponent.isValid) {
self.assignStateData(paymentComponent);
}
} else {
console.warn('Payment component could not be generated!');
}
Expand All @@ -78,14 +82,18 @@ define([
let baseComponentConfiguration = this._super();

baseComponentConfiguration.onChange = function (state) {
$('#stateData').val(state.isValid ? JSON.stringify(state.data) : '');
self.placeOrderAllowed(!!state.isValid);
self.storeCc = !!state.data.storePaymentMethod;
self.assignStateData(state);
};

return baseComponentConfiguration;
},

assignStateData: function (state) {
$('#stateData').val(state.isValid ? JSON.stringify(state.data) : '');
this.placeOrderAllowed(!!state.isValid);
this.storeCc = !!state.data.storePaymentMethod;
},

// Observable is set to true after div element in `cc-form.html` template is rendered
setIsTemplateRendered: function () {
this.isTemplateRendered(true);
Expand Down
Loading