MC-29722: Default shipping address not being honoured

Author: serhii-balko

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

@@ -39,7 +39,6 @@
 use Magento\Quote\Model\Quote\Address\TotalFactory;
 use Magento\Quote\Model\Quote\Item\AbstractItem;
 use Magento\Quote\Model\ResourceModel\Quote\Address\Rate\CollectionFactory;
-use Magento\SalesRule\Model\Rule;
 use Magento\Shipping\Model\CarrierFactoryInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\ScopeInterface;
@@ -119,7 +118,7 @@
  * @method float getShippingInclTax()
  * @method Address setShippingInclTax(float $value)
  * @method float getBaseShippingInclTax()
- * @method Rule[] getCartFixedRules()
+ * @method \Magento\SalesRule\Model\Rule[] getCartFixedRules()
  * @method int[] getAppliedRuleIds()
  * @method Address setBaseShippingInclTax(float $value)
  *

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

@@ -102,6 +102,7 @@ public function loadByCustomerId($quote, $customerId)
 
         if ($data) {
             $quote->setData($data);
+            $quote->setOrigData();
         }
 
         $this->_afterLoad($quote);
@@ -124,6 +125,7 @@ public function loadActive($quote, $quoteId)
         $data = $connection->fetchRow($select);
         if ($data) {
             $quote->setData($data);
+            $quote->setOrigData();
         }
 
         $this->_afterLoad($quote);
@@ -148,6 +150,7 @@ public function loadByIdWithoutStore($quote, $quoteId)
 
             if ($data) {
                 $quote->setData($data);
+                $quote->setOrigData();
             }
         }