From c63f2b62e9c580de9d7029c3aeb25f1c5883b7a7 Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Mon, 16 Jun 2025 10:54:46 +0200 Subject: [PATCH] fix: :art: add condition to have invoiceModels sorted by query string or orderByDesc if no query string in InvoiceController --- app/Http/Controllers/Bo/InvoiceController.php | 6 +++++- app/Http/Controllers/Controller.php | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Bo/InvoiceController.php b/app/Http/Controllers/Bo/InvoiceController.php index 531880e..fee33fa 100644 --- a/app/Http/Controllers/Bo/InvoiceController.php +++ b/app/Http/Controllers/Bo/InvoiceController.php @@ -25,8 +25,12 @@ class InvoiceController extends Controller */ public function index(Request $request): \Illuminate\Contracts\View\View { + // If no sorting is requested, apply the default orderByDesc. /** @var \Illuminate\Database\Eloquent\Builder $invoiceModels */ - $invoiceModels = Invoice::query(); + $invoiceModels = (!request()->query('sort_col') && !request()->query('sort_way')) + ? Invoice::query()->orderByDesc('created_at') + : Invoice::query(); + $status = intval($request->status); $invoiceModels = $invoiceModels->when($status, function ($query) use ($status) { $query->where('status', $status); diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 5c92252..75b55bd 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -223,9 +223,6 @@ class Controller extends BaseController (!isset($ignore) || (isset($ignore) && !in_array(request()->sort_col, $ignore))) ) { $query = $query->orderBy("$table." . request()->sort_col, request()->sort_way); - } else { - // Else, orderByDesc by default. - $query = $query->orderByDesc("$table.created_at"); } return $query; }