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

Merge pull request #331 from ladybirdweb/analysis-zYokO0

Browse Source 
Apply fixes from StyleCI
This commit is contained in:
Manish Verma
2016-12-05 16:10:49 +05:30
committed by GitHub
parent e98ee6c635 01869a422a
commit b1b6771846
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1465,7 +1465,7 @@ class TicketController extends Controller
public function assign($id) public function assign($id)
{ {
$ticket_array = []; $ticket_array = [];
if(strpos($id, ',') !== false) { if (strpos($id, ',') !== false) {
$ticket_array = explode(',', $id); $ticket_array = explode(',', $id);
} else { } else {
array_push($ticket_array, $id); array_push($ticket_array, $id);
@@ -1491,7 +1491,7 @@ class TicketController extends Controller
$thread->save(); $thread->save();
} elseif ($assign_to[0] == 'user') { } elseif ($assign_to[0] == 'user') {
$ticket->assigned_to = $assign_to[1]; $ticket->assigned_to = $assign_to[1];
if( $user_detail === null) { if ($user_detail === null) {
$user_detail = User::where('id', '=', $assign_to[1])->first(); $user_detail = User::where('id', '=', $assign_to[1])->first();
$assignee = $user_detail->first_name.' '.$user_detail->last_name; $assignee = $user_detail->first_name.' '.$user_detail->last_name;
} }
@@ -1523,6 +1523,7 @@ class TicketController extends Controller
} }
} }
} }
return 1; return 1;
} }
@@ -2556,12 +2557,13 @@ class TicketController extends Controller
$name = $from->user_name; $name = $from->user_name;
} }
} }
$color = ""; $color = '';
if($verify->status == 1 || $verify->status == '1') { if ($verify->status == 1 || $verify->status == '1') {
if($from->active == 0 || $from->active == '0') { if ($from->active == 0 || $from->active == '0') {
$color = "<i class='fa fa-exclamation-triangle'></i>"; $color = "<i class='fa fa-exclamation-triangle'></i>";
} }
} }
return "<a href='".$url."' title='".Lang::get('lang.see-profile1').' '.ucfirst($from->user_name).'&apos;'.Lang::get('lang.see-profile2')."'><span style='color:#508983'>".ucfirst(str_limit($name, 30)).' <span style="color:#f75959">'.$color.'</span></span></a>'; return "<a href='".$url."' title='".Lang::get('lang.see-profile1').' '.ucfirst($from->user_name).'&apos;'.Lang::get('lang.see-profile2')."'><span style='color:#508983'>".ucfirst(str_limit($name, 30)).' <span style="color:#f75959">'.$color.'</span></span></a>';
}) })
// ->addColumn('Last Replier', function ($ticket) { // ->addColumn('Last Replier', function ($ticket) {

2
app/Http/Controllers/Agent/helpdesk/UserController.php
View File

@@ -1006,7 +1006,9 @@ 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 * @param null
*
* @return data * @return data
*/ */
public function getAgentDetails() public function getAgentDetails()