From 57019857343e59fe2284633dca560fb914f89523 Mon Sep 17 00:00:00 2001 From: Ludovic CANDELLIER Date: Thu, 17 Feb 2022 12:27:20 +0100 Subject: [PATCH] active visible on shelves --- app/Http/Controllers/Controller.php | 2 +- app/Repositories/Core/Categories.php | 13 +++++++++++++ app/Repositories/Shop/Categories.php | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 7a1b8d4c..77b23d0e 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -15,7 +15,7 @@ class Controller extends BaseController public static function init() { - $data['categories'] = Categories::getTree(); + $data['categories'] = Categories::getTreeVisibles(); return $data; } } diff --git a/app/Repositories/Core/Categories.php b/app/Repositories/Core/Categories.php index cdbf3d96..5868943e 100644 --- a/app/Repositories/Core/Categories.php +++ b/app/Repositories/Core/Categories.php @@ -3,6 +3,7 @@ namespace App\Repositories\Core; use App\Repositories\Core\Arrays; +use App\Models\Shop\Category; class Categories { @@ -15,6 +16,12 @@ class Categories return $categories; } + public static function getTreeVisibles($withFolder = false) + { + $categories = self::getCategoryTreeVisibles()->toArray(); + return self::getChildren($categories[0]['children'], $withFolder); + } + public static function getTree($withFolder = false) { $categories = self::getCategoryTree()->toArray(); @@ -26,6 +33,11 @@ class Categories return self::getModel()->defaultOrder()->get()->toTree(); } + public static function getCategoryTreeVisibles() + { + return self::getModel()->defaultOrder()->where('visible', 1)->get()->toTree(); + } + public static function getChildren($data, $withFolder = false) { $tree = []; @@ -98,6 +110,7 @@ class Categories public static function getModel() { + // return Category::class; return app('rinvex.categories.category'); } } diff --git a/app/Repositories/Shop/Categories.php b/app/Repositories/Shop/Categories.php index 8c0daec9..e849f7fb 100644 --- a/app/Repositories/Shop/Categories.php +++ b/app/Repositories/Shop/Categories.php @@ -40,7 +40,7 @@ class Categories public static function getTreeVisibles() { - $tree = Category::get()->toTree(); + return CategoryTrees::getTreeVisibles(); } public static function getTree()