diff --git a/app/Http/Controllers/TicketController.php b/app/Http/Controllers/TicketController.php index dde2737..59e3631 100644 --- a/app/Http/Controllers/TicketController.php +++ b/app/Http/Controllers/TicketController.php @@ -70,7 +70,7 @@ class TicketController extends Controller }); }); } - $tickets = $tickets->where('status', $request->status ? '=' : '<>', TicketStatus::archived()); + $tickets = $tickets->where('status', ($request->st==TicketStatus::archived()) ? '=' : '<>', TicketStatus::archived()); if ($request->search) { $tickets = $this->searchTicket($tickets, $request); } diff --git a/resources/views/ticket/index.blade.php b/resources/views/ticket/index.blade.php index e73d37f..4d861e8 100644 --- a/resources/views/ticket/index.blade.php +++ b/resources/views/ticket/index.blade.php @@ -12,10 +12,10 @@ $userPr = Auth::user()->sites ?? collect([]);
{{ __('Créer un ticket') }} - @if(request()->status) - {{ __('Tickets en cours') }} + @if(session('tickets.st') == TicketStatus::archived()) + {{ __('Tickets Actifs') }} @else - {{ __('Tickets Archivés') }} + {{ __('Tickets Archivés') }} @endif {{ __('Réinitialiser le tri') }}
@@ -35,11 +35,7 @@ $userPr = Auth::user()->sites ?? collect([]);