waqas
/
Akaunting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added category colors next to options vol 2

This commit is contained in:
Cüneyt Şentürk 2024-05-17 13:55:47 +03:00
parent ab96ae7192
commit 5a602cbb73
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/View/Components/Form/Group/Category.php
View File

@ -29,7 +29,7 @@ class Category extends Form
$this->path = route('modals.categories.create', ['type' => $this->type]);
$this->remoteAction = route('categories.index', ['search' => 'type:' . $this->type . ' enabled:1']);
$this->categories = Model::type($this->type)->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$this->categories = Model::type($this->type)->enabled()->orderBy('name')->take(setting('default.select_limit'))->get();
$model = $this->getParentData('model');
@ -38,10 +38,14 @@ class Category extends Form
if (! empty($category_id)) {
$this->selected = $category_id;
if (! $this->categories->has($category_id)) {
$has_category = $this->categories->search(function ($category, int $key) use ($category_id) {
return $category->id === $category_id;
});
if (! $has_category) {
$category = Model::find($category_id);
$this->categories->put($category->id, $category->name);
$this->categories->push($category);
}
}
@ -57,8 +61,16 @@ class Category extends Form
$selected_category = Model::find($this->selected);
}
if (! empty($selected_category) && ! $this->categories->has($selected_category->id)) {
$this->categories->put($selected_category->id, $selected_category->name);
if (! empty($selected_category)) {
$selected_category_id = $selected_category->id;
$has_selected_category = $this->categories->search(function ($category, int $key) use ($selected_category_id) {
return $category->id === $selected_category_id;
});
if (! $has_selected_category) {
$this->categories->push($selected_category);
}
}
return view('components.form.group.category');

16
resources/views/components/form/group/category.blade.php
View File

@ -23,8 +23,8 @@
>
<template #option="{option}">
<div class="flex items-center">
<span class="w-5 h-4 rounded-full" style="background-color:red !important;"></span>
<span> @{{ option.value }}</span>
<span class="w-5 h-4 rounded-full" :style="{backgroundColor: option.option.color}"></span>
<span>@{{ option.option.name }}</span>
</div>
</template>
</x-form.group.select>
@ -50,8 +50,8 @@
>
<template #option="{option}">
<div class="flex items-center">
<span class="w-5 h-4 rounded-full" style="background-color:red !important;"></span>
<span> @{{ option.value }}</span>
<span class="w-5 h-4 rounded-full" :style="{backgroundColor: option.option.color}"></span>
<span>@{{ option.option.name }}</span>
</div>
</template>
</x-form.group.select>
@ -77,8 +77,8 @@
>
<template #option="{option}">
<div class="flex items-center">
<span class="w-5 h-4 rounded-full" style="background-color:red !important;"></span>
<span> @{{ option.value }}</span>
<span class="w-5 h-4 rounded-full" :style="{backgroundColor: option.option.color}"></span>
<span>@{{ option.option.name }}</span>
</div>
</template>
</x-form.group.select>
@ -101,8 +101,8 @@
>
<template #option="{option}">
<div class="flex items-center">
<span class="w-5 h-4 rounded-full" style="background-color:red !important;"></span>
<span> @{{ option.value }}</span>
<span class="w-5 h-4 rounded-full":style="{backgroundColor: option.option.color}"></span>
<span>@{{ option.option.name }}</span>
</div>
</template>
</x-form.group.select>