Skip to content

Commit

Permalink
up
Browse files Browse the repository at this point in the history
  • Loading branch information
marco76tv committed Sep 7, 2023
1 parent 3573f21 commit 41afe27
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Models/Traits/FrontendSortable.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

trait FrontendSortable
{
public function scopeSortableBy(Builder $builder, array $sortableColumns, array $defaultSort = ['name' => 'asc']): Builder
public function scopeSortableBy(Builder $query, array $sortableColumns, array $defaultSort = ['name' => 'asc']): Builder
{
$request = request();
$sorted = $request->has('sort_by') && in_array($request->input('sort_by'), $sortableColumns);
Expand All @@ -22,14 +22,14 @@ public function scopeSortableBy(Builder $builder, array $sortableColumns, array
*/
$sortDirectionRequest = $request->input('sort_direction', 'asc');

return $builder->when($sorted, static function (Builder $builder) use ($sortByRequest, $sortDirectionRequest) : void {
$builder->orderBy(
return $query->when($sorted, static function (Builder $query) use ($sortByRequest, $sortDirectionRequest): void {
$query->orderBy(
(string) $sortByRequest,
('desc' == (string) $sortDirectionRequest) ? 'desc' : 'asc'
);
}, static function (Builder $builder) use ($defaultSort) : void {
}, static function (Builder $query) use ($defaultSort): void {
foreach ($defaultSort as $key => $direction) {
$builder->orderBy($key, $direction);
$query->orderBy($key, $direction);
}
});
}
Expand Down

0 comments on commit 41afe27

Please sign in to comment.