Skip to content

Commit 53ad543

Browse files
committed
ACP2E-1650:Create Shipment API
- addressed CR issue
1 parent cd2c7df commit 53ad543

File tree

1 file changed

+12
-10
lines changed
  • app/code/Magento/Sales/Model/Order/Shipment

1 file changed

+12
-10
lines changed

app/code/Magento/Sales/Model/Order/Shipment/Item.php

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -389,16 +389,18 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\ShipmentItemExten
389389
*/
390390
private function loadChildren(): void
391391
{
392-
$collection = $this->_orderItem->getOrder()->getItemsCollection();
393-
$collection->filterByParent($this->_orderItem->getItemId());
394-
395-
if ($collection->count()) {
396-
$this->_orderItem->setData('has_children', true);
397-
398-
/** @var \Magento\Sales\Model\Order\Item $childItem */
399-
foreach ($collection as $childItem) {
400-
if ($childItem->getItemId() != $this->_orderItem->getItemId()) {
401-
$this->_orderItem->addChildItem($childItem);
392+
if ($this->_orderItem) {
393+
$collection = $this->_orderItem->getOrder()->getItemsCollection();
394+
$collection->filterByParent($this->_orderItem->getItemId());
395+
396+
if ($collection->count()) {
397+
$this->_orderItem->setData('has_children', true);
398+
399+
/** @var \Magento\Sales\Model\Order\Item $childItem */
400+
foreach ($collection as $childItem) {
401+
if ($childItem->getItemId() != $this->_orderItem->getItemId()) {
402+
$this->_orderItem->addChildItem($childItem);
403+
}
402404
}
403405
}
404406
}

0 commit comments

Comments
 (0)