MAGETWO-44714: Update Multishipping Address Processing

Alex Akimov · Alex Akimov · commit 7d3035cd63c1 · 2015-10-29T16:10:29.000+02:00
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -471,6 +471,7 @@ protected function _addShippingItem($quoteItemId, $data)
                 }
 
                 $quoteAddress = $this->getQuote()->getShippingAddressByCustomerAddressId($address->getId());
+                $quoteAddress->setCustomerAddressId($addressId);
                 $quoteAddressItem = $quoteAddress->getItemByQuoteItemId($quoteItemId);
                 if ($quoteAddressItem) {
                     $quoteAddressItem->setQty((int)($quoteAddressItem->getQty() + $qty));
@@ -936,6 +937,6 @@ protected function isAddressIdApplicable($addressId)
             /** @var \Magento\Customer\Api\Data\AddressInterface $address */
             return $address->getId();
         }, $this->getCustomer()->getAddresses());
-        return in_array($addressId, $applicableAddressIds);
+        return !is_numeric($addressId) || in_array($addressId, $applicableAddressIds);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -471,6 +471,7 @@ protected function _addShippingItem($quoteItemId, $data)`
`471`	`471`	`}`
`472`	`472`
`473`	`473`	`$quoteAddress = $this->getQuote()->getShippingAddressByCustomerAddressId($address->getId());`
	`474`	`+ $quoteAddress->setCustomerAddressId($addressId);`
`474`	`475`	`$quoteAddressItem = $quoteAddress->getItemByQuoteItemId($quoteItemId);`
`475`	`476`	`if ($quoteAddressItem) {`
`476`	`477`	`$quoteAddressItem->setQty((int)($quoteAddressItem->getQty() + $qty));`
`@@ -936,6 +937,6 @@ protected function isAddressIdApplicable($addressId)`
`936`	`937`	`/** @var \Magento\Customer\Api\Data\AddressInterface $address */`
`937`	`938`	`return $address->getId();`
`938`	`939`	`}, $this->getCustomer()->getAddresses());`
`939`		`- return in_array($addressId, $applicableAddressIds);`
	`940`	`+ return !is_numeric($addressId) \|\| in_array($addressId, $applicableAddressIds);`
`940`	`941`	`}`
`941`	`942`	`}`