From 4e4930ba62355bee219eb837a39ae3c6d3c622f9 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 29 Aug 2024 21:01:48 +0100 Subject: [PATCH] Check for array Signed-off-by: snipe --- app/Models/Asset.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index f1150f9a2..dd2f1c8e2 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -1811,7 +1811,9 @@ class Asset extends Depreciable public function scopeInCategory($query, $category_id) { return $query->join('models as category_models', 'assets.model_id', '=', 'category_models.id') - ->join('categories', 'category_models.category_id', '=', 'categories.id')->whereIn('category_models.category_id', $category_id); + ->join('categories', 'category_models.category_id', '=', 'categories.id') + ->whereIn('category_models.category_id', (!is_array($category_id) ? explode(',',$category_id): $category_id)); + //->whereIn('category_models.category_id', $category_id); } /** @@ -1825,7 +1827,7 @@ class Asset extends Depreciable public function scopeByManufacturer($query, $manufacturer_id) { return $query->join('models', 'assets.model_id', '=', 'models.id') - ->join('manufacturers', 'models.manufacturer_id', '=', 'manufacturers.id')->whereIn('models.manufacturer_id', $manufacturer_id); + ->join('manufacturers', 'models.manufacturer_id', '=', 'manufacturers.id')->whereIn('models.manufacturer_id', (!is_array($manufacturer_id) ? explode(',',$manufacturer_id): $manufacturer_id)); }