Merge branch 'develop' into trunk
This commit is contained in:
commit
d9b316eae4
1 changed files with 1 additions and 1 deletions
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue