diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php index 99f2623b2..927787da4 100644 --- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php +++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php @@ -196,6 +196,7 @@ class FilterController extends Controller ->leftJoin('ticket_status', function ($join) { $join->on('ticket_status.id', '=', 'tickets.status'); }) + ->where('isanswered', '=', 0) ->where('tickets.status', '=', 1); case '/duetoday': if (Auth::user()->role == 'agent') { @@ -238,7 +239,7 @@ class FilterController extends Controller ->whereNotNull('title') ->where('ticket_thread.is_internal', '<>', 1); }) - + ->leftJoin('ticket_thread as ticket_thread2', 'ticket_thread2.ticket_id', '=', 'tickets.id') ->Join('ticket_source', 'ticket_source.id', '=', 'tickets.source') ->leftJoin('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id') ->leftJoin('users as u', 'u.id', '=', 'tickets.user_id') diff --git a/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php b/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php index a30e321a8..3cec0bf17 100644 --- a/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php @@ -72,7 +72,7 @@ class="active"
-s {!! Lang::get('lang.overdue') !!} + {!! Lang::get('lang.overdue') !!} {{ $overdues->count() }} Tickets
diff --git a/resources/views/themes/default1/agent/helpdesk/dept-ticket/tickets.blade.php b/resources/views/themes/default1/agent/helpdesk/dept-ticket/tickets.blade.php index 14fb6a50d..ff88f6abc 100644 --- a/resources/views/themes/default1/agent/helpdesk/dept-ticket/tickets.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/dept-ticket/tickets.blade.php @@ -45,17 +45,15 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::select('id', 'name')->where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::whereIn('status', array(1, 7))->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20); $dept_name = $dept->name; } else { $dept_name = \Request::segments()[1]; - $tickets = App\Model\helpdesk\Ticket\Tickets::whereIn('status', array(1, 7))->orderBy('id', 'DESC')->paginate(20); } ?>
-

{!! $dept_name !!} / {!! $status !!}

{!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

{!! $dept_name !!} / {!! $status !!}

diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/answered.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/answered.blade.php index 1ff95fbfd..531dcc6e2 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/answered.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/answered.blade.php @@ -46,15 +46,15 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 1)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 1)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 1)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 1)->orderBy('id', 'DESC')->count(); } ?>
-

{!! Lang::get('lang.answered') !!}

{!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

{!! Lang::get('lang.answered') !!}

{!! $tickets !!} {!! Lang::get('lang.tickets') !!}
diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/assigned.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/assigned.blade.php index 40faa1ae4..d0f7c0dbd 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/assigned.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/assigned.blade.php @@ -46,15 +46,15 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '>', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '>', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '>', 0)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '>', 0)->orderBy('id', 'DESC')->count(); } ?>
-

{!! Lang::get('lang.assigned') !!}

{!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

{!! Lang::get('lang.assigned') !!}

{!! $tickets !!} {!! Lang::get('lang.tickets') !!}
@if(Session::has('success')) diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/closed.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/closed.blade.php index 5665bab35..8697a33da 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/closed.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/closed.blade.php @@ -46,15 +46,15 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '>', 1)->where('dept_id', '=', $dept->id)->where('status', '<', 4)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '>', 1)->where('dept_id', '=', $dept->id)->where('status', '<', 4)->orderBy('id', 'DESC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '>', 1)->where('status', '<', 4)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '>', 1)->where('status', '<', 4)->orderBy('id', 'DESC')->count(); } ?>
-

{!! Lang::get('lang.closed') !!}

{!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

{!! Lang::get('lang.closed') !!}

{!! $tickets !!} {!! Lang::get('lang.tickets') !!}
@if(Session::has('success')) diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/duetodayticket.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/duetodayticket.blade.php index 6c646ab46..e0fc82183 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/duetodayticket.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/duetodayticket.blade.php @@ -48,23 +48,14 @@ class="active" $todaytickets = count(App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->whereRaw('date(duedate) = ?', [date('Y-m-d')])->get()); } else { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $todaytickets = count(App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->whereRaw('date(duedate) = ?', [date('Y-m-d')])->where('dept_id', '=', $dept->id)->get()); + $todaytickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->whereRaw('date(duedate) = ?', [date('Y-m-d')])->where('dept_id', '=', $dept->id)->count(); } ?> -role == 'agent') { - $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20); -} else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->orderBy('id', 'DESC')->paginate(20); -} -?>
-

{!! Lang::get('lang.open') !!}

{!! $todaytickets !!} {!! Lang::get('lang.tickets') !!} +

{!! Lang::get('lang.duetoday') !!}

{!! $todaytickets !!} {!! Lang::get('lang.tickets') !!}
diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php index a700033d0..e644c5fee 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php @@ -45,15 +45,15 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::whereIn('status', array(1, 7))->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::whereIn('status', array(1, 7))->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::whereIn('status', array(1, 7))->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::whereIn('status', array(1, 7))->orderBy('id', 'DESC')->count(); } ?>
-

