Skip to content

Virtual-only quotes use default shipping address for estimation instead of default billing address #17744 fix #18084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ericflemes wants to merge 3 commits into from
Closed

Virtual-only quotes use default shipping address for estimation instead of default billing address #17744 fix #18084

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f992b9
#17744
Sep 16, 2018
eef78e7
17744
Sep 16, 2018
7718c1c
17744
Sep 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,17 +219,30 @@ define([
*/
applyBillingAddress: function () {
var shippingAddress;
var isBillingAddressInitialized;

if (quote.billingAddress()) {
selectBillingAddress(quote.billingAddress());

return;
}
shippingAddress = quote.shippingAddress();
shippingAddress = quote.billingAddress();

if(quote.isVirtual()) {
isBillingAddressInitialized = addressList.some(function (addrs) {
if (addrs.isDefaultBilling()) {
selectBillingAddress(addrs);
return true;
}

return false;
});
}

if (shippingAddress &&
if (!isBillingAddressInitialized &&
shippingAddress &&
shippingAddress.canUseForBilling() &&
(shippingAddress.isDefaultShipping() || !quote.isVirtual())
(shippingAddress.isDefaultBilling() || !quote.isVirtual())
) {
//set billing address same as shipping by default if it is not empty
selectBillingAddress(quote.shippingAddress());
Expand Down