Skip to content

A free open source IT asset/license management system

Added FilterRequest and added refactorerd search check

snipe026177677810
diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php
index 400c71b672..5a3b63bf8f 100644
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -70,20 +70,9 @@ class AccessoriesController extends Controller
->with('category', 'company', 'manufacturer', 'checkouts', 'location', 'supplier', 'adminuser')
->withCount('checkouts as checkouts_count');
- $filter = [];
-
- if ($request->filled('filter')) {
- $filter = json_decode($request->input('filter'), true);
- $filter = array_filter($filter, function ($key) use ($allowed_columns) {
- return in_array($key, $allowed_columns);
- }, ARRAY_FILTER_USE_KEY);
-
- }
-
- if ((! is_null($filter)) && (count($filter)) > 0) {
- $accessories->ByFilter($filter);
- } elseif ($request->filled('search')) {
- $accessories->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $accessories->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
if ($request->filled('company_id')) {
diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php
index bb6fb26c43..71bad53097 100644
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -93,21 +93,9 @@ class AssetModelsController extends Controller
->withCount('assignedAssets as assets_assigned_count')
->withCount('archivedAssets as assets_archived_count');
- $filter = [];
-
- if ($request->filled('filter')) {
- $filter = json_decode($request->input('filter'), true);
-
- $filter = array_filter($filter, function ($key) use ($allowed_columns) {
- return in_array($key, $allowed_columns);
- }, ARRAY_FILTER_USE_KEY);
-
- }
-
- if ((! is_null($filter)) && (count($filter)) > 0) {
- $assetmodels->ByFilter($filter);
- } elseif ($request->filled('search')) {
- $assetmodels->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $assetmodels->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
if ($request->input('status') == 'deleted') {
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 4f982b918a..f195df92dc 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -142,17 +142,6 @@ class AssetsController extends Controller
$allowed_columns[] = $field->db_column_name();
}
- $filter = [];
-
- if ($request->filled('filter')) {
- $filter = json_decode($request->input('filter'), true);
-
- $filter = array_filter($filter, function ($key) use ($allowed_columns) {
- return in_array($key, $allowed_columns);
- }, ARRAY_FILTER_USE_KEY);
-
- }
-
$assets = Asset::select('assets.*')
// ->addSelect([
// 'first_checkout_at' => Actionlog::query()
@@ -195,10 +184,9 @@ class AssetsController extends Controller
}
}
- if ((! is_null($filter)) && (count($filter)) > 0) {
- $assets->ByFilter($filter);
- } elseif ($request->filled('search')) {
- $assets->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $assets->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
/**
diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php
index 51d78e9d71..a68c4384a1 100644
--- a/app/Http/Controllers/Api/CategoriesController.php
+++ b/app/Http/Controllers/Api/CategoriesController.php
@@ -78,10 +78,9 @@ class CategoriesController extends Controller
}
- if ((! is_null($filter)) && (count($filter)) > 0) {
- $categories->ByFilter($filter);
- } elseif ($request->filled('search')) {
- $categories->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $categories->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
/*
diff --git a/app/Http/Controllers/Api/CompaniesController.php b/app/Http/Controllers/Api/CompaniesController.php
index 05808a16b0..250769aada 100644
--- a/app/Http/Controllers/Api/CompaniesController.php
+++ b/app/Http/Controllers/Api/CompaniesController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
+use App\Http\Requests\FilterRequest;
use App\Http\Requests\ImageUploadRequest;
use App\Http\Transformers\CompaniesTransformer;
use App\Http\Transformers\SelectlistTransformer;
@@ -21,7 +22,7 @@ class CompaniesController extends Controller
*
* @since [v4.0]
*/
- public function index(Request $request): JsonResponse|array
+ public function index(FilterRequest $request): JsonResponse|array
{
$this->authorize('view', Company::class);
@@ -49,8 +50,9 @@ class CompaniesController extends Controller
->with('adminuser')
->withCount('licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'users as users_count');
- if ($request->filled('search')) {
- $companies->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $companies->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
if ($request->filled('name')) {
diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php
index eb35d21986..a9ee4777d5 100644
--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -73,10 +73,9 @@ class ComponentsController extends Controller
}
- if ((! is_null($filter)) && (count($filter)) > 0) {
- $components->ByFilter($filter);
- } elseif ($request->filled('search')) {
- $components->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $components->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
if ($request->filled('name')) {
diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php
index 6fe6d1e004..0d56be9fb4 100644
--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api;
use App\Events\CheckoutableCheckedOut;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
+use App\Http\Requests\FilterRequest;
use App\Http\Requests\ImageUploadRequest;
use App\Http\Requests\StoreConsumableRequest;
use App\Http\Transformers\ActionlogsTransformer;
@@ -25,7 +26,7 @@ class ConsumablesController extends Controller
*
* @since [v4.0]
*/
- public function index(Request $request): array
+ public function index(FilterRequest $request): array
{
$this->authorize('index', Consumable::class);
@@ -60,21 +61,9 @@ class ConsumablesController extends Controller
'manufacturer',
];
- $filter = [];
-
- if ($request->filled('filter')) {
- $filter = json_decode($request->input('filter'), true);
-
- $filter = array_filter($filter, function ($key) use ($allowed_columns) {
- return in_array($key, $allowed_columns);
- }, ARRAY_FILTER_USE_KEY);
-
- }
-
- if ((! is_null($filter)) && (count($filter)) > 0) {
- $consumables->ByFilter($filter);
- } elseif ($request->filled('search')) {
- $consumables->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $consumables->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
if ($request->filled('name')) {
diff --git a/app/Http/Controllers/Api/CustomFieldsetsController.php b/app/Http/Controllers/Api/CustomFieldsetsController.php
index 51123eea6f..d52d5a7873 100644
--- a/app/Http/Controllers/Api/CustomFieldsetsController.php
+++ b/app/Http/Controllers/Api/CustomFieldsetsController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
+use App\Http\Requests\FilterRequest;
use App\Http\Transformers\CustomFieldsetsTransformer;
use App\Http\Transformers\CustomFieldsTransformer;
use App\Models\CustomField;
@@ -35,10 +36,16 @@ class CustomFieldsetsController extends Controller
*
* @since [v1.8]
*/
- public function index(): array
+ public function index(FilterRequest $request): array
{
$this->authorize('index', CustomField::class);
- $fieldsets = CustomFieldset::withCount('fields as fields_count', 'models as models_count')->get();
+ $fieldsets = CustomFieldset::withCount('fields as fields_count', 'models as models_count');
+
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $fieldsets->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
+ }
+ $fieldsets->get();
return (new CustomFieldsetsTransformer)->transformCustomFieldsets($fieldsets, $fieldsets->count());
}
diff --git a/app/Http/Controllers/Api/DepartmentsController.php b/app/Http/Controllers/Api/DepartmentsController.php
index 2310125841..98ed860016 100644
--- a/app/Http/Controllers/Api/DepartmentsController.php
+++ b/app/Http/Controllers/Api/DepartmentsController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
+use App\Http\Requests\FilterRequest;
use App\Http\Requests\ImageUploadRequest;
use App\Http\Requests\StoreDepartmentRequest;
use App\Http\Transformers\DepartmentsTransformer;
@@ -22,7 +23,7 @@ class DepartmentsController extends Controller
*
* @since [v4.0]
*/
- public function index(Request $request): JsonResponse|array
+ public function index(FilterRequest $request): JsonResponse|array
{
$this->authorize('view', Department::class);
$allowed_columns = ['id', 'name', 'image', 'users_count', 'notes', 'tag_color'];
@@ -43,8 +44,9 @@ class DepartmentsController extends Controller
'departments.notes',
])->with('location')->with('manager')->with('company')->withCount('users as users_count');
- if ($request->filled('search')) {
- $departments = $departments->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $departments->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
if ($request->filled('name')) {
diff --git a/app/Http/Controllers/Api/DepreciationsController.php b/app/Http/Controllers/Api/DepreciationsController.php
index 74d2fadb4b..bd248bd6d8 100644
--- a/app/Http/Controllers/Api/DepreciationsController.php
+++ b/app/Http/Controllers/Api/DepreciationsController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
+use App\Http\Requests\FilterRequest;
use App\Http\Transformers\DepreciationsTransformer;
use App\Models\Depreciation;
use Illuminate\Http\JsonResponse;
@@ -18,7 +19,7 @@ class DepreciationsController extends Controller
*
* @since [v4.0]
*/
- public function index(Request $request): JsonResponse|array
+ public function index(FilterRequest $request): JsonResponse|array
{
$this->authorize('view', Depreciation::class);
$allowed_columns = [
@@ -33,14 +34,15 @@ class DepreciationsController extends Controller
'licenses_count',
];
- $depreciations = Depreciation::select('id', 'name', 'months', 'depreciation_min', 'depreciation_type', 'created_at', 'updated_at', 'created_by')
+ $depreciations = Depreciation::select(['id', 'name', 'months', 'depreciation_min', 'depreciation_type', 'created_at', 'updated_at', 'created_by'])
->with('adminuser')
->withCount('assets as assets_count')
->withCount('models as models_count')
->withCount('licenses as licenses_count');
- if ($request->filled('search')) {
- $depreciations = $depreciations->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $depreciations->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
// Make sure the offset and limit are actually integers and do not exceed system limits
diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php
index b6a06af488..f3b65561f0 100644
--- a/app/Http/Controllers/Api/GroupsController.php
+++ b/app/Http/Controllers/Api/GroupsController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
+use App\Http\Requests\FilterRequest;
use App\Http\Transformers\GroupsTransformer;
use App\Models\Group;
use Illuminate\Http\JsonResponse;
@@ -18,7 +19,7 @@ class GroupsController extends Controller
*
* @since [v4.0]
*/
- public function index(Request $request): JsonResponse|array
+ public function index(FilterRequest $request): JsonResponse|array
{
$this->authorize('superadmin');
@@ -26,8 +27,9 @@ class GroupsController extends Controller
$groups = Group::select(['id', 'name', 'permissions', 'notes', 'created_at', 'updated_at', 'created_by'])->with('adminuser')->withCount('users as users_count');
- if ($request->filled('search')) {
- $groups = $groups->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $groups->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
if ($request->filled('name')) {
diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.php
index c624c52758..317c8fb2ec 100644
--- a/app/Http/Controllers/Api/LicensesController.php
+++ b/app/Http/Controllers/Api/LicensesController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
+use App\Http\Requests\FilterRequest;
use App\Http\Transformers\ActionlogsTransformer;
use App\Http\Transformers\LicensesTransformer;
use App\Http\Transformers\SelectlistTransformer;
@@ -22,7 +23,7 @@ class LicensesController extends Controller
*
* @since [v4.0]
*/
- public function index(Request $request): JsonResponse|array
+ public function index(FilterRequest $request): JsonResponse|array
{
$this->authorize('view', License::class);
@@ -97,8 +98,9 @@ class LicensesController extends Controller
$licenses->whereNull('expiration_date');
}
- if ($request->filled('search')) {
- $licenses = $licenses->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $licenses->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
if ($request->input('deleted') == 'true') {
diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.php
index 9a7bab6314..f5aaa3a0fc 100644
--- a/app/Http/Controllers/Api/LocationsController.php
+++ b/app/Http/Controllers/Api/LocationsController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
+use App\Http\Requests\FilterRequest;
use App\Http\Requests\ImageUploadRequest;
use App\Http\Transformers\ActionlogsTransformer;
use App\Http\Transformers\AssetsTransformer;
@@ -32,7 +33,7 @@ class LocationsController extends Controller
*
* @return Response
*/
- public function index(Request $request): JsonResponse|array
+ public function index(FilterRequest $request): JsonResponse|array
{
$this->authorize('view', Location::class);
$allowed_columns = [
@@ -107,8 +108,9 @@ class LocationsController extends Controller
$locations = Company::scopeCompanyables($locations);
}
- if ($request->filled('search')) {
- $locations = $locations->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $locations->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
if ($request->filled('name')) {
diff --git a/app/Http/Controllers/Api/MaintenancesController.php b/app/Http/Controllers/Api/MaintenancesController.php
index 7a132ab7e2..3759899d82 100644
--- a/app/Http/Controllers/Api/MaintenancesController.php
+++ b/app/Http/Controllers/Api/MaintenancesController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
+use App\Http\Requests\FilterRequest;
use App\Http\Requests\ImageUploadRequest;
use App\Http\Transformers\ActionlogsTransformer;
use App\Http\Transformers\MaintenancesTransformer;
@@ -32,15 +33,16 @@ class MaintenancesController extends Controller
*
* @since [v1.8]
*/
- public function index(Request $request): JsonResponse|array
+ public function index(FilterRequest $request): JsonResponse|array
{
$this->authorize('view', Asset::class);
$maintenances = Maintenance::select('maintenances.*')
->with('asset', 'asset.model', 'asset.location', 'asset.defaultLoc', 'supplier', 'asset.company', 'asset.assetstatus', 'adminuser', 'asset.assignedTo');
- if ($request->filled('search')) {
- $maintenances = $maintenances->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $maintenances->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
if ($request->filled('asset_id')) {
diff --git a/app/Http/Controllers/Api/ManufacturersController.php b/app/Http/Controllers/Api/ManufacturersController.php
index c2e311f855..1617d30499 100644
--- a/app/Http/Controllers/Api/ManufacturersController.php
+++ b/app/Http/Controllers/Api/ManufacturersController.php
@@ -6,6 +6,7 @@ use App\Actions\Manufacturers\DeleteManufacturerAction;
use App\Exceptions\ItemStillHasChildren;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
+use App\Http\Requests\FilterRequest;
use App\Http\Requests\ImageUploadRequest;
use App\Http\Transformers\ManufacturersTransformer;
use App\Http\Transformers\SelectlistTransformer;
@@ -28,7 +29,7 @@ class ManufacturersController extends Controller
*
* @return Response
*/
- public function index(Request $request): JsonResponse|array
+ public function index(FilterRequest $request): JsonResponse|array
{
$this->authorize('view', Manufacturer::class);
$allowed_columns = [
@@ -81,8 +82,9 @@ class ManufacturersController extends Controller
$manufacturers->onlyTrashed();
}
- if ($request->filled('search')) {
- $manufacturers = $manufacturers->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $manufacturers->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
if ($request->filled('name')) {
diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.php
index 9f583d560f..120b297cf7 100644
--- a/app/Http/Controllers/Api/ReportsController.php
+++ b/app/Http/Controllers/Api/ReportsController.php
@@ -3,10 +3,10 @@
namespace App\Http\Controllers\Api;
use App\Http\Controllers\Controller;
+use App\Http\Requests\FilterRequest;
use App\Http\Transformers\ActionlogsTransformer;
use App\Models\Actionlog;
use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
class ReportsController extends Controller
{
@@ -17,14 +17,15 @@ class ReportsController extends Controller
*
* @since [v4.0]
*/
- public function index(Request $request): JsonResponse|array
+ public function index(FilterRequest $request): JsonResponse|array
{
$this->authorize('activity.view');
$actionlogs = Actionlog::with('item', 'user', 'adminuser', 'target', 'location');
- if ($request->filled('search')) {
- $actionlogs = $actionlogs->TextSearch(e($request->input('search')));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $actionlogs->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
if (($request->filled('target_type')) && ($request->filled('target_id'))) {
diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php
index fc9de64687..c6f25d53d8 100644
--- a/app/Http/Controllers/Api/StatuslabelsController.php
+++ b/app/Http/Controllers/Api/StatuslabelsController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
+use App\Http\Requests\FilterRequest;
use App\Http\Transformers\AssetsTransformer;
use App\Http\Transformers\PieChartTransformer;
use App\Http\Transformers\SelectlistTransformer;
@@ -23,7 +24,7 @@ class StatuslabelsController extends Controller
*
* @since [v4.0]
*/
- public function index(Request $request): array
+ public function index(FilterRequest $request): array
{
$this->authorize('view', Statuslabel::class);
$allowed_columns = [
@@ -38,8 +39,9 @@ class StatuslabelsController extends Controller
$statuslabels = Statuslabel::with('adminuser')->withCount('assets as assets_count');
- if ($request->filled('search')) {
- $statuslabels = $statuslabels->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $statuslabels->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
if ($request->filled('name')) {
diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.php
index 98361ec62c..f058f58890 100644
--- a/app/Http/Controllers/Api/SuppliersController.php
+++ b/app/Http/Controllers/Api/SuppliersController.php
@@ -11,6 +11,7 @@ use App\Exceptions\ItemStillHasLicenses;
use App\Exceptions\ItemStillHasMaintenances;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
+use App\Http\Requests\FilterRequest;
use App\Http\Requests\ImageUploadRequest;
use App\Http\Transformers\SelectlistTransformer;
use App\Http\Transformers\SuppliersTransformer;
@@ -31,7 +32,7 @@ class SuppliersController extends Controller
*
* @return Response
*/
- public function index(Request $request): array
+ public function index(FilterRequest $request): array
{
$this->authorize('view', Supplier::class);
$allowed_columns = [
@@ -67,8 +68,9 @@ class SuppliersController extends Controller
->withCount('consumables as consumables_count')
->with('adminuser');
- if ($request->filled('search')) {
- $suppliers->TextSearch($request->input('search'));
+ // This invokes the Searchable model trait scopeTextSearch and will handle input by search or by advanced search filter
+ if ($request->filled('filter') || $request->filled('search')) {
+ $suppliers->TextSearch($request->input('filter') ? $request->input('filter') : $request->input('search'));
}
if ($request->filled('name')) {