ACP2E-924: MSI - Inventory Compensation command is not working properly for partial shipment of the Configurable products

Author: bubasuma

app/code/Magento/Sales/Test/Fixture/Creditmemo.php

@@ -103,7 +103,7 @@ private function prepareData(array $data): array
     }
 
     /**
-     * Prepare creditmemo items
+     * Prepare creditmemo item
      *
      * @param array $data
      * @return array
@@ -122,30 +122,24 @@ private function prepareCreditmemoItems(array $data): array
         }
 
         foreach ($data['items'] as $itemToRefund) {
-            $qty = 1;
-            $orderItemId = null;
-            $sku = null;
+            $creditmemoItem = ['order_item_id' => null, 'qty' => 1];
             if (is_numeric($itemToRefund)) {
-                $orderItemId = $itemToRefund;
+                $creditmemoItem['order_item_id'] = $itemToRefund;
             } elseif (is_string($itemToRefund)) {
-                $sku = $itemToRefund;
+                $creditmemoItem['order_item_id'] = $orderItemIdsBySku[$itemToRefund];
             } elseif ($itemToRefund instanceof ProductInterface) {
-                $sku = $itemToRefund->getSku();
+                $creditmemoItem['order_item_id'] = $orderItemIdsBySku[$itemToRefund->getSku()];
             } else {
-                $qty = $itemToRefund['qty'] ?? $qty;
-                if (isset($itemToRefund['order_item_id'])) {
-                    $orderItemId = $itemToRefund['order_item_id'];
+                $creditmemoItem = array_intersect($itemToRefund, $creditmemoItem) + $creditmemoItem;
+                if (isset($itemToRefund['sku'])) {
+                    $creditmemoItem['order_item_id'] = $orderItemIdsBySku[$itemToRefund['sku']];
                 } elseif (isset($itemToRefund['product_id'])) {
-                    $orderItemId = $orderItemIdsByProductIds[$itemToRefund['product_id']];
+                    $creditmemoItem['order_item_id'] = $orderItemIdsByProductIds[$itemToRefund['product_id']];
                 } elseif (isset($itemToRefund['quote_item_id'])) {
-                    $orderItemId = $orderItemIdsByQuoteItemIds[$itemToRefund['quote_item_id']];
+                    $creditmemoItem['order_item_id'] = $orderItemIdsByQuoteItemIds[$itemToRefund['quote_item_id']];
                 }
-                $sku = $itemToRefund['sku'] ?? $sku;
             }
-            if (!$orderItemId && $sku) {
-                $orderItemId = $orderItemIdsBySku[$sku];
-            }
-            $creditmemoItems[] = ['order_item_id' => $orderItemId, 'qty' => $qty];
+            $creditmemoItems[] = $creditmemoItem;
         }
 
         return $creditmemoItems;

app/code/Magento/Sales/Test/Fixture/Invoice.php

@@ -110,7 +110,7 @@ private function prepareData(array $data): array
      */
     private function prepareInvoiceItems(array $data): array
     {
-        $items = [];
+        $invoiceItems = [];
         $order = $this->orderRepository->get($data['order_id']);
         $orderItemIdsBySku = [];
         $orderItemIdsByProductIds = [];
@@ -122,32 +122,26 @@ private function prepareInvoiceItems(array $data): array
         }
 
         foreach ($data['items'] as $itemToInvoice) {
-            $qty = 1;
-            $orderItemId = null;
-            $sku = null;
+            $invoiceItem = ['order_item_id' => null, 'qty' => 1];
             if (is_numeric($itemToInvoice)) {
-                $orderItemId = $itemToInvoice;
+                $invoiceItem['order_item_id'] = $itemToInvoice;
             } elseif (is_string($itemToInvoice)) {
-                $sku = $itemToInvoice;
+                $invoiceItem['order_item_id'] = $orderItemIdsBySku[$itemToInvoice];
             } elseif ($itemToInvoice instanceof ProductInterface) {
-                $sku = $itemToInvoice->getSku();
+                $invoiceItem['order_item_id'] = $orderItemIdsBySku[$itemToInvoice->getSku()];
             } else {
-                $qty = $itemToInvoice['qty'] ?? $qty;
-                if (isset($itemToInvoice['order_item_id'])) {
-                    $orderItemId = $itemToInvoice['order_item_id'];
+                $invoiceItem = array_intersect($itemToInvoice, $invoiceItem) + $invoiceItem;
+                if (isset($itemToInvoice['sku'])) {
+                    $invoiceItem['order_item_id'] = $orderItemIdsBySku[$itemToInvoice['sku']];
                 } elseif (isset($itemToInvoice['product_id'])) {
-                    $orderItemId = $orderItemIdsByProductIds[$itemToInvoice['product_id']];
+                    $invoiceItem['order_item_id'] = $orderItemIdsByProductIds[$itemToInvoice['product_id']];
                 } elseif (isset($itemToInvoice['quote_item_id'])) {
-                    $orderItemId = $orderItemIdsByQuoteItemIds[$itemToInvoice['quote_item_id']];
+                    $invoiceItem['order_item_id'] = $orderItemIdsByQuoteItemIds[$itemToInvoice['quote_item_id']];
                 }
-                $sku = $itemToInvoice['sku'] ?? $sku;
             }
-            if (!$orderItemId && $sku) {
-                $orderItemId = $orderItemIdsBySku[$sku];
-            }
-            $items[] = ['order_item_id' => $orderItemId, 'qty' => $qty];
+            $invoiceItems[] = $invoiceItem;
         }
 
-        return $items;
+        return $invoiceItems;
     }
 }

