Skip to content

[ECP-9940] Fix missing countryId for virtual product payments #3282

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
Mar 26, 2026
Merged

[ECP-9940] Fix missing countryId for virtual product payments #3282

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
5ca0b2b
[ECP-9940] Observe countyId before mounting the checkout component
candemiralp Mar 25, 2026
9d77512
Merge branch 'main' into ECP-9940
candemiralp Mar 25, 2026
6ae3731
Merge branch 'main' into ECP-9940
candemiralp Mar 26, 2026
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
32 changes: 21 additions & 11 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 @@ -149,18 +149,28 @@ define(
},
// Build AdyenCheckout library and creates the payment method component
createCheckoutComponent: async function () {
if (!this.checkoutComponent) {
const paymentMethodsResponse = adyenPaymentService.getPaymentMethods();
const countryCode = quote.billingAddress().countryId;

this.checkoutComponent = await adyenCheckout.buildCheckoutComponent(
paymentMethodsResponse(),
countryCode,
this.handleOnAdditionalDetails.bind(this)
)
}
const billingAddressObservable = quote.billingAddress;
let self = this;

if (billingAddressObservable() && billingAddressObservable().countryId) {
if (!this.checkoutComponent) {
const paymentMethodsResponse = adyenPaymentService.getPaymentMethods();

this.checkoutComponent = await adyenCheckout.buildCheckoutComponent(
paymentMethodsResponse(),
billingAddressObservable().countryId,
this.handleOnAdditionalDetails.bind(this)
)
}

this.renderCCPaymentMethod();
this.renderCCPaymentMethod();
} else {
billingAddressObservable.subscribe(function (updatedBillingAddress) {
if (updatedBillingAddress && updatedBillingAddress.countryId) {
self.createCheckoutComponent();
}
});
Comment thread
candemiralp marked this conversation as resolved.
}
},
/**
* Returns true if card details can be stored
Expand Down
32 changes: 21 additions & 11 deletions view/frontend/web/js/view/payment/method-renderer/adyen-cc-vault-method.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,18 +130,28 @@ define([

// Build AdyenCheckout library and creates the payment method component
createCheckoutComponent: async function() {
if (!this.checkoutComponent) {
const paymentMethodsResponse = adyenPaymentService.getPaymentMethods();
const countryCode = quote.billingAddress().countryId;

this.checkoutComponent = await adyenCheckout.buildCheckoutComponent(
paymentMethodsResponse(),
countryCode,
this.handleOnAdditionalDetails.bind(this)
);
}
const billingAddressObservable = quote.billingAddress;
let self = this;

this.renderCheckoutComponent();
if (billingAddressObservable() && billingAddressObservable().countryId) {
if (!this.checkoutComponent) {
const paymentMethodsResponse = adyenPaymentService.getPaymentMethods();

this.checkoutComponent = await adyenCheckout.buildCheckoutComponent(
paymentMethodsResponse(),
billingAddressObservable().countryId,
this.handleOnAdditionalDetails.bind(this)
);
}

this.renderCheckoutComponent();
} else {
billingAddressObservable.subscribe(function (updatedBillingAddress) {
if (updatedBillingAddress && updatedBillingAddress.countryId) {
self.createCheckoutComponent();
}
});
Comment thread
candemiralp marked this conversation as resolved.
}
},

handleOnAdditionalDetails: function (result) {
Expand Down
3 changes: 3 additions & 0 deletions view/frontend/web/js/view/payment/method-renderer/adyen-giftcard-method.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ define(
selectedGiftcardPaymentMethod: ko.observable(null),
giftcardTitle: ko.observable(null),
icon: ko.observable(window.checkoutConfig.payment.adyen.giftcard.icon),
billingAddressAvailable: ko.observable(false),

initialize: async function () {
this._super();
Expand All @@ -74,6 +75,8 @@ define(
this.fetchGiftcardPaymentMethods(paymentMethodsObserver());
this.fetchRedeemedGiftcards();
}

this.billingAddressAvailable(quote.billingAddress() !== null);
Comment thread
candemiralp marked this conversation as resolved.
},

addNewGiftcard: function () {
Expand Down
31 changes: 18 additions & 13 deletions view/frontend/web/js/view/payment/method-renderer/adyen-pm-method.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ define(

this._lastGrandTotal = undefined;

// This event is triggered when the total changes or billing address is added (virtual products)
quote.totals.subscribe(function (totals) {
if (!totals) {
return;
Expand Down Expand Up @@ -177,20 +178,24 @@ define(

// Build AdyenCheckout library and creates the payment method component
createCheckoutComponent: async function(forceCreate = false) {
if (!this.checkoutComponent || forceCreate) {
const paymentMethodsResponse = adyenPaymentService.getPaymentMethods();
const countryCode = quote.billingAddress().countryId;

this.checkoutComponent = await adyenCheckout.buildCheckoutComponent(
paymentMethodsResponse(),
countryCode,
this.handleOnAdditionalDetails.bind(this),
this.handleOnCancel.bind(this),
this.handleOnSubmit.bind(this),
this.handleOnError.bind(this)
);
const billingAddressObservable = quote.billingAddress;
let self = this;

this.renderCheckoutComponent();
if (billingAddressObservable() && billingAddressObservable().countryId) {
if (!this.checkoutComponent || forceCreate) {
const paymentMethodsResponse = adyenPaymentService.getPaymentMethods();

this.checkoutComponent = await adyenCheckout.buildCheckoutComponent(
paymentMethodsResponse(),
billingAddressObservable().countryId,
this.handleOnAdditionalDetails.bind(this),
this.handleOnCancel.bind(this),
this.handleOnSubmit.bind(this),
this.handleOnError.bind(this)
);

this.renderCheckoutComponent();
}
}
Comment thread
candemiralp marked this conversation as resolved.
},

Expand Down
2 changes: 2 additions & 0 deletions view/frontend/web/template/payment/giftcard-form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<!--/ko-->
</div>

<!-- ko if: billingAddressAvailable -->
<div data-bind="attr: {'id': getCode() + '_new_giftcard_wrapper'}">
<div class="field" data-bind="attr: {'id': getCode() + '_giftcard_button_wrapper'}, visible: canAddNewGiftCard">
<button data-bind="click: addNewGiftcard, attr: {'class': 'adyen-checkout__button'}">
Expand All @@ -59,6 +60,7 @@
</select>
</div>
</div>
<!-- /ko -->

<h2 data-bind="attr: {'class': 'adyen-giftcard-header'}, visible: giftcardTitle, text: giftcardTitle"></h2>
<div class="field" data-bind="attr: {'id': 'giftcard-component-wrapper'}"></div>
Expand Down
Loading