Completed
Push — master ( bcb82e...80085e )
by vijay
07:39
created
app/Http/Controllers/Client/helpdesk/ClientTicketController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
         $this->TicketWorkflowController = $TicketWorkflowController;
34 34
         // $this->middleware('auth');
35 35
         // $this->middleware('role.user');
36
-         $this->middleware('board');
36
+            $this->middleware('board');
37 37
     }
38 38
 
39 39
     /**
Please login to merge, or discard this patch.
app/Http/Controllers/Client/helpdesk/UnAuthController.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -348,11 +348,11 @@  discard block
 block discarded – undo
348 348
     }
349 349
 
350 350
     // Follow up tickets
351
-       public function followup()
352
-       {
353
-           $followup = Followup::whereId('1')->first();
354
-           $condition = $followup->condition;
355
-         // dd($condition);
351
+        public function followup()
352
+        {
353
+            $followup = Followup::whereId('1')->first();
354
+            $condition = $followup->condition;
355
+            // dd($condition);
356 356
 
357 357
         switch ($condition) {
358 358
             case 'everyMinute':
@@ -384,12 +384,12 @@  discard block
 block discarded – undo
384 384
                 break;
385 385
         }
386 386
 
387
-           if ($followup->status = 1) {
388
-               $tickets = Tickets::where('id', '>=', 1)->where('status', '!=', 5)->get();
387
+            if ($followup->status = 1) {
388
+                $tickets = Tickets::where('id', '>=', 1)->where('status', '!=', 5)->get();
389 389
         // dd( $tickets);
390
-         // $tickets=Tickets::where('id', '>=', 1)->where('status', '!=', 5)->pluck('id');
390
+            // $tickets=Tickets::where('id', '>=', 1)->where('status', '!=', 5)->pluck('id');
391 391
         // dd( $tickets);
392
-         // $id=1;
392
+            // $id=1;
393 393
         foreach ($tickets as $ticket) {
394 394
             // $id=1;
395 395
             // $id++;
@@ -404,14 +404,14 @@  discard block
 block discarded – undo
404 404
             if ($current_time > $ck) {
405 405
                 $ticket->follow_up = 1;
406 406
                 $ticket->save();
407
-             //  Tickets::where('id', '=',$id)
408
-             // ->update(['follow_up' => 1]);
407
+                //  Tickets::where('id', '=',$id)
408
+                // ->update(['follow_up' => 1]);
409 409
 
410 410
             // }
411 411
             }
412 412
         //       if($id=2)
413 413
         // {dd($ticket);}
414 414
         }
415
-           }
416
-       }
415
+            }
416
+        }
417 417
 }
Please login to merge, or discard this patch.
app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php 1 patch
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -35,10 +35,10 @@  discard block
 block discarded – undo
35 35
         $render = false;
36 36
         if (is_array($labels) && count($labels) > 0) {
37 37
             $table = $table
38
-                     ->leftJoin('filters as label', function ($join) {
39
-                         $join->on('tickets.id', '=', 'label.ticket_id')
38
+                        ->leftJoin('filters as label', function ($join) {
39
+                            $join->on('tickets.id', '=', 'label.ticket_id')
40 40
                                 ->where('label.key', '=', 'label');
41
-                     })
41
+                        })
42 42
                     ->whereIn('label.value', $labels);
43 43
         }
44 44
         if (is_array($tags) && count($tags) > 0) {
@@ -104,9 +104,9 @@  discard block
 block discarded – undo
104 104
                     });
105 105
             case '/ticket/myticket':
106 106
                     return $table
107
-                      ->leftJoin('ticket_status', function ($join) {
108
-                          $join->on('ticket_status.id', '=', 'tickets.status');
109
-                      })
107
+                        ->leftJoin('ticket_status', function ($join) {
108
+                            $join->on('ticket_status.id', '=', 'tickets.status');
109
+                        })
110 110
                     ->orWhere('tickets.assigned_to', '=', Auth::user()->id)
111 111
                     ->where('tickets.status', '=', 1);
112 112
             case '/unassigned':
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
                 }
117 117
 
118 118
                 return $table
119
-                     ->leftJoin('ticket_status', function ($join) {
120
-                         $join->on('ticket_status.id', '=', 'tickets.status');
121
-                     })
119
+                        ->leftJoin('ticket_status', function ($join) {
120
+                            $join->on('ticket_status.id', '=', 'tickets.status');
121
+                        })
122 122
                     ->where('tickets.assigned_to', '=', null)
123 123
                     ->where('tickets.status', '=', 1);
124 124
             case '/ticket/overdue':
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
                     $table = $table->where('tickets.dept_id', '=', $id);
128 128
                 }
129 129
 
130
-                  return $table
130
+                    return $table
131 131
                     ->leftJoin('ticket_status', function ($join) {
132 132
                         $join->on('ticket_status.id', '=', 'tickets.status');
133 133
                     })
@@ -181,9 +181,9 @@  discard block
 block discarded – undo
181 181
                 }
182 182
 
183 183
                 return $table
184
-                     ->leftJoin('ticket_status', function ($join) {
185
-                         $join->on('ticket_status.id', '=', 'tickets.status');
186
-                     })
184
+                        ->leftJoin('ticket_status', function ($join) {
185
+                            $join->on('ticket_status.id', '=', 'tickets.status');
186
+                        })
187 187
                     ->where('tickets.assigned_to', '>', 0)
188 188
                     ->where('tickets.status', '=', 1);
189 189
             case '/ticket/open':
@@ -193,9 +193,9 @@  discard block
 block discarded – undo
193 193
                 }
194 194
 
195 195
                 return $table
196
-                     ->leftJoin('ticket_status', function ($join) {
197
-                         $join->on('ticket_status.id', '=', 'tickets.status');
198
-                     })
196
+                        ->leftJoin('ticket_status', function ($join) {
197
+                            $join->on('ticket_status.id', '=', 'tickets.status');
198
+                        })
199 199
                     ->where('isanswered', '=', 0)
200 200
                     ->where('tickets.status', '=', 1);
201 201
             case '/duetoday':
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
                     $table = $table->where('tickets.dept_id', '=', $id);
205 205
                 }
206 206
 
207
-               return $table
207
+                return $table
208 208
                     ->leftJoin('ticket_status', function ($join) {
209 209
                         $join->on('ticket_status.id', '=', 'tickets.status');
210 210
                     })
@@ -326,8 +326,8 @@  discard block
 block discarded – undo
326 326
         $table = $this->table();
327 327
         if ($user->role == 'user') {
328 328
             $table = $table->leftJoin('ticket_status', 'tickets.status', '=', 'ticket_status.id')
329
-                     ->where('tickets.user_id', '=', $user->id)
330
-                     ->where('ticket_status.name', $convert_to_array[3]);
329
+                        ->where('tickets.user_id', '=', $user->id)
330
+                        ->where('ticket_status.name', $convert_to_array[3]);
331 331
         } else {
332 332
             $table = $table->leftJoin('ticket_status', 'tickets.status', '=', 'ticket_status.id')
333 333
                     ->where('tickets.assigned_to', '=', $user->id)
Please login to merge, or discard this patch.
app/Http/Controllers/Agent/helpdesk/UserController.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
         }
150 150
         // displaying list of users with chumper datatables
151 151
         // return \Datatable::collection(User::where('role', "!=", "admin")->get())
152
-       return \Datatables::of($users)
152
+        return \Datatables::of($users)
153 153
                         /* column username */
