From 90ebccbb95d488db0b44ef568ace8e3ba5ec5e24 Mon Sep 17 00:00:00 2001 From: Arshad M Date: Wed, 3 May 2017 11:41:15 +0530 Subject: [PATCH 1/4] #7988 Typo in billingAddressFromData changed --- app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js index b5d3c93de6539..2cf37296840a3 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js @@ -39,7 +39,7 @@ define([ 'selectedShippingRate': null, 'selectedPaymentMethod': null, 'selectedBillingAddress': null, - 'billingAddressFormData': null, + 'billingAddressFromData': null, 'newCustomerBillingAddress': null }; saveData(checkoutData); From 5bc1a222fe16121d020ffbb578cf9f8688983f75 Mon Sep 17 00:00:00 2001 From: Arshad M Date: Wed, 3 May 2017 14:03:32 +0530 Subject: [PATCH 2/4] magento/magento2#7988 Added commnets in file checkout-data.js - added missing index in checkoutData --- .../view/frontend/web/js/checkout-data.js | 57 ++++++++++++++++--- 1 file changed, 49 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js index 2cf37296840a3..2c9950e522d22 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js @@ -33,20 +33,24 @@ define([ if ($.isEmptyObject(getData())) { checkoutData = { - 'selectedShippingAddress': null, - 'shippingAddressFromData': null, - 'newCustomerShippingAddress': null, - 'selectedShippingRate': null, - 'selectedPaymentMethod': null, - 'selectedBillingAddress': null, - 'billingAddressFromData': null, - 'newCustomerBillingAddress': null + 'selectedShippingAddress': null, // Selected shipping address pullled from local storage (Persistence) + 'shippingAddressFromData': null, // Shipping address pullled from local storage (Persistence) + 'newCustomerShippingAddress': null, // Shipping address pullled from local storage for new customer (Persistence) + 'selectedShippingRate': null, // Shipping rate pulled from local storage (Persistence) + 'selectedPaymentMethod': null, // Payment method pulled from local storage (Persistence) + 'selectedBillingAddress': null, // Selected billing address pullled from local storage (Persistence) + 'billingAddressFromData': null, // Billing address pullled from local storage (Persistence) + 'newCustomerBillingAddress': null, // Billing address pullled from local storage for new customer (Persistence) + 'validatedEmailValue': null, // Validated email address from local storage (Persistence) + 'inputFieldEmailValue' : null // Email input field value from local storage (Persistence) }; saveData(checkoutData); } return { /** + * Setting the selected shipping address pulled from local storage + * * @param {Object} data */ setSelectedShippingAddress: function (data) { @@ -57,6 +61,8 @@ define([ }, /** + * Pulling the selected shipping address from local storage + * * @return {*} */ getSelectedShippingAddress: function () { @@ -64,6 +70,8 @@ define([ }, /** + * Setting the shipping address pulled from local storage + * * @param {Object} data */ setShippingAddressFromData: function (data) { @@ -74,6 +82,8 @@ define([ }, /** + * Pulling the shipping address from local storage + * * @return {*} */ getShippingAddressFromData: function () { @@ -81,6 +91,8 @@ define([ }, /** + * Setting the shipping address pulled from local storage for new customer + * * @param {Object} data */ setNewCustomerShippingAddress: function (data) { @@ -91,6 +103,8 @@ define([ }, /** + * Pulling the shipping address from local storage for new customer + * * @return {*} */ getNewCustomerShippingAddress: function () { @@ -98,6 +112,8 @@ define([ }, /** + * Setting the selected shipping rate pulled from local storage + * * @param {Object} data */ setSelectedShippingRate: function (data) { @@ -108,6 +124,8 @@ define([ }, /** + * Pulling the selected shipping rate from local storge + * * @return {*} */ getSelectedShippingRate: function () { @@ -115,6 +133,8 @@ define([ }, /** + * Setting the selected payment method pulled from local storage + * * @param {Object} data */ setSelectedPaymentMethod: function (data) { @@ -125,6 +145,8 @@ define([ }, /** + * Pulling the payment method from local storage + * * @return {*} */ getSelectedPaymentMethod: function () { @@ -132,6 +154,8 @@ define([ }, /** + * Setting the selected billing address pulled from local storage + * * @param {Object} data */ setSelectedBillingAddress: function (data) { @@ -142,6 +166,8 @@ define([ }, /** + * Pulling the selected billing address from local storage + * * @return {*} */ getSelectedBillingAddress: function () { @@ -149,6 +175,8 @@ define([ }, /** + * Setting the billing address pulled from local storage + * * @param {Object} data */ setBillingAddressFromData: function (data) { @@ -159,6 +187,7 @@ define([ }, /** + * Pulling the billing address from local storage * @return {*} */ getBillingAddressFromData: function () { @@ -166,6 +195,8 @@ define([ }, /** + * Setting the billing address pulled from local storage for new customer + * * @param {Object} data */ setNewCustomerBillingAddress: function (data) { @@ -176,6 +207,8 @@ define([ }, /** + * Pulling the billing address from local storage for new customer + * * @return {*} */ getNewCustomerBillingAddress: function () { @@ -183,6 +216,8 @@ define([ }, /** + * Pulling the email address from local storage + * * @return {*} */ getValidatedEmailValue: function () { @@ -192,6 +227,8 @@ define([ }, /** + * Setting the email address pulled from local storage + * * @param {String} email */ setValidatedEmailValue: function (email) { @@ -202,6 +239,8 @@ define([ }, /** + * Pulling the email input field value from local storage + * * @return {*} */ getInputFieldEmailValue: function () { @@ -211,6 +250,8 @@ define([ }, /** + * Setting the email input field value pulled from local storage + * * @param {String} email */ setInputFieldEmailValue: function (email) { From e3b22e4a95ef8abfbf689151e182089af43a198f Mon Sep 17 00:00:00 2001 From: Arshad M Date: Wed, 3 May 2017 14:43:10 +0530 Subject: [PATCH 3/4] magento/magento2#7988 Requested changes updated also reverted last updates in checkoutData index --- .../view/frontend/web/js/checkout-data.js | 56 +++++++++---------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js index 2c9950e522d22..d5ad5fea29dcf 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js @@ -33,23 +33,21 @@ define([ if ($.isEmptyObject(getData())) { checkoutData = { - 'selectedShippingAddress': null, // Selected shipping address pullled from local storage (Persistence) - 'shippingAddressFromData': null, // Shipping address pullled from local storage (Persistence) - 'newCustomerShippingAddress': null, // Shipping address pullled from local storage for new customer (Persistence) - 'selectedShippingRate': null, // Shipping rate pulled from local storage (Persistence) - 'selectedPaymentMethod': null, // Payment method pulled from local storage (Persistence) - 'selectedBillingAddress': null, // Selected billing address pullled from local storage (Persistence) - 'billingAddressFromData': null, // Billing address pullled from local storage (Persistence) - 'newCustomerBillingAddress': null, // Billing address pullled from local storage for new customer (Persistence) - 'validatedEmailValue': null, // Validated email address from local storage (Persistence) - 'inputFieldEmailValue' : null // Email input field value from local storage (Persistence) + 'selectedShippingAddress': null, //Selected shipping address pullled from persistence storage. + 'shippingAddressFromData': null, //Shipping address pullled from persistence storage. + 'newCustomerShippingAddress': null, //Shipping address pullled 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 pullled from persistence storage. + 'billingAddressFromData': null, //Billing address pullled from persistence storage. + 'newCustomerBillingAddress': null //Billing address pullled from persistence storage for new customer. }; saveData(checkoutData); } return { /** - * Setting the selected shipping address pulled from local storage + * Setting the selected shipping address pulled from persistence storage. * * @param {Object} data */ @@ -61,7 +59,7 @@ define([ }, /** - * Pulling the selected shipping address from local storage + * Pulling the selected shipping address from persistence storage. * * @return {*} */ @@ -70,7 +68,7 @@ define([ }, /** - * Setting the shipping address pulled from local storage + * Setting the shipping address pulled from persistence storage. * * @param {Object} data */ @@ -82,7 +80,7 @@ define([ }, /** - * Pulling the shipping address from local storage + * Pulling the shipping address from persistence storage. * * @return {*} */ @@ -91,7 +89,7 @@ define([ }, /** - * Setting the shipping address pulled from local storage for new customer + * Setting the shipping address pulled from persistence storage for new customer. * * @param {Object} data */ @@ -103,7 +101,7 @@ define([ }, /** - * Pulling the shipping address from local storage for new customer + * Pulling the shipping address from persistence storage for new customer. * * @return {*} */ @@ -112,7 +110,7 @@ define([ }, /** - * Setting the selected shipping rate pulled from local storage + * Setting the selected shipping rate pulled from persistence storage. * * @param {Object} data */ @@ -133,7 +131,7 @@ define([ }, /** - * Setting the selected payment method pulled from local storage + * Setting the selected payment method pulled from persistence storage. * * @param {Object} data */ @@ -145,7 +143,7 @@ define([ }, /** - * Pulling the payment method from local storage + * Pulling the payment method from persistence storage. * * @return {*} */ @@ -154,7 +152,7 @@ define([ }, /** - * Setting the selected billing address pulled from local storage + * Setting the selected billing address pulled from persistence storage. * * @param {Object} data */ @@ -166,7 +164,7 @@ define([ }, /** - * Pulling the selected billing address from local storage + * Pulling the selected billing address from persistence storage. * * @return {*} */ @@ -175,7 +173,7 @@ define([ }, /** - * Setting the billing address pulled from local storage + * Setting the billing address pulled from persistence storage. * * @param {Object} data */ @@ -187,7 +185,7 @@ define([ }, /** - * Pulling the billing address from local storage + * Pulling the billing address from persistence storage. * @return {*} */ getBillingAddressFromData: function () { @@ -195,7 +193,7 @@ define([ }, /** - * Setting the billing address pulled from local storage for new customer + * Setting the billing address pulled from persistence storage for new customer. * * @param {Object} data */ @@ -207,7 +205,7 @@ define([ }, /** - * Pulling the billing address from local storage for new customer + * Pulling the billing address from persistence storage for new customer. * * @return {*} */ @@ -216,7 +214,7 @@ define([ }, /** - * Pulling the email address from local storage + * Pulling the email address from persistence storage. * * @return {*} */ @@ -227,7 +225,7 @@ define([ }, /** - * Setting the email address pulled from local storage + * Setting the email address pulled from persistence storage. * * @param {String} email */ @@ -239,7 +237,7 @@ define([ }, /** - * Pulling the email input field value from local storage + * Pulling the email input field value from persistence storage. * * @return {*} */ @@ -250,7 +248,7 @@ define([ }, /** - * Setting the email input field value pulled from local storage + * Setting the email input field value pulled from persistence storage. * * @param {String} email */ From 73ac8c4bd994764a2e401b2c6b1c2f22d7a27ed0 Mon Sep 17 00:00:00 2001 From: Arshad M Date: Wed, 3 May 2017 17:37:43 +0530 Subject: [PATCH 4/4] magento/magento2#7988 Changed typo pullled to pulled --- .../Checkout/view/frontend/web/js/checkout-data.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js index d5ad5fea29dcf..49911ddbee9d4 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js @@ -33,14 +33,14 @@ define([ if ($.isEmptyObject(getData())) { checkoutData = { - 'selectedShippingAddress': null, //Selected shipping address pullled from persistence storage. - 'shippingAddressFromData': null, //Shipping address pullled from persistence storage. - 'newCustomerShippingAddress': null, //Shipping address pullled from persistence storage for new customer. + '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 pullled from persistence storage. - 'billingAddressFromData': null, //Billing address pullled from persistence storage. - 'newCustomerBillingAddress': null //Billing address pullled from persistence storage for new customer. + '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(checkoutData); }