Skip to content

Commit 5cc5abf

Browse files
committed
ACP2E-1650:Create Shipment API
- addressed build failures
1 parent e101e94 commit 5cc5abf

File tree

1 file changed

+4
-3
lines changed
  • app/code/Magento/Sales/Model/Order/Shipment

1 file changed

+4
-3
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,9 @@ private function loadChildren(): void
404404
}
405405
}
406406
}
407-
$this->_orderItem->setData('has_children', $hasChildrenFlag);
407+
if ($this->_orderItem) {
408+
$this->_orderItem->setData('has_children', $hasChildrenFlag);
409+
}
408410
}
409411

410412
/**
@@ -424,8 +426,7 @@ private function shouldLoadChildren(): bool
424426
$order = $this->_shipment->getOrder();
425427
/** @var Item $item */
426428
foreach ($this->getShipment()->getAllItems() as $item) {
427-
if (
428-
$this->_orderItem->getItemId() != $item->getOrderItemId() &&
429+
if ($this->_orderItem->getItemId() != $item->getOrderItemId() &&
429430
$this->_orderItem->getItemId() == $order->getItemById($item->getOrderItemId())->getParentItemId()
430431
) {
431432
return false;

0 commit comments

Comments
 (0)