diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php index 9eea51a26..92b8cafeb 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php @@ -25,25 +25,25 @@
{!! view_render_event('sales.order.page_action.before', ['order' => $order]) !!} - @if ($order->canCancel() && $order->customer) + @if ($order->canCancel()) {{ __('admin::app.sales.orders.cancel-btn-title') }} @endif - @if ($order->canInvoice() && $order->customer) + @if ($order->canInvoice()) {{ __('admin::app.sales.orders.invoice-btn-title') }} @endif - @if ($order->canRefund() && $order->customer) + @if ($order->canRefund()) {{ __('admin::app.sales.orders.refund-btn-title') }} @endif - @if ($order->canShip() && $order->customer) + @if ($order->canShip()) {{ __('admin::app.sales.orders.shipment-btn-title') }} diff --git a/packages/Webkul/Sales/src/Models/Order.php b/packages/Webkul/Sales/src/Models/Order.php index 8f90a3b55..e5648b56a 100755 --- a/packages/Webkul/Sales/src/Models/Order.php +++ b/packages/Webkul/Sales/src/Models/Order.php @@ -284,7 +284,7 @@ class Order extends Model implements OrderContract } foreach ($this->items as $item) { - if ($item->qty_to_refund > 0) { + if ($item->qty_to_refund > 0 && $item->order->status !== 'closed') { return true; } } diff --git a/packages/Webkul/Sales/src/Models/OrderItem.php b/packages/Webkul/Sales/src/Models/OrderItem.php index cfd479d4e..4facf7341 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) { + if ($this->qty_to_ship > 0 && $this->order->status !== 'closed') { return true; } @@ -83,7 +83,7 @@ class OrderItem extends Model implements OrderItemContract */ public function canInvoice() { - if ($this->qty_to_invoice > 0) { + if ($this->qty_to_invoice > 0 && $this->order->status !== 'closed') { return true; } @@ -103,7 +103,7 @@ class OrderItem extends Model implements OrderItemContract */ public function canCancel() { - if ($this->qty_to_cancel > 0) { + if ($this->qty_to_cancel > 0 && $this->order->status !== 'closed') { return true; }