Skip to content

Commit e5236e1

Browse files
committed
MC-29722: Default shipping address not being honoured
1 parent 7bf8b54 commit e5236e1

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

app/code/Magento/Quote/Model/ResourceModel/Quote.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,5 +306,7 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
306306
if (!$object->isPreventSaving()) {
307307
return parent::save($object);
308308
}
309+
310+
return $this;
309311
}
310312
}

app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderForCustomerWithTwoAddressesTaxableAndNonTaxableTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
</actionGroup>
4646
<!--Step 2: Select taxable address as billing address-->
4747
<selectOption selector="{{AdminOrderFormBillingAddressSection.selectAddress}}" userInput="{{US_Address_CA.state}}" stepKey="selectTaxableAddress" />
48+
<waitForPageLoad stepKey="waitForChangeBillingAddress"/>
49+
<!--Step 3: Set shipping address same as billing -->
50+
<checkOption selector="{{AdminOrderFormShippingAddressSection.SameAsBilling}}" stepKey="checkSameAsBillingAddressCheckbox"/>
51+
<waitForPageLoad stepKey="waitForChangeShippingAddress"/>
4852
<!--Step 3: Select FlatRate shipping method-->
4953
<actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShippingMethod"/>
5054
<!--Step 4: Verify that tax is applied to the order-->

0 commit comments

Comments
 (0)