Fixed transfer category delete and changed type issue..

akaunting · Apr 5, 2023 · 15a9923 · 15a9923
1 parent e4154a7
commit 15a9923
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/app/Jobs/Setting/DeleteCategory.php b/app/Jobs/Setting/DeleteCategory.php
@@ -31,6 +31,13 @@ public function handle(): bool
      */
     public function authorize(): void
     {
+        // Can not delete transfer category
+        if ($this->model->isTransferCategory()) {
+            $message = trans('messages.error.transfer_category', ['type' => $this->model->name]);
+
+            throw new \Exception($message);
+        }
+
         // Can not delete the last category by type
         if (Category::where('type', $this->model->type)->count() == 1) {
             $message = trans('messages.error.last_category', ['type' => strtolower(trans_choice('general.' . $this->model->type . 's', 1))]);

diff --git a/resources/lang/en-GB/messages.php b/resources/lang/en-GB/messages.php
@@ -25,7 +25,8 @@
         'not_user_company'  => 'Error: You are not allowed to manage this company!',
         'customer'          => 'Error: User not created! :name already uses this email address.',
         'no_file'           => 'Error: No file selected!',
-        'last_category'     => 'Error: Can not delete the last :type category!',
+        'last_category'     => 'Error: Can not delete the last <b>:type</b> category!',
+        'transfer_category' => 'Error: Can not delete the transfer <b>:type</b> category!',
         'change_type'       => 'Error: Can not change the type because it has :text related!',
         'invalid_apikey'    => 'Error: The API Key entered is invalid!',
         'import_column'     => 'Error: :message Column name: :column. Line number: :line.',

diff --git a/resources/views/settings/categories/edit.blade.php b/resources/views/settings/categories/edit.blade.php
@@ -17,21 +17,23 @@
                         <x-form.group.color name="color" label="{{ trans('general.color') }}" />
 
                         @if ($type_disabled)
-                            <x-form.group.select name="type" label="{{ trans_choice('general.types', 1) }}" :options="$types" disabled />
+                            <x-form.group.select name="type" label="{{ trans_choice('general.types', 1) }}" :options="$types" v-disabled="true" />
 
                             <input type="hidden" name="type" value="{{ $category->type }}" />
                         @else
                             <x-form.group.select name="type" label="{{ trans_choice('general.types', 1) }}" :options="$types" change="updateParentCategories" />
-                        @endif
 
-                        <x-form.group.select name="parent_id" label="{{ trans('general.parent') . ' ' . trans_choice('general.categories', 1) }}" :options="$parent_categories" not-required dynamicOptions="categoriesBasedTypes" sort-options="false" />
+                            <x-form.group.select name="parent_id" label="{{ trans('general.parent') . ' ' . trans_choice('general.categories', 1) }}" :options="$parent_categories" not-required dynamicOptions="categoriesBasedTypes" sort-options="false" />
 
-                        <x-form.input.hidden name="parent_category_id" value="{{ $category->parent_id }}" />
-                        <x-form.input.hidden name="categories" value="{{ json_encode($categories) }}" />
+                            <x-form.input.hidden name="parent_category_id" value="{{ $category->parent_id }}" />
+                            <x-form.input.hidden name="categories" value="{{ json_encode($categories) }}" />
+                        @endif
                     </x-slot>
                 </x-form.section>
 
+                @if (! $type_disabled)
                 <x-form.group.switch name="enabled" label="{{ trans('general.enabled') }}" />
+                @endif
 
                 @can('update-settings-categories')
                 <x-form.section>

diff --git a/resources/views/settings/categories/index.blade.php b/resources/views/settings/categories/index.blade.php
@@ -67,7 +67,11 @@
                     @foreach($categories as $item)
                         <x-table.tr href="{{ route('categories.edit', $item->id) }}">
                             <x-table.td kind="bulkaction">
-                                <x-index.bulkaction.single id="{{ $item->id }}" name="{{ $item->name }}" />
+                                <x-index.bulkaction.single 
+                                    id="{{ $item->id }}"
+                                    name="{{ $item->name }}"
+                                    :disabled="($item->isTransferCategory()) ? true : false"
+                                />
                             </x-table.td>
 
                             <x-table.td class="w-5/12">