diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php index 382f68e35..43fae0c8a 100644 --- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php +++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php @@ -1035,14 +1035,13 @@ class FilterController extends Controller public function getGMT() { $system = \App\Model\helpdesk\Settings\System::select('time_zone')->first(); - $timezone = \DB::table('timezone')->select('location')->where('name', '=', $system->time_zone)->first(); + $timezone = \DB::table('timezone')->select('location')->where('id', '=', $system->time_zone)->first(); $location = '(GMT) London'; if ($timezone) { $location = $timezone->location; } $tz = explode(')', substr($location, stripos($location, 'T') + 1)); - return $tz[0]; } diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 27f6251e6..77fa77539 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -2659,7 +2659,12 @@ class TicketController extends Controller { return \Datatable::table() ->addColumn( - '', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity') + '', + Lang::get('lang.subject'), + Lang::get('lang.ticket_id'), + Lang::get('lang.from'), + Lang::get('lang.assigned_to'), + Lang::get('lang.last_activity') )->noScript(); } @@ -2691,7 +2696,7 @@ class TicketController extends Controller return "