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
404
404
}
405
405
}
406
406
}
407
- $ this ->_orderItem ->setData ('has_children ' , $ hasChildrenFlag );
407
+ if ($ this ->_orderItem ) {
408
+ $ this ->_orderItem ->setData ('has_children ' , $ hasChildrenFlag );
409
+ }
408
410
}
409
411
410
412
/**
@@ -424,8 +426,7 @@ private function shouldLoadChildren(): bool
424
426
$ order = $ this ->_shipment ->getOrder ();
425
427
/** @var Item $item */
426
428
foreach ($ this ->getShipment ()->getAllItems () as $ item ) {
427
- if (
428
- $ this ->_orderItem ->getItemId () != $ item ->getOrderItemId () &&
429
+ if ($ this ->_orderItem ->getItemId () != $ item ->getOrderItemId () &&
429
430
$ this ->_orderItem ->getItemId () == $ order ->getItemById ($ item ->getOrderItemId ())->getParentItemId ()
430
431
) {
431
432
return false ;
You can’t perform that action at this time.
0 commit comments