ENGCOM-584: #13231: Default State or Province is not pre-selected in the Estimate Shipping and Tax #1258

Author: Stanislav Idolov

app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js

@@ -17,18 +17,26 @@ define([
      */
     return function (addressData) {
         var identifier = Date.now(),
+            countryId,
             regionId;
 
-        if (addressData.region && addressData.region['region_id']) {
-            regionId = addressData.region['region_id'];
-        } else if (addressData['country_id'] && addressData['country_id'] == window.checkoutConfig.defaultCountryId) { //eslint-disable-line
-            regionId = window.checkoutConfig.defaultRegionId || undefined;
+        countryId = addressData['country_id'] || addressData.countryId;
+
+        if (countryId) {
+            if (addressData.region && addressData.region['region_id']) {
+                regionId = addressData.region['region_id'];
+            } else if (countryId === window.checkoutConfig.defaultCountryId) {
+                regionId = window.checkoutConfig.defaultRegionId;
+            }
+        } else {
+            countryId = window.checkoutConfig.defaultCountryId;
+            regionId = window.checkoutConfig.defaultRegionId;
         }
 
         return {
             email: addressData.email,
-            countryId: addressData['country_id'] || addressData.countryId || window.checkoutConfig.defaultCountryId,
-            regionId: regionId || addressData.regionId,
+            countryId: countryId,
+            regionId: regionId,
             regionCode: addressData.region ? addressData.region['region_code'] : null,
             region: addressData.region ? addressData.region.region : null,
             customerId: addressData['customer_id'] || addressData.customerId,

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/new-customer-address.test.js

@@ -14,7 +14,8 @@ define([
         beforeEach(function () {
 
             window.checkoutConfig = {
-                defaultCountryId: 'US'
+                defaultCountryId: 'US',
+                defaultRegionId: 1
             };
 
             newCustomerAddress = NewCustomerAddress;
@@ -27,6 +28,7 @@ define([
         it('Check on empty object.', function () {
             var expected = {
                 countryId: 'US',
+                regionId: 1,
                 regionCode: null,
                 region: null
             };
@@ -46,27 +48,28 @@ define([
             expect(result.canUseForBilling()).toBeTruthy();
         });
 
-        it('Check on regionId with region object in address data.', function () {
+        it('Check on regionId with country object in address data.', function () {
             var result = newCustomerAddress({
-                    region: {
-                        'region_id': 1
-                    }
+                    'country_id': 'CA'
                 }),
                 expected = {
-                    countryId: 'US',
-                    regionId: 1
+                    countryId: 'CA',
+                    regionCode: null,
+                    region: null
                 };
 
             expect(JSON.stringify(result)).toEqual(JSON.stringify(expected));
         });
-        it('Check on regionId with countryId in address data.', function () {
+        it('Check on regionId with countryId and regionId in address data.', function () {
             var result = newCustomerAddress({
-                    'country_id': 'US'
+                    'country_id': 'CA',
+                    region: {
+                        'region_id': 66
+                    }
                 }),
                 expected = {
-                    countryId: 'US',
-                    regionCode: null,
-                    region: null
+                    countryId: 'CA',
+                    regionId: 66
                 };
 
             expect(JSON.stringify(result)).toEqual(JSON.stringify(expected));