From 57ebfab80edf719bb7dc9019439c090d850b899d Mon Sep 17 00:00:00 2001 From: Devansh Date: Tue, 11 Aug 2020 11:56:25 +0530 Subject: [PATCH] Fixed Invoice Cancelled Order Issue At Customer End --- packages/Webkul/Sales/src/Models/Order.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Sales/src/Models/Order.php b/packages/Webkul/Sales/src/Models/Order.php index b7748a837..0d41b82a3 100755 --- a/packages/Webkul/Sales/src/Models/Order.php +++ b/packages/Webkul/Sales/src/Models/Order.php @@ -257,6 +257,11 @@ class Order extends Model implements OrderContract return false; } + $pendingInvoice = $this->invoices->where('state', 'pending')->first(); + if ($pendingInvoice) { + return true; + } + foreach ($this->items as $item) { if ($item->canCancel() && $item->order->status !== self::STATUS_CLOSED) { return true; @@ -278,7 +283,7 @@ class Order extends Model implements OrderContract } foreach ($this->invoices as $item) { - if ($item->state == self::STATUS_PENDING || $item->state == "overdue") { + if ($item->state == 'pending' || $item->state == 'overdue') { return false; } }