File tree Expand file tree Collapse file tree 1 file changed +8
-2
lines changed
app/code/Magento/Checkout/view/frontend/web/js/model Expand file tree Collapse file tree 1 file changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -17,17 +17,23 @@ define([
1717 */
1818 return function ( addressData ) {
1919 var identifier = Date . now ( ) ,
20+ countryId = addressData [ 'country_id' ] || addressData . countryId || window . checkoutConfig . defaultCountryId ,
2021 regionId ;
2122
2223 if ( addressData . region && addressData . region [ 'region_id' ] ) {
2324 regionId = addressData . region [ 'region_id' ] ;
24- } else if ( addressData [ 'country_id' ] && addressData [ 'country_id' ] == window . checkoutConfig . defaultCountryId ) { //eslint-disable-line
25+ } else if (
26+ /* eslint-disable */
27+ addressData [ 'country_id' ] && addressData [ 'country_id' ] == window . checkoutConfig . defaultCountryId ||
28+ ! addressData [ 'country_id' ] && countryId == window . checkoutConfig . defaultCountryId
29+ /* eslint-enable */
30+ ) {
2531 regionId = window . checkoutConfig . defaultRegionId || undefined ;
2632 }
2733
2834 return {
2935 email : addressData . email ,
30- countryId : addressData [ 'country_id' ] || addressData . countryId || window . checkoutConfig . defaultCountryId ,
36+ countryId : countryId ,
3137 regionId : regionId || addressData . regionId ,
3238 regionCode : addressData . region ? addressData . region [ 'region_code' ] : null ,
3339 region : addressData . region ? addressData . region . region : null ,
You can’t perform that action at this time.
0 commit comments