diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php index 4e4793dcfa..6ef76a5d93 100644 --- a/app/Http/Controllers/Api/AccessoriesController.php +++ b/app/Http/Controllers/Api/AccessoriesController.php @@ -46,7 +46,7 @@ class AccessoriesController extends Controller $accessories->where('supplier_id','=',$request->input('supplier_id')); } - $offset = $request->input('offset', 0); + $offset = (($accessories) && (request('offset') > $accessories->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/AssetMaintenancesController.php b/app/Http/Controllers/Api/AssetMaintenancesController.php index e292ac11af..626ba898b2 100644 --- a/app/Http/Controllers/Api/AssetMaintenancesController.php +++ b/app/Http/Controllers/Api/AssetMaintenancesController.php @@ -44,7 +44,7 @@ class AssetMaintenancesController extends Controller $maintenances->where('asset_id', '=', $request->input('asset_id')); } - $offset = request('offset', 0); + $offset = (($maintenances) && (request('offset') > $maintenances->count())) ? 0 : request('offset', 0); $limit = request('limit', 50); $allowed_columns = [ diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php index 289348f17c..2da6508ebe 100644 --- a/app/Http/Controllers/Api/AssetModelsController.php +++ b/app/Http/Controllers/Api/AssetModelsController.php @@ -61,7 +61,7 @@ class AssetModelsController extends Controller $assetmodels->TextSearch($request->input('search')); } - $offset = $request->input('offset', 0); + $offset = (($assetmodels) && (request('offset') > $assetmodels->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'models.created_at'; diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 47083f5fe8..40045af848 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -145,7 +145,7 @@ class AssetsController extends Controller $request->filled('order_number') ? $assets = $assets->where('assets.order_number', '=', e($request->get('order_number'))) : ''; - $offset = request('offset', 0); + $offset = (($assets) && (request('offset') > $assets->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php index 1cee93110c..a51376ac29 100644 --- a/app/Http/Controllers/Api/CategoriesController.php +++ b/app/Http/Controllers/Api/CategoriesController.php @@ -31,7 +31,7 @@ class CategoriesController extends Controller $categories = $categories->TextSearch($request->input('search')); } - $offset = $request->input('offset', 0); + $offset = (($categories) && (request('offset') > $categories->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'assets_count'; diff --git a/app/Http/Controllers/Api/CompaniesController.php b/app/Http/Controllers/Api/CompaniesController.php index 6b1c63f54b..56be71aaef 100644 --- a/app/Http/Controllers/Api/CompaniesController.php +++ b/app/Http/Controllers/Api/CompaniesController.php @@ -41,7 +41,7 @@ class CompaniesController extends Controller $companies->TextSearch($request->input('search')); } - $offset = $request->input('offset', 0); + $offset = (($companies) && (request('offset') > $companies->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php index 068f7747f0..e077a6ea48 100644 --- a/app/Http/Controllers/Api/ComponentsController.php +++ b/app/Http/Controllers/Api/ComponentsController.php @@ -43,7 +43,7 @@ class ComponentsController extends Controller $components->where('location_id','=',$request->input('location_id')); } - $offset = request('offset', 0); + $offset = (($components) && (request('offset') > $components->count())) ? 0 : request('offset', 0); $limit = request('limit', 50); $allowed_columns = ['id','name','min_amt','order_number','serial','purchase_date','purchase_cost','company','category','qty','location','image']; diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php index 85b5201729..be2b07437d 100644 --- a/app/Http/Controllers/Api/ConsumablesController.php +++ b/app/Http/Controllers/Api/ConsumablesController.php @@ -35,12 +35,16 @@ class ConsumablesController extends Controller $consumables->where('company_id','=',$request->input('company_id')); } + if ($request->filled('category_id')) { + $consumables->where('category_id','=',$request->input('category_id')); + } + if ($request->filled('manufacturer_id')) { $consumables->where('manufacturer_id','=',$request->input('manufacturer_id')); } - $offset = request('offset', 0); + $offset = (($consumables) && (request('offset') > $consumables->count())) ? 0 : request('offset', 0); $limit = request('limit', 50); $allowed_columns = ['id','name','order_number','min_amt','purchase_date','purchase_cost','company','category','model_number', 'item_no', 'manufacturer','location','qty','image']; $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; diff --git a/app/Http/Controllers/Api/DepartmentsController.php b/app/Http/Controllers/Api/DepartmentsController.php index 338dc520b3..d4f24e58bb 100644 --- a/app/Http/Controllers/Api/DepartmentsController.php +++ b/app/Http/Controllers/Api/DepartmentsController.php @@ -40,7 +40,7 @@ class DepartmentsController extends Controller $departments = $departments->TextSearch($request->input('search')); } - $offset = $request->input('offset', 0); + $offset = (($departments) && (request('offset') > $departments->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/DepreciationsController.php b/app/Http/Controllers/Api/DepreciationsController.php index e3f6edf2e8..4a0ca180ef 100644 --- a/app/Http/Controllers/Api/DepreciationsController.php +++ b/app/Http/Controllers/Api/DepreciationsController.php @@ -28,7 +28,7 @@ class DepreciationsController extends Controller $depreciations = $depreciations->TextSearch($request->input('search')); } - $offset = $request->input('offset', 0); + $offset = (($depreciations) && (request('offset') > $depreciations->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php index 4e779f9be6..e1296fc7c3 100644 --- a/app/Http/Controllers/Api/GroupsController.php +++ b/app/Http/Controllers/Api/GroupsController.php @@ -28,7 +28,7 @@ class GroupsController extends Controller $groups = $groups->TextSearch($request->input('search')); } - $offset = $request->input('offset', 0); + $offset = (($groups) && (request('offset') > $groups->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.php index ee8f991136..c8ead62b86 100644 --- a/app/Http/Controllers/Api/LicensesController.php +++ b/app/Http/Controllers/Api/LicensesController.php @@ -82,7 +82,7 @@ class LicensesController extends Controller } - $offset = request('offset', 0); + $offset = (($licenses) && (request('offset') > $licenses->count())) ? 0 : request('offset', 0); $limit = request('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.php index eaabc0ac30..3158e22c60 100644 --- a/app/Http/Controllers/Api/LocationsController.php +++ b/app/Http/Controllers/Api/LocationsController.php @@ -52,7 +52,7 @@ class LocationsController extends Controller - $offset = $request->input('offset', 0); + $offset = (($locations) && (request('offset') > $locations->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/ManufacturersController.php b/app/Http/Controllers/Api/ManufacturersController.php index 2d30b3d5f2..d1b144d97a 100644 --- a/app/Http/Controllers/Api/ManufacturersController.php +++ b/app/Http/Controllers/Api/ManufacturersController.php @@ -40,7 +40,7 @@ class ManufacturersController extends Controller - $offset = request('offset', 0); + $offset = (($manufacturers) && (request('offset') > $manufacturers->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php index 6a7aa33d4b..7304f7dcf3 100644 --- a/app/Http/Controllers/Api/StatuslabelsController.php +++ b/app/Http/Controllers/Api/StatuslabelsController.php @@ -30,7 +30,7 @@ class StatuslabelsController extends Controller $statuslabels = $statuslabels->TextSearch($request->input('search')); } - $offset = $request->input('offset', 0); + $offset = (($statuslabels) && (request('offset') > $statuslabels->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.php index d15492b1bb..d537f2d526 100644 --- a/app/Http/Controllers/Api/SuppliersController.php +++ b/app/Http/Controllers/Api/SuppliersController.php @@ -34,7 +34,7 @@ class SuppliersController extends Controller $suppliers = $suppliers->TextSearch($request->input('search')); } - $offset = request('offset', 0); + $offset = (($suppliers) && (request('offset') > $suppliers->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 35676c584c..0ffabd7505 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -87,7 +87,7 @@ class UsersController extends Controller } $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; - $offset = request('offset', 0); + $offset = (($users) && (request('offset') > $users->count())) ? 0 : request('offset', 0); $limit = request('limit', 20); switch ($request->input('sort')) {