Skip to content

[Backport] #17744 Adding logic to get default billing address used on Cart and Checkout #18863

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 6 commits into from
Oct 31, 2018
Merged

[Backport] #17744 Adding logic to get default billing address used on Cart and Checkout #18863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b57ae01
#17744 Adding logic to get default billing address
LucasCalazans Sep 16, 2018
f7a8160
#17744 Reorganizing code
LucasCalazans Sep 17, 2018
f3f9cff
#17744 Fixing syntax pattern
LucasCalazans Sep 17, 2018
3836bd2
#17744 Adding logic to get default billing address
VladimirZaets Sep 18, 2018
d88d133
#17744 Adding isVirtual mock to quote instance && fixs
LucasCalazans Oct 1, 2018
7116fed
#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
19 changes: 17 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 @@ -218,16 +218,31 @@ define([
* Apply resolved billing address to quote
*/
applyBillingAddress: function () {
var shippingAddress;
var shippingAddress,
isBillingAddressInitialized;

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

return;
}

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

return true;
}

return false;
});
}

shippingAddress = quote.shippingAddress();

if (shippingAddress &&
if (!isBillingAddressInitialized &&
shippingAddress &&
shippingAddress.canUseForBilling() &&
(shippingAddress.isDefaultShipping() || !quote.isVirtual())
) {
Expand Down
7 changes: 6 additions & 1 deletion ...tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ define([
billingAddress: ko.observable(),
shippingAddress: ko.observable(),
paymentMethod: ko.observable(),
totals: ko.observable({})
totals: ko.observable({}),

/** Stub */
isVirtual: function () {
return false;
}
},
'Magento_Braintree/js/view/payment/validator-handler': jasmine.createSpyObj(
'validator-handler',
Expand Down
7 changes: 6 additions & 1 deletion .../tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ define([
paymentMethod: ko.observable(),
totals: ko.observable({
'base_grand_total': 0
})
}),

/** Stub */
isVirtual: function () {
return false;
}
},
'Magento_Braintree/js/view/payment/adapter': {
config: {},
Expand Down
6 changes: 5 additions & 1 deletion ...e/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,12 @@ define([
billingAddress: ko.observable(),
shippingAddress: ko.observable(),
paymentMethod: ko.observable(),
totals: ko.observable({})
totals: ko.observable({}),

/** Stub */
isVirtual: function () {
return false;
}
},
'Magento_Checkout/js/action/set-payment-information': setPaymentMock,
'Magento_Checkout/js/model/payment/additional-validators': {
Expand Down