MAGETWO-68877: Issue #7988 Typo changed also added comments for each index, getters and setters. #9484

 - fixed merge conflict

Author: Oleksii Korshenko

app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js

@@ -15,35 +15,36 @@ define([
     'use strict';
 
     var cacheKey = 'checkout-data',
-        checkoutData,
-
-        /**
-         * @return {*}
-         */
-        getData = function () {
-            return storage.get(cacheKey)();
-        },
 
         /**
          * @param {Object} data
          */
         saveData = function (data) {
             storage.set(cacheKey, data);
-        };
+        },
 
-    if ($.isEmptyObject(getData())) {
-        checkoutData = {
-            'selectedShippingAddress': null, //Selected shipping address pulled from persistence storage
-            'shippingAddressFromData': null, //Shipping address pulled from persistence storage
-            'newCustomerShippingAddress': null, //Shipping address pulled from persistence storage for new customer
-            'selectedShippingRate': null, //Shipping rate pulled from persistence storage
-            'selectedPaymentMethod': null, //Payment method pulled from persistence storage
-            'selectedBillingAddress': null, //Selected billing address pulled from persistence storage
-            'billingAddressFromData': null, //Billing address pulled from persistence storage
-            'newCustomerBillingAddress': null //Billing address pulled from persistence storage for new customer
+        /**
+         * @return {*}
+         */
+        getData = function () {
+            var data = storage.get(cacheKey)();
+
+            if ($.isEmptyObject(data)) {
+                data = {
+                    'selectedShippingAddress': null, //Selected shipping address pulled from persistence storage
+                    'shippingAddressFromData': null, //Shipping address pulled from persistence storage
+                    'newCustomerShippingAddress': null, //Shipping address pulled from persistence storage for customer
+                    'selectedShippingRate': null, //Shipping rate pulled from persistence storage
+                    'selectedPaymentMethod': null, //Payment method pulled from persistence storage
+                    'selectedBillingAddress': null, //Selected billing address pulled from persistence storage
+                    'billingAddressFromData': null, //Billing address pulled from persistence storage
+                    'newCustomerBillingAddress': null //Billing address pulled from persistence storage for new customer
+                };
+                saveData(data);
+            }
+
+            return data;
         };
-        saveData(checkoutData);
-    }
 
     return {
         /**