Merge pull request #264 from ladybirdweb/arindam-bugg

Arindam bugg

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;

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',
+     'select_another_agent'                                        => 'Select Another Agent',
-    'agent_delete_successfully_and_ticket_assign_to_another_user' => 'Agent Delete Successfully And Ticket Assign TO Another User',
+    'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent Delete Successfully And Ticket Assign TO Another Agent',
 
 ];

resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php

@@ -200,7 +200,7 @@ if ($thread->title != "") {
                     <?php
                     $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $tickets->priority_id)->first();
                     ?>
-                    <div class="callout callout-{{$priority->priority_color}}">
+                    <div class="callout callout-{{$priority->priority_color}}" style = 'background-color:{{$priority->priority_color}}'>
                         <div class="row">
                             <div class="col-md-3">
                                 <?php

resources/views/themes/default1/agent/helpdesk/user/show.blade.php

@@ -216,7 +216,14 @@ class="active"
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                                 aria-hidden="true">&times;</span>
                         </button>
-                        <h4 class="modal-title" id="titleLabel">Delete Agent</h4>
+                         @if($users->role=='user')
+                        <h4 class="modal-title" id="titleLabel">{{Lang::get('lang.delete_user')}}</h4>
+                       @endif 
+                        @if($users->role=='agent')
+                         <h4 class="modal-title" id="titleLabel">{{Lang::get('lang.delete_agent')}}</h4>
+                           @endif
+                       
+                    
                     </div>
 
                     <div class="modal-body">
@@ -879,13 +886,19 @@ class="active"
                 </div><!-- /.col -->          
             </div> <!-- /.row -->
         </div>
-        @if(Auth::user()->role == 'user')
+        @if(Auth::user()->role == 'admin')
         <div class="row">
             <div class="col-md-12">
                 <link type="text/css" href="{{asset("lb-faveo/css/bootstrap-datetimepicker4.7.14.min.css")}}" rel="stylesheet">
                 <div class="box box-info">
                     <div class="box-header with-border">
+                    @if($users->role=='user')
                         <h3 class="box-title">{!! Lang::get('lang.user_report') !!}</h3>
+                       @endif 
+                        @if($users->role=='agent')
+                         <h3 class="box-title">{!! Lang::get('lang.agent_report') !!}</h3>
+                           @endif
+
                     </div>
                     <div class="box-body">
                         <form id="foo">
@@ -943,7 +956,17 @@ class="active"
                                             <style>
                                                 #legend-holder { border: 1px solid #ccc; float: left; width: 25px; height: 25px; margin: 1px; }
                                             </style>
-                                            <div class="col-md-4"><span id="legend-holder" style="background-color: #6C96DF;"></span>&nbsp; <span class="lead"> <span id="total-created-tickets" ></span> {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.created') !!} </span></div> 
+
+                                             @if($users->role=='user')
+
+                                            <div class="col-md-4"><span id="legend-holder" style="background-color: #6C96DF;"></span>&nbsp; <span class="lead"> <span id="total-created-tickets" ></span> {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.created') !!} </span></div>
+                                             @endif 
+                        @if($users->role=='agent')
+                        <div class="col-md-4"><span id="legend-holder" style="background-color: #6C96DF;"></span>&nbsp; <span class="lead"> <span id="total-created-tickets" ></span> {!! Lang::get('lang.assign_tickets') !!}  </span></div>
+                         
+                           @endif
+
+
                                             <div class="col-md-4"><span id="legend-holder" style="background-color: #6DC5B2;"></span>&nbsp; <span class="lead"> <span id="total-reopen-tickets" class="lead"></span> {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.reopen') !!}  </span></div> 
                                             <div class="col-md-4"><span id="legend-holder" style="background-color: #E3B870;"></span>&nbsp; <span class="lead"> <span id="total-closed-tickets" class="lead"></span> {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.closed') !!}  </span></div> 
                                         </div>