forge-joniko/ldc-supportweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: 🎨 add condition to have invoiceModels sorted by query string or orderByDesc if no query string in InvoiceController

Browse source
This commit is contained in:
Nicolas Demangeat 2025-06-16 10:54:46 +02:00
parent 4c8f5f20f7
commit c63f2b62e9
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Bo/InvoiceController.php
View file

@ -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);

3
app/Http/Controllers/Controller.php
View file

@ -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;
}