154 154
                         ->removeColumn('id', 'last_name', 'country_code', 'phone_number')
155 155
                         ->addColumn('user_name', function ($model) {
@@ -218,14 +218,14 @@  discard block
 block discarded – undo
218 218
                                 if (Auth::user()->role == 'admin') {
219 219
                                     // @if(Auth::user()->role == 'admin')
220 220
 
221
-                           return '<a href="'.route('user.show', $model->id).'" class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>';
221
+                            return '<a href="'.route('user.show', $model->id).'" class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>';
222 222
                                 }
223 223
 
224 224
                                 if (Auth::user()->role == 'agent') {
225 225
                                     // @if(Auth::user()->role == 'admin')
226
-                             if ($model->role == 'user') {
227
-                                 return '<a href="'.route('user.show', $model->id).'" class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>';
228
-                             }
226
+                                if ($model->role == 'user') {
227
+                                    return '<a href="'.route('user.show', $model->id).'" class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>';
228
+                                }
229 229
                                 }
230 230
                             }
231 231
                         })
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
     public function restoreUser($id)
236 236
     {
237 237
         // dd($id);
238
-         // $delete_all = Input::get('delete_all');
238
+            // $delete_all = Input::get('delete_all');
239 239
         $users = User::where('id', '=', $id)->first();
240 240
         $users->is_delete = 0;
241 241
         $users->active = 1;
@@ -521,7 +521,7 @@  discard block
 block discarded – undo
521 521
                         // $users = User::where('id', '=', $id)->get();
522 522
                         // $organization = User_org::where('user_id', '=', $id)->delete();
523 523
                         // Assign_team_agent::where('agent_id', '=', $id)->update(['agent_id' => $assign_to[1]]);
524
-           $tickets = Tickets::where('assigned_to', '=', $id)->get();
524
+            $tickets = Tickets::where('assigned_to', '=', $id)->get();
525 525
 
526 526
                     foreach ($tickets as $ticket) {
527 527
                         // code...
@@ -561,20 +561,20 @@  discard block
 block discarded – undo
561 561
             } elseif ($delete_all == 1) {
562 562
                 if ($delete_all) {
563 563
                     // dd('here');
564
-              $tickets = Tickets::where('assigned_to', '=', $id)->get();
565
-              // dd($tickets);
566
-             foreach ($tickets as $ticket) {
567
-                 $ticket->assigned_to = null;
568
-                 $ticket_number = $ticket->ticket_number;
569
-                 $ticket->save();
570
-
571
-                 $thread = new Ticket_Thread();
572
-                 $thread->ticket_id = $ticket->id;
573
-                 $thread->user_id = Auth::user()->id;
574
-                 $thread->is_internal = 1;
575
-                 $thread->body = 'This Ticket has been unassigned ';
576
-                 $thread->save();
577
-             }
564
+                $tickets = Tickets::where('assigned_to', '=', $id)->get();
565
+                // dd($tickets);
566
+                foreach ($tickets as $ticket) {
567
+                    $ticket->assigned_to = null;
568
+                    $ticket_number = $ticket->ticket_number;
569
+                    $ticket->save();
570
+
571
+                    $thread = new Ticket_Thread();
572
+                    $thread->ticket_id = $ticket->id;
573
+                    $thread->user_id = Auth::user()->id;
574
+                    $thread->is_internal = 1;
575
+                    $thread->body = 'This Ticket has been unassigned ';
576
+                    $thread->save();
577
+                }
578 578
                     // $users = User::where('id', '=', $id)->get();
579 579
                     $user = User::find($id);
580 580
                     $users->is_delete = 1;
Please login to merge, or discard this patch.
app/Http/routes.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
       | Here is defining entire routes for the Admin Panel
29 29
       |
30 30
      */
31
-     Route::get('password/email/{one?}/{two?}/{three?}/{four?}/{five?}', ['as' => 'password.email', 'uses' => 'Auth\PasswordController@getEmail']);
31
+        Route::get('password/email/{one?}/{two?}/{three?}/{four?}/{five?}', ['as' => 'password.email', 'uses' => 'Auth\PasswordController@getEmail']);
32 32
     Breadcrumbs::register('password.email', function ($breadcrumbs) {
33 33
         $breadcrumbs->parent('/');
34 34
         $breadcrumbs->push('Login', url('auth/login'));
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         $breadcrumbs->push('Create Account', url('auth/register'));
44 44
     });
45 45
 
46
-  // Auth login
46
+    // Auth login
47 47
         Route::get('auth/login/{one?}/{two?}/{three?}/{four?}/{five?}', ['as' => 'auth.login', 'uses' => 'Auth\AuthController@getLogin']);
48 48
     Breadcrumbs::register('auth.login', function ($breadcrumbs) {
49 49
         $breadcrumbs->parent('/');
@@ -83,10 +83,10 @@  discard block
 block discarded – undo
83 83
 
84 84
         Route::resource('teams', 'Admin\helpdesk\TeamController'); // in teams module, for CRUD
85 85
         Route::get('/teams/show/{id}', ['as' => 'teams.show', 'uses' => 'Admin\helpdesk\TeamController@show']); /*  Get Team View */
86
-         Breadcrumbs::register('teams.show', function ($breadcrumbs) {
87
-             $breadcrumbs->parent('teams.index');
88
-             $breadcrumbs->push(Lang::get('lang.show'), url('teams/{teams}/show'));
89
-         });
86
+            Breadcrumbs::register('teams.show', function ($breadcrumbs) {
87
+                $breadcrumbs->parent('teams.index');
88
+                $breadcrumbs->push(Lang::get('lang.show'), url('teams/{teams}/show'));
89
+            });
90 90
         Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpdesk\TeamController@getshow']);
91 91
         Route::resource('agents', 'Admin\helpdesk\AgentController'); // in agents module, for CRUD
92 92
 
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
         // route to get the data on change
429 429
         Route::post('help-topic-report/{date1}/{date2}/{id}', ['as' => 'report.helptopic', 'uses' => 'Agent\helpdesk\ReportController@chartdataHelptopic']); /* To show dashboard pages */
430 430
         Route::post('help-topic-pdf', ['as' => 'help.topic.pdf', 'uses' => 'Agent\helpdesk\ReportController@helptopicPdf']);
431
-         // Route to get details of agents
431
+            // Route to get details of agents
432 432
         Route::post('get-agents', ['as' => 'get-agents', 'uses' => 'Agent\helpdesk\UserController@getAgentDetails']);
433 433
 
434 434
         /*
@@ -816,8 +816,8 @@  discard block
 block discarded – undo
816 816
     Route::post('ticket/priority/edit1', ['as' => 'priority.edit1', 'uses' => 'Admin\helpdesk\PriorityController@priorityEdit1']);
817 817
     Route::get('ticket/priority/{ticket_priority}/edit', ['as' => 'priority.edit', 'uses' => 'Admin\helpdesk\PriorityController@priorityEdit']);
818 818
     Route::get('ticket/priority/{ticket_priority}/destroy', ['as' => 'priority.destroy', 'uses' => 'Admin\helpdesk\PriorityController@destroy']);
819
- // user---arindam
820
- Route::post('rolechangeadmin/{id}', ['as' => 'user.post.rolechangeadmin',  'uses' =>'Agent\helpdesk\UserController@changeRoleAdmin']);
819
+    // user---arindam
820
+    Route::post('rolechangeadmin/{id}', ['as' => 'user.post.rolechangeadmin',  'uses' =>'Agent\helpdesk\UserController@changeRoleAdmin']);
821 821
     Route::post('rolechangeagent/{id}', ['as' => 'user.post.rolechangeagent',  'uses' =>'Agent\helpdesk\UserController@changeRoleAgent']);
822 822
     Route::post('rolechangeuser/{id}', ['as' => 'user.post.rolechangeuser',  'uses' =>'Agent\helpdesk\UserController@changeRoleUser']);
823 823
     Route::get('password', ['as' => 'user.changepassword',  'uses' =>'Agent\helpdesk\UserController@randomPassword']);
@@ -825,15 +825,15 @@  discard block
 block discarded – undo
825 825
     Route::post('delete/{id}', ['as' => 'user.post.delete',  'uses' =>'Agent\helpdesk\UserController@deleteAgent']);
826 826
 
827 827
     // deleted user list
828
-         Route::get('deleted/user', ['as' => 'user.deleted', 'uses' => 'Agent\helpdesk\UserController@deletedUser']);
828
+            Route::get('deleted/user', ['as' => 'user.deleted', 'uses' => 'Agent\helpdesk\UserController@deletedUser']);
829 829
 
830 830
     Route::post('restore/{id}', ['as' => 'user.restore', 'uses' => 'Agent\helpdesk\UserController@restoreUser']);
831 831
 
832
-   //due today ticket
833
-   Route::get('duetoday', ['as' => 'ticket.duetoday',  'uses' =>'Agent\helpdesk\TicketController@dueTodayTicketlist']);
832
+    //due today ticket
833
+    Route::get('duetoday', ['as' => 'ticket.duetoday',  'uses' =>'Agent\helpdesk\TicketController@dueTodayTicketlist']);
834 834
 
835
-  // Route::post('duetoday/list/ticket', ['as' => 'ticket.post.duetoday',  'uses' =>'Agent\helpdesk\TicketController@getDueToday']);
836
- Route::get('duetoday/list/ticket', ['as' => 'ticket.post.duetoday',  'uses' =>'Agent\helpdesk\TicketController@getDueToday']); /*  Get Open Ticket */
835
+    // Route::post('duetoday/list/ticket', ['as' => 'ticket.post.duetoday',  'uses' =>'Agent\helpdesk\TicketController@getDueToday']);
836
+    Route::get('duetoday/list/ticket', ['as' => 'ticket.post.duetoday',  'uses' =>'Agent\helpdesk\TicketController@getDueToday']); /*  Get Open Ticket */
837 837
         // Breadcrumbs::register('open.ticket', function ($breadcrumbs) {
838 838
         //     $breadcrumbs->parent('dashboard');
839 839
         //     $breadcrumbs->push(Lang::get('lang.tickets') . '&nbsp; > &nbsp;' . Lang::get('lang.open'), route('open.ticket'));
Please login to merge, or discard this patch.
resources/views/themes/default1/admin/kb/article/edit.blade.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@
 block discarded – undo
135 135
 						<div class="form-group">
136 136
 							<div class="col-md-1">
137 137
 			<input type="checkbox" name="category_id[]" value="<?php echo $val;?>" <?php if (in_array($val, $assign)) {
138
-	echo ('checked');
138
+    echo ('checked');
139 139
 }
140 140
 ?> ></div>
141 141
 							<div class="col-md-10">
Please login to merge, or discard this patch.
themes/default1/admin/helpdesk/emails/template/listdirectories.blade.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -107,9 +107,9 @@
 block discarded – undo
107 107
 
108 108
 <?php 
109 109
 if($dir == 'default')  {
110
-  $dis = "disabled";  
110
+    $dis = "disabled";  
111 111
 } else {
112
-  $dis = "";
112
+    $dis = "";
113 113
 } ?>
114 114
     <button class="btn btn-danger btn-xs {!! $dis !!}"  data-toggle="modal" data-target="#{{$dir}}delete">Delete</button>
115 115
                                                             <div class="modal fade" id="{{$dir}}delete">
Please login to merge, or discard this patch.
views/themes/default1/admin/helpdesk/emails/emails/index.blade.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -59,9 +59,9 @@  discard block
 block discarded – undo
59 59
     <?php
60 60
     $default_system_email = App\Model\helpdesk\Settings\Email::where('id', '=', '1')->first();
61 61
     if($default_system_email->sys_email) {
62
-    	$default_email = $default_system_email->sys_email;
62
+        $default_email = $default_system_email->sys_email;
63 63
     } else {
64
-    	$default_email = null;
64
+        $default_email = null;
65 65
     }
66 66
     ?>
67 67
     		<!-- table -->
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 							<td>{!! $priority !!}</td>
95 95
 							@if($email->department !== null)
96 96
 								<?php  $department = App\Model\helpdesk\Agent\Department::where('id','=',$email->department)->first(); 
97
-								$dept = $department->name; ?>
97
+                                $dept = $department->name; ?>
98 98
 							@elseif($email->department == null)
99 99
 								<?php  $dept = "<a href=". url('getsystem') .">System Default</a>"; ?>
100 100
 							@endif
Please login to merge, or discard this patch.
resources/views/themes/default1/admin/helpdesk/agent/teams/show.blade.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -48,10 +48,10 @@
 block discarded – undo
48 48
     @endif
49 49
 <!-- <input type="text" name="show_id" value="{{$id}}"> -->
50 50
 <?php
51
- if($team_lead_name= App\User::whereId($teams->team_lead)->first())
52
-          {
51
+    if($team_lead_name= App\User::whereId($teams->team_lead)->first())
52
+            {
53 53
             $team_lead = $team_lead_name->first_name . " " . $team_lead_name->last_name;
54
-             // $assign_team_agent=App\Model\helpdesk\Agent\Assign_team_agent::all();
54
+                // $assign_team_agent=App\Model\helpdesk\Agent\Assign_team_agent::all();
55 55
             // $total_members = $assign_team_agent->where('team_id',$id)->count();
56 56
         }
57 57
 
Please login to merge, or discard this patch.