diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 8bac8029d2..7848cf2529 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -155,11 +155,12 @@ class CategoryController extends Controller public function show(SCRI $repository, Category $category) { $hideCategory = true; // used in list. + $pageSize = Preferences::get('transactionPageSize', 50)->data; $page = intval(Input::get('page')); - $set = $repository->getJournals($category, $page); + $set = $repository->getJournals($category, $page, $pageSize); $count = $repository->countJournals($category); $subTitle = $category->name; - $journals = new LengthAwarePaginator($set, $count, 50, $page); + $journals = new LengthAwarePaginator($set, $count, $pageSize, $page); $journals->setPath('categories/show/' . $category->id); // list of ranges for list of periods: diff --git a/app/Repositories/Category/SingleCategoryRepository.php b/app/Repositories/Category/SingleCategoryRepository.php index ea7dd6fc29..4025ada2ca 100644 --- a/app/Repositories/Category/SingleCategoryRepository.php +++ b/app/Repositories/Category/SingleCategoryRepository.php @@ -138,14 +138,15 @@ class SingleCategoryRepository extends ComponentRepository implements SingleCate /** * @param Category $category * @param int $page + * @param int $pageSize * * @return Collection */ - public function getJournals(Category $category, $page): Collection + public function getJournals(Category $category, int $page, int $pageSize = 50): Collection { - $offset = $page > 0 ? $page * 50 : 0; + $offset = $page > 0 ? $page * $pageSize : 0; - return $category->transactionjournals()->expanded()->take(50)->offset($offset) + return $category->transactionjournals()->expanded()->take($pageSize)->offset($offset) ->orderBy('transaction_journals.date', 'DESC') ->orderBy('transaction_journals.order', 'ASC') ->orderBy('transaction_journals.id', 'DESC') diff --git a/app/Repositories/Category/SingleCategoryRepositoryInterface.php b/app/Repositories/Category/SingleCategoryRepositoryInterface.php index 29649457be..7219b8980c 100644 --- a/app/Repositories/Category/SingleCategoryRepositoryInterface.php +++ b/app/Repositories/Category/SingleCategoryRepositoryInterface.php @@ -74,10 +74,11 @@ interface SingleCategoryRepositoryInterface /** * @param Category $category * @param int $page + * @param int $pageSize * * @return Collection */ - public function getJournals(Category $category, $page): Collection; + public function getJournals(Category $category, int $page, int $pageSize = 50): Collection; /** * @param Category $category