Merge branch 'akaunting:master' into master

This commit is contained in:
Burak Civan
2021-06-23 13:32:15 +03:00
committed by GitHub
19 changed files with 23 additions and 23 deletions

View File

@ -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);

View File

@ -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);