diff --git a/app/Http/Controllers/Bo/InvoiceController.php b/app/Http/Controllers/Bo/InvoiceController.php index c9e27d3..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()->orderByDesc('created_at'); + $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 5686abc..75b55bd 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -216,13 +216,13 @@ class Controller extends BaseController Session::remove("$rName.sort_col"); Session::remove("$rName.sort_way"); } - if (request()->sort_col and request()->sort_way and Schema::hasColumn($table, request()->sort_col)) { - if ( - !isset($ignore) or - (isset($ignore) and !in_array(request()->sort_col, $ignore)) - ) { - $query = $query->orderBy(\sprintf("$table.%s", request()->sort_col), request()->sort_way); - } + if ( + request()->sort_col && + request()->sort_way && + Schema::hasColumn($table, request()->sort_col) && + (!isset($ignore) || (isset($ignore) && !in_array(request()->sort_col, $ignore))) + ) { + $query = $query->orderBy("$table." . request()->sort_col, request()->sort_way); } return $query; } diff --git a/routes/web-bo.php b/routes/web-bo.php index faca415..86c2699 100644 --- a/routes/web-bo.php +++ b/routes/web-bo.php @@ -41,7 +41,7 @@ Route::middleware('admin-secure') Route::middleware('auth:backend') ->group(function () { // * HOME - Route::get('/', function(){ + Route::get('/', function () { return redirect()->route('bo.ticket.index'); })->name('dashboard');