Skip to content

#17744 Adding logic to get default billing address used on Cart and Checkout #18095

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

Merged
magento-engcom-team merged 7 commits into from
Oct 27, 2018
Merged

#17744 Adding logic to get default billing address used on Cart and Checkout #18095

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a44eb5d
#17744 Adding logic to get default billing address
LucasCalazans Sep 16, 2018
0890139
#17744 Reorganizing code
LucasCalazans Sep 17, 2018
5372c7d
#17744 Fixing syntax pattern
LucasCalazans Sep 17, 2018
b871ea9
#17744 Adding logic to get default billing address
VladimirZaets Sep 18, 2018
ec5d9b7
#17744 Adding isVirtual mock to quote instance && fixs
LucasCalazans Oct 1, 2018
a862620
Merge branch 'feature/17744' of github.com:LucasCalazans/magento2 int…
LucasCalazans Oct 1, 2018
f3bad34
#17744 Adding others isVirtual mock and annotations
LucasCalazans Oct 1, 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
16 changes: 14 additions & 2 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,15 +219,27 @@ define([
*/
applyBillingAddress: function () {
var shippingAddress;
var isBillingAddressInitialized;

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

return;
}
shippingAddress = quote.shippingAddress();

if (shippingAddress &&
if(quote.isVirtual()) {
Copy link
Member

@williankeller williankeller Sep 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @LucasCalazans,
Please add space between ifand (.

Copy link
Member Author

@LucasCalazans LucasCalazans Sep 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @williankeller, thanks for your review, I've just added this alteration.

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

shippingAddress = quote.shippingAddress();
if (!isBillingAddressInitialized &&
shippingAddress &&
shippingAddress.canUseForBilling() &&
(shippingAddress.isDefaultShipping() || !quote.isVirtual())
) {
Expand Down