MAGETWO-96545: Wrong calculation of invoiced items in shipment document in order with bundle product after partial invoice

- Moved logic part from template to block;

Author: Alexey Yakimovich

app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php

@@ -100,6 +100,8 @@ public function getChildren($item)
     }
 
     /**
+     * Check if item can be shipped separately
+     *
      * @param mixed $item
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -136,6 +138,8 @@ public function isShipmentSeparately($item = null)
     }
 
     /**
+     * Check if child items calculated
+     *
      * @param mixed $item
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -174,6 +178,8 @@ public function isChildCalculated($item = null)
     }
 
     /**
+     * Retrieve selection attributes values
+     *
      * @param mixed $item
      * @return mixed|null
      */
@@ -191,6 +197,8 @@ public function getSelectionAttributes($item)
     }
 
     /**
+     * Retrieve order item options array
+     *
      * @return array
      */
     public function getOrderOptions()
@@ -212,6 +220,8 @@ public function getOrderOptions()
     }
 
     /**
+     * Retrieve order item
+     *
      * @return mixed
      */
     public function getOrderItem()
@@ -223,6 +233,8 @@ public function getOrderItem()
     }
 
     /**
+     * Get html info for item
+     *
      * @param mixed $item
      * @return string
      */
@@ -245,6 +257,8 @@ public function getValueHtml($item)
     }
 
     /**
+     * Check if we can show price info for this item
+     *
      * @param object $item
      * @return bool
      */
@@ -257,4 +271,22 @@ public function canShowPriceInfo($item)
         }
         return false;
     }
+
+    /**
+     * Check if this iten should be shipped together
+     *
+     * @param object $item
+     * @return bool
+     */
+    public function isShipTogether($item)
+    {
+        $orderItem = $item->getOrderItem();
+        if ($orderItem->getProductType() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
+            $shipTogether = !$orderItem->isShipSeparately();
+        } else {
+            $shipTogether = !$orderItem->getParentItem()->isShipSeparately();
+        }
+
+        return $shipTogether;
+    }
 }

app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml

@@ -29,12 +29,7 @@
 
 <?php foreach ($items as $_item): ?>
     <?php
-        $orderItem = $_item->getOrderItem();
-        if ($orderItem->getProductType() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
-            $shipTogether = !$orderItem->isShipSeparately();
-        } else {
-            $shipTogether = !$orderItem->getParentItem()->isShipSeparately();
-        }
+        $shipTogether = $block->isShipTogether($_item);
     ?>
     <?php $block->setPriceDataObject($_item) ?>
     <?php if ($_item->getOrderItem()->getParentItem()): ?>