{!! Lang::get('lang.inbox') !!}

{!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

{!! Lang::get('lang.inbox') !!}

{!! $tickets !!} {!! Lang::get('lang.tickets') !!}
diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/myticket.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/myticket.blade.php index 84846f332..72e2998c0 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/myticket.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/myticket.blade.php @@ -44,15 +44,15 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->orderBy('id', 'ASC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->orderBy('id', 'ASC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->orderBy('id', 'ASC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->orderBy('id', 'ASC')->count(); } ?>
-

{!! Lang::get('lang.my_tickets') !!}

{!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

{!! Lang::get('lang.my_tickets') !!}

{!! $tickets !!} {!! Lang::get('lang.tickets') !!}
diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php index 28cbb9466..627ddc735 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php @@ -46,15 +46,15 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->orderBy('id', 'DESC')->count(); } ?>
-

{!! Lang::get('lang.open') !!}

{!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

{!! Lang::get('lang.open') !!}

{!! $tickets !!} {!! Lang::get('lang.tickets') !!}
diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/overdue.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/overdue.blade.php index 37e16b856..1bd289111 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/overdue.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/overdue.blade.php @@ -41,38 +41,20 @@ class="active" @stop @section('content') role == 'agent') { -// $dept = \App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); -// $overdues = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->get(); -// } else { -// $overdues = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->orderBy('id', 'DESC')->get(); -// } -// $i = count($overdues); -// if ($i == 0) { -// $overdue_ticket = 0; -// } else { -// $j = 0; -// foreach ($overdues as $overdue) { -// $sla_plan = App\Model\helpdesk\Manage\Sla_plan::where('id', '=', $overdue->sla)->first(); -// $ovadate = $overdue->created_at; -// $new_date = date_add($ovadate, date_interval_create_from_date_string($sla_plan->grace_period)) . '

'; -// if (date('Y-m-d H:i:s') > $new_date) { -// $j++; -// //$value[] = $overdue; -// } -// } -// // dd(count($value)); -// if ($j > 0) { -// $overdue_ticket = $j; -// } else { -// $overdue_ticket = 0; -// } -// } - $overdue_ticket=App\Model\helpdesk\Ticket\Tickets::where('tickets.duedate','<', \Carbon\Carbon::now())->count(); + $otickets = App\Model\helpdesk\Ticket\Tickets::where('tickets.status', '=', 1) + ->where('tickets.isanswered', '=', 0) + ->whereNotNull('tickets.duedate') + ->where('tickets.duedate', '!=', '00-00-00 00:00:00') + // ->where('duedate','>',\Carbon\Carbon::now()); + ->where('tickets.duedate', '<', \Carbon\Carbon::now()); + if (\Auth::user()->role === 'agent') { + $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); + $otickets = $otickets->where('dept_id', '=', $dept->id); + } + $overdue_ticket = $otickets->count(); ?> diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/trash.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/trash.blade.php index 5cff811cc..33add1a07 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/trash.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/trash.blade.php @@ -44,15 +44,15 @@ class="active" // $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 5)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 5)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 5)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 5)->orderBy('id', 'DESC')->count(); } ?>
-

{!! Lang::get('lang.trash') !!}

{!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

{!! Lang::get('lang.trash') !!}

{!! $tickets !!} {!! Lang::get('lang.tickets') !!}
@if(Session::has('success')) diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/unassigned.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/unassigned.blade.php index 479cdc37d..11c3b726d 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/unassigned.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/unassigned.blade.php @@ -44,9 +44,9 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=', null)->where('dept_id', '=', $dept->id)->where('status', '1')->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=', null)->where('dept_id', '=', $dept->id)->where('status', '1')->orderBy('id', 'DESC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=', null)->where('status', '1')->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=', null)->where('status', '1')->orderBy('id', 'DESC')->count(); } // dd($tickets); ?> @@ -54,7 +54,7 @@ if (Auth::user()->role == 'agent') {
get()); ?> -

{!! Lang::get('lang.unassigned') !!}

{!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

{!! Lang::get('lang.unassigned') !!}

{!! $tickets !!} {!! Lang::get('lang.tickets') !!}
@if(Session::has('success')) diff --git a/resources/views/themes/default1/agent/layout/agent.blade.php b/resources/views/themes/default1/agent/layout/agent.blade.php index 052388d57..6f032b588 100644 --- a/resources/views/themes/default1/agent/layout/agent.blade.php +++ b/resources/views/themes/default1/agent/layout/agent.blade.php @@ -320,7 +320,7 @@ where('group_status', '=', '1')->first(); +$group = App\Model\helpdesk\Agent\Groups::where('id', '=', $agent_group)->first(); ?>
@@ -344,10 +344,6 @@ $group = App\Model\helpdesk\Agent\Groups::where('id', '=', $agent_group)->where(