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([
17
17
*/
18
18
return function ( addressData ) {
19
19
var identifier = Date . now ( ) ,
20
+ countryId = addressData [ 'country_id' ] || addressData . countryId || window . checkoutConfig . defaultCountryId ,
20
21
regionId ;
21
22
22
23
if ( addressData . region && addressData . region [ 'region_id' ] ) {
23
24
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
+ ) {
25
31
regionId = window . checkoutConfig . defaultRegionId || undefined ;
26
32
}
27
33
28
34
return {
29
35
email : addressData . email ,
30
- countryId : addressData [ 'country_id' ] || addressData . countryId || window . checkoutConfig . defaultCountryId ,
36
+ countryId : countryId ,
31
37
regionId : regionId || addressData . regionId ,
32
38
regionCode : addressData . region ? addressData . region [ 'region_code' ] : null ,
33
39
region : addressData . region ? addressData . region . region : null ,
You can’t perform that action at this time.
0 commit comments