diff --git a/app/BulkActions/Purchases/Bills.php b/app/BulkActions/Purchases/Bills.php index 7000eb289..18fc2c396 100644 --- a/app/BulkActions/Purchases/Bills.php +++ b/app/BulkActions/Purchases/Bills.php @@ -67,7 +67,7 @@ class Bills extends BulkAction $bills = $this->getSelectedRecords($request); foreach ($bills as $bill) { - if ($bill->status == 'cancelled') { + if (in_array($bill->status, ['cancelled', 'draft'])) { continue; } diff --git a/app/BulkActions/Sales/Invoices.php b/app/BulkActions/Sales/Invoices.php index 168eac93c..7f202dfdb 100644 --- a/app/BulkActions/Sales/Invoices.php +++ b/app/BulkActions/Sales/Invoices.php @@ -67,7 +67,7 @@ class Invoices extends BulkAction $invoices = $this->getSelectedRecords($request); foreach ($invoices as $invoice) { - if ($invoice->status == 'cancelled') { + if (in_array($invoice->status, ['cancelled', 'draft'])) { continue; } diff --git a/app/Models/Document/Document.php b/app/Models/Document/Document.php index a3eafa946..68b0e2ec1 100644 --- a/app/Models/Document/Document.php +++ b/app/Models/Document/Document.php @@ -611,7 +611,7 @@ class Document extends Model 'type' => 'divider', ]; - if ($this->status != 'cancelled') { + if (! in_array($this->status, ['cancelled', 'draft'])) { try { $actions[] = [ 'title' => trans('general.cancel'), diff --git a/resources/views/components/documents/show/more-buttons.blade.php b/resources/views/components/documents/show/more-buttons.blade.php index 8612910e4..d0cb0bcb5 100644 --- a/resources/views/components/documents/show/more-buttons.blade.php +++ b/resources/views/components/documents/show/more-buttons.blade.php @@ -108,15 +108,13 @@ @stack('button_cancelled_start') - @if (! $hideCancel) + @if (! $hideCancel && ! in_array($document->status, ['cancelled', 'draft'])) @can($permissionUpdate) - @if ($document->status != 'cancelled') - - {{ trans('general.cancel') }} - - @endif + + {{ trans('general.cancel') }} + @endcan @endif