Merge pull request #20 from syamsoul/bugfix/info-data-when-request-al…

…l-items make sure correct info when user put itemsPerPage -1 (all)
syamsoul · Aug 24, 2024 · a7d689d · a7d689d
2 parents be902db + c579ff3
commit a7d689d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Handler/DataHandler.php b/src/Handler/DataHandler.php
@@ -117,7 +117,7 @@ public function getData(bool $is_for_csv = false, ?callable $chunkCallback = nul
                     $ret['total_filtered_item_count'] = $query_filtered_count;
                     if (!empty($pagination_data)) {
                         $ret['current_page'] = $pagination_data['current_page'];
-                        $ret['total_pages'] = intval(ceil($ret['total_filtered_item_count'] / $pagination_data['items_per_page']));
+                        $ret['total_pages'] = $pagination_data['items_per_page'] < 0 ? 1 : intval(ceil($ret['total_filtered_item_count'] / $pagination_data['items_per_page']));
                     }
                 }
 

diff --git a/src/Handler/QueryHandler.php b/src/Handler/QueryHandler.php
@@ -122,12 +122,12 @@ public function queryOrder(EloquentBuilder|QueryBuilder $query): void
 
     public function queryPagination(EloquentBuilder|QueryBuilder $query, bool $is_for_csv = false): void
     {
-        $request = request();
-
         $pagination_data = $this->getPaginationData($is_for_csv);
 
         if (isset($pagination_data['items_per_page']) && isset($pagination_data['offset'])) {
-            if ($pagination_data['items_per_page'] != "-1") $query->limit($pagination_data['items_per_page'])->offset($pagination_data['offset']);
+            if ($pagination_data['items_per_page'] === -1) {
+                if ($pagination_data['current_page'] > 1) $query->limit(0);
+            } else $query->limit($pagination_data['items_per_page'])->offset($pagination_data['offset']);
         }
     }