From ba38b841cb0f0532c3aa3fc477d9f9895402ca1e Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 14 Nov 2017 16:47:21 -0800 Subject: [PATCH 1/2] Constrain accessory by category ID if one is passed --- app/Http/Controllers/Api/AccessoriesController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php index 3a1857b9a..8590accfd 100644 --- a/app/Http/Controllers/Api/AccessoriesController.php +++ b/app/Http/Controllers/Api/AccessoriesController.php @@ -34,6 +34,10 @@ class AccessoriesController extends Controller $accessories->where('company_id','=',$request->input('company_id')); } + if ($request->has('category_id')) { + $accessories->where('category_id','=',$request->input('category_id')); + } + if ($request->has('manufacturer_id')) { $accessories->where('manufacturer_id','=',$request->input('manufacturer_id')); } From f137e516a69a0a80bf1775456c2c17d27a069857 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 14 Nov 2017 16:49:18 -0800 Subject: [PATCH 2/2] Bumped version --- config/version.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/config/version.php b/config/version.php index 3e0de8996..24685c38f 100644 --- a/config/version.php +++ b/config/version.php @@ -1,8 +1,7 @@ 'v4.1.3', - 'build_version' => '48', - 'hash_version' => 'g74aa562', - 'full_hash' => 'v4.1.3-48-g74aa562', - + 'app_version' => 'v4.1.4', + 'build_version' => '173', + 'hash_version' => 'gba38b84', + 'full_hash' => 'v4.1.4-173-gba38b84', );