MC-21876: "Same as Billing Address" checkbox is checked automatically when re-ordering an order with different billing/shipping via Admin Panel.

Roman Lytvynenko · Roman Lytvynenko · commit ec1c8585d99d · 2019-10-17T13:01:31.000-05:00
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -425,9 +425,11 @@ protected function _populateBeforeSaveData()
      */
     protected function _isSameAsBilling()
     {
+        $quoteSameAsBilling = $this->getQuote()->getShippingAddress()->getSameAsBilling();
+
         return $this->getAddressType() == \Magento\Quote\Model\Quote\Address::TYPE_SHIPPING &&
-            ($this->_isNotRegisteredCustomer() ||
-            $this->_isDefaultShippingNullOrSameAsBillingAddress());
+            ($this->_isNotRegisteredCustomer() || $this->_isDefaultShippingNullOrSameAsBillingAddress()) &&
+            ($quoteSameAsBilling || $quoteSameAsBilling === 0 || $quoteSameAsBilling === null);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -425,9 +425,11 @@ protected function _populateBeforeSaveData()`
`425`	`425`	`*/`
`426`	`426`	`protected function _isSameAsBilling()`
`427`	`427`	`{`
	`428`	`+ $quoteSameAsBilling = $this->getQuote()->getShippingAddress()->getSameAsBilling();`
	`429`	`+`
`428`	`430`	`return $this->getAddressType() == \Magento\Quote\Model\Quote\Address::TYPE_SHIPPING &&`
`429`		`- ($this->_isNotRegisteredCustomer() \|\|`
`430`		`- $this->_isDefaultShippingNullOrSameAsBillingAddress());`
	`431`	`+ ($this->_isNotRegisteredCustomer() \|\| $this->_isDefaultShippingNullOrSameAsBillingAddress()) &&`
	`432`	`+ ($quoteSameAsBilling \|\| $quoteSameAsBilling === 0 \|\| $quoteSameAsBilling === null);`
`431`	`433`	`}`
`432`	`434`
`433`	`435`	`/**`