diff --git a/app/BulkActions/Sales/Invoices.php b/app/BulkActions/Sales/Invoices.php index 168eac93c..6399d8691 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 ($invoice->status == 'cancelled' || $invoice->status == 'draft') { continue; } diff --git a/app/Models/Document/Document.php b/app/Models/Document/Document.php index a3eafa946..95118609c 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 ($this->status != 'cancelled' && $this->status != '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..1879a6655 100644 --- a/resources/views/components/documents/show/more-buttons.blade.php +++ b/resources/views/components/documents/show/more-buttons.blade.php @@ -112,7 +112,7 @@ @can($permissionUpdate) - @if ($document->status != 'cancelled') + @if ($document->status != 'cancelled' && $document->status != 'draft') {{ trans('general.cancel') }}