Code refactoring after commit 510c38a

akaunting · Feb 15, 2023 · fb00b31 · fb00b31
1 parent 510c38a
commit fb00b31
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/app/BulkActions/Purchases/Bills.php b/app/BulkActions/Purchases/Bills.php
@@ -67,7 +67,7 @@ public function cancelled($request)
         $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
@@ -67,7 +67,7 @@ public function cancelled($request)
         $invoices = $this->getSelectedRecords($request);
 
         foreach ($invoices as $invoice) {
-            if ($invoice->status == 'cancelled' || $invoice->status == 'draft') {
+            if (! in_array($invoice->status, ['cancelled', 'draft'])) {
                 continue;
             }
 

diff --git a/app/Models/Document/Document.php b/app/Models/Document/Document.php
@@ -611,7 +611,7 @@ public function getLineActionsAttribute()
                 'type' => 'divider',
             ];
 
-            if ($this->status != 'cancelled' && $this->status != 'draft') {
+            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
@@ -108,15 +108,13 @@
 
         @stack('button_cancelled_start')
 
-        @if (! $hideCancel)
+        @if (! $hideCancel && ! in_array($document->status, ['cancelled', 'draft']))
             @can($permissionUpdate)
                 <x-dropdown.divider />
 
-                @if ($document->status != 'cancelled' && $document->status != 'draft')
-                    <x-dropdown.link href="{{ route($cancelledRoute, $document->id) }}" id="show-more-actions-cancel-{{ $document->type }}">
-                        {{ trans('general.cancel') }}
-                    </x-dropdown.link>
-                @endif
+                <x-dropdown.link href="{{ route($cancelledRoute, $document->id) }}" id="show-more-actions-cancel-{{ $document->type }}">
+                    {{ trans('general.cancel') }}
+                </x-dropdown.link>
             @endcan
         @endif