diff --git a/app/BulkActions/Settings/Categories.php b/app/BulkActions/Settings/Categories.php index ed63dd003..77afe39c0 100644 --- a/app/BulkActions/Settings/Categories.php +++ b/app/BulkActions/Settings/Categories.php @@ -39,6 +39,19 @@ class Categories extends BulkAction ], ]; + public function getSelectedRecords($request, $relationships = null) + { + if (empty($relationships)) { + $model = $this->model::query(); + } else { + $relationships = Arr::wrap($relationships); + + $model = $this->model::with($relationships); + } + + return $model->getWithoutChildren()->find($this->getSelectedInput($request)); + } + public function disable($request) { $categories = $this->getSelectedRecords($request); diff --git a/resources/views/settings/categories/index.blade.php b/resources/views/settings/categories/index.blade.php index 614e466bf..b280bd9e1 100644 --- a/resources/views/settings/categories/index.blade.php +++ b/resources/views/settings/categories/index.blade.php @@ -64,51 +64,58 @@ - @foreach($categories as $category) - + @foreach($categories as $item) + - @if ($category->sub_categories->count()) + @if ($item->sub_categories->count())
- {{ $category->name }} - + {{ $item->name }} + +
@else - {{ $category->name }} + + {{ $item->name }} + + @endif + + @if (! $item->enabled) + @endif
- @if (! empty($types[$category->type])) - {{ $types[$category->type] }} + @if (! empty($types[$item->type])) + {{ $types[$item->type] }} @else @endif - circle + circle - +
- @foreach($category->sub_categories as $sub_category) - @include('settings.categories.sub_category', ['parent_category' => $category, 'sub_category' => $sub_category, 'tree_level' => 1]) + @foreach($item->sub_categories as $sub_category) + @include('settings.categories.sub_category', ['parent_category' => $item, 'sub_category' => $sub_category, 'tree_level' => 1]) @endforeach @endforeach
diff --git a/resources/views/settings/categories/sub_category.blade.php b/resources/views/settings/categories/sub_category.blade.php index be9afa002..204778ecf 100644 --- a/resources/views/settings/categories/sub_category.blade.php +++ b/resources/views/settings/categories/sub_category.blade.php @@ -31,15 +31,15 @@ - @if (! empty($types[$category->type])) - {{ $types[$category->type] }} + @if (! empty($types[$item->type])) + {{ $types[$item->type] }} @else @endif - circle + circle