diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 8b5f6fe99..40a477ac8 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -1464,8 +1464,8 @@ class TicketController extends Controller */ public function assign($id) { - $ticket_array = []; - if(strpos($id, ',') !== false) { + $ticket_array = []; + if (strpos($id, ',') !== false) { $ticket_array = explode(',', $id); } else { array_push($ticket_array, $id); @@ -1491,7 +1491,7 @@ class TicketController extends Controller $thread->save(); } elseif ($assign_to[0] == 'user') { $ticket->assigned_to = $assign_to[1]; - if( $user_detail === null) { + if ($user_detail === null) { $user_detail = User::where('id', '=', $assign_to[1])->first(); $assignee = $user_detail->first_name.' '.$user_detail->last_name; } @@ -1523,6 +1523,7 @@ class TicketController extends Controller } } } + return 1; } @@ -2556,12 +2557,13 @@ class TicketController extends Controller $name = $from->user_name; } } - $color = ""; - if($verify->status == 1 || $verify->status == '1') { - if($from->active == 0 || $from->active == '0') { + $color = ''; + if ($verify->status == 1 || $verify->status == '1') { + if ($from->active == 0 || $from->active == '0') { $color = ""; } } + return "user_name).'''.Lang::get('lang.see-profile2')."'>".ucfirst(str_limit($name, 30)).' '.$color.''; }) // ->addColumn('Last Replier', function ($ticket) { diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index fee09435a..e9dc8e1f9 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -1005,15 +1005,17 @@ class UserController extends Controller } /** - * @category function to get user details and show in select field + * @category function to get user details and show in select field + * * @param null + * * @return data */ public function getAgentDetails() { $users = User::where('role', '<>', 'user')->where('active', '=', 1)->get(); foreach ($users as $user) { - echo "'; + echo "'; } } } diff --git a/app/Http/routes.php b/app/Http/routes.php index 865b50155..687311ec4 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -724,7 +724,7 @@ Route::group(['middleware' => ['web']], function () { // route to get the data on change Route::post('help-topic-report/{date1}/{date2}/{id}', ['as' => 'report.helptopic', 'uses' => 'Agent\helpdesk\ReportController@chartdataHelptopic']); /* To show dashboard pages */ Route::post('help-topic-pdf', ['as' => 'help.topic.pdf', 'uses' => 'Agent\helpdesk\ReportController@helptopicPdf']); - // Route to get details of agents + // Route to get details of agents Route::post('get-agents', ['as' => 'get-agents', 'uses' => 'Agent\helpdesk\UserController@getAgentDetails']); }); diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 12b6dccfc..30ac3a1bd 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1549,5 +1549,5 @@ return [ /*********** Updated 3-12-2016 **********/ 'activate' => 'Activate', 'system-email-not-configured' => 'We are unable to process email request as the system has no configured email for sending mails. Please contact and report system admin.', - 'assign-ticket' => 'Assign tickets', + 'assign-ticket' => 'Assign tickets', ];