app/code/Magento/Sales/Test/Fixture/Shipment.php

@@ -124,30 +124,24 @@ private function prepareShipmentItems(array $data): array
         }
 
         foreach ($data['items'] as $itemToShip) {
-            $qty = 1;
-            $orderItemId = null;
-            $sku = null;
+            $shipmentItem = ['order_item_id' => null, 'qty' => 1];
             if (is_numeric($itemToShip)) {
-                $orderItemId = $itemToShip;
+                $shipmentItem['order_item_id'] = $itemToShip;
             } elseif (is_string($itemToShip)) {
-                $sku = $itemToShip;
+                $shipmentItem['order_item_id'] = $orderItemIdsBySku[$itemToShip];
             } elseif ($itemToShip instanceof ProductInterface) {
-                $sku = $itemToShip->getSku();
+                $shipmentItem['order_item_id'] = $orderItemIdsBySku[$itemToShip->getSku()];
             } else {
-                $qty = $itemToShip['qty'] ?? $qty;
-                if (isset($itemToShip['order_item_id'])) {
-                    $orderItemId = $itemToShip['order_item_id'];
+                $shipmentItem = array_intersect($itemToShip, $shipmentItem) + $shipmentItem;
+                if (isset($itemToShip['sku'])) {
+                    $shipmentItem['order_item_id'] = $orderItemIdsBySku[$itemToShip['sku']];
                 } elseif (isset($itemToShip['product_id'])) {
-                    $orderItemId = $orderItemIdsByProductIds[$itemToShip['product_id']];
+                    $shipmentItem['order_item_id'] = $orderItemIdsByProductIds[$itemToShip['product_id']];
                 } elseif (isset($itemToShip['quote_item_id'])) {
-                    $orderItemId = $orderItemIdsByQuoteItemIds[$itemToShip['quote_item_id']];
+                    $shipmentItem['order_item_id'] = $orderItemIdsByQuoteItemIds[$itemToShip['quote_item_id']];
                 }
-                $sku = $itemToShip['sku'] ?? $sku;
             }
-            if (!$orderItemId && $sku) {
-                $orderItemId = $orderItemIdsBySku[$sku];
-            }
-            $shipmentItems[] = ['order_item_id' => $orderItemId, 'qty' => $qty];
+            $shipmentItems[] = $shipmentItem;
         }
 
         return $shipmentItems;