diff --git a/app/Http/Controllers/Bo/TicketController.php b/app/Http/Controllers/Bo/TicketController.php index fd1ae81..6d88359 100644 --- a/app/Http/Controllers/Bo/TicketController.php +++ b/app/Http/Controllers/Bo/TicketController.php @@ -95,8 +95,8 @@ class TicketController extends Controller TicketStatusEnum::archived ); - $tickets = $this->searchTicket($tickets, $request); $tickets = $this->filterTickets($tickets, $request); + $tickets = $this->searchTicket($tickets, $request); /** Custom pagination */ $tickets = $this->customPaginate($tickets, $request->pagination); @@ -489,6 +489,7 @@ class TicketController extends Controller Session::remove('tickets.pr'); Session::remove('tickets.sort_col'); Session::remove('tickets.sort_way'); + Session::remove('tickets.search'); } if ($request->assr) { Session::remove('tickets.ass'); diff --git a/resources/views/bo/pages/brands/form-inputs.blade.php b/resources/views/bo/pages/brands/form-inputs.blade.php index a724e8e..6e36654 100644 --- a/resources/views/bo/pages/brands/form-inputs.blade.php +++ b/resources/views/bo/pages/brands/form-inputs.blade.php @@ -58,7 +58,7 @@ @push('scripts') -