From 3b4dbf3ee5e13e66562332e1d517c756c12529da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 27 Jul 2022 10:30:34 +0300
Subject: [PATCH] quick category changes..

---
 app/Http/Controllers/Modals/Categories.php    | 12 ++++------
 .../js/components/AkauntingModalAddNew.vue    | 24 -------------------
 .../views/modals/categories/create.blade.php  |  4 +---
 3 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/app/Http/Controllers/Modals/Categories.php b/app/Http/Controllers/Modals/Categories.php
index 11a422bfa..2e49a77d1 100644
--- a/app/Http/Controllers/Modals/Categories.php
+++ b/app/Http/Controllers/Modals/Categories.php
@@ -31,18 +31,14 @@ class Categories extends Controller
     {
         $type = $request->get('type', 'item');
 
-        $categories = [];
+        $categories = collect();
 
-        foreach (config('type.category') as $type => $config) {
-            $categories[$type] = [];
-        }
-
-        Category::enabled()->orderBy('name')->get()->each(function ($category) use (&$categories) {
-            $categories[$category->type][] = [
+        Category::type($type)->enabled()->orderBy('name')->get()->each(function ($category) use (&$categories) {
+            $categories->push([
                 'id' => $category->id,
                 'title' => $category->name,
                 'level' => $category->level,
-            ];
+            ]);
         });
 
         $html = view('modals.categories.create', compact('type', 'categories'))->render();
diff --git a/resources/assets/js/components/AkauntingModalAddNew.vue b/resources/assets/js/components/AkauntingModalAddNew.vue
index 7225d8481..1846ca549 100644
--- a/resources/assets/js/components/AkauntingModalAddNew.vue
+++ b/resources/assets/js/components/AkauntingModalAddNew.vue
@@ -228,8 +228,6 @@ export default {
                                 '#efef32'
                             ],
                             min_date: false,
-                            categoriesBasedTypes: null,
-                            isParentCategoryDisabled: true,
                         }
                     },
 
@@ -290,28 +288,6 @@ export default {
                             .catch(error => {
                             });
                         },
-
-                        updateParentCategories(event) {
-                            if (event === '') {
-                                return;
-                            }
-
-                            if (typeof JSON.parse(this.form.categories)[event] === 'undefined') {
-                                this.categoriesBasedTypes = [];
-                                this.isParentCategoryDisabled = true;
-
-                                return;
-                            }
-
-                            if (this.form.parent_category_id) {
-                                this.form.parent_category_id = null;
-
-                                return;
-                            }
-
-                            this.categoriesBasedTypes = JSON.parse(this.form.categories)[event];
-                            this.isParentCategoryDisabled = false;
-                        },
                     }
                 })
             });
diff --git a/resources/views/modals/categories/create.blade.php b/resources/views/modals/categories/create.blade.php
index 1b6d1de36..f1f4e24ad 100644
--- a/resources/views/modals/categories/create.blade.php
+++ b/resources/views/modals/categories/create.blade.php
@@ -4,9 +4,7 @@
 
         <x-form.group.color name="color" label="{{ trans('general.color') }}" form-group-class="col-span-6" />
 
-        <x-form.group.select name="parent_id" label="{{ trans('general.parent') . ' ' . trans_choice('general.categories', 1) }}" :options="[]" not-required focus="updateParentCategories(form.type)" dynamicOptions="categoriesBasedTypes" sort-options="false" v-disabled="isParentCategoryDisabled" form-group-class="col-span-6" />
-
-        <x-form.input.hidden name="categories" value="{{ json_encode($categories) }}" />
+        <x-form.group.select name="parent_id" label="{{ trans('general.parent') . ' ' . trans_choice('general.categories', 1) }}" :options="$categories" not-required sort-options="false" searchable form-group-class="col-span-6" />
 
         <x-form.input.hidden name="type" :value="'{{ $type }}'" @change="updateParentCategories" />
         <x-form.input.hidden name="enabled" value="1" />