merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Order Closed Status Check To Four Methods

This commit is contained in:
Devansh 2020-08-11 10:59:04 +05:30
parent c119f022e6
commit 7d7fa982b9
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
View File

@ -25,25 +25,25 @@
<div class="page-action">
{!! view_render_event('sales.order.page_action.before', ['order' => $order]) !!}
@if ($order->canCancel() && $order->customer)
@if ($order->canCancel())
<a href="{{ route('admin.sales.orders.cancel', $order->id) }}" class="btn btn-lg btn-primary" v-alert:message="'{{ __('admin::app.sales.orders.cancel-confirm-msg') }}'">
{{ __('admin::app.sales.orders.cancel-btn-title') }}
</a>
@endif
@if ($order->canInvoice() && $order->customer)
@if ($order->canInvoice())
<a href="{{ route('admin.sales.invoices.create', $order->id) }}" class="btn btn-lg btn-primary">
{{ __('admin::app.sales.orders.invoice-btn-title') }}
</a>
@endif
@if ($order->canRefund() && $order->customer)
@if ($order->canRefund())
<a href="{{ route('admin.sales.refunds.create', $order->id) }}" class="btn btn-lg btn-primary">
{{ __('admin::app.sales.orders.refund-btn-title') }}
</a>
@endif
@if ($order->canShip() && $order->customer)
@if ($order->canShip())
<a href="{{ route('admin.sales.shipments.create', $order->id) }}" class="btn btn-lg btn-primary">
{{ __('admin::app.sales.orders.shipment-btn-title') }}
</a>

2
packages/Webkul/Sales/src/Models/Order.php
View File

@ -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;
}
}

6
packages/Webkul/Sales/src/Models/OrderItem.php
View File

@ -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;
}