#17744 Reorganizing code

LucasCalazans · LucasCalazans · commit 0890139741aa · 2018-09-17T11:05:54.000-03:00
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
@@ -226,7 +226,7 @@ define([
 
                 return;
             }
-            shippingAddress = quote.billingAddress();
+
             if(quote.isVirtual()) {
                 isBillingAddressInitialized = addressList.some(function (addrs) {
                     if (addrs.isDefaultBilling()) {
@@ -237,6 +237,7 @@ define([
                 });
             }
 
+            shippingAddress = quote.shippingAddress();
             if (!isBillingAddressInitialized &&
                 shippingAddress &&
                 shippingAddress.canUseForBilling() &&

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ define([`
`226`	`226`
`227`	`227`	`return;`
`228`	`228`	`}`
`229`		`- shippingAddress = quote.billingAddress();`
	`229`	`+`
`230`	`230`	`if(quote.isVirtual()) {`
`231`	`231`	`isBillingAddressInitialized = addressList.some(function (addrs) {`
`232`	`232`	`if (addrs.isDefaultBilling()) {`
`@@ -237,6 +237,7 @@ define([`
`237`	`237`	`});`
`238`	`238`	`}`
`239`	`239`
	`240`	`+ shippingAddress = quote.shippingAddress();`
`240`	`241`	`if (!isBillingAddressInitialized &&`
`241`	`242`	`shippingAddress &&`
`242`	`243`	`shippingAddress.canUseForBilling() &&`