diff --git a/app/Http/Controllers/Admin/Shop/CategoryController.php b/app/Http/Controllers/Admin/Shop/CategoryController.php index 502a6191..8c9c4ea1 100644 --- a/app/Http/Controllers/Admin/Shop/CategoryController.php +++ b/app/Http/Controllers/Admin/Shop/CategoryController.php @@ -83,5 +83,4 @@ class CategoryController extends Controller $data = Categories::toggleHomepage($request->input('id'), ($request->input('homepage') == 'true') ? 1 : 0); return response()->json(['error' => 0]); } - } diff --git a/app/Repositories/Core/Categories.php b/app/Repositories/Core/Categories.php index 82e57acc..0ee02549 100644 --- a/app/Repositories/Core/Categories.php +++ b/app/Repositories/Core/Categories.php @@ -51,10 +51,13 @@ class Categories if ($withFolder) { $leaf['folder'] = true; } + } else { + $leaf['children'] = []; } $tree[] = $leaf; } - $tree = collect($tree)->sortBy('name')->toArray(); + // $tree = collect($tree)->sortBy('name')->toArray(); + $tree = collect($tree)->toArray(); return $tree; } diff --git a/resources/views/load/form/tree.blade.php b/resources/views/load/form/tree.blade.php index c849bb8c..e7b4b527 100644 --- a/resources/views/load/form/tree.blade.php +++ b/resources/views/load/form/tree.blade.php @@ -1,7 +1,7 @@ @if(!defined('LOAD_TREE')) @push('scripts') - + @endpush @push('css')