From 6f50a4e685ecefb20d80e1be1ab62a35b38f9827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= Date: Tue, 10 Mar 2026 22:15:51 +0300 Subject: [PATCH] refactored category validation and removed unused module trait --- app/Http/Controllers/Settings/Categories.php | 18 ++++++++++++------ app/Http/Requests/Setting/Category.php | 7 ++++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Settings/Categories.php b/app/Http/Controllers/Settings/Categories.php index 91be4b6ce..5a4848b81 100644 --- a/app/Http/Controllers/Settings/Categories.php +++ b/app/Http/Controllers/Settings/Categories.php @@ -12,11 +12,10 @@ use App\Jobs\Setting\DeleteCategory; use App\Jobs\Setting\UpdateCategory; use App\Models\Setting\Category; use App\Traits\Categories as Helper; -use App\Traits\Modules; class Categories extends Controller { - use Helper, Modules; + use Helper; /** * Display a listing of the resource. @@ -85,13 +84,16 @@ class Categories extends Controller $types = $this->getCategoryTypes(true, true); $categories = []; + $has_code = false; foreach (config('type.category') as $type => $config) { + if (empty($config['hide']) || ! in_array('code', $config['hide'])) { + $has_code = true; + } + $categories[$type] = []; } - $has_code = $this->moduleIsEnabled('double-entry'); - Category::enabled()->orderBy('name')->get()->each(function ($category) use (&$categories) { $categories[$category->type][] = [ 'id' => $category->id, @@ -171,8 +173,14 @@ class Categories extends Controller $edited_category_id = $category->id; $categories = []; + $has_code = false; foreach (config('type.category') as $type => $config) { + if (empty($config['hide']) || ! in_array('code', $config['hide'])) { + $has_code = true; + break; + } + $categories[$type] = []; } @@ -205,8 +213,6 @@ class Categories extends Controller $parent_categories = $categories[$category->type] ?? []; - $has_code = $this->moduleIsEnabled('double-entry'); - return view('settings.categories.edit', compact('category', 'types', 'type_disabled', 'categories', 'parent_categories', 'has_code')); } diff --git a/app/Http/Requests/Setting/Category.php b/app/Http/Requests/Setting/Category.php index 758c6557a..428427983 100644 --- a/app/Http/Requests/Setting/Category.php +++ b/app/Http/Requests/Setting/Category.php @@ -3,11 +3,9 @@ namespace App\Http\Requests\Setting; use App\Abstracts\Http\FormRequest; -use App\Traits\Modules; class Category extends FormRequest { - use Modules; /** * Get the validation rules that apply to the request. * @@ -17,7 +15,10 @@ class Category extends FormRequest { $types = collect(config('type.category'))->keys(); - $code = $this->moduleIsEnabled('double-entry') ? 'required|string' : 'nullable|string'; + $type = $this->request->get('type'); + $config = config('type.category.' . $type, []); + $code_hidden = !empty($config['hide']) && in_array('code', $config['hide']); + $code = $code_hidden ? 'nullable|string' : 'required|string'; return [ 'name' => 'required|string',