shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #2135 (#mxb4e4) Fixed: Broken collect scope for limit and page column.

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-06-22 19:12:33 +03:00
parent d5127ddb1f
commit 6f753553e0
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Abstracts/Http/Controller.php
View File

@ -39,7 +39,7 @@ abstract class Controller extends BaseController
*/ */
public function paginate($items, $perPage = 15, $page = null, $options = []) 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); $page = $page ?: (Paginator::resolveCurrentPage() ?: 1);

2
app/Abstracts/Model.php
View File

@ -113,7 +113,7 @@ abstract class Model extends Eloquent implements Ownable
return $query->get(); 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); return $query->paginate($limit);
} }

2
app/Http/Controllers/Purchases/Vendors.php
View File

@ -87,7 +87,7 @@ class Vendors extends Controller
$amounts['paid'] += $item->getAmountConvertedToDefault(); $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); $transactions = $this->paginate($transactions->sortByDesc('paid_at'), $limit);
$bills = $this->paginate($bills->sortByDesc('issued_at'), $limit); $bills = $this->paginate($bills->sortByDesc('issued_at'), $limit);

2
app/Http/Controllers/Sales/Customers.php
View File

@ -85,7 +85,7 @@ class Customers extends Controller
$amounts['paid'] += $item->getAmountConvertedToDefault(); $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); $transactions = $this->paginate($transactions->sortByDesc('paid_at'), $limit);
$invoices = $this->paginate($invoices->sortByDesc('issued_at'), $limit); $invoices = $this->paginate($invoices->sortByDesc('issued_at'), $limit);

2
app/Models/Auth/Permission.php
View File

@ -42,7 +42,7 @@ class Permission extends LaratrustPermission
$request = request(); $request = request();
$search = $request->get('search'); $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); return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
} }

2
app/Models/Auth/Role.php
View File

@ -35,7 +35,7 @@ class Role extends LaratrustRole
$request = request(); $request = request();
$search = $request->get('search'); $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); return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
} }

2
app/Models/Auth/User.php
View File

@ -176,7 +176,7 @@ class User extends Authenticatable implements HasLocalePreference
$request = request(); $request = request();
$search = $request->get('search'); $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); return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
} }

2
app/Models/Common/Company.php
View File

@ -342,7 +342,7 @@ class Company extends Eloquent implements Ownable
return $query->get(); 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); return $query->paginate($limit);
} }