Skip to content

Commit eed21b7

Browse files
MC-36884: Incorrect default country displayed on shipping page when store view is changed in cart
1 parent b9c13fd commit eed21b7

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,13 @@ define(
7878
}
7979

8080
if (!quote.isVirtual()) {
81-
checkoutProvider.on('shippingAddress', function (shippingAddressData) {
82-
checkoutData.setShippingAddressFromData(shippingAddressData);
83-
});
81+
checkoutProvider.on('shippingAddress', function (shippingAddressData) {
82+
if (quote.shippingAddress().countryId !== shippingAddressData.country_id ||
83+
(shippingAddressData.postcode || shippingAddressData.region_id)
84+
) {
85+
checkoutData.setShippingAddressFromData(shippingAddressData);
86+
}
87+
});
8488
} else {
8589
checkoutProvider.on('shippingAddress', function (shippingAddressData) {
8690
checkoutData.setBillingAddressFromData(shippingAddressData);

0 commit comments

Comments
 (0)