From 019684b585a4c46eb9710adc52424a3136aea888 Mon Sep 17 00:00:00 2001
From: arindam85 <arindam.bg91@gmail.com>
Date: Mon, 24 Oct 2016 13:26:39 +0530
Subject: [PATCH 1/5] popup+usergraph-fix

---
 example.env                                   | 18 ------------
 resources/lang/en/lang.php                    |  8 +++--
 .../agent/helpdesk/user/show.blade.php        | 29 +++++++++++++++++--
 3 files changed, 32 insertions(+), 23 deletions(-)
 delete mode 100644 example.env

diff --git a/example.env b/example.env
deleted file mode 100644
index 18dbf2e92..000000000
--- a/example.env
+++ /dev/null
@@ -1,18 +0,0 @@
-APP_ENV=production
-APP_DEBUG=false
-APP_KEY=SomeRandomString
-DB_TYPE=
-DB_HOST=
-DB_PORT=
-DB_DATABASE=
-DB_USERNAME=
-DB_PASSWORD=
-DB_INSTALL=%0%
-MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-QUEUE_DRIVER=sync
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"
                         <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>

From df888294ff28ba833c7646f6abe3fb76800cae4f Mon Sep 17 00:00:00 2001
From: arindam85 <arindam.bg91@gmail.com>
Date: Mon, 24 Oct 2016 13:28:04 +0530
Subject: [PATCH 2/5] Revert "popup+usergraph-fix"

This reverts commit 019684b585a4c46eb9710adc52424a3136aea888.
---
 example.env                                   | 18 ++++++++++++
 resources/lang/en/lang.php                    |  8 ++---
 .../agent/helpdesk/user/show.blade.php        | 29 ++-----------------
 3 files changed, 23 insertions(+), 32 deletions(-)
 create mode 100644 example.env

diff --git a/example.env b/example.env
new file mode 100644
index 000000000..18dbf2e92
--- /dev/null
+++ b/example.env
@@ -0,0 +1,18 @@
+APP_ENV=production
+APP_DEBUG=false
+APP_KEY=SomeRandomString
+DB_TYPE=
+DB_HOST=
+DB_PORT=
+DB_DATABASE=
+DB_USERNAME=
+DB_PASSWORD=
+DB_INSTALL=%0%
+MAIL_DRIVER=smtp
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
index 08e7dcdf3..25260c1fb 100644
--- a/resources/lang/en/lang.php
+++ b/resources/lang/en/lang.php
@@ -1507,10 +1507,6 @@ 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',
@@ -1527,7 +1523,7 @@ return [
      'role_change_successfully'                                   => 'Role Change Successfully',
      'user_delete_successfully'                                   => 'User Delete Successfully',
      'agent_delete_successfully'                                  => 'Agent Delete Successfully',
-     'select_another_agent'                                        => 'Select Another Agent',
-    'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent Delete Successfully And Ticket Assign TO Another Agent',
+     'select_another_user'                                        => 'Select Another User',
+    'agent_delete_successfully_and_ticket_assign_to_another_user' => 'Agent Delete Successfully And Ticket Assign TO Another User',
 
 ];
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 97af5624d..a26377510 100644
--- a/resources/views/themes/default1/agent/helpdesk/user/show.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/user/show.blade.php
@@ -216,14 +216,7 @@ class="active"
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                                 aria-hidden="true">&times;</span>
                         </button>
-                         @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
-                       
-                    
+                        <h4 class="modal-title" id="titleLabel">Delete Agent</h4>
                     </div>
 
                     <div class="modal-body">
@@ -886,19 +879,13 @@ class="active"
                 </div><!-- /.col -->          
             </div> <!-- /.row -->
         </div>
-        @if(Auth::user()->role == 'admin')
+        @if(Auth::user()->role == 'user')
         <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">
@@ -956,17 +943,7 @@ class="active"
                                             <style>
                                                 #legend-holder { border: 1px solid #ccc; float: left; width: 25px; height: 25px; margin: 1px; }
                                             </style>
-
-                                             @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: #6C96DF;"></span>&nbsp; <span class="lead"> <span id="total-created-tickets" ></span> {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.created') !!} </span></div> 
                                             <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>

From 252c72cf2d5609265ef0547c84dbf55cafaf7ebe Mon Sep 17 00:00:00 2001
From: arindam85 <arindam.bg91@gmail.com>
Date: Mon, 24 Oct 2016 13:30:03 +0530
Subject: [PATCH 3/5] fix-popup+graph

---
 .../Agent/helpdesk/UserController.php         |  4 +--
 resources/lang/en/lang.php                    |  8 +++--
 .../agent/helpdesk/user/show.blade.php        | 29 +++++++++++++++++--
 3 files changed, 34 insertions(+), 7 deletions(-)

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"
                         <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>

From d2c5be138e12222b520107a7ecea50ce0d7f521c Mon Sep 17 00:00:00 2001
From: arindam85 <arindam.bg91@gmail.com>
Date: Mon, 24 Oct 2016 14:52:54 +0530
Subject: [PATCH 4/5] popup massage

---
 app/Http/Controllers/Agent/helpdesk/UserController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php
index 4f03d6b69..9a94171de 100644
--- a/app/Http/Controllers/Agent/helpdesk/UserController.php
+++ b/app/Http/Controllers/Agent/helpdesk/UserController.php
@@ -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_agent'));
+                    return redirect('user')->with('success', Lang::get('lang.agent_delete_successfully_and_ticket_assign_to_another_user'));
                 }
                 if (User_org::where('user_id', '=', $id)) {
                     DB::table('user_assign_organization')->where('user_id', '=', $id)->delete();

From 296736f0923dd6bad2be81b5d0559a678aec0008 Mon Sep 17 00:00:00 2001
From: arindam85 <arindam.bg91@gmail.com>
Date: Mon, 24 Oct 2016 15:05:48 +0530
Subject: [PATCH 5/5] arindam-changes

---
 resources/lang/en/lang.php                                  | 6 +++---
 .../default1/agent/helpdesk/ticket/timeline.blade.php       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
index 08e7dcdf3..d296e8e69 100644
--- a/resources/lang/en/lang.php
+++ b/resources/lang/en/lang.php
@@ -1508,9 +1508,9 @@ return [
      * --------------------------------------------------------------------------------------------
      */
      'agent_report'                                               =>'Agent Report',
-     'assign_tickets'=>'Assign Tickets',
-     'delete_agent'=>'Delete Agent',
-     'delete_user'=>'Delete User',
+     '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',
diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
index 575042337..bcab50ae5 100644
--- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
+++ b/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