diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index 9cfba99ab..4f03d6b69 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -465,7 +465,7 @@ class UserController extends Controller $ticket = Tickets::where('assigned_to', '=', $id)->where('status', '=', '1')->get(); if ($assign_to[0] == 'user') { if ($users->id == $assign_to[1]) { - return redirect('user')->with('warning', Lang::get('lang.select_another_user')); + return redirect('user')->with('warning', Lang::get('lang.select_another_agent')); } $user_detail = User::where('id', '=', $assign_to[1])->first(); $assignee = $user_detail->first_name.' '.$user_detail->last_name; @@ -491,7 +491,7 @@ class UserController extends Controller $user = User::find($id); $user->delete(); - return redirect('user')->with('success', Lang::get('lang.agent_delete_successfully_and_ticket_assign_to_another_user')); + return redirect('user')->with('success', Lang::get('lang.agent_delete_successfully_and_ticket_assign_to_another_agent')); } if (User_org::where('user_id', '=', $id)) { DB::table('user_assign_organization')->where('user_id', '=', $id)->delete(); diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 25260c1fb..08e7dcdf3 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1507,6 +1507,10 @@ return [ * User Module * -------------------------------------------------------------------------------------------- */ + 'agent_report' =>'Agent Report', + 'assign_tickets'=>'Assign Tickets', + 'delete_agent'=>'Delete Agent', + 'delete_user'=>'Delete User', 'confirm_deletion' => 'Confirm Deletion', 'delete_all_content' => ' Delete all content', 'agent_profile' => 'Agent Profile', @@ -1523,7 +1527,7 @@ return [ 'role_change_successfully' => 'Role Change Successfully', 'user_delete_successfully' => 'User Delete Successfully', 'agent_delete_successfully' => 'Agent Delete Successfully', - 'select_another_user' => 'Select Another User', - 'agent_delete_successfully_and_ticket_assign_to_another_user' => 'Agent Delete Successfully And Ticket Assign TO Another User', + 'select_another_agent' => 'Select Another Agent', + 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent Delete Successfully And Ticket Assign TO Another Agent', ]; diff --git a/resources/views/themes/default1/agent/helpdesk/user/show.blade.php b/resources/views/themes/default1/agent/helpdesk/user/show.blade.php index a26377510..97af5624d 100644 --- a/resources/views/themes/default1/agent/helpdesk/user/show.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/user/show.blade.php @@ -216,7 +216,14 @@ class="active" - + @if($users->role=='user') + + @endif + @if($users->role=='agent') + + @endif + + - @if(Auth::user()->role == 'user') + @if(Auth::user()->role == 'admin')
+ @if($users->role=='user')

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

+ @endif + @if($users->role=='agent') +

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

+ @endif +
@@ -943,7 +956,17 @@ class="active" -
  {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.created') !!}
+ + @if($users->role=='user') + +
  {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.created') !!}
+ @endif + @if($users->role=='agent') +
  {!! Lang::get('lang.assign_tickets') !!}
+ + @endif + +
  {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.reopen') !!}
  {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.closed') !!}