Skip to content

Commit b8e3eb9

Browse files
authored
Fix pagination bug (#1285)
* Fix pagination bug * Handle edge case for customer search with term parameter
1 parent b57f520 commit b8e3eb9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/backend/app/Http/Controllers/PersonController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ public function __construct(
3939
*/
4040
public function index(Request $request): ApiResource {
4141
$customerType = $request->input('is_customer', 1);
42-
$limit = $request->input('limit', config('settings.paginate'));
42+
$perPage = $request->input('per_page', config('settings.paginate'));
4343
$agentId = $request->input('agent_id');
4444
$activeCustomer = $request->has('active_customer') ? (bool) $request->input('active_customer') : null;
4545

46-
return ApiResource::make($this->personService->getAll($limit, $customerType, $agentId, $activeCustomer));
46+
return ApiResource::make($this->personService->getAll($perPage, $customerType, $agentId, $activeCustomer));
4747
}
4848

4949
/**
@@ -159,7 +159,7 @@ public function transactions(
159159
public function search(
160160
Request $request,
161161
): ApiResource {
162-
$term = $request->input('term');
162+
$term = $request->input('term', '');
163163
$paginate = $request->input('paginate', 1);
164164
$per_page = $request->input('per_page', 15);
165165

src/frontend/src/shared/Paginate.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export default {
152152
this.loadPage(1)
153153
},
154154
defaultItemsPerPage(data) {
155-
this.paginator.perPage = data.target.value
155+
this.paginator.perPage = data
156156
this.loadPage(this.paginator.currentPage)
157157
},
158158
loadPage(pageNumber) {

0 commit comments

Comments
 (0)