diff --git a/packages/Webkul/Sales/src/Models/Order.php b/packages/Webkul/Sales/src/Models/Order.php index e5648b56a..b7748a837 100755 --- a/packages/Webkul/Sales/src/Models/Order.php +++ b/packages/Webkul/Sales/src/Models/Order.php @@ -218,7 +218,7 @@ class Order extends Model implements OrderContract } foreach ($this->items as $item) { - if ($item->canShip()) { + if ($item->canShip() && $item->order->status !== self::STATUS_CLOSED) { return true; } } @@ -238,7 +238,7 @@ class Order extends Model implements OrderContract } foreach ($this->items as $item) { - if ($item->canInvoice()) { + if ($item->canInvoice() && $item->order->status !== self::STATUS_CLOSED) { return true; } } @@ -258,7 +258,7 @@ class Order extends Model implements OrderContract } foreach ($this->items as $item) { - if ($item->canCancel()) { + if ($item->canCancel() && $item->order->status !== self::STATUS_CLOSED) { return true; } } @@ -278,13 +278,13 @@ class Order extends Model implements OrderContract } foreach ($this->invoices as $item) { - if ($item->state == "pending" || $item->state == "overdue") { + if ($item->state == self::STATUS_PENDING || $item->state == "overdue") { return false; } } foreach ($this->items as $item) { - if ($item->qty_to_refund > 0 && $item->order->status !== 'closed') { + if ($item->qty_to_refund > 0 && $item->order->status !== self::STATUS_CLOSED) { return true; } } diff --git a/packages/Webkul/Sales/src/Models/OrderItem.php b/packages/Webkul/Sales/src/Models/OrderItem.php index 4facf7341..cfd479d4e 100755 --- a/packages/Webkul/Sales/src/Models/OrderItem.php +++ b/packages/Webkul/Sales/src/Models/OrderItem.php @@ -59,7 +59,7 @@ class OrderItem extends Model implements OrderItemContract return false; } - if ($this->qty_to_ship > 0 && $this->order->status !== 'closed') { + if ($this->qty_to_ship > 0) { return true; } @@ -83,7 +83,7 @@ class OrderItem extends Model implements OrderItemContract */ public function canInvoice() { - if ($this->qty_to_invoice > 0 && $this->order->status !== 'closed') { + if ($this->qty_to_invoice > 0) { return true; } @@ -103,7 +103,7 @@ class OrderItem extends Model implements OrderItemContract */ public function canCancel() { - if ($this->qty_to_cancel > 0 && $this->order->status !== 'closed') { + if ($this->qty_to_cancel > 0) { return true; }