shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Missing category type edit and update issue solved. ( #8669n1n1t )

Browse Source
This commit is contained in:
Cüneyt Şentürk 2023-03-15 16:37:26 +03:00
parent df071fd993
commit 19d87562ec
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Settings/Categories.php
View File

@ -30,10 +30,10 @@ class Categories extends Controller
$query->withSubcategory(); $query->withSubcategory();
} }
$categories = $query->collect();
$types = $this->getCategoryTypes(); $types = $this->getCategoryTypes();
$categories = $query->type(array_keys($types))->collect();
return $this->response('settings.categories.index', compact('categories', 'types')); return $this->response('settings.categories.index', compact('categories', 'types'));
} }
@ -173,7 +173,9 @@ class Categories extends Controller
]; ];
}); });
return view('settings.categories.edit', compact('category', 'types', 'type_disabled', 'categories')); $parent_categories = $categories[$category->type] ?? [];
return view('settings.categories.edit', compact('category', 'types', 'type_disabled', 'categories', 'parent_categories'));
} }
/** /**

4
app/Http/Requests/Setting/Category.php
View File

@ -13,9 +13,11 @@ class Category extends FormRequest
*/ */
public function rules() public function rules()
{ {
$types = collect(config('type.category'))->keys();
return [ return [
'name' => 'required|string', 'name' => 'required|string',
'type' => 'required|string', 'type' => 'required|string|in:' . $types->implode(','),
'color' => 'required|string', 'color' => 'required|string',
]; ];
} }

2
resources/views/settings/categories/edit.blade.php
View File

@ -24,7 +24,7 @@
<x-form.group.select name="type" label="{{ trans_choice('general.types', 1) }}" :options="$types" change="updateParentCategories" /> <x-form.group.select name="type" label="{{ trans_choice('general.types', 1) }}" :options="$types" change="updateParentCategories" />
@endif @endif
<x-form.group.select name="parent_id" label="{{ trans('general.parent') . ' ' . trans_choice('general.categories', 1) }}" :options="$categories[$category->type]" 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="parent_category_id" value="{{ $category->parent_id }}" />
<x-form.input.hidden name="categories" value="{{ json_encode($categories) }}" /> <x-form.input.hidden name="categories" value="{{ json_encode($categories) }}" />