fix: manual pagination not triggered

aw-studio · Feb 21, 2025 · 7d32bf9 · 7d32bf9
1 parent 0e0ce6a
commit 7d32bf9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Concerns/PaginateIndex.php b/src/Concerns/PaginateIndex.php
@@ -20,13 +20,13 @@ public function pageName(string $pageName)
         return $this;
     }
 
-    public function paginateFromRequest(Request $request)
+    public function paginateFromRequest(Request $request, $perPage = null)
     {
-        if (($request->has('page') || $request->has('perPage')) == false) {
+        if (($request->has('page') || $request->has('perPage')) == false && $perPage === null) {
             return $this;
         }
 
-        $perPage = $request->get('perPage', $this->perPage);
+        $perPage = $perPage ?? $request->get('perPage', $this->perPage);
 
         return $this->query()
             ->paginate($perPage, ['*'], $this->pageName)