@@ -184,7 +184,7 @@ |
||
184 | 184 | * @param type $condition |
185 | 185 | * @param type $statement |
186 | 186 | * |
187 | - * @return type boolean |
|
187 | + * @return boolean boolean |
|
188 | 188 | */ |
189 | 189 | public function checkRuleCondition($to_check, $condition, $statement) |
190 | 190 | { |
@@ -7,7 +7,6 @@ |
||
7 | 7 | // models |
8 | 8 | use App\Model\helpdesk\Agent\Department; |
9 | 9 | use App\Model\helpdesk\Agent\Teams; |
10 | -use App\Model\helpdesk\Email\Emails; |
|
11 | 10 | use App\Model\helpdesk\Manage\Help_topic; |
12 | 11 | use App\Model\helpdesk\Manage\Sla_plan; |
13 | 12 | use App\Model\helpdesk\Ticket\Ticket_Priority; |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | * @param type User $user |
272 | 272 | * @param type Sys_userRequest $request |
273 | 273 | * |
274 | - * @return type redirect |
|
274 | + * @return \Illuminate\Http\RedirectResponse redirect |
|
275 | 275 | */ |
276 | 276 | public function store(User $user, Sys_userRequest $request) |
277 | 277 | { |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | * @param type int $id |
376 | 376 | * @param type User $user |
377 | 377 | * |
378 | - * @return type view |
|
378 | + * @return \Illuminate\Http\RedirectResponse view |
|
379 | 379 | */ |
380 | 380 | public function randomPostPassword($id, ChangepasswordRequest $request) |
381 | 381 | { |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | * @param type $id |
402 | 402 | * @param Request $request |
403 | 403 | * |
404 | - * @return type |
|
404 | + * @return \Illuminate\Http\RedirectResponse |
|
405 | 405 | */ |
406 | 406 | public function changeRoleAdmin($id, Request $request) |
407 | 407 | { |
@@ -423,7 +423,7 @@ discard block |
||
423 | 423 | * @param type $id |
424 | 424 | * @param Request $request |
425 | 425 | * |
426 | - * @return type |
|
426 | + * @return \Illuminate\Http\RedirectResponse |
|
427 | 427 | */ |
428 | 428 | public function changeRoleAgent($id, Request $request) |
429 | 429 | { |
@@ -444,7 +444,7 @@ discard block |
||
444 | 444 | /** |
445 | 445 | * @param type $id |
446 | 446 | * |
447 | - * @return type |
|
447 | + * @return \Illuminate\Http\RedirectResponse |
|
448 | 448 | */ |
449 | 449 | public function changeRoleUser($id) |
450 | 450 | { |
@@ -471,7 +471,7 @@ discard block |
||
471 | 471 | /** |
472 | 472 | * @param type $id |
473 | 473 | * |
474 | - * @return type |
|
474 | + * @return \Illuminate\Http\RedirectResponse|null |
|
475 | 475 | */ |
476 | 476 | public function deleteAgent($id) |
477 | 477 | { |
@@ -664,7 +664,7 @@ discard block |
||
664 | 664 | * @param type User $user |
665 | 665 | * @param type Sys_userUpdate $request |
666 | 666 | * |
667 | - * @return type Response |
|
667 | + * @return \Illuminate\Http\RedirectResponse Response |
|
668 | 668 | */ |
669 | 669 | public function update($id, Sys_userUpdate $request) |
670 | 670 | { |
@@ -742,7 +742,7 @@ discard block |
||
742 | 742 | * @param type int $id |
743 | 743 | * @param type ProfileRequest $request |
744 | 744 | * |
745 | - * @return type Redirect |
|
745 | + * @return \Illuminate\Http\RedirectResponse|null Redirect |
|
746 | 746 | */ |
747 | 747 | public function postProfileedit(ProfileRequest $request) |
748 | 748 | { |
@@ -794,7 +794,7 @@ discard block |
||
794 | 794 | * @param type int $id |
795 | 795 | * @param type ProfilePassword $request |
796 | 796 | * |
797 | - * @return type Redirect |
|
797 | + * @return \Illuminate\Http\RedirectResponse Redirect |
|
798 | 798 | */ |
799 | 799 | public function postProfilePassword($id, ProfilePassword $request) |
800 | 800 | { |
@@ -820,7 +820,7 @@ discard block |
||
820 | 820 | * |
821 | 821 | * @param type $id |
822 | 822 | * |
823 | - * @return type boolean |
|
823 | + * @return integer boolean |
|
824 | 824 | */ |
825 | 825 | public function UserAssignOrg($id) |
826 | 826 | { |
@@ -930,7 +930,7 @@ discard block |
||
930 | 930 | /** |
931 | 931 | * Generate a random string for password. |
932 | 932 | * |
933 | - * @param type $length |
|
933 | + * @param integer $length |
|
934 | 934 | * |
935 | 935 | * @return string |
936 | 936 | */ |
@@ -991,6 +991,9 @@ discard block |
||
991 | 991 | } |
992 | 992 | } |
993 | 993 | |
994 | + /** |
|
995 | + * @param string $date |
|
996 | + */ |
|
994 | 997 | public function convertDate($date) |
995 | 998 | { |
996 | 999 | $converted_date = date('Y-m-d H:i:s', strtotime($date)); |
@@ -998,6 +1001,10 @@ discard block |
||
998 | 1001 | return $converted_date; |
999 | 1002 | } |
1000 | 1003 | |
1004 | + /** |
|
1005 | + * @param string $first |
|
1006 | + * @param string $last |
|
1007 | + */ |
|
1001 | 1008 | public function getUsers($first, $last) |
1002 | 1009 | { |
1003 | 1010 | $user = new User(); |
@@ -21,7 +21,6 @@ |
||
21 | 21 | use App\Model\helpdesk\Agent\Assign_team_agent; |
22 | 22 | use App\Model\helpdesk\Agent_panel\Organization; |
23 | 23 | use App\Model\helpdesk\Agent_panel\User_org; |
24 | -use App\Model\helpdesk\Notification\Notification; |
|
25 | 24 | use App\Model\helpdesk\Notification\UserNotification; |
26 | 25 | use App\Model\helpdesk\Settings\CommonSettings; |
27 | 26 | use App\Model\helpdesk\Settings\Email; |
@@ -149,7 +149,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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; |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | $users = $users->select('user_name', 'email', 'mobile', 'active', 'updated_at', 'role', 'id', 'last_name', 'country_code', 'phone_number'); |
138 | 138 | |
139 | 139 | if ($search !== '') { |
140 | - $users = $users->where(function ($query) use ($search) { |
|
140 | + $users = $users->where(function($query) use ($search) { |
|
141 | 141 | $query->where('user_name', 'LIKE', '%'.$search.'%'); |
142 | 142 | $query->orWhere('email', 'LIKE', '%'.$search.'%'); |
143 | 143 | $query->orWhere('first_name', 'LIKE', '%'.$search.'%'); |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | return \Datatables::of($users) |
153 | 153 | /* column username */ |
154 | 154 | ->removeColumn('id', 'last_name', 'country_code', 'phone_number') |
155 | - ->addColumn('user_name', function ($model) { |
|
155 | + ->addColumn('user_name', function($model) { |
|
156 | 156 | if ($model->first_name) { |
157 | 157 | $string = strip_tags($model->first_name.' '.$model->last_name); |
158 | 158 | } else { |
@@ -168,13 +168,13 @@ discard block |
||
168 | 168 | return "<a href='".route('user.show', $model->id)."' title='".$string."''>".$stringCut.'</a>'; |
169 | 169 | }) |
170 | 170 | /* column email */ |
171 | - ->addColumn('email', function ($model) { |
|
171 | + ->addColumn('email', function($model) { |
|
172 | 172 | $email = "<a href='".route('user.show', $model->id)."'>".$model->email.'</a>'; |
173 | 173 | |
174 | 174 | return $email; |
175 | 175 | }) |
176 | 176 | /* column phone */ |
177 | - ->addColumn('mobile', function ($model) { |
|
177 | + ->addColumn('mobile', function($model) { |
|
178 | 178 | $phone = ''; |
179 | 179 | if ($model->phone_number) { |
180 | 180 | $phone = $model->ext.' '.$model->phone_number; |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | return $phone; |
189 | 189 | }) |
190 | 190 | /* column account status */ |
191 | - ->addColumn('active', function ($model) { |
|
191 | + ->addColumn('active', function($model) { |
|
192 | 192 | $status = $model->active; |
193 | 193 | if ($status == 1) { |
194 | 194 | $stat = '<button class="btn btn-success btn-xs">Active</button>'; |
@@ -199,19 +199,19 @@ discard block |
||
199 | 199 | return $stat; |
200 | 200 | }) |
201 | 201 | /* column last login date */ |
202 | - ->addColumn('updated_at', function ($model) { |
|
202 | + ->addColumn('updated_at', function($model) { |
|
203 | 203 | $t = $model->updated_at; |
204 | 204 | |
205 | 205 | return TicketController::usertimezone($t); |
206 | 206 | }) |
207 | 207 | /* column Role */ |
208 | - ->addColumn('role', function ($model) { |
|
208 | + ->addColumn('role', function($model) { |
|
209 | 209 | $role = $model->role; |
210 | 210 | |
211 | 211 | return $role; |
212 | 212 | }) |
213 | 213 | /* column actions */ |
214 | - ->addColumn('Actions', function ($model) { |
|
214 | + ->addColumn('Actions', function($model) { |
|
215 | 215 | if ($model->is_delete == 0) { |
216 | 216 | return '<a href="'.route('user.edit', $model->id).'" class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a> <a href="'.route('user.show', $model->id).'" class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>'; |
217 | 217 | } else { |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | * @param type Article $article |
150 | 150 | * @param type ArticleRequest $request |
151 | 151 | * |
152 | - * @return type redirect |
|
152 | + * @return \Illuminate\Http\RedirectResponse redirect |
|
153 | 153 | */ |
154 | 154 | public function store(Article $article, ArticleRequest $request) |
155 | 155 | { |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | * @param type Relationship $relation |
219 | 219 | * @param type ArticleRequest $request |
220 | 220 | * |
221 | - * @return Response |
|
221 | + * @return \Illuminate\Http\RedirectResponse |
|
222 | 222 | */ |
223 | 223 | public function update($slug, ArticleUpdate $request) |
224 | 224 | { |
@@ -259,10 +259,9 @@ discard block |
||
259 | 259 | /** |
260 | 260 | * Delete an Agent by id. |
261 | 261 | * |
262 | - * @param type $id |
|
263 | 262 | * @param type Article $article |
264 | 263 | * |
265 | - * @return Response |
|
264 | + * @return \Illuminate\Http\RedirectResponse |
|
266 | 265 | */ |
267 | 266 | public function destroy($slug, Article $article, Relationship $relation, Comment $comment) |
268 | 267 | { |
@@ -15,13 +15,10 @@ |
||
15 | 15 | use App\Model\kb\Settings; |
16 | 16 | // Classes |
17 | 17 | use Auth; |
18 | -use Chumper\Datatable\Table; |
|
19 | 18 | use Datatable; |
20 | 19 | use DB; |
21 | 20 | use Exception; |
22 | -use Illuminate\Http\Request; |
|
23 | 21 | use Lang; |
24 | -use Redirect; |
|
25 | 22 | |
26 | 23 | /** |
27 | 24 | * ArticleController |
@@ -71,19 +71,19 @@ |
||
71 | 71 | return Datatable::Collection($articles) |
72 | 72 | |
73 | 73 | /* add column name */ |
74 | - ->addColumn('name', function ($model) { |
|
74 | + ->addColumn('name', function($model) { |
|
75 | 75 | $name = str_limit($model->name, 20, '...'); |
76 | 76 | |
77 | 77 | return "<p title=$model->name>$name</p>"; |
78 | 78 | }) |
79 | 79 | /* add column Created */ |
80 | - ->addColumn('publish_time', function ($model) { |
|
80 | + ->addColumn('publish_time', function($model) { |
|
81 | 81 | $t = $model->publish_time; |
82 | 82 | |
83 | 83 | return $t; |
84 | 84 | }) |
85 | 85 | /* add column action */ |
86 | - ->addColumn('Actions', function ($model) { |
|
86 | + ->addColumn('Actions', function($model) { |
|
87 | 87 | /* here are all the action buttons and modal popup to delete articles with confirmations */ |
88 | 88 | return '<span data-toggle="modal" data-target="#deletearticle'.$model->id.'"><a href="#" ><button class="btn btn-danger btn-xs"></a> '.\Lang::get('lang.delete').' </button></span> <a href='.url("article/$model->id/edit").' class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a> <a href='.url("show/$model->slug").' class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a> |
89 | 89 | <div class="modal fade" id="deletearticle'.$model->id.'"> |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | * @param type Category $category |
138 | 138 | * @param type CategoryRequest $request |
139 | 139 | * |
140 | - * @return type Redirect |
|
140 | + * @return \Illuminate\Http\RedirectResponse Redirect |
|
141 | 141 | */ |
142 | 142 | public function store(Category $category, CategoryRequest $request) |
143 | 143 | { |
@@ -158,7 +158,6 @@ discard block |
||
158 | 158 | /** |
159 | 159 | * Show the form for editing the specified category. |
160 | 160 | * |
161 | - * @param type $slug |
|
162 | 161 | * @param type Category $category |
163 | 162 | * |
164 | 163 | * @return type view |
@@ -175,11 +174,10 @@ discard block |
||
175 | 174 | /** |
176 | 175 | * Update the specified Category in storage. |
177 | 176 | * |
178 | - * @param type $slug |
|
179 | 177 | * @param type Category $category |
180 | 178 | * @param type CategoryUpdate $request |
181 | 179 | * |
182 | - * @return type redirect |
|
180 | + * @return \Illuminate\Http\RedirectResponse redirect |
|
183 | 181 | */ |
184 | 182 | public function update($id, CategoryRequest $request) |
185 | 183 | { |
@@ -208,7 +206,7 @@ discard block |
||
208 | 206 | * @param type Category $category |
209 | 207 | * @param type Relationship $relation |
210 | 208 | * |
211 | - * @return type Redirect |
|
209 | + * @return \Illuminate\Http\RedirectResponse Redirect |
|
212 | 210 | */ |
213 | 211 | public function destroy($id, Category $category, Relationship $relation) |
214 | 212 | { |
@@ -75,20 +75,20 @@ |
||
75 | 75 | /* order column name and description */ |
76 | 76 | ->orderColumns('name', 'description') |
77 | 77 | /* add column name */ |
78 | - ->addColumn('name', function ($model) { |
|
78 | + ->addColumn('name', function($model) { |
|
79 | 79 | $string = strip_tags($model->name); |
80 | 80 | |
81 | 81 | return str_limit($string, 20); |
82 | 82 | }) |
83 | 83 | /* add column Created */ |
84 | - ->addColumn('Created', function ($model) { |
|
84 | + ->addColumn('Created', function($model) { |
|
85 | 85 | $t = $model->created_at; |
86 | 86 | |
87 | 87 | return TicketController::usertimezone($t); |
88 | 88 | }) |
89 | 89 | /* add column Actions */ |
90 | 90 | /* there are action buttons and modal popup to delete a data column */ |
91 | - ->addColumn('Actions', function ($model) { |
|
91 | + ->addColumn('Actions', function($model) { |
|
92 | 92 | return '<span data-toggle="modal" data-target="#deletecategory'.$model->slug.'"><a href="#" ><button class="btn btn-danger btn-xs"></a>'.\Lang::get('lang.delete').'</button></span> <a href=category/'.$model->id.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a> <a href=article-list class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a> |
93 | 93 | <div class="modal fade" id="deletecategory'.$model->slug.'"> |
94 | 94 | <div class="modal-dialog"> |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | * |
122 | 122 | * @param type Request $request |
123 | 123 | * |
124 | - * @return type |
|
124 | + * @return \Illuminate\Http\RedirectResponse |
|
125 | 125 | */ |
126 | 126 | public function store(PageRequest $request) |
127 | 127 | { |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | * @param type $slug |
162 | 162 | * @param type PageUpdate $request |
163 | 163 | * |
164 | - * @return type redirect |
|
164 | + * @return \Illuminate\Http\RedirectResponse redirect |
|
165 | 165 | */ |
166 | 166 | public function update($slug, PageRequest $request) |
167 | 167 | { |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | * |
186 | 186 | * @param type $id |
187 | 187 | * |
188 | - * @return type redirect |
|
188 | + * @return \Illuminate\Http\RedirectResponse redirect |
|
189 | 189 | */ |
190 | 190 | public function destroy($id) |
191 | 191 | { |
@@ -72,18 +72,18 @@ |
||
72 | 72 | /* order column name, description and created */ |
73 | 73 | ->orderColumns('name', 'description', 'created') |
74 | 74 | /* add column name */ |
75 | - ->addColumn('name', function ($model) { |
|
75 | + ->addColumn('name', function($model) { |
|
76 | 76 | return $model->name; |
77 | 77 | }) |
78 | 78 | /* add column Created */ |
79 | - ->addColumn('Created', function ($model) { |
|
79 | + ->addColumn('Created', function($model) { |
|
80 | 80 | $t = $model->created_at; |
81 | 81 | |
82 | 82 | return TicketController::usertimezone($t); |
83 | 83 | }) |
84 | 84 | /* add column Actions */ |
85 | 85 | /* there are action buttons and modal popup to delete a data column */ |
86 | - ->addColumn('Actions', function ($model) { |
|
86 | + ->addColumn('Actions', function($model) { |
|
87 | 87 | return '<span data-toggle="modal" data-target="#deletepage'.$model->id.'"><a href="#" ><button class="btn btn-danger btn-xs"></a> '.\Lang::get('lang.delete').'</button></span> <a href=page/'.$model->slug.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a> <a href=pages/'.$model->slug.' class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a> |
88 | 88 | <div class="modal fade" id="deletepage'.$model->id.'"> |
89 | 89 | <div class="modal-dialog"> |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * |
70 | 70 | * @param int $id |
71 | 71 | * |
72 | - * @return Response |
|
72 | + * @return \Illuminate\Http\RedirectResponse |
|
73 | 73 | */ |
74 | 74 | public function postSettings($id, Settings $settings, SettingsRequests $request) |
75 | 75 | { |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | * @param type $id |
175 | 175 | * @param type Comment $comment |
176 | 176 | * |
177 | - * @return bool |
|
177 | + * @return \Illuminate\Http\RedirectResponse |
|
178 | 178 | */ |
179 | 179 | public function publish($id, Comment $comment) |
180 | 180 | { |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | * @param type $id |
194 | 194 | * @param type Comment $comment |
195 | 195 | * |
196 | - * @return type |
|
196 | + * @return \Illuminate\Http\RedirectResponse |
|
197 | 197 | */ |
198 | 198 | public function delete($id, Comment $comment) |
199 | 199 | { |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | * |
224 | 224 | * @param type ProfileRequest $request |
225 | 225 | * |
226 | - * @return type redirect |
|
226 | + * @return \Illuminate\Http\RedirectResponse redirect |
|
227 | 227 | */ |
228 | 228 | public function postProfile(ProfileRequest $request) |
229 | 229 | { |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | * @param type $id |
268 | 268 | * @param type ProfilePassword $request |
269 | 269 | * |
270 | - * @return type redirect |
|
270 | + * @return \Illuminate\Http\RedirectResponse redirect |
|
271 | 271 | */ |
272 | 272 | public function postProfilePassword($id, ProfilePassword $request) |
273 | 273 | { |
@@ -19,7 +19,6 @@ |
||
19 | 19 | use Config; |
20 | 20 | use Exception; |
21 | 21 | use Hash; |
22 | -use Illuminate\Http\Request; |
|
23 | 22 | use Image; |
24 | 23 | use Input; |
25 | 24 | use Lang; |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | return \Datatable::collection(Comment::All()) |
141 | 141 | ->searchColumns('details', 'comment', 'created') |
142 | 142 | ->orderColumns('details') |
143 | - ->addColumn('details', function ($model) { |
|
143 | + ->addColumn('details', function($model) { |
|
144 | 144 | $name = "<p>$model->name</p><br>"; |
145 | 145 | $email = "<p>$model->email</p><br>"; |
146 | 146 | $website = "<p>$model->website</p><br>"; |
@@ -148,12 +148,12 @@ discard block |
||
148 | 148 | return $name.$email.$website; |
149 | 149 | }) |
150 | 150 | |
151 | - ->addColumn('comment', function ($model) { |
|
151 | + ->addColumn('comment', function($model) { |
|
152 | 152 | $created = TicketController::usertimezone(date($model->created_at)); |
153 | 153 | |
154 | 154 | return $model->comment."<p>$created</p>"; |
155 | 155 | }) |
156 | - ->addColumn('status', function ($model) { |
|
156 | + ->addColumn('status', function($model) { |
|
157 | 157 | $status = $model->status; |
158 | 158 | if ($status == 1) { |
159 | 159 | return '<p style="color:blue"">'.\Lang::get('lang.published'); |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | } |
163 | 163 | }) |
164 | 164 | |
165 | - ->addColumn('Actions', function ($model) { |
|
165 | + ->addColumn('Actions', function($model) { |
|
166 | 166 | return '<div class="row"><div class="col-md-12"><a href=comment/delete/'.$model->id.' class="btn btn-danger btn-xs">'.\Lang::get('lang.delete').'</a></div><div class="col-md-12"><a href=published/'.$model->id.' class="btn btn-warning btn-xs">'.\Lang::get('lang.publish').'</a></div></div>'; |
167 | 167 | }) |
168 | 168 | ->make(); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | * |
119 | 119 | * @param user_id,subject,body,helptopic,sla,priority,dept |
120 | 120 | * |
121 | - * @return json |
|
121 | + * @return \Illuminate\Http\JsonResponse |
|
122 | 122 | */ |
123 | 123 | public function createTicket(\App\Http\Requests\helpdesk\CreateTicketRequest $request, \App\Model\helpdesk\Utility\CountryCode $code) |
124 | 124 | { |
@@ -175,9 +175,8 @@ discard block |
||
175 | 175 | /** |
176 | 176 | * Reply for the ticket. |
177 | 177 | * |
178 | - * @param TicketRequest $request |
|
179 | 178 | * |
180 | - * @return json |
|
179 | + * @return \Illuminate\Http\JsonResponse |
|
181 | 180 | */ |
182 | 181 | public function ticketReply() |
183 | 182 | { |
@@ -215,7 +214,7 @@ discard block |
||
215 | 214 | /** |
216 | 215 | * Edit a ticket. |
217 | 216 | * |
218 | - * @return json |
|
217 | + * @return \Illuminate\Http\JsonResponse |
|
219 | 218 | */ |
220 | 219 | public function editTicket() |
221 | 220 | { |
@@ -253,7 +252,7 @@ discard block |
||
253 | 252 | /** |
254 | 253 | * Delete The Ticket. |
255 | 254 | * |
256 | - * @return json |
|
255 | + * @return \Illuminate\Http\JsonResponse |
|
257 | 256 | */ |
258 | 257 | public function deleteTicket() |
259 | 258 | { |
@@ -433,7 +432,7 @@ discard block |
||
433 | 432 | /** |
434 | 433 | * Get All agents. |
435 | 434 | * |
436 | - * @return json |
|
435 | + * @return \Illuminate\Http\JsonResponse |
|
437 | 436 | */ |
438 | 437 | public function getAgents() |
439 | 438 | { |
@@ -457,7 +456,7 @@ discard block |
||
457 | 456 | /** |
458 | 457 | * Get All Teams. |
459 | 458 | * |
460 | - * @return json |
|
459 | + * @return \Illuminate\Http\JsonResponse |
|
461 | 460 | */ |
462 | 461 | public function getTeams() |
463 | 462 | { |
@@ -481,7 +480,7 @@ discard block |
||
481 | 480 | /** |
482 | 481 | * To assign a ticket. |
483 | 482 | * |
484 | - * @return json |
|
483 | + * @return \Illuminate\Http\JsonResponse |
|
485 | 484 | */ |
486 | 485 | public function assignTicket() |
487 | 486 | { |
@@ -520,7 +519,7 @@ discard block |
||
520 | 519 | /** |
521 | 520 | * Get all customers. |
522 | 521 | * |
523 | - * @return json |
|
522 | + * @return \Illuminate\Http\JsonResponse |
|
524 | 523 | */ |
525 | 524 | public function getCustomers() |
526 | 525 | { |
@@ -587,7 +586,7 @@ discard block |
||
587 | 586 | /** |
588 | 587 | * Get a customer by id. |
589 | 588 | * |
590 | - * @return json |
|
589 | + * @return \Illuminate\Http\JsonResponse |
|
591 | 590 | */ |
592 | 591 | public function getCustomer() |
593 | 592 | { |
@@ -620,7 +619,7 @@ discard block |
||
620 | 619 | /** |
621 | 620 | * Search tickets. |
622 | 621 | * |
623 | - * @return json |
|
622 | + * @return \Illuminate\Http\JsonResponse |
|
624 | 623 | */ |
625 | 624 | public function searchTicket() |
626 | 625 | { |
@@ -691,7 +690,7 @@ discard block |
||
691 | 690 | /** |
692 | 691 | * Check the url is valid or not. |
693 | 692 | * |
694 | - * @return json |
|
693 | + * @return \Illuminate\Http\JsonResponse |
|
695 | 694 | */ |
696 | 695 | public function checkUrl() |
697 | 696 | { |
@@ -739,7 +738,7 @@ discard block |
||
739 | 738 | /** |
740 | 739 | * Call curl function for Get Method. |
741 | 740 | * |
742 | - * @param type $url |
|
741 | + * @param string $url |
|
743 | 742 | * |
744 | 743 | * @return type int|string|json |
745 | 744 | */ |
@@ -789,7 +788,7 @@ discard block |
||
789 | 788 | /** |
790 | 789 | * To generate api string. |
791 | 790 | * |
792 | - * @return type | json |
|
791 | + * @return \Illuminate\Http\JsonResponse | json |
|
793 | 792 | */ |
794 | 793 | public function generateApiKey() |
795 | 794 | { |
@@ -824,7 +823,7 @@ discard block |
||
824 | 823 | /** |
825 | 824 | * Get help topics. |
826 | 825 | * |
827 | - * @return json |
|
826 | + * @return \Illuminate\Http\JsonResponse |
|
828 | 827 | */ |
829 | 828 | public function getHelpTopic() |
830 | 829 | { |
@@ -848,7 +847,7 @@ discard block |
||
848 | 847 | /** |
849 | 848 | * Get Sla plans. |
850 | 849 | * |
851 | - * @return json |
|
850 | + * @return \Illuminate\Http\JsonResponse |
|
852 | 851 | */ |
853 | 852 | public function getSlaPlan() |
854 | 853 | { |
@@ -872,7 +871,7 @@ discard block |
||
872 | 871 | /** |
873 | 872 | * Get priorities. |
874 | 873 | * |
875 | - * @return json |
|
874 | + * @return \Illuminate\Http\JsonResponse |
|
876 | 875 | */ |
877 | 876 | public function getPriority() |
878 | 877 | { |
@@ -896,7 +895,7 @@ discard block |
||
896 | 895 | /** |
897 | 896 | * Get departments. |
898 | 897 | * |
899 | - * @return json |
|
898 | + * @return \Illuminate\Http\JsonResponse |
|
900 | 899 | */ |
901 | 900 | public function getDepartment() |
902 | 901 | { |
@@ -993,7 +992,7 @@ discard block |
||
993 | 992 | /** |
994 | 993 | * Create internal note. |
995 | 994 | * |
996 | - * @return type json |
|
995 | + * @return \Illuminate\Http\JsonResponse json |
|
997 | 996 | */ |
998 | 997 | public function internalNote() |
999 | 998 | { |
@@ -1460,6 +1459,9 @@ discard block |
||
1460 | 1459 | return $query; |
1461 | 1460 | } |
1462 | 1461 | |
1462 | + /** |
|
1463 | + * @param string $check |
|
1464 | + */ |
|
1463 | 1465 | public function getSystem($check, $query) |
1464 | 1466 | { |
1465 | 1467 | switch ($check) { |
@@ -1477,7 +1479,7 @@ discard block |
||
1477 | 1479 | * |
1478 | 1480 | * @param Request $request |
1479 | 1481 | * |
1480 | - * @return type json |
|
1482 | + * @return \Illuminate\Http\JsonResponse json |
|
1481 | 1483 | */ |
1482 | 1484 | public function register(Request $request) |
1483 | 1485 | { |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | // $result = $this->model->where('status', '=', 1)->where('isanswered', '=', 0)->where('assigned_to', '=', null)->orderBy('id', 'DESC')->get(); |
296 | 296 | // return response()->json(compact('result')); |
297 | 297 | |
298 | - $result = $this->user->join('tickets', function ($join) { |
|
298 | + $result = $this->user->join('tickets', function($join) { |
|
299 | 299 | $join->on('users.id', '=', 'tickets.user_id') |
300 | 300 | ->where('isanswered', '=', 0)->where('status', '=', 1)->whereNull('assigned_to'); |
301 | 301 | }) |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla') |
305 | 305 | ->join('help_topic', 'help_topic.id', '=', 'tickets.help_topic_id') |
306 | 306 | ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status') |
307 | - ->join('ticket_thread', function ($join) { |
|
307 | + ->join('ticket_thread', function($join) { |
|
308 | 308 | $join->on('tickets.id', '=', 'ticket_thread.ticket_id') |
309 | 309 | ->whereNotNull('title'); |
310 | 310 | }) |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | // $result = $this->model->where('assigned_to', '=', null)->where('status', '1')->orderBy('id', 'DESC')->get(); |
342 | 342 | // return response()->json(compact('result')); |
343 | 343 | $user = \JWTAuth::parseToken()->authenticate(); |
344 | - $unassigned = $this->user->join('tickets', function ($join) { |
|
344 | + $unassigned = $this->user->join('tickets', function($join) { |
|
345 | 345 | $join->on('users.id', '=', 'tickets.user_id') |
346 | 346 | ->whereNull('assigned_to')->where('status', '=', 1); |
347 | 347 | }) |
@@ -350,12 +350,12 @@ discard block |
||
350 | 350 | ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla') |
351 | 351 | ->join('help_topic', 'help_topic.id', '=', 'tickets.help_topic_id') |
352 | 352 | ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status') |
353 | - ->join('ticket_thread', function ($join) { |
|
353 | + ->join('ticket_thread', function($join) { |
|
354 | 354 | $join->on('tickets.id', '=', 'ticket_thread.ticket_id') |
355 | 355 | ->whereNotNull('title'); |
356 | 356 | }) |
357 | 357 | ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name') |
358 | - ->where(function ($query) use ($user) { |
|
358 | + ->where(function($query) use ($user) { |
|
359 | 359 | if ($user->role != 'admin') { |
360 | 360 | $query->where('tickets.dept_id', '=', $user->primary_dpt); |
361 | 361 | } |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | // $result = $this->model->where('status', '>', 1)->where('status', '<', 4)->orderBy('id', 'DESC')->get(); |
392 | 392 | // return response()->json(compact('result')); |
393 | 393 | $user = \JWTAuth::parseToken()->authenticate(); |
394 | - $result = $this->user->join('tickets', function ($join) { |
|
394 | + $result = $this->user->join('tickets', function($join) { |
|
395 | 395 | $join->on('users.id', '=', 'tickets.user_id') |
396 | 396 | ->where('status', '=', 3)->orWhere('status', '=', 2); |
397 | 397 | }) |
@@ -400,12 +400,12 @@ discard block |
||
400 | 400 | ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla') |
401 | 401 | ->join('help_topic', 'help_topic.id', '=', 'tickets.help_topic_id') |
402 | 402 | ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status') |
403 | - ->join('ticket_thread', function ($join) { |
|
403 | + ->join('ticket_thread', function($join) { |
|
404 | 404 | $join->on('tickets.id', '=', 'ticket_thread.ticket_id') |
405 | 405 | ->whereNotNull('title'); |
406 | 406 | }) |
407 | 407 | ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name') |
408 | - ->where(function ($query) use ($user) { |
|
408 | + ->where(function($query) use ($user) { |
|
409 | 409 | if ($user->role != 'admin') { |
410 | 410 | $query->where('tickets.dept_id', '=', $user->primary_dpt); |
411 | 411 | } |
@@ -951,7 +951,7 @@ discard block |
||
951 | 951 | { |
952 | 952 | try { |
953 | 953 | $user = \JWTAuth::parseToken()->authenticate(); |
954 | - $inbox = $this->user->join('tickets', function ($join) { |
|
954 | + $inbox = $this->user->join('tickets', function($join) { |
|
955 | 955 | $join->on('users.id', '=', 'tickets.user_id') |
956 | 956 | ->where('status', '=', 1); |
957 | 957 | }) |
@@ -960,12 +960,12 @@ discard block |
||
960 | 960 | ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla') |
961 | 961 | ->join('help_topic', 'help_topic.id', '=', 'tickets.help_topic_id') |
962 | 962 | ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status') |
963 | - ->join('ticket_thread', function ($join) { |
|
963 | + ->join('ticket_thread', function($join) { |
|
964 | 964 | $join->on('tickets.id', '=', 'ticket_thread.ticket_id') |
965 | 965 | ->whereNotNull('ticket_thread.title'); |
966 | 966 | }) |
967 | 967 | ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'ticket_thread.title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name', 'department.id as department_id', 'users.primary_dpt as user_dpt') |
968 | - ->where(function ($query) use ($user) { |
|
968 | + ->where(function($query) use ($user) { |
|
969 | 969 | if ($user->role != 'admin') { |
970 | 970 | $query->where('tickets.dept_id', '=', $user->primary_dpt); |
971 | 971 | } |
@@ -1032,7 +1032,7 @@ discard block |
||
1032 | 1032 | { |
1033 | 1033 | try { |
1034 | 1034 | $user = \JWTAuth::parseToken()->authenticate(); |
1035 | - $trash = $this->user->join('tickets', function ($join) { |
|
1035 | + $trash = $this->user->join('tickets', function($join) { |
|
1036 | 1036 | $join->on('users.id', '=', 'tickets.user_id') |
1037 | 1037 | ->where('status', '=', 5); |
1038 | 1038 | }) |
@@ -1041,12 +1041,12 @@ discard block |
||
1041 | 1041 | ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla') |
1042 | 1042 | ->join('help_topic', 'help_topic.id', '=', 'tickets.help_topic_id') |
1043 | 1043 | ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status') |
1044 | - ->join('ticket_thread', function ($join) { |
|
1044 | + ->join('ticket_thread', function($join) { |
|
1045 | 1045 | $join->on('tickets.id', '=', 'ticket_thread.ticket_id') |
1046 | 1046 | ->whereNotNull('title'); |
1047 | 1047 | }) |
1048 | 1048 | ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name') |
1049 | - ->where(function ($query) use ($user) { |
|
1049 | + ->where(function($query) use ($user) { |
|
1050 | 1050 | if ($user->role != 'admin') { |
1051 | 1051 | $query->where('tickets.dept_id', '=', $user->primary_dpt); |
1052 | 1052 | } |
@@ -1089,7 +1089,7 @@ discard block |
||
1089 | 1089 | return response()->json(compact('error')); |
1090 | 1090 | } |
1091 | 1091 | //$user = \JWTAuth::parseToken()->authenticate(); |
1092 | - $result = $this->user->join('tickets', function ($join) use ($id) { |
|
1092 | + $result = $this->user->join('tickets', function($join) use ($id) { |
|
1093 | 1093 | $join->on('users.id', '=', 'tickets.assigned_to') |
1094 | 1094 | ->where('status', '=', 1); |
1095 | 1095 | //->where('user_id', '=', $id); |
@@ -1099,7 +1099,7 @@ discard block |
||
1099 | 1099 | ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla') |
1100 | 1100 | ->join('help_topic', 'help_topic.id', '=', 'tickets.help_topic_id') |
1101 | 1101 | ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status') |
1102 | - ->join('ticket_thread', function ($join) { |
|
1102 | + ->join('ticket_thread', function($join) { |
|
1103 | 1103 | $join->on('tickets.id', '=', 'ticket_thread.ticket_id') |
1104 | 1104 | ->whereNotNull('title'); |
1105 | 1105 | }) |
@@ -1147,7 +1147,7 @@ discard block |
||
1147 | 1147 | |
1148 | 1148 | return response()->json(compact('error')); |
1149 | 1149 | } |
1150 | - $result = $this->user->join('tickets', function ($join) use ($id) { |
|
1150 | + $result = $this->user->join('tickets', function($join) use ($id) { |
|
1151 | 1151 | $join->on('users.id', '=', 'tickets.user_id') |
1152 | 1152 | ->where('user_id', '=', $id); |
1153 | 1153 | }) |
@@ -1156,7 +1156,7 @@ discard block |
||
1156 | 1156 | ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla') |
1157 | 1157 | ->join('help_topic', 'help_topic.id', '=', 'tickets.help_topic_id') |
1158 | 1158 | ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status') |
1159 | - ->join('ticket_thread', function ($join) { |
|
1159 | + ->join('ticket_thread', function($join) { |
|
1160 | 1160 | $join->on('tickets.id', '=', 'ticket_thread.ticket_id') |
1161 | 1161 | ->whereNotNull('title'); |
1162 | 1162 | }) |
@@ -1199,7 +1199,7 @@ discard block |
||
1199 | 1199 | |
1200 | 1200 | return response()->json(compact('error')); |
1201 | 1201 | } |
1202 | - $query = $this->user->join('tickets', function ($join) use ($id) { |
|
1202 | + $query = $this->user->join('tickets', function($join) use ($id) { |
|
1203 | 1203 | $join->on('users.id', '=', 'tickets.user_id') |
1204 | 1204 | ->where('tickets.id', '=', $id); |
1205 | 1205 | }); |
@@ -71,7 +71,7 @@ |
||
71 | 71 | /** |
72 | 72 | * Call curl function for Get Method. |
73 | 73 | * |
74 | - * @param type $url |
|
74 | + * @param string $url |
|
75 | 75 | * |
76 | 76 | * @return type int|string|json |
77 | 77 | */ |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | * |
118 | 118 | * @param type $headers |
119 | 119 | * |
120 | - * @return type |
|
120 | + * @return boolean|string |
|
121 | 121 | */ |
122 | 122 | public function storeCollaborators($headers, $id) |
123 | 123 | { |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | * |
196 | 196 | * @param type $ticket_number |
197 | 197 | * |
198 | - * @return type integer |
|
198 | + * @return string integer |
|
199 | 199 | */ |
200 | 200 | public function ticketNumber($ticket_number) |
201 | 201 | { |
@@ -234,9 +234,9 @@ discard block |
||
234 | 234 | /** |
235 | 235 | * Generate a random string for password. |
236 | 236 | * |
237 | - * @param type $length |
|
237 | + * @param integer $length |
|
238 | 238 | * |
239 | - * @return type string |
|
239 | + * @return string string |
|
240 | 240 | */ |
241 | 241 | public function generateRandomString($length = 10) |
242 | 242 | { |
@@ -259,6 +259,9 @@ discard block |
||
259 | 259 | * |
260 | 260 | * @param type Ticket_Thread $thread |
261 | 261 | * @param type TicketRequest $request |
262 | + * @param Ticket_Thread $thread |
|
263 | + * @param \Illuminate\Http\Request $request |
|
264 | + * @param Ticket_attachments $ta |
|
262 | 265 | * |
263 | 266 | * @return type bool |
264 | 267 | */ |
@@ -408,6 +411,8 @@ discard block |
||
408 | 411 | * |
409 | 412 | * @param type $ticket_id |
410 | 413 | * @param type Ticket_Thread $thread |
414 | + * @param Ticket_Thread $thread |
|
415 | + * @param Tickets $ticket |
|
411 | 416 | * |
412 | 417 | * @return type bool |
413 | 418 | */ |
@@ -499,10 +504,11 @@ discard block |
||
499 | 504 | /** |
500 | 505 | * Function to delete ticket. |
501 | 506 | * |
502 | - * @param type $id |
|
507 | + * @param type $ids |
|
503 | 508 | * @param type Tickets $ticket |
509 | + * @param Tickets $ticket |
|
504 | 510 | * |
505 | - * @return type string |
|
511 | + * @return string string |
|
506 | 512 | */ |
507 | 513 | public function delete($ids, $ticket) |
508 | 514 | { |
@@ -597,7 +603,7 @@ discard block |
||
597 | 603 | * Create Attachment. |
598 | 604 | * |
599 | 605 | * @param type $thread |
600 | - * @param type $attach |
|
606 | + * @param string $attach |
|
601 | 607 | * |
602 | 608 | * @return int |
603 | 609 | */ |
@@ -668,7 +674,7 @@ discard block |
||
668 | 674 | /** |
669 | 675 | * user remove. |
670 | 676 | * |
671 | - * @return type |
|
677 | + * @return string |
|
672 | 678 | */ |
673 | 679 | public function userremove() |
674 | 680 | { |
@@ -694,7 +694,7 @@ |
||
694 | 694 | $ticketid = Input::get('ticket_id'); |
695 | 695 | |
696 | 696 | $ticket_collaborator = \DB::table('users') |
697 | - ->join('ticket_collaborator', function ($join) use ($ticketid) { |
|
697 | + ->join('ticket_collaborator', function($join) use ($ticketid) { |
|
698 | 698 | $join->on('users.id', '=', 'ticket_collaborator.user_id') |
699 | 699 | ->where('ticket_collaborator.ticket_id', '=', $ticketid); |
700 | 700 | }) |