ENGCOM-3503: issue #18349 Fixed for 2.3: Incorrect quote_item_id saved on order items during multiple address checkout #19192

magento-engcom-team · magento-engcom-team · commit 581ab7d57872 · 2019-01-11T06:40:12.000-06:00
- Merge Pull Request #19192 from maheshWebkul721/magento2:multishipping-quote-issue - Merged commits: 1. 517ef26 2. f9adaee 3. 6d90348 4. 0bded20 5. 261ab09 6. 48e9086 7. 0fc868c 8. 09e2b43
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -1182,7 +1182,7 @@ private function removePlacedItemsFromQuote(array $shippingAddresses, array $pla
     {
         foreach ($shippingAddresses as $address) {
             foreach ($address->getAllItems() as $addressItem) {
-                if (in_array($addressItem->getId(), $placedAddressItems)) {
+                if (in_array($addressItem->getQuoteItemId(), $placedAddressItems)) {
                     if ($addressItem->getProduct()->getIsVirtual()) {
                         $addressItem->isDeleted(true);
                     } else {
@@ -1232,7 +1232,7 @@ private function searchQuoteAddressId(OrderInterface $order, array $addresses):
         $item = array_pop($items);
         foreach ($addresses as $address) {
             foreach ($address->getAllItems() as $addressItem) {
-                if ($addressItem->getId() == $item->getQuoteItemId()) {
+                if ($addressItem->getQuoteItemId() == $item->getQuoteItemId()) {
                     return (int)$address->getId();
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -1182,7 +1182,7 @@ private function removePlacedItemsFromQuote(array $shippingAddresses, array $pla`
`1182`	`1182`	`{`
`1183`	`1183`	`foreach ($shippingAddresses as $address) {`
`1184`	`1184`	`foreach ($address->getAllItems() as $addressItem) {`
`1185`		`- if (in_array($addressItem->getId(), $placedAddressItems)) {`
	`1185`	`+ if (in_array($addressItem->getQuoteItemId(), $placedAddressItems)) {`
`1186`	`1186`	`if ($addressItem->getProduct()->getIsVirtual()) {`
`1187`	`1187`	`$addressItem->isDeleted(true);`
`1188`	`1188`	`} else {`
`@@ -1232,7 +1232,7 @@ private function searchQuoteAddressId(OrderInterface $order, array $addresses):`
`1232`	`1232`	`$item = array_pop($items);`
`1233`	`1233`	`foreach ($addresses as $address) {`
`1234`	`1234`	`foreach ($address->getAllItems() as $addressItem) {`
`1235`		`- if ($addressItem->getId() == $item->getQuoteItemId()) {`
	`1235`	`+ if ($addressItem->getQuoteItemId() == $item->getQuoteItemId()) {`
`1236`	`1236`	`return (int)$address->getId();`
`1237`	`1237`	`}`
`1238`	`1238`	`}`