Merge remote-tracking branch 'origin/MAGETWO-66627' into NORD-FIXES

Author: RuslanKostiv1

app/code/Magento/Checkout/view/base/web/js/model/default-post-code-resolver.js

@@ -0,0 +1,35 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([], function () {
+    'use strict';
+
+    /**
+     * Define necessity of using default post code value
+     */
+    var useDefaultPostCode;
+
+    return {
+        /**
+         * Resolve default post code
+         *
+         * @returns {String|null}
+         */
+        resolve: function () {
+            return useDefaultPostCode ?  window.checkoutConfig.defaultPostcode : null;
+        },
+
+        /**
+         * Set state to useDefaultPostCode variable
+         *
+         * @param {Boolean} shouldUseDefaultPostCode
+         * @returns {underscore}
+         */
+        setUseDefaultPostCode: function (shouldUseDefaultPostCode) {
+            useDefaultPostCode = shouldUseDefaultPostCode;
+
+            return this;
+        }
+    };
+});

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

@@ -6,8 +6,9 @@
  * @api
  */
 define([
-    'underscore'
-], function (_) {
+    'underscore',
+    'Magento_Checkout/js/model/default-post-code-resolver'
+], function (_, DefaultPostCodeResolver) {
     'use strict';
 
     /**
@@ -35,7 +36,7 @@ define([
             company: addressData.company,
             telephone: addressData.telephone,
             fax: addressData.fax,
-            postcode: addressData.postcode ? addressData.postcode : window.checkoutConfig.defaultPostcode || undefined,
+            postcode: addressData.postcode ? addressData.postcode : DefaultPostCodeResolver.resolve(),
             city: addressData.city,
             firstname: addressData.firstname,
             lastname: addressData.lastname,

app/code/Magento/Ui/view/base/web/js/form/element/region.js

@@ -9,8 +9,9 @@
 define([
     'underscore',
     'uiRegistry',
-    './select'
-], function (_, registry, Select) {
+    './select',
+    'Magento_Checkout/js/model/default-post-code-resolver'
+], function (_, registry, Select, defaultPostCodeResolver) {
     'use strict';
 
     return Select.extend({
@@ -33,8 +34,8 @@ define([
             if (!value) {
                 return;
             }
-
             option = options[value];
+            defaultPostCodeResolver.setUseDefaultPostCode(!option['is_zipcode_optional']);
 
             if (this.skipValidation) {
                 this.validation['required-entry'] = false;

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/base/web/js/model/default-post-code-resolver.test.js

@@ -0,0 +1,30 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'underscore',
+    'Magento_Checkout/js/model/default-post-code-resolver'
+], function (_, DefaultPostCodeResolver) {
+    'use strict';
+
+    describe('checkout/js/model/default-post-code-resolver', function () {
+        var defaultPostCodeResolver;
+
+        beforeEach(function () {
+            defaultPostCodeResolver = DefaultPostCodeResolver;
+            window.checkoutConfig = {
+                defaultPostcode: '19800'
+            };
+        });
+
+        it('resolve', function () {
+            expect(defaultPostCodeResolver.resolve()).toBeNull();
+        });
+        it('resolve with using default code', function () {
+            defaultPostCodeResolver.setUseDefaultPostCode(true);
+            expect(defaultPostCodeResolver.resolve()).toEqual('19800');
+        });
+    });
+
+});