File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed
app/code/Magento/Sales/Model/Order/Shipment Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff 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 ;
You can’t perform that action at this time.
0 commit comments