Skip to content

Commit f1acf72

Browse files
committed
ACP2E-862:: Cash on Delivery method is visible even if it is not allowed for that particular country
1 parent 629e9d9 commit f1acf72

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ function (
126126
if (this.isAddressSameAsShipping()) {
127127
selectBillingAddress(quote.shippingAddress());
128128

129-
this.updateAddresses();
129+
this.updateAddress();
130130
this.isAddressDetailsVisible(true);
131131
} else {
132132
lastSelectedBillingAddress = quote.billingAddress();
@@ -147,8 +147,13 @@ function (
147147
addressUpadated = true;
148148

149149
if (this.selectedAddress() && !this.isAddressFormVisible()) {
150-
selectBillingAddress(this.selectedAddress());
151-
checkoutData.setSelectedBillingAddress(this.selectedAddress().getKey());
150+
if (this.isAddressDetailsVisible()) {
151+
selectBillingAddress(quote.shippingAddress());
152+
checkoutData.setSelectedBillingAddress(quote.shippingAddress().getKey());
153+
} else {
154+
selectBillingAddress(this.selectedAddress());
155+
checkoutData.setSelectedBillingAddress(this.selectedAddress().getKey());
156+
}
152157
} else {
153158
this.source.set('params.invalid', false);
154159
this.source.trigger(this.dataScopePrefix + '.data.validate');

0 commit comments

Comments
 (0)