File tree Expand file tree Collapse file tree 2 files changed +2
-3
lines changed
app/code/Magento/Sales/Model
ResourceModel/Order/Handler Expand file tree Collapse file tree 2 files changed +2
-3
lines changed Original file line number Diff line number Diff line change @@ -888,8 +888,7 @@ private function checkItemShipping(): bool
888
888
{
889
889
foreach ($ this ->getAllItems () as $ item ) {
890
890
if (!$ item ->getParentItem ()) {
891
- $ qtyToShip = !$ item ->getParentItem () || $ item ->getParentItem ()->getProductType () !== Type::TYPE_BUNDLE ?
892
- $ item ->getQtyToShip () : $ item ->getSimpleQtyToShip ();
891
+ $ qtyToShip = $ item ->getQtyToShip ();
893
892
894
893
if ($ qtyToShip > 0 && !$ item ->getIsVirtual () && !$ item ->getLockedDoShip ()) {
895
894
return true ;
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ public function check(Order $order)
27
27
->setStatus ($ order ->getConfig ()->getStateDefaultStatus (Order::STATE_PROCESSING ));
28
28
$ currentState = Order::STATE_PROCESSING ;
29
29
}
30
- if ($ order ->isCanceled () && $ order ->canUnhold () && $ order ->canInvoice ()) {
30
+ if ($ order ->isCanceled () || $ order ->canUnhold () || $ order ->canInvoice ()) {
31
31
return $ this ;
32
32
}
33
33
You can’t perform that action at this time.
0 commit comments