From 9a5d431962e7cffcf2c21b7ea458a6692a6dd72c Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 15 Nov 2022 17:13:26 +0000 Subject: [PATCH] Allow searching firectly for asset tag and serial Signed-off-by: snipe --- app/Http/Controllers/Api/AssetsController.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 9d6c3f1168..04bc6d35db 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -120,7 +120,6 @@ class AssetsController extends Controller if ($filter_non_deprecable_assets) { $non_deprecable_models = AssetModel::select('id')->whereNotNull('depreciation_id')->get(); - $assets->InModelList($non_deprecable_models->toArray()); } @@ -141,6 +140,14 @@ class AssetsController extends Controller $assets->where('assets.status_id', '=', $request->input('status_id')); } + if ($request->filled('asset_tag')) { + $assets->where('assets.asset_tag', '=', $request->input('asset_tag')); + } + + if ($request->filled('serial')) { + $assets->where('assets.serial', '=', $request->input('serial')); + } + if ($request->input('requestable') == 'true') { $assets->where('assets.requestable', '=', '1'); }