diff --git a/src/MindOfMicah/LaravelDatatables/Datatable.php b/src/MindOfMicah/LaravelDatatables/Datatable.php index 235b0b9..7599d40 100644 --- a/src/MindOfMicah/LaravelDatatables/Datatable.php +++ b/src/MindOfMicah/LaravelDatatables/Datatable.php @@ -9,7 +9,7 @@ class Datatable protected $columns; public function __construct($a) { - $this->a = $a; + $this->a = $a; } public function asJsonResponse() @@ -21,9 +21,13 @@ public function asJsonResponse() if ($this->columns) { } - $models = $model_name::select($this->columns?:'*')->get(); + $sql = $model_name::query()->select($this->columns ?: '*'); + + $total = ($sql->count()); + $models = $sql->take($this->a->input('length'))->get(); $data = $models->toArray(); - $total = count($models); + + $total = $total; $amount_displayed = count($models); }