diff --git a/app/Abstracts/Http/Controller.php b/app/Abstracts/Http/Controller.php index dbe2a5727..4ed55d0a1 100644 --- a/app/Abstracts/Http/Controller.php +++ b/app/Abstracts/Http/Controller.php @@ -39,7 +39,7 @@ abstract class Controller extends BaseController */ public function paginate($items, $perPage = 15, $page = null, $options = []) { - $perPage = $perPage ?: request('limit', setting('default.list_limit', '25')); + $perPage = $perPage ?: (int) request('limit', setting('default.list_limit', '25')); $page = $page ?: (Paginator::resolveCurrentPage() ?: 1); diff --git a/app/Abstracts/Model.php b/app/Abstracts/Model.php index ae5842816..5a88999e8 100644 --- a/app/Abstracts/Model.php +++ b/app/Abstracts/Model.php @@ -113,7 +113,7 @@ abstract class Model extends Eloquent implements Ownable return $query->get(); } - $limit = $request->get('limit', setting('default.list_limit', '25')); + $limit = (int) $request->get('limit', setting('default.list_limit', '25')); return $query->paginate($limit); } diff --git a/app/Http/Controllers/Purchases/Vendors.php b/app/Http/Controllers/Purchases/Vendors.php index 131a2c56f..d970c6f86 100644 --- a/app/Http/Controllers/Purchases/Vendors.php +++ b/app/Http/Controllers/Purchases/Vendors.php @@ -87,7 +87,7 @@ class Vendors extends Controller $amounts['paid'] += $item->getAmountConvertedToDefault(); }); - $limit = request('limit', setting('default.list_limit', '25')); + $limit = (int) request('limit', setting('default.list_limit', '25')); $transactions = $this->paginate($transactions->sortByDesc('paid_at'), $limit); $bills = $this->paginate($bills->sortByDesc('issued_at'), $limit); diff --git a/app/Http/Controllers/Sales/Customers.php b/app/Http/Controllers/Sales/Customers.php index 4667e5591..351b067c2 100644 --- a/app/Http/Controllers/Sales/Customers.php +++ b/app/Http/Controllers/Sales/Customers.php @@ -85,7 +85,7 @@ class Customers extends Controller $amounts['paid'] += $item->getAmountConvertedToDefault(); }); - $limit = request('limit', setting('default.list_limit', '25')); + $limit = (int) request('limit', setting('default.list_limit', '25')); $transactions = $this->paginate($transactions->sortByDesc('paid_at'), $limit); $invoices = $this->paginate($invoices->sortByDesc('issued_at'), $limit); diff --git a/app/Models/Auth/Permission.php b/app/Models/Auth/Permission.php index 6e89fd53e..31108210f 100644 --- a/app/Models/Auth/Permission.php +++ b/app/Models/Auth/Permission.php @@ -42,7 +42,7 @@ class Permission extends LaratrustPermission $request = request(); $search = $request->get('search'); - $limit = $request->get('limit', setting('default.list_limit', '25')); + $limit = (int) $request->get('limit', setting('default.list_limit', '25')); return $query->usingSearchString($search)->sortable($sort)->paginate($limit); } diff --git a/app/Models/Auth/Role.php b/app/Models/Auth/Role.php index 676ce046f..31523b9ff 100644 --- a/app/Models/Auth/Role.php +++ b/app/Models/Auth/Role.php @@ -35,7 +35,7 @@ class Role extends LaratrustRole $request = request(); $search = $request->get('search'); - $limit = $request->get('limit', setting('default.list_limit', '25')); + $limit = (int) $request->get('limit', setting('default.list_limit', '25')); return $query->usingSearchString($search)->sortable($sort)->paginate($limit); } diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php index 3d2c2157e..709ea5b47 100644 --- a/app/Models/Auth/User.php +++ b/app/Models/Auth/User.php @@ -176,7 +176,7 @@ class User extends Authenticatable implements HasLocalePreference $request = request(); $search = $request->get('search'); - $limit = $request->get('limit', setting('default.list_limit', '25')); + $limit = (int) $request->get('limit', setting('default.list_limit', '25')); return $query->usingSearchString($search)->sortable($sort)->paginate($limit); } diff --git a/app/Models/Common/Company.php b/app/Models/Common/Company.php index 033d35a67..8a5662f1b 100644 --- a/app/Models/Common/Company.php +++ b/app/Models/Common/Company.php @@ -342,7 +342,7 @@ class Company extends Eloquent implements Ownable return $query->get(); } - $limit = $request->get('limit', setting('default.list_limit', '25')); + $limit = (int) $request->get('limit', setting('default.list_limit', '25')); return $query->paginate($limit); }