MAGETWO-72747: [Magento Cloud] - /rest/default/V1/order/<order id>/ship and configurable products - for 2.2

Author: Eric Bohanon

app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php

@@ -79,20 +79,9 @@ public function create(
         array $packages = [],
         ShipmentCreationArgumentsInterface $arguments = null
     ) {
-        $shipmentItems = [];
-        if (empty($items)) {
-            /** @var OrderItemInterface $item */
-            foreach ($order->getItems() as $item) {
-                if (!$item->getIsVirtual() && !$item->getParentItem()) {
-                    $shipmentItems[$item->getItemId()] = $item->getQtyOrdered();
-                }
-            }
-        } else {
-            /** @var ShipmentItemCreationInterface $item */
-            foreach ($items as $item) {
-                    $shipmentItems[$item->getOrderItemId()] = $item->getQty();
-            }
-        }
+        $shipmentItems = empty($items)
+            ? $this->getQuantitiesFromOrderItems($order->getItems())
+            : $this->getQuantitiesFromShipmentItems($items);
 
         /** @var Shipment $shipment */
         $shipment = $this->shipmentFactory->create(
@@ -117,4 +106,36 @@ public function create(
 
         return $shipment;
     }
+
+    /**
+     * Translate OrderItemInterface array to product id => product quantity array.
+     *
+     * @param OrderItemInterface[] $items
+     * @return array
+     */
+    private function getQuantitiesFromOrderItems(array $items)
+    {
+        $shipmentItems = [];
+        foreach ($items as $item) {
+            if (!$item->getIsVirtual() && !$item->getParentItem()) {
+                $shipmentItems[$item->getItemId()] = $item->getQtyOrdered();
+            }
+        }
+        return $shipmentItems;
+    }
+
+    /**
+     * Translate ShipmentItemCreationInterface array to product id => product quantity array.
+     *
+     * @param ShipmentItemCreationInterface[] $items
+     * @return array
+     */
+    private function getQuantitiesFromShipmentItems(array $items)
+    {
+        $shipmentItems = [];
+        foreach ($items as $item) {
+            $shipmentItems[$item->getOrderItemId()] = $item->getQty();
+        }
+        return $shipmentItems;
+    }
 }

app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php

@@ -135,14 +135,7 @@ public function load()
                 return false;
             }
 
-            $shipmentItems = [];
-            foreach ($this->getItemQtys() as $itemId => $quantity) {
-                /** @var ShipmentItemCreationInterface $item */
-                $item = $this->itemFactory->create();
-                $item->setOrderItemId($itemId);
-                $item->setQty($quantity);
-                $shipmentItems[] = $item;
-            }
+            $shipmentItems = $this->getShipmentItems($this->getShipment());
 
             $shipment = $this->documentFactory->create(
                 $order,
@@ -193,4 +186,24 @@ private function getTrackingArray()
 
         return $trackingCreation;
     }
+
+    /**
+     * Extract product id => product quantity array from shipment data.
+     *
+     * @param array $shipmentData
+     * @return array
+     */
+    private function getShipmentItems(array $shipmentData)
+    {
+        $shipmentItems = [];
+        $itemQty = isset($shipmentData['items']) ? $shipmentData['items'] : [];
+        foreach ($itemQty as $itemId => $quantity) {
+            /** @var ShipmentItemCreationInterface $item */
+            $item = $this->itemFactory->create();
+            $item->setOrderItemId($itemId);
+            $item->setQty($quantity);
+            $shipmentItems[] = $item;
+        }
+        return $shipmentItems;
+    }
 }