Merge pull request #310 from magento-south/MAGETWO-46891-2.0

[SOUTH] Bug

Author: Korshenko, Olexii(okorshenko)

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

@@ -12,9 +12,6 @@ define(
     function($, address, customerData, mageUtils) {
         'use strict';
         var countryData = customerData.get('directory-data');
-        if (_.isEmpty(countryData())) {
-            countryData(customerData.reload(['directory-data'], false));
-        }
 
         return {
             /**

app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js

@@ -50,10 +50,6 @@ define(
         });
         addressOptions.push(newAddressOption);
 
-        if (_.isEmpty(countryData())) {
-            countryData(customerData.reload(['directory-data'], false));
-        }
-
         return Component.extend({
             defaults: {
                 template: 'Magento_Checkout/billing-address'

app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js

@@ -15,9 +15,6 @@ define([
 ], function($, ko, Component, selectShippingAddressAction, quote, formPopUpState, checkoutData, customerData) {
     'use strict';
     var countryData = customerData.get('directory-data');
-    if (_.isEmpty(countryData())) {
-        countryData(customerData.reload(['directory-data'], false));
-    }
 
     return Component.extend({
         defaults: {

app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js

@@ -9,9 +9,6 @@ define([
 ], function(Component, customerData) {
     'use strict';
     var countryData = customerData.get('directory-data');
-    if (_.isEmpty(countryData())) {
-        countryData(customerData.reload(['directory-data'], false));
-    }
 
     return Component.extend({
         defaults: {

app/code/Magento/Customer/view/frontend/web/js/customer-data.js

@@ -104,8 +104,13 @@ define([
 
     var customerData = {
         init: function() {
+            var countryData,
+                privateContent = $.cookieStorage.get('private_content_version');
+
             if (_.isEmpty(storage.keys())) {
-                this.reload([], false);
+                if (!_.isEmpty(privateContent)) {
+                    this.reload([], false);
+                }
             } else if (this.needReload()) {
                 _.each(dataProvider.getFromStorage(storage.keys()), function (sectionData, sectionName) {
                     buffer.notify(sectionName, sectionData);
@@ -119,6 +124,13 @@ define([
                     this.reload(storageInvalidation.keys(), false);
                 }
             }
+
+            if (!_.isEmpty(privateContent)) {
+                countryData = this.get('directory-data');
+                if (_.isEmpty(countryData())) {
+                    countryData(customerData.reload(['directory-data'], false));
+                }
+            }
         },
         needReload: function () {
             var cookieSections = $.cookieStorage.get('section_data_ids');