cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update inbox fix

Browse Source
This commit is contained in:
Manish Verma
2018-08-09 16:57:57 +05:30
parent 3c24de643c
commit 02b4b42363
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php
View File

@@ -1035,14 +1035,13 @@ class FilterController extends Controller
public function getGMT() public function getGMT()
{ {
$system = \App\Model\helpdesk\Settings\System::select('time_zone')->first(); $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'; $location = '(GMT) London';
if ($timezone) { if ($timezone) {
$location = $timezone->location; $location = $timezone->location;
} }
$tz = explode(')', substr($location, stripos($location, 'T') $tz = explode(')', substr($location, stripos($location, 'T')
+ 1)); + 1));
return $tz[0]; return $tz[0];
} }

17
app/Http/Controllers/Agent/helpdesk/TicketController.php
View File

@@ -2659,7 +2659,12 @@ class TicketController extends Controller
{ {
return \Datatable::table() return \Datatable::table()
->addColumn( ->addColumn(
'<a class="checkbox-toggle"><i class="fa fa-square-o fa-2x"></i></a>', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity') '<a class="checkbox-toggle"><i class="fa fa-square-o fa-2x"></i></a>',
Lang::get('lang.subject'),
Lang::get('lang.ticket_id'),
Lang::get('lang.from'),
Lang::get('lang.assigned_to'),
Lang::get('lang.last_activity')
)->noScript(); )->noScript();
} }
@@ -2691,7 +2696,7 @@ class TicketController extends Controller
return "<center><input type='checkbox' name='select_all[]' id='".$tickets->id."' onclick='someFunction(this.id)' class='selectval icheckbox_flat-blue ".$tickets->color.' '.$rep."' value='".$tickets->id."'></input></center>"; return "<center><input type='checkbox' name='select_all[]' id='".$tickets->id."' onclick='someFunction(this.id)' class='selectval icheckbox_flat-blue ".$tickets->color.' '.$rep."' value='".$tickets->id."'></input></center>";
}) })
->addColumn('title', function ($tickets) { ->editColumn('title', function ($tickets) {
if (isset($tickets->ticket_title)) { if (isset($tickets->ticket_title)) {
$string = utfEncoding($tickets->ticket_title); $string = utfEncoding($tickets->ticket_title);
if (strlen($string) > 25) { if (strlen($string) > 25) {
@@ -2783,15 +2788,7 @@ class TicketController extends Controller
} }
} }
}) })
->editColumn('updated_at', function ($tickets) {
$TicketDatarow = $tickets->updated_at;
$updated = '--';
if ($TicketDatarow) {
$updated = faveoDate($tickets->updated_at);
}
return '<span style="display:none">'.$updated.'</span>'.$updated;
})
->make(); ->make();
} }

11
app/Http/helpers.php
View File

@@ -211,3 +211,14 @@ function faveoDate($date = '', $format = '', $tz = '')
return 'invalid'; return 'invalid';
} }
} }
function timezone()
{
$system = App\Model\helpdesk\Settings\System::select('time_zone')->first();
$tz = 'UTC';
if ($system) {
$tz = App\Model\helpdesk\Utility\Timezones::where('id', $system->time_zone)->first()->name;
}
return $tz;
}