From e873ce5e12bfed675f2af7e9d924ef627d7dbe4f Mon Sep 17 00:00:00 2001
From: Manish Verma <alerts@ladybirdweb.com>
Date: Thu, 9 Aug 2018 17:25:02 +0530
Subject: [PATCH] Inbox updates

Updated links for ticket list pages
---
 .../agent/helpdesk/ticket/tickets.blade.php   | 12 ++++++++++-
 .../default1/agent/layout/agent.blade.php     | 20 +++++++++----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/tickets.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/tickets.blade.php
index b6b7bbbad..b6569d6b1 100644
--- a/resources/views/themes/default1/agent/helpdesk/ticket/tickets.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/ticket/tickets.blade.php
@@ -14,6 +14,8 @@ $activepage = $inputs[0];
 if (\Input::has('assigned'))
 {
     $activepage = \Input::get('assigned')[0];
+} elseif (\Input::has('last-response-by')){
+    $activepage = \Input::get('last-response-by')[0];
 }
 ?>
 
@@ -45,12 +47,20 @@ if (\Input::has('assigned'))
     @section('approval')
         class="active"
     @stop
+@elseif($activepage == 'Agent')
+    @section('answered')
+        class="active"
+    @stop
+@elseif($activepage == 'Client')
+    @section('open')
+        class="active"
+    @stop
 @elseif($activepage == 0)
     @section('unassigned')
         class="active"
     @stop
 @else
-    @section('inbox')
+    @section('assigned')
         class="active"
     @stop
 @endif
diff --git a/resources/views/themes/default1/agent/layout/agent.blade.php b/resources/views/themes/default1/agent/layout/agent.blade.php
index 889a614b4..750cf67c6 100644
--- a/resources/views/themes/default1/agent/layout/agent.blade.php
+++ b/resources/views/themes/default1/agent/layout/agent.blade.php
@@ -270,31 +270,31 @@
                         <li class="header">{!! Lang::get('lang.Tickets') !!}</li>
 
                         <li @yield('inbox')>
-                             <a href="{{ url('/ticket/inbox')}}" id="load-inbox">
+                             <a href="{{ url('tickets')}}" id="load-inbox">
                                 <i class="fa fa-envelope"></i> <span>{!! Lang::get('lang.inbox') !!}</span> <small class="label pull-right bg-green">{{$tickets -> count()}}</small>
                             </a>
                         </li>
                         <li @yield('myticket')>
-                             <a href="{{url('ticket/myticket')}}" id="load-myticket">
+                             <a href="{{url('/tickets?show=mytickets')}}" id="load-myticket">
                                 <i class="fa fa-user"></i> <span>{!! Lang::get('lang.my_tickets') !!} </span>
                                 <small class="label pull-right bg-green">{{$myticket -> count()}}</small>
                             </a>
                         </li>
                         <li @yield('unassigned')>
-                             <a href="{{url('unassigned')}}" id="load-unassigned">
+                             <a href="{{url('/tickets?assigned[]=0')}}" id="load-unassigned">
                                 <i class="fa fa-th"></i> <span>{!! Lang::get('lang.unassigned') !!}</span>
                                 <small class="label pull-right bg-green">{{$unassigned -> count()}}</small>
                             </a>
                         </li>
                         <li @yield('overdue')>
-                             <a href="{{url('ticket/overdue')}}" id="load-unassigned">
+                             <a href="{{url('/tickets?show=overdue')}}" id="load-unassigned">
                                 <i class="fa fa-calendar-times-o"></i> <span>{!! Lang::get('lang.overdue') !!}</span>
                                 <small class="label pull-right bg-green">{{$overdues->count()}}</small>
                             </a>
                         </li>
 
                         <li @yield('trash')>
-                             <a href="{{url('trash')}}">
+                             <a href="{{url('/tickets?show=trash')}}">
                                 <i class="fa fa-trash-o"></i> <span>{!! Lang::get('lang.trash') !!}</span>
                                 <small class="label pull-right bg-green">{{$deleted -> count()}}</small>
                             </a>
@@ -329,7 +329,7 @@
                            @foreach($statuses as $status)
                            @if($dept->get($status))
                            <ul class="treeview-menu">
-                                <li @if($status2 == $dept->get($status)->status && $dept2 === $name) @yield('inbox') @endif><a href="{{url('tickets/'.$name.'/'.$dept->get($status)->status)}}"><i class="fa fa-circle-o"></i> {!!$dept->get($status)->status !!}<small class="label pull-right bg-green">{{$dept->get($status)->count}}</small></a></li>
+                                <li @if($status2 == $dept->get($status)->status && $dept2 === $name) @yield('inbox') @endif><a href="{!! url('tickets?departments='.$name.'&status='.$dept->get($status)->status) !!}"><i class="fa fa-circle-o"></i> {!!$dept->get($status)->status !!}<small class="label pull-right bg-green">{{$dept->get($status)->count}}</small></a></li>
                             </ul>
                            @endif
                             @endforeach
@@ -368,10 +368,10 @@ $group = App\Model\helpdesk\Agent\Groups::where('id', '=', $agent_group)->first(
                             </div>
                             <div class="tabs-pane @yield('ticket-bar')" id="tabC">
                                 <ul class="nav navbar-nav">
-                                    <li id="bar" @yield('open')><a href="{{ url('/ticket/open')}}" id="load-open">{!! Lang::get('lang.open') !!}</a></li>
-                                    <li id="bar" @yield('answered')><a href="{{ url('/ticket/answered')}}" id="load-answered">{!! Lang::get('lang.answered') !!}</a></li>
-                                    <li id="bar" @yield('assigned')><a href="{{ url('/ticket/assigned')}}" id="load-assigned" >{!! Lang::get('lang.assigned') !!}</a></li>
-                                    <li id="bar" @yield('closed')><a href="{{ url('/ticket/closed')}}" >{!! Lang::get('lang.closed') !!}</a></li>
+                                    <li id="bar" @yield('open')><a href="{{ url('/tickets?last-response-by[]=Client') }}" id="load-open">{!! Lang::get('lang.not-answered') !!}</a></li>
+                                    <li id="bar" @yield('answered')><a href="{{ url('/tickets?last-response-by[]=Agent')}}" id="load-answered">{!! Lang::get('lang.answered') !!}</a></li>
+                                    <li id="bar" @yield('assigned')><a href="{{ url('/tickets?assigned[]=1') }}" id="load-assigned" >{!! Lang::get('lang.assigned') !!}</a></li>
+                                    <li id="bar" @yield('closed')><a href="{{ url('/tickets?show=closed') }}" >{!! Lang::get('lang.closed') !!}</a></li>
 <?php if ($group->can_create_ticket == 1) { ?>
                                         <li id="bar" @yield('newticket')><a href="{{ url('/newticket')}}" >{!! Lang::get('lang.create_ticket') !!}</a></li>
                                     <?php } ?>