Skip to content

Commit c062bc3

Browse files
committed
MAGETWO-90966: Tax estimation not using default location for estimate with virtual product
1 parent 7263e4e commit c062bc3

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ define(
5555
checkoutDataResolver.resolveEstimationAddress();
5656
address = quote.isVirtual() ? quote.billingAddress() : quote.shippingAddress();
5757

58+
if (!address && quote.isVirtual()) {
59+
address = addressConverter.formAddressDataToQuoteAddress(
60+
checkoutData.getSelectedBillingAddress()
61+
);
62+
}
63+
5864
if (address) {
5965
estimatedAddress = address.isEditable() ?
6066
addressConverter.quoteAddressToFormAddressData(address) :

app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
<testCaseId value="MAGETWO-41931"/>
1919
<group value="checkout"/>
2020
<group value="tax"/>
21-
<skip>
22-
<issueId value="MAGETWO-90966"/>
23-
</skip>
2421
</annotations>
2522
<before>
2623
<!-- Preconditions -->

0 commit comments

Comments
 (0)