From 77c88cc2294216df4d9b1a664845208eb14467f1 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Mon, 19 Dec 2016 15:47:17 +0530 Subject: [PATCH 01/41] bug-fix-patch # Counting only authenticated user's notification # Agents were not able to select canned resposne while replying --- .../Common/NotificationController.php | 2 +- .../agent/helpdesk/ticket/timeline.blade.php | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Common/NotificationController.php b/app/Http/Controllers/Common/NotificationController.php index 1ab7058b1..2507c2f7f 100644 --- a/app/Http/Controllers/Common/NotificationController.php +++ b/app/Http/Controllers/Common/NotificationController.php @@ -164,7 +164,7 @@ class NotificationController extends Controller }, 'notification.model' => function ($query) { $query->select('id', 'ticket_number'); }, - ]); + ])->where('id', '=', \Auth::user()->id); return $notifications; } 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 a9a0ab028..3a9d33bc6 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php @@ -397,14 +397,14 @@ if ($thread->title != "") {
- id)->get(); ?> @foreach($canneds as $canned) - + @endforeach {{-- --}} @@ -2210,5 +2210,20 @@ echo $ticket_data->title; $(this).html($('').width(Math.max(0, (Math.min(5, parseFloat($(this).html())))) * 16)); }); } + + function addCannedResponse() { + var selectedResponse = document.getElementById( "select" ); + var response = selectedResponse.options[selectedResponse.selectedIndex ].value; + if (response == 'zzz') { + for ( instance in CKEDITOR.instances ){ + CKEDITOR.instances[instance].updateElement(); + CKEDITOR.instances[instance].setData(''); + } + } else { + for ( instance in CKEDITOR.instances ) { + CKEDITOR.instances[instance].insertHtml(response); + } + } + } @stop \ No newline at end of file From 54af5c3765f8992f7a8e35acd19bbb6b3e5e738d Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Mon, 19 Dec 2016 17:22:21 +0530 Subject: [PATCH 02/41] Bug-fix-patch2 # correct while registration --- app/Http/Controllers/Auth/AuthController.php | 14 ++++++++++---- resources/lang/de/lang.php | 3 +++ resources/lang/en/lang.php | 3 +++ resources/lang/fr/lang.php | 3 +++ resources/lang/it/lang.php | 3 +++ resources/lang/nl/lang.php | 3 +++ resources/lang/pt/lang.php | 3 +++ resources/lang/ru/lang.php | 3 +++ 8 files changed, 31 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 971ebc449..7692962c2 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -183,9 +183,11 @@ class AuthController extends Controller $message12 = ''; $settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first(); $sms = Plugin::select('status')->where('name', '=', 'SMS')->first(); - // Event for login - \Event::fire(new \App\Events\LoginEvent($request)); - $var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => null, 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/'.$code)]); + // Event for login + \Event::fire(new \App\Events\LoginEvent($request)); + if ($request->input('email') !== '') { + $var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => null, 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/'.$code)]); + } if ($settings->status == 1 || $settings->status == '1') { if (count($sms) > 0) { if ($sms->status == 1 || $sms->status == '1') { @@ -194,7 +196,11 @@ class AuthController extends Controller $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup'); } } else { - $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail'); + if ($request->input('email') !== '') { + $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail'); + } else { + $message12 = Lang::get('lang.account-created-contact-admin-as-we-were-not-able-to-send-opt'); + } } } else { $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail'); diff --git a/resources/lang/de/lang.php b/resources/lang/de/lang.php index e2d90f32e..751d75ae6 100644 --- a/resources/lang/de/lang.php +++ b/resources/lang/de/lang.php @@ -1146,4 +1146,7 @@ return [ 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', + ]; diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index d96b13e49..4eb8f0b87 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1583,4 +1583,7 @@ return [ 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', + ]; diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php index 2df9999b9..dfe4b5106 100644 --- a/resources/lang/fr/lang.php +++ b/resources/lang/fr/lang.php @@ -1554,4 +1554,7 @@ return [ 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', + ]; diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php index 40bb8faaf..b629f2bd1 100644 --- a/resources/lang/it/lang.php +++ b/resources/lang/it/lang.php @@ -1105,4 +1105,7 @@ return [ 'restore-user' => 'Restore user account', 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', + + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', ]; diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php index 34c6e13ce..8bb0b35c7 100644 --- a/resources/lang/nl/lang.php +++ b/resources/lang/nl/lang.php @@ -1599,4 +1599,7 @@ return [ 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', + ]; diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php index fed5c3db7..116d1ec49 100644 --- a/resources/lang/pt/lang.php +++ b/resources/lang/pt/lang.php @@ -1544,4 +1544,7 @@ return [ 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', + ]; diff --git a/resources/lang/ru/lang.php b/resources/lang/ru/lang.php index df3ffe5c0..3bf31ee42 100644 --- a/resources/lang/ru/lang.php +++ b/resources/lang/ru/lang.php @@ -1052,4 +1052,7 @@ return [ 'restore-user' => 'Restore user account', 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', + + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', ]; From 964ca87b89a8fdac1f608d2ea6fc1b43aa083b1c Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Mon, 19 Dec 2016 12:49:19 +0000 Subject: [PATCH 03/41] Apply fixes from StyleCI --- app/Http/ViewComposers/AgentLayout.php | 4 ++-- resources/lang/de/lang.php | 2 +- resources/lang/en/lang.php | 2 +- resources/lang/fr/lang.php | 2 +- resources/lang/it/lang.php | 2 +- resources/lang/nl/lang.php | 2 +- resources/lang/pt/lang.php | 2 +- resources/lang/ru/lang.php | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/Http/ViewComposers/AgentLayout.php b/app/Http/ViewComposers/AgentLayout.php index df04bf23d..1fdef6059 100644 --- a/app/Http/ViewComposers/AgentLayout.php +++ b/app/Http/ViewComposers/AgentLayout.php @@ -150,9 +150,9 @@ class AgentLayout } return $table->Join('ticket_status', function ($join) { - $join->on('ticket_status.id', '=', 'tickets.status') + $join->on('ticket_status.id', '=', 'tickets.status') ->whereIn('ticket_status.id', [1, 7]); - }); + }); } public function overdues() diff --git a/resources/lang/de/lang.php b/resources/lang/de/lang.php index 751d75ae6..4a04a3b01 100644 --- a/resources/lang/de/lang.php +++ b/resources/lang/de/lang.php @@ -1146,7 +1146,7 @@ return [ 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', - //update 18-12-2016 + //update 18-12-2016 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', ]; diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 4eb8f0b87..0869be465 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1583,7 +1583,7 @@ return [ 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', - //update 18-12-2016 + //update 18-12-2016 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', ]; diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php index dfe4b5106..66b28872c 100644 --- a/resources/lang/fr/lang.php +++ b/resources/lang/fr/lang.php @@ -1554,7 +1554,7 @@ return [ 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', - //update 18-12-2016 + //update 18-12-2016 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', ]; diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php index b629f2bd1..c9cc32aa8 100644 --- a/resources/lang/it/lang.php +++ b/resources/lang/it/lang.php @@ -1106,6 +1106,6 @@ return [ 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', - //update 18-12-2016 + //update 18-12-2016 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', ]; diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php index 8bb0b35c7..95bdb72a5 100644 --- a/resources/lang/nl/lang.php +++ b/resources/lang/nl/lang.php @@ -1599,7 +1599,7 @@ return [ 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', - //update 18-12-2016 + //update 18-12-2016 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', ]; diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php index 116d1ec49..4db1a1d87 100644 --- a/resources/lang/pt/lang.php +++ b/resources/lang/pt/lang.php @@ -1544,7 +1544,7 @@ return [ 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', - //update 18-12-2016 + //update 18-12-2016 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', ]; diff --git a/resources/lang/ru/lang.php b/resources/lang/ru/lang.php index 3bf31ee42..5f06a8d0d 100644 --- a/resources/lang/ru/lang.php +++ b/resources/lang/ru/lang.php @@ -1053,6 +1053,6 @@ return [ 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', - //update 18-12-2016 + //update 18-12-2016 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', ]; From 1f8cda387592b0bce98e6b038a977757a2fe0f58 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Tue, 20 Dec 2016 10:58:11 +0530 Subject: [PATCH 04/41] Bug-fix-patch3 Fixed issue #350 - Removed labels from ticket settings menu --- resources/views/themes/default1/admin/layout/admin.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/themes/default1/admin/layout/admin.blade.php b/resources/views/themes/default1/admin/layout/admin.blade.php index 6715f0df6..02abdfc5a 100644 --- a/resources/views/themes/default1/admin/layout/admin.blade.php +++ b/resources/views/themes/default1/admin/layout/admin.blade.php @@ -278,7 +278,6 @@
  • {!! Lang::get('lang.auto_response') !!}
  • {!! Lang::get('lang.alert_notices') !!}
  • {!! Lang::get('lang.status') !!}
    • -
  • {!! Lang::get('lang.labels') !!}
  • {!! Lang::get('lang.ratings') !!}
  • {!! Lang::get('lang.close-workflow') !!}
    • From 78f6a13528b40a484752c0e0c31308405b55d9c0 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Tue, 20 Dec 2016 19:33:23 +0530 Subject: [PATCH 05/41] Bug-fix-patch4 # handling exception in while adding language # Implemented Yajra in users list table # custom filter and veiw option in users list table --- .../Admin/helpdesk/LanguageController.php | 129 +++++++++--------- .../Agent/helpdesk/UserController.php | 56 ++++---- resources/lang/de/lang.php | 7 + resources/lang/en/lang.php | 8 +- resources/lang/fr/lang.php | 7 + resources/lang/it/lang.php | 7 + resources/lang/nl/lang.php | 7 + resources/lang/pt/lang.php | 8 ++ resources/lang/ru/lang.php | 8 ++ .../agent/helpdesk/user/index.blade.php | 24 +++- .../vendor/Chumper/user-javascript.blade.php | 57 +++++++- 11 files changed, 220 insertions(+), 98 deletions(-) diff --git a/app/Http/Controllers/Admin/helpdesk/LanguageController.php b/app/Http/Controllers/Admin/helpdesk/LanguageController.php index 8eb174a22..91802568c 100644 --- a/app/Http/Controllers/Admin/helpdesk/LanguageController.php +++ b/app/Http/Controllers/Admin/helpdesk/LanguageController.php @@ -122,79 +122,84 @@ class LanguageController extends Controller */ public function postForm() { - // getting all of the post data - $file = [ - 'File' => Input::file('File'), - 'language-name' => Input::input('language-name'), - 'iso-code' => Input::input('iso-code'), - ]; + try { + // getting all of the post data + $file = [ + 'File' => Input::file('File'), + 'language-name' => Input::input('language-name'), + 'iso-code' => Input::input('iso-code'), + ]; - // setting up rules - $rules = [ - 'File' => 'required|mimes:zip|max:30000', - 'language-name' => 'required', - 'iso-code' => 'required|max:2', - ]; // and for max size - // doing the validation, passing post data, rules and the messages - $validator = Validator::make($file, $rules); - if ($validator->fails()) { + // setting up rules + $rules = [ + 'File' => 'required|mimes:zip|max:30000', + 'language-name' => 'required', + 'iso-code' => 'required|max:2', + ]; // and for max size + // doing the validation, passing post data, rules and the messages + $validator = Validator::make($file, $rules); + if ($validator->fails()) { - // send back to the page with the input data and errors - return Redirect::back()->withInput()->withErrors($validator); - } else { - - //Checking if package already exists or not in lang folder - $path = base_path('resources/lang'); - if (in_array(strtolower(Input::get('iso-code')), scandir($path))) { - - //sending back with error message - Session::flash('fails', Lang::get('lang.package_exist')); - Session::flash('link', 'change-language/'.strtolower(Input::get('iso-code'))); - - return Redirect::back()->withInput(); - } elseif (!array_key_exists(strtolower(Input::get('iso-code')), Config::get('languages'))) {//Checking Valid ISO code form Languages.php - //sending back with error message - Session::flash('fails', Lang::get('lang.iso-code-error')); - - return Redirect::back()->withInput(); + // send back to the page with the input data and errors + return Redirect::back()->withInput()->withErrors($validator); } else { - // checking file is valid. - if (Input::file('File')->isValid()) { - $name = Input::file('File')->getClientOriginalName(); //uploaded file's original name - $destinationPath = base_path('public/uploads/'); // defining uploading path - $extractpath = base_path('resources/lang').'/'.strtolower(Input::get('iso-code')); //defining extracting path - mkdir($extractpath); //creating directroy for extracting uploadd file - //mkdir($destinationPath); - Input::file('File')->move($destinationPath, $name); // uploading file to given path - \Zipper::make($destinationPath.'/'.$name)->extractTo($extractpath); //extracting file to give path - //check if Zip extract foldercontains any subfolder - $directories = File::directories($extractpath); - //$directories = glob($extractpath. '/*' , GLOB_ONLYDIR); - if (!empty($directories)) { //if extract folder contains subfolder - $success = File::deleteDirectory($extractpath); //remove extracted folder and it's subfolder from lang - //$success2 = File::delete($destinationPath.'/'.$name); - if ($success) { - //sending back with error message - Session::flash('fails', Lang::get('lang.zipp-error')); - Session::flash('link2', 'http://www.ladybirdweb.com/support/show/how-to-translate-faveo-into-multiple-languages'); + //Checking if package already exists or not in lang folder + $path = base_path('resources/lang'); + if (in_array(strtolower(Input::get('iso-code')), scandir($path))) { - return Redirect::back()->withInput(); + //sending back with error message + Session::flash('fails', Lang::get('lang.package_exist')); + Session::flash('link', 'change-language/'.strtolower(Input::get('iso-code'))); + + return Redirect::back()->withInput(); + } elseif (!array_key_exists(strtolower(Input::get('iso-code')), Config::get('languages'))) {//Checking Valid ISO code form Languages.php + //sending back with error message + Session::flash('fails', Lang::get('lang.iso-code-error')); + + return Redirect::back()->withInput(); + } else { + + // checking file is valid. + if (Input::file('File')->isValid()) { + $name = Input::file('File')->getClientOriginalName(); //uploaded file's original name + $destinationPath = base_path('public/uploads/'); // defining uploading path + $extractpath = base_path('resources/lang').'/'.strtolower(Input::get('iso-code')); //defining extracting path + mkdir($extractpath); //creating directroy for extracting uploadd file + //mkdir($destinationPath); + Input::file('File')->move($destinationPath, $name); // uploading file to given path + \Zipper::make($destinationPath.'/'.$name)->extractTo($extractpath); //extracting file to give path + //check if Zip extract foldercontains any subfolder + $directories = File::directories($extractpath); + //$directories = glob($extractpath. '/*' , GLOB_ONLYDIR); + if (!empty($directories)) { //if extract folder contains subfolder + $success = File::deleteDirectory($extractpath); //remove extracted folder and it's subfolder from lang + //$success2 = File::delete($destinationPath.'/'.$name); + if ($success) { + //sending back with error message + Session::flash('fails', Lang::get('lang.zipp-error')); + Session::flash('link2', 'http://www.ladybirdweb.com/support/show/how-to-translate-faveo-into-multiple-languages'); + + return Redirect::back()->withInput(); + } + } else { + // sending back with success message + Session::flash('success', Lang::get('lang.upload-success')); + Session::flash('link', 'change-language/'.strtolower(Input::get('iso-code'))); + + return Redirect::route('LanguageController'); } } else { - // sending back with success message - Session::flash('success', Lang::get('lang.upload-success')); - Session::flash('link', 'change-language/'.strtolower(Input::get('iso-code'))); + // sending back with error message. + Session::flash('fails', Lang::get('lang.file-error')); - return Redirect::route('LanguageController'); + return Redirect::route('form'); } - } else { - // sending back with error message. - Session::flash('fails', Lang::get('lang.file-error')); - - return Redirect::route('form'); } } + } catch (\Exception $e) { + Session::flash('fails', $e->getMessage()); + Redirect::back()->withInput(); } } diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index 9ba440655..8dd0b7715 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -41,6 +41,7 @@ use Illuminate\Http\Request; use Input; use Lang; use Redirect; +use Datatables; /** * UserController @@ -85,7 +86,6 @@ class UserController extends Controller Lang::get('lang.email'), Lang::get('lang.phone'), Lang::get('lang.status'), - Lang::get('lang.ban'), Lang::get('lang.last_login'), Lang::get('lang.role'), Lang::get('lang.action')) // these are the column headings to be shown @@ -116,21 +116,42 @@ class UserController extends Controller public function user_list(Request $request) { $type = $request->input('profiletype'); + $search = $request->input('searchTerm'); - if ($type == 'active') { - $users = User::where('role', '!=', 'admin')->where('is_delete', '=', 0)->get(); + if ($type === 'agents') { + $users = User::where('role', '=', 'agent')->where('is_delete', '=', 0); + } elseif ($type === 'users') { + $users = User::where('role', '=', 'user')->where('is_delete', '=', 0); + } elseif ($type === 'active') { + $users = User::where('role', '!=', 'admin')->where('active', '=', 1); + } elseif ($type === 'inactive') { + $users = User::where('role', '!=', 'admin')->where('active', '=', 0); + } elseif ($type === 'deleted') { + $users = User::where('role', '!=', 'admin')->where('is_delete', '=', 1); + } elseif ($type === 'banned') { + $users = User::where('role', '!=', 'admin')->where('ban', '=', 1); } else { - $users = User::where('role', '!=', 'admin')->where('is_delete', '=', 1)->get(); + $users = User::where('role', '!=', 'admin')->where('is_delete', '=', 0); } + + $users = $users->select('user_name', 'email', 'mobile', 'active', 'updated_at', 'role', 'id', 'last_name', 'country_code', 'phone_number'); + if ($search !== '') { + $users = $users->where(function($query) use ($search){ + $query->where('user_name', 'LIKE', '%'.$search.'%'); + $query->orWhere('email', 'LIKE', '%'.$search.'%'); + $query->orWhere('first_name', 'LIKE', '%'.$search.'%'); + $query->orWhere('last_name', 'LIKE', '%'.$search.'%'); + $query->orWhere('mobile', 'LIKE', '%'.$search.'%'); + $query->orWhere('updated_at', 'LIKE', '%'.$search.'%'); + $query->orWhere('country_code', 'LIKE', '%'.$search.'%'); + }); + } // displaying list of users with chumper datatables // return \Datatable::collection(User::where('role', "!=", "admin")->get()) - return \Datatable::collection($users) - /* searchable column username and email */ - ->searchColumns('user_name', 'email', 'phone') - /* order column username and email */ - ->orderColumns('user_name', 'email') + return \Datatables::of($users) /* column username */ + ->removeColumn('id', 'last_name', 'country_code', 'phone_number') ->addColumn('user_name', function ($model) { if ($model->first_name) { $string = strip_tags($model->first_name.' '.$model->last_name); @@ -153,7 +174,7 @@ class UserController extends Controller return $email; }) /* column phone */ - ->addColumn('phone', function ($model) { + ->addColumn('mobile', function ($model) { $phone = ''; if ($model->phone_number) { $phone = $model->ext.' '.$model->phone_number; @@ -167,7 +188,7 @@ class UserController extends Controller return $phone; }) /* column account status */ - ->addColumn('status', function ($model) { + ->addColumn('active', function ($model) { $status = $model->active; if ($status == 1) { $stat = ''; @@ -177,19 +198,8 @@ class UserController extends Controller return $stat; }) - /* column ban status */ - ->addColumn('ban', function ($model) { - $status = $model->ban; - if ($status == 1) { - $stat = ''; - } else { - $stat = ''; - } - - return $stat; - }) /* column last login date */ - ->addColumn('lastlogin', function ($model) { + ->addColumn('updated_at', function ($model) { $t = $model->updated_at; return TicketController::usertimezone($t); diff --git a/resources/lang/de/lang.php b/resources/lang/de/lang.php index 4a04a3b01..936663210 100644 --- a/resources/lang/de/lang.php +++ b/resources/lang/de/lang.php @@ -1148,5 +1148,12 @@ return [ //update 18-12-2016 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', + //update 19-12-2016 + 'only-agents' => 'Agent users', + 'only-users' => 'Clients users', + 'banned-users' => 'Banned users', + 'inactive-users' => 'Inactive users', + 'all-users' => 'All users', + 'search' => 'Search...', ]; diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 0869be465..3582fa87c 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1585,5 +1585,11 @@ return [ //update 18-12-2016 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', - + //update 19-12-2016 + 'only-agents' => 'Agent users', + 'only-users' => 'Clients users', + 'banned-users' => 'Banned users', + 'inactive-users' => 'Inactive users', + 'all-users' => 'All users', + 'search' => 'Search...', ]; diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php index 66b28872c..9cc8f4f5a 100644 --- a/resources/lang/fr/lang.php +++ b/resources/lang/fr/lang.php @@ -1556,5 +1556,12 @@ return [ //update 18-12-2016 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', + //update 19-12-2016 + 'only-agents' => 'Agent users', + 'only-users' => 'Clients users', + 'banned-users' => 'Banned users', + 'inactive-users' => 'Inactive users', + 'all-users' => 'All users', + 'search' => 'Search...', ]; diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php index c9cc32aa8..94275e16a 100644 --- a/resources/lang/it/lang.php +++ b/resources/lang/it/lang.php @@ -1108,4 +1108,11 @@ return [ //update 18-12-2016 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', + //update 19-12-2016 + 'only-agents' => 'Agent users', + 'only-users' => 'Clients users', + 'banned-users' => 'Banned users', + 'inactive-users' => 'Inactive users', + 'all-users' => 'All users', + 'search' => 'Search...', ]; diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php index 95bdb72a5..0f8fda029 100644 --- a/resources/lang/nl/lang.php +++ b/resources/lang/nl/lang.php @@ -1602,4 +1602,11 @@ return [ //update 18-12-2016 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', + //update 19-12-2016 + 'only-agents' => 'Agent users', + 'only-users' => 'Clients users', + 'banned-users' => 'Banned users', + 'inactive-users' => 'Inactive users', + 'all-users' => 'All users', + 'search' => 'Search...', ]; diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php index 4db1a1d87..0121dd46a 100644 --- a/resources/lang/pt/lang.php +++ b/resources/lang/pt/lang.php @@ -1547,4 +1547,12 @@ return [ //update 18-12-2016 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', + //update 19-12-2016 + 'only-agents' => 'Agent users', + 'only-users' => 'Clients users', + 'banned-users' => 'Banned users', + 'inactive-users' => 'Inactive users', + 'all-users' => 'All users', + 'search' => 'Search...', + ]; diff --git a/resources/lang/ru/lang.php b/resources/lang/ru/lang.php index 5f06a8d0d..206d4a3b8 100644 --- a/resources/lang/ru/lang.php +++ b/resources/lang/ru/lang.php @@ -1055,4 +1055,12 @@ return [ //update 18-12-2016 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', + + //update 19-12-2016 + 'only-agents' => 'Agent users', + 'only-users' => 'Clients users', + 'banned-users' => 'Banned users', + 'inactive-users' => 'Inactive users', + 'all-users' => 'All users', + 'search' => 'Search...', ]; diff --git a/resources/views/themes/default1/agent/helpdesk/user/index.blade.php b/resources/views/themes/default1/agent/helpdesk/user/index.blade.php index 706d04845..e3d8edce5 100644 --- a/resources/views/themes/default1/agent/helpdesk/user/index.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/user/index.blade.php @@ -34,20 +34,32 @@ class="active"
    +

    {{Lang::get('lang.user')}}

    -
    +
    +
    +
    + + +
    +
    -
    +
    Export diff --git a/resources/views/vendor/Chumper/user-javascript.blade.php b/resources/views/vendor/Chumper/user-javascript.blade.php index fd79a2be8..53bfe4e41 100644 --- a/resources/views/vendor/Chumper/user-javascript.blade.php +++ b/resources/views/vendor/Chumper/user-javascript.blade.php @@ -7,8 +7,9 @@ foreach($segments as $seg){ ?> \ No newline at end of file From 92df1e0654225c4a08bee594552bfea314256dad Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Wed, 21 Dec 2016 11:43:37 +0530 Subject: [PATCH 06/41] Bug-fix-patch-5 # Removed approval link which is not a part of community version # Added storage in side bar menu # Fixed UI --- app/FaveoStorage/views/settings.blade.php | 23 +++++++++++++++---- .../default1/admin/layout/admin.blade.php | 2 +- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/FaveoStorage/views/settings.blade.php b/app/FaveoStorage/views/settings.blade.php index 52fb6dda4..ba5b0d5e9 100644 --- a/app/FaveoStorage/views/settings.blade.php +++ b/app/FaveoStorage/views/settings.blade.php @@ -1,9 +1,24 @@ @extends('themes.default1.admin.layout.admin') -@section('content') -
    -

    {{Lang::get('storage::lang.settings')}}

    -
    +@section('Settings') +active +@stop + +@section('settings-bar') +active +@stop + +@section('storage') +class="active" +@stop + +@section('PageHeader') +

    {{ Lang::get('storage::lang.storage')}}

    +@stop + +@section('HeadInclude') +@stop +@section('content')
    diff --git a/resources/views/themes/default1/admin/layout/admin.blade.php b/resources/views/themes/default1/admin/layout/admin.blade.php index 02abdfc5a..bf6c51e1e 100644 --- a/resources/views/themes/default1/admin/layout/admin.blade.php +++ b/resources/views/themes/default1/admin/layout/admin.blade.php @@ -296,7 +296,7 @@
  • {!! Lang::get('lang.cron') !!}
  • {!! Lang::get('lang.security') !!}
  • {!! Lang::get('lang.notifications') !!}
    • -
  • {!! Lang::get('lang.approval') !!}
    • +
  • {!! Lang::get('storage::lang.storage') !!}
  • From d9a2e97c228d792cd7fb02785e5b5bf1e3c8504a Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Wed, 21 Dec 2016 07:06:23 +0000 Subject: [PATCH 07/41] Apply fixes from StyleCI --- .../Agent/helpdesk/UserController.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index 8dd0b7715..a9ad614d9 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -32,6 +32,7 @@ use App\Model\helpdesk\Utility\Otp; use App\User; // classes use Auth; +use Datatables; use DateTime; use DB; use Exception; @@ -41,7 +42,6 @@ use Illuminate\Http\Request; use Input; use Lang; use Redirect; -use Datatables; /** * UserController @@ -120,7 +120,7 @@ class UserController extends Controller if ($type === 'agents') { $users = User::where('role', '=', 'agent')->where('is_delete', '=', 0); - } elseif ($type === 'users') { + } elseif ($type === 'users') { $users = User::where('role', '=', 'user')->where('is_delete', '=', 0); } elseif ($type === 'active') { $users = User::where('role', '!=', 'admin')->where('active', '=', 1); @@ -133,19 +133,19 @@ class UserController extends Controller } else { $users = User::where('role', '!=', 'admin')->where('is_delete', '=', 0); } - + $users = $users->select('user_name', 'email', 'mobile', 'active', 'updated_at', 'role', 'id', 'last_name', 'country_code', 'phone_number'); if ($search !== '') { - $users = $users->where(function($query) use ($search){ - $query->where('user_name', 'LIKE', '%'.$search.'%'); - $query->orWhere('email', 'LIKE', '%'.$search.'%'); - $query->orWhere('first_name', 'LIKE', '%'.$search.'%'); - $query->orWhere('last_name', 'LIKE', '%'.$search.'%'); - $query->orWhere('mobile', 'LIKE', '%'.$search.'%'); - $query->orWhere('updated_at', 'LIKE', '%'.$search.'%'); - $query->orWhere('country_code', 'LIKE', '%'.$search.'%'); - }); + $users = $users->where(function ($query) use ($search) { + $query->where('user_name', 'LIKE', '%'.$search.'%'); + $query->orWhere('email', 'LIKE', '%'.$search.'%'); + $query->orWhere('first_name', 'LIKE', '%'.$search.'%'); + $query->orWhere('last_name', 'LIKE', '%'.$search.'%'); + $query->orWhere('mobile', 'LIKE', '%'.$search.'%'); + $query->orWhere('updated_at', 'LIKE', '%'.$search.'%'); + $query->orWhere('country_code', 'LIKE', '%'.$search.'%'); + }); } // displaying list of users with chumper datatables // return \Datatable::collection(User::where('role', "!=", "admin")->get()) From d29ca0e626c922bac1781d29dcbef87045ede177 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Wed, 21 Dec 2016 15:25:30 +0530 Subject: [PATCH 08/41] Bug-fix-patch-6 # Style and UI enhancement in users table for view filteration option. --- .../Agent/helpdesk/UserController.php | 2 +- .../vendor/Chumper/user-javascript.blade.php | 48 +++++++++++++------ 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index a9ad614d9..b2b9bf358 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -122,7 +122,7 @@ class UserController extends Controller $users = User::where('role', '=', 'agent')->where('is_delete', '=', 0); } elseif ($type === 'users') { $users = User::where('role', '=', 'user')->where('is_delete', '=', 0); - } elseif ($type === 'active') { + } elseif ($type === 'active-users') { $users = User::where('role', '!=', 'admin')->where('active', '=', 1); } elseif ($type === 'inactive') { $users = User::where('role', '!=', 'admin')->where('active', '=', 0); diff --git a/resources/views/vendor/Chumper/user-javascript.blade.php b/resources/views/vendor/Chumper/user-javascript.blade.php index 53bfe4e41..f1f55b214 100644 --- a/resources/views/vendor/Chumper/user-javascript.blade.php +++ b/resources/views/vendor/Chumper/user-javascript.blade.php @@ -39,44 +39,52 @@ foreach($segments as $seg){ $('.all').on('click', function(){ show = 'all'; - $("#chumper").dataTable().fnDestroy(); - myFunction(show, searchTerm); + classname = '.'+show; + filterTable(show); + toggleActiveClass(classname); }); $('.active-users').on('click', function(){ - show = 'active'; - $("#chumper").dataTable().fnDestroy(); - myFunction(show, searchTerm); + show = 'active-users'; + classname = '.'+show; + filterTable(show); + toggleActiveClass(classname); + }); $('.inactive').on('click', function(){ show = 'inactive'; - $("#chumper").dataTable().fnDestroy(); - myFunction(show, searchTerm); + classname = '.'+show; + filterTable(show); + toggleActiveClass(classname); }); $('.agents').on('click', function(){ show = 'agents'; - $("#chumper").dataTable().fnDestroy(); - myFunction(show, searchTerm); + classname = '.'+show; + filterTable(show); + toggleActiveClass(classname); }); $('.users').on('click', function(){ show = 'users'; - $("#chumper").dataTable().fnDestroy(); - myFunction(show, searchTerm); + classname = '.'+show; + filterTable(show); + toggleActiveClass(classname); }); $('.banned').on('click', function(){ show = 'banned'; - $("#chumper").dataTable().fnDestroy(); - myFunction(show, searchTerm); + classname = '.'+show; + filterTable(show); + toggleActiveClass(classname); }); $('.deleted').on('click', function(){ show = 'deleted'; - $("#chumper").dataTable().fnDestroy(); - myFunction(show, searchTerm); + classname = '.'+show; + filterTable(show); + toggleActiveClass(classname); }); document.getElementById('search-text').onkeypress = function(e){ @@ -88,5 +96,15 @@ foreach($segments as $seg){ myFunction(show, searchTerm); } } + + function filterTable(show) { + $("#chumper").dataTable().fnDestroy(); + myFunction(show, searchTerm); + } + + function toggleActiveClass(classname) { + $('.active').removeClass('active'); + $(classname).parent('li').addClass('active'); + } }); \ No newline at end of file From df14836985db6bc04e4615677a792c7612dcfd86 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Wed, 21 Dec 2016 16:29:55 +0530 Subject: [PATCH 09/41] bug-fix-patch-6 # Fixed search input hieght in user directory for all browsers # Showing agents by ascending name order in ticket assign modal pop ups --- app/Http/Controllers/Agent/helpdesk/UserController.php | 2 +- .../themes/default1/agent/helpdesk/ticket/timeline.blade.php | 2 +- .../views/themes/default1/agent/helpdesk/user/index.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index b2b9bf358..ccc0a6896 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -1074,7 +1074,7 @@ class UserController extends Controller public function getAgentDetails() { - $users = User::where('role', '<>', 'user')->where('active', '=', 1)->get(); + $users = User::where('role', '<>', 'user')->where('active', '=', 1)->orderBy('first_name')->get(); foreach ($users as $user) { echo "'; } 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 3a9d33bc6..41abed0af 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php @@ -1054,7 +1054,7 @@ alert(h+20);

    {!! Lang::get('lang.whome_do_you_want_to_assign_ticket') !!}?

    +
    • From c47b5da890805d0be19d652a980d01c01d1f11bc Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Thu, 22 Dec 2016 13:15:16 +0530 Subject: [PATCH 10/41] bug-fix-patch-7 # while changing owner of the ticket cheking if the owner already owns the ticket or not # fixed showing inactive agents problem in help topic edit and create pages --- .../Admin/helpdesk/HelptopicController.php | 4 ++-- .../Agent/helpdesk/TicketController.php | 3 +++ resources/lang/de/lang.php | 2 ++ resources/lang/en/lang.php | 4 +++- resources/lang/fr/lang.php | 2 ++ resources/lang/it/lang.php | 2 ++ resources/lang/nl/lang.php | 2 ++ resources/lang/pt/lang.php | 2 ++ resources/lang/ru/lang.php | 2 ++ .../manage/helptopic/create.blade.php | 2 +- .../helpdesk/manage/helptopic/edit.blade.php | 2 +- .../agent/helpdesk/ticket/timeline.blade.php | 22 ++++++++++--------- 12 files changed, 34 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/Admin/helpdesk/HelptopicController.php b/app/Http/Controllers/Admin/helpdesk/HelptopicController.php index 0f78400fa..82a1669af 100644 --- a/app/Http/Controllers/Admin/helpdesk/HelptopicController.php +++ b/app/Http/Controllers/Admin/helpdesk/HelptopicController.php @@ -85,7 +85,7 @@ class HelptopicController extends Controller $departments = $department->get(); $topics = $topic->get(); $forms = $form->get(); - $agents = $agent->where('role', '=', 'agent')->get(); + $agents = $agent->where('role', '!=', 'user')->where('active', '=', 1)->orderBy('first_name')->get(); $slas = $sla->get(); $priority = Ticket_Priority::where('status', '=', 1)->get(); @@ -143,7 +143,7 @@ class HelptopicController extends Controller public function edit($id, Ticket_Priority $priority, Department $department, Help_topic $topic, Forms $form, Sla_plan $sla) { try { - $agents = User::where('role', '=', 'agent')->get(); + $agents = User::where('role', '!=', 'user')->where('active', '=', 1)->orderBy('first_name')->get(); $departments = $department->get(); $topics = $topic->whereId($id)->first(); $forms = $form->get(); diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 1749ccfb2..7af1ebff8 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -2218,6 +2218,9 @@ class TicketController extends Controller if ($count === 1) { $user_id = $user->id; $ticket = Tickets::where('id', '=', $id)->first(); + if($user_id === $ticket->user_id) { + return 400; + } $ticket_number = $ticket->ticket_number; $ticket->user_id = $user_id; $ticket->save(); diff --git a/resources/lang/de/lang.php b/resources/lang/de/lang.php index 936663210..f7f610765 100644 --- a/resources/lang/de/lang.php +++ b/resources/lang/de/lang.php @@ -1155,5 +1155,7 @@ return [ 'inactive-users' => 'Inactive users', 'all-users' => 'All users', 'search' => 'Search...', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', ]; diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 3582fa87c..81547555c 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1118,7 +1118,7 @@ return [ 'minutes' => ' minutes', 'in_minutes' => 'In minutes', 'add_another_owner' => 'Add another owner', - 'user-not-found' => 'User not found. Try again or add a new user.', + 'user-not-found' => 'User not found or user is inactive. Try again or add a new user.', 'change-success' => 'Success! owner has been changed for this ticket.', 'user-exists' => 'User already exists. Try search existing user.', 'valid-email' => 'Enter a valid email address.', @@ -1592,4 +1592,6 @@ return [ 'inactive-users' => 'Inactive users', 'all-users' => 'All users', 'search' => 'Search...', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', ]; diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php index 9cc8f4f5a..e3b5c8cf4 100644 --- a/resources/lang/fr/lang.php +++ b/resources/lang/fr/lang.php @@ -1563,5 +1563,7 @@ return [ 'inactive-users' => 'Inactive users', 'all-users' => 'All users', 'search' => 'Search...', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', ]; diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php index 94275e16a..aa4fc7cc3 100644 --- a/resources/lang/it/lang.php +++ b/resources/lang/it/lang.php @@ -1115,4 +1115,6 @@ return [ 'inactive-users' => 'Inactive users', 'all-users' => 'All users', 'search' => 'Search...', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', ]; diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php index 0f8fda029..4ab5bce4c 100644 --- a/resources/lang/nl/lang.php +++ b/resources/lang/nl/lang.php @@ -1609,4 +1609,6 @@ return [ 'inactive-users' => 'Inactive users', 'all-users' => 'All users', 'search' => 'Search...', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', ]; diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php index 0121dd46a..79a0ec520 100644 --- a/resources/lang/pt/lang.php +++ b/resources/lang/pt/lang.php @@ -1554,5 +1554,7 @@ return [ 'inactive-users' => 'Inactive users', 'all-users' => 'All users', 'search' => 'Search...', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', ]; diff --git a/resources/lang/ru/lang.php b/resources/lang/ru/lang.php index 206d4a3b8..e6a4ae651 100644 --- a/resources/lang/ru/lang.php +++ b/resources/lang/ru/lang.php @@ -1063,4 +1063,6 @@ return [ 'inactive-users' => 'Inactive users', 'all-users' => 'All users', 'search' => 'Search...', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', ]; diff --git a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php index 319f40607..46419ceff 100644 --- a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php @@ -137,7 +137,7 @@ class="active"
    {!! Form::label('auto_assign',Lang::get('lang.auto_assign')) !!} - {!!Form::select('auto_assign', [''=>Lang::get('lang.select_an_agent'),Lang::get('lang.agents')=>$agents->lists('first_name','id')->toArray()],null,['class' => 'form-control']) !!} + {!!Form::select('auto_assign', [''=>Lang::get('lang.select_an_agent'),Lang::get('lang.agents')=>$agents->lists('full_name','id')->toArray()],null,['class' => 'form-control']) !!}
    diff --git a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/edit.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/edit.blade.php index a7da41666..36f8707de 100644 --- a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/edit.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/edit.blade.php @@ -135,7 +135,7 @@ class="active"
    {!! Form::label('auto_assign',Lang::get('lang.auto_assign')) !!} - {!!Form::select('auto_assign', [''=>Lang::get('lang.select_an_agent'),Lang::get('lang.agents')=>$agents->lists('first_name','id')->toArray()],null,['class' => 'form-control']) !!} + {!!Form::select('auto_assign', [''=>Lang::get('lang.select_an_agent'),Lang::get('lang.agents')=>$agents->lists('full_name','id')->toArray()],null,['class' => 'form-control']) !!}
    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 41abed0af..a3508c1ca 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php @@ -948,7 +948,7 @@ alert(h+20);
    @@ -1645,15 +1645,17 @@ alert(h+20); $("#change_loader").show(); }, success: function(response) { - if (response != 1) - { - // $("#assign_body").show(); - var message = "{{Lang::get('lang.user-not-found')}}"; - $('#change_alert').show(); - $('#message-success42').html(message); - setInterval(function(){$("#change_alert").hide(); }, 5000); - $("#change_body").show(); - $("#change_loader").hide(); + if (response != 1) { + // $("#assign_body").show(); + var message = "{{Lang::get('lang.user-not-found')}}"; + if (response == 400) { + message = "{{Lang::get('lang.selected-user-is-already-the-owner')}}"; + } + $('#change_alert').show(); + $('#message-success42').html(message); + setInterval(function(){$("#change_alert").hide(); }, 5000); + $("#change_body").show(); + $("#change_loader").hide(); } else { $("#change_body").show(); $("#change_loader").hide(); From a496bd03d73aca01a23befed18aceb7b9d8c71e0 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Thu, 22 Dec 2016 07:46:38 +0000 Subject: [PATCH 11/41] Apply fixes from StyleCI --- app/Http/Controllers/Agent/helpdesk/TicketController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 7af1ebff8..74e2c3a95 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -2218,7 +2218,7 @@ class TicketController extends Controller if ($count === 1) { $user_id = $user->id; $ticket = Tickets::where('id', '=', $id)->first(); - if($user_id === $ticket->user_id) { + if ($user_id === $ticket->user_id) { return 400; } $ticket_number = $ticket->ticket_number; From d3f3497fe04b0a816f40249dd5bf46477f34c3e5 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Fri, 23 Dec 2016 12:58:34 +0530 Subject: [PATCH 12/41] bug-fix-patch-8 # correcting comparision between integer number and string number # Importing help topic's set priority and auto-assigne while creating ticket from cleint panel. --- app/Http/Controllers/Agent/helpdesk/TicketController.php | 2 +- app/Http/Controllers/Client/helpdesk/FormController.php | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 74e2c3a95..0cd96d3d9 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -2218,7 +2218,7 @@ class TicketController extends Controller if ($count === 1) { $user_id = $user->id; $ticket = Tickets::where('id', '=', $id)->first(); - if ($user_id === $ticket->user_id) { + if ($user_id === (int)$ticket->user_id) { return 400; } $ticket_number = $ticket->ticket_number; diff --git a/app/Http/Controllers/Client/helpdesk/FormController.php b/app/Http/Controllers/Client/helpdesk/FormController.php index 5c6d061df..d2afa550b 100644 --- a/app/Http/Controllers/Client/helpdesk/FormController.php +++ b/app/Http/Controllers/Client/helpdesk/FormController.php @@ -178,10 +178,13 @@ class FormController extends Controller $sla = $ticket_settings->first()->sla; // $priority = $ticket_settings->first()->priority; - $default_priority = Ticket_Priority::where('is_default', '=', 1)->first(); + $default_priority = Ticket_Priority::where('is_default', '=', 1)->first(); $user_priority = CommonSettings::where('option_name', '=', 'user_priority')->first(); if (!($request->input('priority'))) { $priority = $default_priority->priority_id; + if ($helpTopicObj->exists() && ($helpTopicObj->value('status') == 1)) { + $priority = $helpTopicObj->value('priority'); + } } else { $priority = $request->input('priority'); } @@ -189,6 +192,9 @@ class FormController extends Controller $attachments = $request->file('attachment'); $collaborator = null; $assignto = null; + if ($helpTopicObj->exists() && ($helpTopicObj->value('status') == 1)) { + $assignto = $helpTopicObj->value('auto_assign'); + } $auto_response = 0; $team_assign = null; if ($phone != null || $mobile_number != null) { From 5293a238355f55711af90699ab070e12fa2c81f3 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Fri, 23 Dec 2016 07:30:24 +0000 Subject: [PATCH 13/41] Apply fixes from StyleCI --- app/Http/Controllers/Agent/helpdesk/TicketController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 0cd96d3d9..bd4ea6c27 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -2218,7 +2218,7 @@ class TicketController extends Controller if ($count === 1) { $user_id = $user->id; $ticket = Tickets::where('id', '=', $id)->first(); - if ($user_id === (int)$ticket->user_id) { + if ($user_id === (int) $ticket->user_id) { return 400; } $ticket_number = $ticket->ticket_number; From 3ae9062a8c9766f57e0c32471eea7dfc309553c7 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Mon, 26 Dec 2016 11:57:58 +0530 Subject: [PATCH 14/41] Bug-fix-patch # using correct directory seperator in language controller --- app/Http/Controllers/Admin/helpdesk/LanguageController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/helpdesk/LanguageController.php b/app/Http/Controllers/Admin/helpdesk/LanguageController.php index 91802568c..684f2c7d4 100644 --- a/app/Http/Controllers/Admin/helpdesk/LanguageController.php +++ b/app/Http/Controllers/Admin/helpdesk/LanguageController.php @@ -210,7 +210,8 @@ class LanguageController extends Controller */ public function download() { - $file_path = base_path('public/downloads/en.zip'); + $path = 'downloads'.DIRECTORY_SEPARATOR.'en.zip'; + $file_path = public_path($path); return response()->download($file_path); } From 52257839d4d40668aa74f52b27eaf30858bad7ef Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Tue, 27 Dec 2016 09:32:54 +0530 Subject: [PATCH 15/41] Bug-fix-patch-10 #showing correct count of thread in agent panel ticket list pages --- .../Agent/helpdesk/Filter/FilterController.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php index 4b6ba59ed..6a525c489 100644 --- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php +++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php @@ -255,17 +255,17 @@ class FilterController extends Controller 'u1.user_name as assign_user_name', \DB::raw('max(ticket_thread.updated_at) as updated_at'), \DB::raw('min(ticket_thread.updated_at) as created_at'), - 'tickets.priority_id', 'tickets.assigned_to', - DB::raw('COUNT(ticket_thread.updated_at) as countthread'), - 'ticket_priority.priority_color', - 'u.first_name as first_name', + 'u.first_name as first_name', 'u.last_name as last_name', 'u1.first_name as assign_first_name', 'u1.last_name as assign_last_name', - 'tickets.status', - 'tickets.user_id', + 'ticket_priority.priority_color', + DB::raw('COUNT(DISTINCT ticket_thread2.id) as countthread'), DB::raw('COUNT(ticket_attachment.thread_id) as countattachment'), DB::raw('COUNT(ticket_collaborator.ticket_id) as countcollaborator'), + 'tickets.status', + 'tickets.user_id', + 'tickets.priority_id', 'tickets.assigned_to', 'ticket_status.name as tickets_status', 'ticket_source.css_class as css', DB::raw('substring_index(group_concat(ticket_thread.poster order by ticket_thread.id desc) , ",", 1) as last_replier'), From c6c42dfc31c31428697318228c1fef737ddd1c70 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Tue, 27 Dec 2016 10:57:58 +0530 Subject: [PATCH 16/41] Fixed overdue counts in dashborad and showing exact overdue ticket list --- .../Agent/helpdesk/Filter/FilterController.php | 2 +- .../helpdesk/dashboard/dashboard.blade.php | 17 ++--------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php index 6a525c489..c9483d111 100644 --- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php +++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php @@ -132,7 +132,7 @@ class FilterController extends Controller $join->on('ticket_status.id', '=', 'tickets.status'); }) ->where('tickets.status', '=', 1) - // ->where('tickets.isanswered', '=', 0) + ->where('tickets.isanswered', '=', 0) ->whereNotNull('tickets.duedate') ->where('tickets.duedate', '!=', '00-00-00 00:00:00') diff --git a/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php b/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php index 413abe043..a30e321a8 100644 --- a/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php @@ -38,9 +38,6 @@ class="active" {{-- --}}
    -
    @@ -75,18 +72,8 @@ class="active"
    - - role == 'admin') { - $overdue_ticket = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('tickets.duedate','<', \Carbon\Carbon::now())->count(); - } else { - $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $overdue_ticket = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('tickets.duedate','<', \Carbon\Carbon::now())->where('dept_id', '=', $dept->id)->count(); - } - ?> - - {!! Lang::get('lang.overdue') !!} - {{ $overdue_ticket }} Tickets +s {!! Lang::get('lang.overdue') !!} + {{ $overdues->count() }} Tickets
    From 84e442211637ac42094cd1d249f5b2d3575c6d65 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Tue, 27 Dec 2016 05:32:44 +0000 Subject: [PATCH 17/41] Apply fixes from StyleCI --- app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php index c9483d111..99f2623b2 100644 --- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php +++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php @@ -255,7 +255,7 @@ class FilterController extends Controller 'u1.user_name as assign_user_name', \DB::raw('max(ticket_thread.updated_at) as updated_at'), \DB::raw('min(ticket_thread.updated_at) as created_at'), - 'u.first_name as first_name', + 'u.first_name as first_name', 'u.last_name as last_name', 'u1.first_name as assign_first_name', 'u1.last_name as assign_last_name', From 5ea755fb552d7c1a960835b39ecf387a91760188 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Tue, 27 Dec 2016 16:19:08 +0530 Subject: [PATCH 18/41] #bug-fix-patch-11 # Showing correct ticket count and correct message in ticket listing pages # removed "my tickets" tab form top bar as it's already in sidebar --- .../helpdesk/Filter/FilterController.php | 3 +- .../helpdesk/dashboard/dashboard.blade.php | 2 +- .../helpdesk/dept-ticket/tickets.blade.php | 4 +- .../agent/helpdesk/ticket/answered.blade.php | 6 +-- .../agent/helpdesk/ticket/assigned.blade.php | 6 +-- .../agent/helpdesk/ticket/closed.blade.php | 6 +-- .../helpdesk/ticket/duetodayticket.blade.php | 13 +----- .../agent/helpdesk/ticket/inbox.blade.php | 6 +-- .../agent/helpdesk/ticket/myticket.blade.php | 6 +-- .../agent/helpdesk/ticket/open.blade.php | 6 +-- .../agent/helpdesk/ticket/overdue.blade.php | 40 +++++-------------- .../agent/helpdesk/ticket/trash.blade.php | 6 +-- .../helpdesk/ticket/unassigned.blade.php | 6 +-- .../default1/agent/layout/agent.blade.php | 6 +-- 14 files changed, 42 insertions(+), 74 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php index 99f2623b2..927787da4 100644 --- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php +++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php @@ -196,6 +196,7 @@ class FilterController extends Controller ->leftJoin('ticket_status', function ($join) { $join->on('ticket_status.id', '=', 'tickets.status'); }) + ->where('isanswered', '=', 0) ->where('tickets.status', '=', 1); case '/duetoday': if (Auth::user()->role == 'agent') { @@ -238,7 +239,7 @@ class FilterController extends Controller ->whereNotNull('title') ->where('ticket_thread.is_internal', '<>', 1); }) - + ->leftJoin('ticket_thread as ticket_thread2', 'ticket_thread2.ticket_id', '=', 'tickets.id') ->Join('ticket_source', 'ticket_source.id', '=', 'tickets.source') ->leftJoin('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id') ->leftJoin('users as u', 'u.id', '=', 'tickets.user_id') diff --git a/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php b/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php index a30e321a8..3cec0bf17 100644 --- a/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php @@ -72,7 +72,7 @@ class="active"
    -s {!! Lang::get('lang.overdue') !!} + {!! Lang::get('lang.overdue') !!} {{ $overdues->count() }} Tickets
    diff --git a/resources/views/themes/default1/agent/helpdesk/dept-ticket/tickets.blade.php b/resources/views/themes/default1/agent/helpdesk/dept-ticket/tickets.blade.php index 14fb6a50d..ff88f6abc 100644 --- a/resources/views/themes/default1/agent/helpdesk/dept-ticket/tickets.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/dept-ticket/tickets.blade.php @@ -45,17 +45,15 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::select('id', 'name')->where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::whereIn('status', array(1, 7))->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20); $dept_name = $dept->name; } else { $dept_name = \Request::segments()[1]; - $tickets = App\Model\helpdesk\Ticket\Tickets::whereIn('status', array(1, 7))->orderBy('id', 'DESC')->paginate(20); } ?>
    -

    {!! $dept_name !!} / {!! $status !!}

    {!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

    {!! $dept_name !!} / {!! $status !!}

    diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/answered.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/answered.blade.php index 1ff95fbfd..531dcc6e2 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/answered.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/answered.blade.php @@ -46,15 +46,15 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 1)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 1)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 1)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 1)->orderBy('id', 'DESC')->count(); } ?>
    -

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

    {!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

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

    {!! $tickets !!} {!! Lang::get('lang.tickets') !!}
    diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/assigned.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/assigned.blade.php index 40faa1ae4..d0f7c0dbd 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/assigned.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/assigned.blade.php @@ -46,15 +46,15 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '>', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '>', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '>', 0)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '>', 0)->orderBy('id', 'DESC')->count(); } ?>
    -

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

    {!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

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

    {!! $tickets !!} {!! Lang::get('lang.tickets') !!}
    @if(Session::has('success')) diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/closed.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/closed.blade.php index 5665bab35..8697a33da 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/closed.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/closed.blade.php @@ -46,15 +46,15 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '>', 1)->where('dept_id', '=', $dept->id)->where('status', '<', 4)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '>', 1)->where('dept_id', '=', $dept->id)->where('status', '<', 4)->orderBy('id', 'DESC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '>', 1)->where('status', '<', 4)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '>', 1)->where('status', '<', 4)->orderBy('id', 'DESC')->count(); } ?>
    -

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

    {!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

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

    {!! $tickets !!} {!! Lang::get('lang.tickets') !!}
    @if(Session::has('success')) diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/duetodayticket.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/duetodayticket.blade.php index 6c646ab46..e0fc82183 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/duetodayticket.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/duetodayticket.blade.php @@ -48,23 +48,14 @@ class="active" $todaytickets = count(App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->whereRaw('date(duedate) = ?', [date('Y-m-d')])->get()); } else { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $todaytickets = count(App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->whereRaw('date(duedate) = ?', [date('Y-m-d')])->where('dept_id', '=', $dept->id)->get()); + $todaytickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->whereRaw('date(duedate) = ?', [date('Y-m-d')])->where('dept_id', '=', $dept->id)->count(); } ?> -role == 'agent') { - $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20); -} else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->orderBy('id', 'DESC')->paginate(20); -} -?>
    -

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

    {!! $todaytickets !!} {!! Lang::get('lang.tickets') !!} +

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

    {!! $todaytickets !!} {!! Lang::get('lang.tickets') !!}
    diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php index a700033d0..e644c5fee 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php @@ -45,15 +45,15 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::whereIn('status', array(1, 7))->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::whereIn('status', array(1, 7))->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::whereIn('status', array(1, 7))->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::whereIn('status', array(1, 7))->orderBy('id', 'DESC')->count(); } ?>
    -

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

    {!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

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

    {!! $tickets !!} {!! Lang::get('lang.tickets') !!}
    diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/myticket.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/myticket.blade.php index 84846f332..72e2998c0 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/myticket.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/myticket.blade.php @@ -44,15 +44,15 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->orderBy('id', 'ASC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->orderBy('id', 'ASC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->orderBy('id', 'ASC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->orderBy('id', 'ASC')->count(); } ?>
    -

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

    {!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

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

    {!! $tickets !!} {!! Lang::get('lang.tickets') !!}
    diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php index 28cbb9466..627ddc735 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php @@ -46,15 +46,15 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->orderBy('id', 'DESC')->count(); } ?>
    -

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

    {!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

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

    {!! $tickets !!} {!! Lang::get('lang.tickets') !!}
    diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/overdue.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/overdue.blade.php index 37e16b856..1bd289111 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/overdue.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/overdue.blade.php @@ -41,38 +41,20 @@ class="active" @stop @section('content') role == 'agent') { -// $dept = \App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); -// $overdues = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->get(); -// } else { -// $overdues = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->orderBy('id', 'DESC')->get(); -// } -// $i = count($overdues); -// if ($i == 0) { -// $overdue_ticket = 0; -// } else { -// $j = 0; -// foreach ($overdues as $overdue) { -// $sla_plan = App\Model\helpdesk\Manage\Sla_plan::where('id', '=', $overdue->sla)->first(); -// $ovadate = $overdue->created_at; -// $new_date = date_add($ovadate, date_interval_create_from_date_string($sla_plan->grace_period)) . '

    '; -// if (date('Y-m-d H:i:s') > $new_date) { -// $j++; -// //$value[] = $overdue; -// } -// } -// // dd(count($value)); -// if ($j > 0) { -// $overdue_ticket = $j; -// } else { -// $overdue_ticket = 0; -// } -// } - $overdue_ticket=App\Model\helpdesk\Ticket\Tickets::where('tickets.duedate','<', \Carbon\Carbon::now())->count(); + $otickets = App\Model\helpdesk\Ticket\Tickets::where('tickets.status', '=', 1) + ->where('tickets.isanswered', '=', 0) + ->whereNotNull('tickets.duedate') + ->where('tickets.duedate', '!=', '00-00-00 00:00:00') + // ->where('duedate','>',\Carbon\Carbon::now()); + ->where('tickets.duedate', '<', \Carbon\Carbon::now()); + if (\Auth::user()->role === 'agent') { + $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); + $otickets = $otickets->where('dept_id', '=', $dept->id); + } + $overdue_ticket = $otickets->count(); ?> diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/trash.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/trash.blade.php index 5cff811cc..33add1a07 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/trash.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/trash.blade.php @@ -44,15 +44,15 @@ class="active" // $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 5)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 5)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 5)->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 5)->orderBy('id', 'DESC')->count(); } ?>
    -

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

    {!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

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

    {!! $tickets !!} {!! Lang::get('lang.tickets') !!}
    @if(Session::has('success')) diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/unassigned.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/unassigned.blade.php index 479cdc37d..11c3b726d 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/unassigned.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/unassigned.blade.php @@ -44,9 +44,9 @@ class="active" $date_time_format = UTC::getDateTimeFormat(); if (Auth::user()->role == 'agent') { $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first(); - $tickets = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=', null)->where('dept_id', '=', $dept->id)->where('status', '1')->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=', null)->where('dept_id', '=', $dept->id)->where('status', '1')->orderBy('id', 'DESC')->count(); } else { - $tickets = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=', null)->where('status', '1')->orderBy('id', 'DESC')->paginate(20); + $tickets = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=', null)->where('status', '1')->orderBy('id', 'DESC')->count(); } // dd($tickets); ?> @@ -54,7 +54,7 @@ if (Auth::user()->role == 'agent') {
    get()); ?> -

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

    {!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!} +

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

    {!! $tickets !!} {!! Lang::get('lang.tickets') !!}
    @if(Session::has('success')) diff --git a/resources/views/themes/default1/agent/layout/agent.blade.php b/resources/views/themes/default1/agent/layout/agent.blade.php index 052388d57..6f032b588 100644 --- a/resources/views/themes/default1/agent/layout/agent.blade.php +++ b/resources/views/themes/default1/agent/layout/agent.blade.php @@ -320,7 +320,7 @@ where('group_status', '=', '1')->first(); +$group = App\Model\helpdesk\Agent\Groups::where('id', '=', $agent_group)->first(); ?>
    @@ -344,10 +344,6 @@ $group = App\Model\helpdesk\Agent\Groups::where('id', '=', $agent_group)->where(
    • {!! Lang::get('lang.open') !!}
    • {!! Lang::get('lang.answered') !!}
      • -
    • {!! Lang::get('lang.my_tickets') !!}
      • - {{-- < li id = "bar" @yield('ticket') > < a href = "{{ url('ticket') }}" >Ticket --}} - {{-- < li id = "bar" @yield('overdue') > < a href = "{{ url('/ticket/overdue') }}" >Overdue --}} -
    • {!! Lang::get('lang.assigned') !!}
    • {!! Lang::get('lang.closed') !!}
      • can_create_ticket == 1) { ?> From 1667e5fdb07fd4842448947e3a3bcd9a1836ff9c Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Wed, 28 Dec 2016 09:42:55 +0530 Subject: [PATCH 19/41] Bug-fix-patch-12 # fixed notifications --- .../Controllers/Common/NotificationController.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Common/NotificationController.php b/app/Http/Controllers/Common/NotificationController.php index 2507c2f7f..3ae311ab8 100644 --- a/app/Http/Controllers/Common/NotificationController.php +++ b/app/Http/Controllers/Common/NotificationController.php @@ -151,21 +151,18 @@ class NotificationController extends Controller /** * get the page to list the notifications. - * * @return response */ - public static function getNotifications() - { + public static function getNotifications() { $notifications = UserNotification::with([ - 'notification.type' => function ($query) { + 'notification.type' => function($query) { $query->select('id', 'message', 'type'); - }, 'users' => function ($query) { + }, 'users' => function($query) { $query->select('id', 'email', 'profile_pic'); - }, 'notification.model' => function ($query) { + }, 'notification.model' => function($query) { $query->select('id', 'ticket_number'); }, - ])->where('id', '=', \Auth::user()->id); - + ])->where('user_id', '=', \Auth::user()->id); return $notifications; } } From 1f6a8ec61742b0484e664e54958b050082505210 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Wed, 28 Dec 2016 11:51:40 +0530 Subject: [PATCH 20/41] Bug-fix-patch-13 # Installer JavaScript disabled check # Added 'mbstring' in extension check # Added max execution time check warning --- .../installer/helpdesk/check-js.blade.php | 9 +-- .../installer/helpdesk/view2.blade.php | 47 +++++--------- .../installer/layout/installer2.blade.php | 63 +++++++++++++++++++ 3 files changed, 82 insertions(+), 37 deletions(-) create mode 100644 resources/views/themes/default1/installer/layout/installer2.blade.php diff --git a/resources/views/themes/default1/installer/helpdesk/check-js.blade.php b/resources/views/themes/default1/installer/helpdesk/check-js.blade.php index aa44a40fb..b16f7b07e 100644 --- a/resources/views/themes/default1/installer/helpdesk/check-js.blade.php +++ b/resources/views/themes/default1/installer/helpdesk/check-js.blade.php @@ -9,11 +9,12 @@ active
      JavaScript Disabled!
      -

      Hello, Sparky! You are just few steps away from your support system. It looks like that JavaScript is disabled in your browser or not supported by your browser. FAVEO doesn't work properly without JavaScript, and it may cause errors in installation. Please check and enable JavaScript in your browser in order to install and run FAVEO to its full extent.

      -
      -

      - +

      Hello, Sparky! You are just a few steps away from your support system. It looks like that JavaScript is disabled in your browser or not supported by your browser. FAVEO doesn't work properly without JavaScript, and it may cause errors in installation. Please check and enable JavaScript in your browser in order to install and run FAVEO to its full extent.

      +

      + Have you enabled JavaScript?  + Click here to reload the page now.

      +
    diff --git a/resources/views/themes/default1/installer/helpdesk/view2.blade.php b/resources/views/themes/default1/installer/helpdesk/view2.blade.php index 37c0da96f..4d4ec1f51 100644 --- a/resources/views/themes/default1/installer/helpdesk/view2.blade.php +++ b/resources/views/themes/default1/installer/helpdesk/view2.blade.php @@ -12,37 +12,7 @@ active @section('content') - - - - $value) { -// // # code... -// // } -// if (strpos($to_check, $statement) !== false) { -// return true; -// } else { -// return false; -// } -?> - -
    +

    Environment Test

    @if (Session::has('fail_to_change'))
    @@ -208,7 +178,7 @@ function validate_zend_compatibility_mode(&$results) { function validate_extensions(&$results) { $ok = true; - $required_extensions = array('mcrypt', 'openssl', 'pdo', 'fileinfo', 'curl', 'zip'); + $required_extensions = array('mcrypt', 'openssl', 'pdo', 'fileinfo', 'curl', 'zip', 'mbstring'); foreach ($required_extensions as $required_extension) { if (extension_loaded($required_extension)) { @@ -277,6 +247,16 @@ function checkDisabledFunctions(&$results) { return $ok; } +function checkMaxExecutiontime(&$results) +{ + $ok = true; + if ((int)ini_get('max_execution_time') >= 120) { + $results[] = new TestResult("Maximum execution time is as per requirement.", STATUS_OK); + } else { + $results[] = new TestResult("Maximum execution time is too low. Recommneded execution time is 120 seconds ", STATUS_WARNING); + } + return $ok; +} // --------------------------------------------------- // Do the magic // --------------------------------------------------- @@ -288,6 +268,7 @@ $memory_ok = validate_memory_limit($results); $extensions_ok = validate_extensions($results); $file_permission = checkFilePermission($results); $required_functions = checkDisabledFunctions($results); +$check_execution_time = checkMaxExecutiontime($results); ?>

    diff --git a/resources/views/themes/default1/installer/layout/installer2.blade.php b/resources/views/themes/default1/installer/layout/installer2.blade.php new file mode 100644 index 000000000..e48ef80ab --- /dev/null +++ b/resources/views/themes/default1/installer/layout/installer2.blade.php @@ -0,0 +1,63 @@ + + + + + + Faveo HELPDESK + + + + + + + + + + + + + + +

    + faveo

    + +
    + @yield('content') +
    + + +

    Copyright © 2015 - · Ladybird Web Solution Pvt Ltd. All Rights Reserved. Powered by Faveo

    + + + + + + + + + + + + \ No newline at end of file From dfe9e759a78154cbcd8c57563a2e1c6fe95c99d6 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Wed, 28 Dec 2016 12:01:51 +0530 Subject: [PATCH 21/41] Bug-fix-patch-13 Fixed UI of login form(drop down form in top nav bar) in client panel --- .../views/themes/default1/client/layout/client.blade.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/views/themes/default1/client/layout/client.blade.php b/resources/views/themes/default1/client/layout/client.blade.php index 5eb4e45fc..e97cbb7ad 100644 --- a/resources/views/themes/default1/client/layout/client.blade.php +++ b/resources/views/themes/default1/client/layout/client.blade.php @@ -171,8 +171,12 @@
    {!! Lang::get("lang.remember") !!}
    - +
    +
    +
    + {!! Form::close() !!} +
    {{Lang::get('lang.or')}}
    From 63919b9ccd7506358af50b6e5fb4dcaafe05a150 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Wed, 28 Dec 2016 16:15:44 +0530 Subject: [PATCH 22/41] bug-fix-patch-14 # Fixed typo in language file --- resources/lang/en/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 81547555c..c3a14464e 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -106,7 +106,7 @@ return [ */ 'i_know_my_password' => 'I know my password', 'recover_passord' => 'Recover password', - 'send_password_reset_link' => 'Send pasword reset link', + 'send_password_reset_link' => 'Send password reset link', 'enter_email_to_reset_password' => 'Enter email/mobile number to reset password', 'link' => 'Link', 'email_or_mobile' => 'Email or mobile', From c5b261ff3c78b964ebb26949e87b83aa1afb4a19 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Wed, 28 Dec 2016 10:53:49 +0000 Subject: [PATCH 23/41] Apply fixes from StyleCI --- .../Controllers/Common/NotificationController.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Common/NotificationController.php b/app/Http/Controllers/Common/NotificationController.php index 3ae311ab8..8e77432ac 100644 --- a/app/Http/Controllers/Common/NotificationController.php +++ b/app/Http/Controllers/Common/NotificationController.php @@ -151,18 +151,21 @@ class NotificationController extends Controller /** * get the page to list the notifications. + * * @return response */ - public static function getNotifications() { + public static function getNotifications() + { $notifications = UserNotification::with([ - 'notification.type' => function($query) { + 'notification.type' => function ($query) { $query->select('id', 'message', 'type'); - }, 'users' => function($query) { + }, 'users' => function ($query) { $query->select('id', 'email', 'profile_pic'); - }, 'notification.model' => function($query) { + }, 'notification.model' => function ($query) { $query->select('id', 'ticket_number'); }, ])->where('user_id', '=', \Auth::user()->id); + return $notifications; } } From 3b0db46f2a6e5c3285921837ea9e21bc0bbe171c Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Wed, 28 Dec 2016 18:50:09 +0530 Subject: [PATCH 24/41] Bug-fix-patch-15 # Showing agents name in team create/edit page in alphbetical order # While edit team, showing only those agents who belongs to the team --- .../Controllers/Admin/helpdesk/TeamController.php | 11 ++++++++--- .../admin/helpdesk/agent/teams/create.blade.php | 1 - .../admin/helpdesk/agent/teams/edit.blade.php | 1 - 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Admin/helpdesk/TeamController.php b/app/Http/Controllers/Admin/helpdesk/TeamController.php index a56df80d0..eef54a4ff 100644 --- a/app/Http/Controllers/Admin/helpdesk/TeamController.php +++ b/app/Http/Controllers/Admin/helpdesk/TeamController.php @@ -68,7 +68,7 @@ class TeamController extends Controller public function create(User $user) { try { - $user = $user->where('role', '<>', 'user')->where('active', '=', 1)->get(); + $user = $user->where('role', '<>', 'user')->where('active', '=', 1)->orderBy('first_name')->get(); return view('themes.default1.admin.helpdesk.agent.teams.create', compact('user')); } catch (Exception $e) { @@ -202,11 +202,16 @@ $users = DB::table('team_assign_agent')->select('team_assign_agent.id', 'team_as public function edit($id, User $user, Assign_team_agent $assign_team_agent, Teams $team) { try { - $user = $user->where('role', '<>', 'user')->where('active', '=', 1)->get(); + $a_id = []; $teams = $team->whereId($id)->first(); $agent_team = $assign_team_agent->where('team_id', $id)->get(); $agent_id = $agent_team->lists('agent_id', 'agent_id'); - + foreach ($agent_id as $value) { + array_push($a_id, $value); + } + // dd($a_id); + $user = $user->whereIn('id', $a_id)->where('active', '=', 1)->orderBy('first_name')->get(); + // dd($user); return view('themes.default1.admin.helpdesk.agent.teams.edit', compact('agent_id', 'user', 'teams', 'allagents')); } catch (Exception $e) { return redirect()->back()->with('fails', $e->getMessage()); diff --git a/resources/views/themes/default1/admin/helpdesk/agent/teams/create.blade.php b/resources/views/themes/default1/admin/helpdesk/agent/teams/create.blade.php index a906686ef..dca50dfbb 100644 --- a/resources/views/themes/default1/admin/helpdesk/agent/teams/create.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/agent/teams/create.blade.php @@ -61,7 +61,6 @@ class="active"
    {!! Form::label('team_lead',Lang::get('lang.team_lead')) !!} - orWhere('role', 'agent')->get(); ?> {!! Form::select('team_lead',[''=>Lang::get('lang.select_a_team_lead'), Lang::get('lang.members')=>$user->lists('full_name','id')->toArray()],null,['class' => 'form-control']) !!}
    diff --git a/resources/views/themes/default1/admin/helpdesk/agent/teams/edit.blade.php b/resources/views/themes/default1/admin/helpdesk/agent/teams/edit.blade.php index c835b58db..2401f0cc7 100644 --- a/resources/views/themes/default1/admin/helpdesk/agent/teams/edit.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/agent/teams/edit.blade.php @@ -60,7 +60,6 @@ class="active"
    {!! Form::label('team_lead',Lang::get('lang.team_lead')) !!} - orWhere('role', 'agent')->get(); ?> {!! Form::select('team_lead',[''=>Lang::get('lang.select_a_team_lead'), Lang::get('lang.members')=>$user->lists('full_name','id')->toArray()],null,['class' => 'form-control']) !!}
    From 74f32c92807bf5c90626c71062721913b7d20ddc Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Wed, 28 Dec 2016 19:19:49 +0530 Subject: [PATCH 25/41] Bug-fix-patch-15.1 # Assigning agent to team if s/he's been choosen as team leader while creating a new team. --- .../Admin/helpdesk/TeamController.php | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Admin/helpdesk/TeamController.php b/app/Http/Controllers/Admin/helpdesk/TeamController.php index eef54a4ff..6b65c4988 100644 --- a/app/Http/Controllers/Admin/helpdesk/TeamController.php +++ b/app/Http/Controllers/Admin/helpdesk/TeamController.php @@ -86,15 +86,24 @@ class TeamController extends Controller */ public function store(Teams $team, TeamRequest $request) { - if ($request->team_lead) { - $team_lead = $request->team_lead; - } else { - $team_lead = null; - } - $team->team_lead = $team_lead; try { /* Check whether function success or not */ $team->fill($request->except('team_lead'))->save(); + $team_update = Teams::find($team->id); + if ($request->team_lead) { + $team_lead = $request->team_lead; + $team_update->update([ + 'team_lead' => $team_lead + ]); + Assign_team_agent::create([ + 'team_id' => $team_update->id, + 'agent_id' => $team_lead + ]); + } else { + $team_lead = null; + } + + /* redirect to Index page with Success Message */ return redirect('teams')->with('success', Lang::get('lang.teams_created_successfully')); } catch (Exception $e) { From 7c87f37b44f9bf2d31fb87ef1cd3ca80e4d2bbd0 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Thu, 29 Dec 2016 13:11:58 +0530 Subject: [PATCH 26/41] Updates # Updated message for showing when agents try to merge tickets of different users --- resources/lang/en/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index c3a14464e..37db82c54 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1137,7 +1137,7 @@ return [ 'merge-success' => 'Tickets have been merged successfully.', 'merge-error2' => 'Please select ticket to merge.', 'select-tickets-to merge' => 'Select two or more tickets to merge.', - 'different-users' => 'Ticktes from different users', + 'different-users' => 'Selected ticktes are from different users', 'clean-up' => 'Delete forever', 'hard-delete-success-message' => 'Tickets have been deleted permanently.', 'overdue' => 'Overdue', From 4cfb4983b520d78d8175e0c6809def133973d084 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Thu, 29 Dec 2016 08:33:21 +0000 Subject: [PATCH 27/41] Apply fixes from StyleCI --- app/Http/Controllers/Admin/helpdesk/TeamController.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Admin/helpdesk/TeamController.php b/app/Http/Controllers/Admin/helpdesk/TeamController.php index 6b65c4988..d662875c1 100644 --- a/app/Http/Controllers/Admin/helpdesk/TeamController.php +++ b/app/Http/Controllers/Admin/helpdesk/TeamController.php @@ -93,17 +93,16 @@ class TeamController extends Controller if ($request->team_lead) { $team_lead = $request->team_lead; $team_update->update([ - 'team_lead' => $team_lead + 'team_lead' => $team_lead, ]); Assign_team_agent::create([ - 'team_id' => $team_update->id, - 'agent_id' => $team_lead + 'team_id' => $team_update->id, + 'agent_id' => $team_lead, ]); } else { $team_lead = null; } - /* redirect to Index page with Success Message */ return redirect('teams')->with('success', Lang::get('lang.teams_created_successfully')); } catch (Exception $e) { From 2c207f70263b88d3a4a9fe677e183e58f31669f4 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Fri, 30 Dec 2016 18:32:53 +0530 Subject: [PATCH 28/41] Refinement update #sending notification via email to user while merging their duplicate tickets --- .../Agent/helpdesk/TicketController.php | 28 ++++++++++++++++++- .../Controllers/Common/PhpMailController.php | 6 ++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index bd4ea6c27..5dbdf1c74 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -2425,7 +2425,7 @@ class TicketController extends Controller $success = 0; } } - + $this->sendMergeNotification($p_id, $t_id); return $success; } @@ -2899,4 +2899,30 @@ class TicketController extends Controller return $base64; } + + /** + *@category function to send notification of ticket merging to the owners + *@param srting array $t_id, $p_id + *@return null + */ + public function sendMergeNotification($p_id, $t_id) + { + try { + $ticket_details = Tickets::select('ticket_number', 'user_id', 'dept_id')->where('id', '=', $p_id)->first(); + $user_detail = User::where('id', '=', $ticket_details->user_id)->first(); + if ($user_detail->count() > 0) { + if ($user_detail->email !== null || $user_detail->email !== '') { + $meged_ticket_details = Tickets::select('ticket_number')->whereIn('id', $t_id)->get(); + $child_ticket_numbers = []; + foreach ($meged_ticket_details as $value) { + array_push($child_ticket_numbers, $value->ticket_number); + } + // dd(implode(", ",$child_ticket_numbers), $ticket_details->ticket_number); + $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket_details->dept_id), $to = ['user' => $user_detail->full_name, 'email' => $user_detail->email], $message = ['subject' => '', 'body' => '', 'scenario' => 'merge-ticket-notification',], $template_variables = ['user' => $user_detail->full_name, 'ticket_number' => $ticket_details->ticket_number, 'ticket_link' => route('ticket.thread',$p_id), 'merged_ticket_numbers' => implode(", ",$child_ticket_numbers),]); + } + } + } catch (\Exception $e) { + //catch the exception + } + } } diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php index 015aa62cc..3432c50f5 100644 --- a/app/Http/Controllers/Common/PhpMailController.php +++ b/app/Http/Controllers/Common/PhpMailController.php @@ -115,7 +115,7 @@ class PhpMailController extends Controller $department_sign = $this->checkElement('department_sign', $template_variables); $password_reset_link = $this->checkElement('password_reset_link', $template_variables); $user_password = $this->checkElement('user_password', $template_variables); - + $merged_ticket_numbers = $this->checkElement('merged_ticket_numbers', $template_variables); $email_address = $this->checkElement('email_address', $template_variables); $user = $this->checkElement('user', $template_variables); @@ -145,9 +145,9 @@ class PhpMailController extends Controller $subject = null; } - $variables = ['{!!$user!!}', '{!!$agent!!}', '{!!$ticket_number!!}', '{!!$content!!}', '{!!$from!!}', '{!!$ticket_agent_name!!}', '{!!$ticket_client_name!!}', '{!!$ticket_client_email!!}', '{!!$ticket_body!!}', '{!!$ticket_assigner!!}', '{!!$ticket_link_with_number!!}', '{!!$system_error!!}', '{!!$agent_sign!!}', '{!!$department_sign!!}', '{!!$password_reset_link!!}', '{!!$email_address!!}', '{!!$user_password!!}', '{!!$system_from!!}', '{!!$system_link!!}', '{!!$ticket_link!!}']; + $variables = ['{!!$user!!}', '{!!$agent!!}', '{!!$ticket_number!!}', '{!!$content!!}', '{!!$from!!}', '{!!$ticket_agent_name!!}', '{!!$ticket_client_name!!}', '{!!$ticket_client_email!!}', '{!!$ticket_body!!}', '{!!$ticket_assigner!!}', '{!!$ticket_link_with_number!!}', '{!!$system_error!!}', '{!!$agent_sign!!}', '{!!$department_sign!!}', '{!!$password_reset_link!!}', '{!!$email_address!!}', '{!!$user_password!!}', '{!!$system_from!!}', '{!!$system_link!!}', '{!!$ticket_link!!}', '{!!$merged_ticket_numbers!!}']; - $data = [$user, $agent, $ticket_number, $content, $from, $ticket_agent_name, $ticket_client_name, $ticket_client_email, $ticket_body, $ticket_assigner, $ticket_link_with_number, $system_error, $agent_sign, $department_sign, $password_reset_link, $email_address, $user_password, $system_from, $system_link, $ticket_link]; + $data = [$user, $agent, $ticket_number, $content, $from, $ticket_agent_name, $ticket_client_name, $ticket_client_email, $ticket_body, $ticket_assigner, $ticket_link_with_number, $system_error, $agent_sign, $department_sign, $password_reset_link, $email_address, $user_password, $system_from, $system_link, $ticket_link, $merged_ticket_numbers]; foreach ($variables as $key => $variable) { $messagebody = str_replace($variables[$key], $data[$key], $contents); From 4b871659e1dcc6fd52d2f02e3675141e9a3ce10e Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Sat, 31 Dec 2016 11:59:44 +0530 Subject: [PATCH 29/41] bug-fix-patch # Removed department's dependency on help topic in client panel mentioned in #361 --- .../themes/default1/client/helpdesk/form.blade.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/resources/views/themes/default1/client/helpdesk/form.blade.php b/resources/views/themes/default1/client/helpdesk/form.blade.php index d0de6f461..b7a46e111 100644 --- a/resources/views/themes/default1/client/helpdesk/form.blade.php +++ b/resources/views/themes/default1/client/helpdesk/form.blade.php @@ -156,15 +156,7 @@ class = "active" $helptopic = App\Model\helpdesk\Manage\Help_topic::where('status', '=', 1)->get(); ?> X
    Drop files here

    SQL upload ( 0 ) x-

    -Click on the bar to scroll to top of page
    Options
    Set default



    Collapse Expand Requery Edit Explain Profiling Query failed Database: Queried time:
    - - - - - - -
    Run SQL query/queries on database pro-fork: Documentation
    x
    54
    select
     
    32
        `label`.`value` as `label_values`,
    33
        `tag`.`value` as `tag_values`
    34
    from
    35
        `tickets`
    36
        left join `ticket_thread` on `tickets`.`id` = `ticket_thread`.`ticket_id`
    37
        and `title` is not null
    38
        and `ticket_thread`.`is_internal` <> ?
    39
        inner join `ticket_status` on `ticket_status`.`id` = `tickets`.`status`
    40
        and `ticket_status`.`id` in (?, ?)
    41
        inner join `ticket_source` on `ticket_source`.`id` = `tickets`.`source`
    42
        left join `ticket_priority` on `ticket_priority`.`priority_id` = `tickets`.`priority_id`
    43
        left join `users` as `u` on `u`.`id` = `tickets`.`user_id`
    44
        left join `users` as `u1` on `u1`.`id` = `tickets`.`assigned_to`
    45
        left join `ticket_attachment` on `ticket_attachment`.`thread_id` = `ticket_thread`.`id`
    46
        left join `filters` as `label` on `tickets`.`id` = `label`.`ticket_id`
    47
        and `label`.`key` = ?
    48
        left join `filters` as `tag` on `tickets`.`id` = `tag`.`ticket_id`
    49
        and `tag`.`key` = ?
    50
        left join `ticket_collaborator` on `ticket_collaborator`.`ticket_id` = `tickets`.`id`
    51
    where
    52
        FIND_IN_SET('on', 'tag.value')
    53
    group by
    54
        `tickets`.`id`
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - - ]
    - -
    -
    -
    -
    - -

    Error

    -

    There seems to be an error in your SQL query. The MySQL server error output below, if there is any, may also help you in diagnosing the problem.

    -
    ERROR: Unknown Punctuation String @ 1264
-STR: ?,
-SQL: select 
-	`tickets`.`id`, 
-	`tickets`.`ticket_number`, 
-	`tickets`.`status`, 
-	`tickets`.`user_id`, 
-	`tickets`.`priority_id`, 
-	`tickets`.`assigned_to`, 
-	`ticket_thread`.`title`, 
-	max(ticket_thread.updated_at) as updated_at, 
-	COUNT(ticket_thread.updated_at) as countthread, 
-	`ticket_priority`.`priority`, 
-	`ticket_priority`.`priority_color`, 
-	`u`.`user_name` as `user_name`, 
-	`u`.`first_name` as `first_name`, 
-	`u`.`last_name` as `last_name`, 
-	`u1`.`user_name` as `assign_user_name`, 
-	`u1`.`first_name` as `assign_first_name`, 
-	`u1`.`last_name` as `assign_last_name`, 
-	COUNT(ticket_attachment.thread_id) as countattachment, 
-	COUNT(ticket_collaborator.ticket_id) as countcollaborator, 
-	`ticket_status`.`name` as `tickets_status`, 
-	`ticket_source`.`css_class` as `css`, 
-	substring_index(
-		group_concat(
-			ticket_thread.poster 
-			order by 
-				ticket_thread.updated_at desc
-		), 
-		",", 
-		1
-	) as last_replier, 
-	`label`.`value` as `label_values`, 
-	`tag`.`value` as `tag_values` 
-from 
-	`tickets` 
-	left join `ticket_thread` on `tickets`.`id` = `ticket_thread`.`ticket_id` 
-	and `title` is not null 
-	and `ticket_thread`.`is_internal` <> ? 
-	inner join `ticket_status` on `ticket_status`.`id` = `tickets`.`status` 
-	and `ticket_status`.`id` in (?, ?) 
-	inner join `ticket_source` on `ticket_source`.`id` = `tickets`.`source` 
-	left join `ticket_priority` on `ticket_priority`.`priority_id` = `tickets`.`priority_id` 
-	left join `users` as `u` on `u`.`id` = `tickets`.`user_id` 
-	left join `users` as `u1` on `u1`.`id` = `tickets`.`assigned_to` 
-	left join `ticket_attachment` on `ticket_attachment`.`thread_id` = `ticket_thread`.`id` 
-	left join `filters` as `label` on `tickets`.`id` = `label`.`ticket_id` 
-	and `label`.`key` = ? 
-	left join `filters` as `tag` on `tickets`.`id` = `tag`.`ticket_id` 
-	and `tag`.`key` = ? 
-	left join `ticket_collaborator` on `ticket_collaborator`.`ticket_id` = `tickets`.`id` 
-where 
-	FIND_IN_SET('on', 'tag.value')<> 0 
-group by 
-	`tickets`.`id`
-
    - -
    -

    SQL query: -Documentation

    -

    -select - `tickets`.`id`, - `tickets`.`ticket_number`, - `tickets`.`status`, - `tickets`.`user_id`, - `tickets`.`priority_id`, - `tickets`.`assigned_to`, - `ticket_thread`.`title`, - max(ticket_thread.updated_at) as updated_at, - COUNT(ticket_thread.updated_at) as countthread, - `ticket_priority`.`priority`, - `ticket_priority`.`priority_color`, - `u`.`user_name` as `user_name`, - `u`.`first_name` as `first_name`, - `u`.`last_name` as `last_name`, - `u1`.`user_name` as `assign_user_name`, - `u1`.`first_name` as `assign_first_name`, - `u1`.`last_name` as `assign_last_name`, - COUNT(ticket_attachment.thread_id) as countattachment, - COUNT(ticket_collaborator.ticket_id) as countcollaborator, - `ticket_status`.`name` as `tickets_status`, - `ticket_source`.`css_class` as `css`, - substring_index( - group_concat( - ticket_thread.poster - order by - ticket_thread.updated_at desc - ), - ",", - 1 - ) as last_replier, - `label`.`value` as `label_values`, - `tag`.`value` as `tag_values` -from - `tickets` - left join `ticket_thread` on `tickets`.`id` = `ticket_thread`.`ticket_id` - and `title` is not null - and `ticket_thread`.`is_internal` <> ? - inner join `ticket_status` on `ticket_status`.`id` = `tickets`.`status` - and `ticket_status`.`id` in (?, ?) - inner join `ticket_source` on `ticket_source`.`id` = `tickets`.`source` - left join `ticket_priority` on `ticket_priority`.`priority_id` = `tickets`.`priority_id` - left join `users` as `u` on `u`.`id` = `tickets`.`user_id` - left join `users` as `u1` on `u1`.`id` = `tickets`.`assigned_to` - left join `ticket_attachment` on `ticket_attachment`.`thread_id` = `ticket_thread`.`id` - left join `filters` as `label` on `tickets`.`id` = `label`.`ticket_id` - and `label`.`key` = ? - left join `filters` as `tag` on `tickets`.`id` = `tag`.`ticket_id` - and `tag`.`key` = ? - left join `ticket_collaborator` on `ticket_collaborator`.`ticket_id` = `tickets`.`id` -where - FIND_IN_SET('on', 'tag.value')<> 0 -group by - `tickets`.`id` -

    -

    - MySQL said: Documentation -

    - -#1064 - You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?
    -    inner join `ticket_status` on `ticket_status`.`id` = `tickets`.`status`
    -    ' at line 38 -
    -
    \ No newline at end of file From 832161ad513b2e80edce3bb06b06b85f0f6681ae Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Tue, 3 Jan 2017 13:28:11 +0530 Subject: [PATCH 37/41] Bug-fix-patch Fixed typos in english translation files --- public/downloads/en.zip | Bin 22240 -> 22230 bytes resources/lang/en/lang.php | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/public/downloads/en.zip b/public/downloads/en.zip index e11572095814fead136b665443cc4ea97bd0b9b6..92e7528f997d91c0c9cd2455f60d3426997d5ae0 100644 GIT binary patch delta 13159 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 Nzg8OtM^yj-004GjxBvhE delta 13213 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 L2#BKU|6~6Hs8QIW diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 37db82c54..2cefeee50 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -474,7 +474,7 @@ return [ 'default' => 'default', 'language-settings' => 'Language settings', 'iso-code' => 'ISO-CODE', - 'download' => 'Downlaod', + 'download' => 'Download', 'upload_file' => 'Upload file', 'enter_iso-code' => 'Enter ISO code', 'eg.' => 'Example', @@ -493,8 +493,8 @@ return [ 'delete-success' => 'Language package deleted successfully.', 'lang-doesnot-exist' => 'Language package does not exist.', 'active-lang-error' => 'Language package can not be deleted when it is active.', - 'language-error' => 'Language package not found in your lang directroy.', - 'lang-fallback-lang' => 'Cannot delete system\'s defualt fallback language', + 'language-error' => 'Language package not found in your lang directory.', + 'lang-fallback-lang' => 'Can not delete system\'s defualt fallback language', /* |-------------------------------------- @@ -550,7 +550,7 @@ return [ 'SLA_plan' => 'SLA plan', 'sla-plans' => 'SLA plans', 'auto_assign' => 'Auto assign', - 'auto_respons' => 'Auto respons', + 'auto_respons' => 'Auto response', 'ticket_number_format' => 'Ticket number format', 'system_default' => 'System default', 'custom' => 'Custom', @@ -807,7 +807,7 @@ return [ 'outgoing_emails' => 'Outgoing emails', 'outgoing_email' => 'Outgoing email', 'template_set' => 'Template set', - 'auto_responding_settings' => 'Auto-Responding settigs', + 'auto_responding_settings' => 'Auto-Responding settings', 'disable_for_this_department' => 'Disable for this department', 'auto_response_email' => 'Auto-Response email', 'recipient' => 'Recipient', @@ -819,14 +819,14 @@ return [ 'edit_department' => 'Edit department', 'select_a_sla' => 'Select a SLA', 'select_a_manager' => 'Select a manager', - 'department_created_sucessfully' => 'Department created sucessfully', + 'department_created_sucessfully' => 'Department created successfully', 'failed_to_create_department' => 'Failed to create department', - 'department_updated_sucessfully' => 'Department updated sucessfully', + 'department_updated_sucessfully' => 'Department updated successfully', 'department_not_updated' => 'Department not updated', 'you_cannot_delete_default_department' => 'You cannot delete default department', 'have_been_moved_to_default_department' => 'have been moved to default department', 'the_associated_helptopic_has_been_deactivated' => 'The associated helptopic has been deactivated', - 'department_deleted_sucessfully' => 'Department deleted sucessfully', + 'department_deleted_sucessfully' => 'Department deleted successfully', 'department_can_not_delete' => 'Department can not be deleted', 'select_a_department' => 'Select a department', 'make-default-department' => 'Make system\'s default department', @@ -1104,7 +1104,7 @@ return [ 'submit' => 'Submit', 'max' => 'Maximum file size', 'add_cc' => 'Add CC', - 'recepients' => 'Recepients', + 'recepients' => 'Recipients', 'select_a_canned_response' => 'Select a canned response', 'assign_to' => 'Assign to', 'detail' => 'Detail', @@ -1137,7 +1137,7 @@ return [ 'merge-success' => 'Tickets have been merged successfully.', 'merge-error2' => 'Please select ticket to merge.', 'select-tickets-to merge' => 'Select two or more tickets to merge.', - 'different-users' => 'Selected ticktes are from different users', + 'different-users' => 'Selected tickets are from different users', 'clean-up' => 'Delete forever', 'hard-delete-success-message' => 'Tickets have been deleted permanently.', 'overdue' => 'Overdue', @@ -1364,11 +1364,11 @@ return [ 'Send' => 'SEND', 'no_article' => 'No article', 'profile_settings' => 'Profile settings', - 'please_fill_all_required_feilds' => 'Please fill all required feilds.', + 'please_fill_all_required_feilds' => 'Please fill all required fields.', 'successfully_replied' => 'Successfully replied', 'please_fill_some_data' => 'Please fill some data!', 'profile_updated_sucessfully' => 'Profile updated sucessfully', - 'password_updated_sucessfully' => 'Password updated sucessfully', + 'password_updated_sucessfully' => 'Password updated successfully', 'password_was_not_updated_incorrect_old_password' => 'Password was not updated. Incorrect old password', 'there_is_no_such_ticket_number' => 'There is no such ticket number', "email_didn't_match_with_ticket_number" => "Email didn't match with ticket number", @@ -1546,9 +1546,9 @@ return [ 'change_password' => 'Change password', 'role_change' => 'Role change', 'password_generator' => 'Password generator', - 'depertment' => 'Depertment', + 'depertment' => 'Department', 'duetoday' => 'Due today', - 'today-due_tickets' => 'Today\'s due ticekts', + 'today-due_tickets' => 'Today\'s due tickets', 'password_change_successfully' => 'Password changed successfully', 'role_change_successfully' => 'Role changed successfully', 'user_delete_successfully' => 'User deleted successfully', @@ -1584,7 +1584,7 @@ return [ 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', //update 18-12-2016 - 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OTP code.', //update 19-12-2016 'only-agents' => 'Agent users', 'only-users' => 'Clients users', From 4aaaa6470e1c28dc11c0f5dc42eee5bd38d341af Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Tue, 3 Jan 2017 13:44:47 +0530 Subject: [PATCH 38/41] updates Added release notes --- release-notes.txt | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/release-notes.txt b/release-notes.txt index 01af93884..948a89bb3 100644 --- a/release-notes.txt +++ b/release-notes.txt @@ -1,3 +1,32 @@ +|====================================================== +|v1.9.2 +|====================================================== + +Bug Fixes + Corrected notification counts + Fixed canned response error + Correct message for registration + Removed routes of PRO features + Exception handling while adding language + Showing agents in alphabetical order in various drop down menus + Handling the case when agent/admin adds same owner while changing ticket's owner + Fixed priority and auto assignment while creating ticket form cleint panel + Fixed typos in english language translation + Fixed counts of tickets of every categroy + Removed duplicate option from top nav bar + Fixed empty database check while installation + Assigning team leader in a team while creating new team + Fixed #361 + +Enhancements + + Sending email notfications to users while merging their duplicate tickets + Implemented Yajra in users table + Custom filter and search option in users table + Check if JavaScript is enabled or not while installation + Put max execution time and "mbstring" extension check while installation + + |======================================================= | v1.9.1 |======================================================= From d18facc079c7397296e1f74560bfc772b631fbde Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Tue, 3 Jan 2017 14:53:48 +0530 Subject: [PATCH 39/41] update updated release notes --- release-notes.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/release-notes.txt b/release-notes.txt index 948a89bb3..2cf728a7a 100644 --- a/release-notes.txt +++ b/release-notes.txt @@ -26,6 +26,12 @@ Enhancements Check if JavaScript is enabled or not while installation Put max execution time and "mbstring" extension check while installation + |======================================================== + | Upgrade giude + |======================================================== + + Follow this wiki article to upgrade your Faveo system + https://github.com/ladybirdweb/faveo-helpdesk/wiki/Upgrade-guide-for-v1.9.2 |======================================================= | v1.9.1 From f99aa6f1851e93878167a7617886caba5c9a6d3c Mon Sep 17 00:00:00 2001 From: Vijay Sebastian Date: Thu, 5 Jan 2017 16:14:49 +0530 Subject: [PATCH 40/41] Task schedule --- app/Console/Kernel.php | 25 +++++----- .../Controllers/SettingsController.php | 47 +++++++++---------- .../Admin/helpdesk/TemplateController.php | 15 ++++-- 3 files changed, 44 insertions(+), 43 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 72588767d..39a671319 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -30,8 +30,9 @@ class Kernel extends ConsoleKernel protected function schedule(Schedule $schedule) { if (env('DB_INSTALL') == 1) { - $queue = $this->getCurrentQueue(); - $schedule->command('queue:listen '.$queue, ['--tries' => 1])->everyMinute(); + if ($this->getCurrentQueue() != "sync") { + $schedule->command('queue:listen '.$this->getCurrentQueue().' --sleep 60')->everyMinute(); + } $this->execute($schedule, 'fetching'); $this->execute($schedule, 'notification'); $this->execute($schedule, 'work'); @@ -61,34 +62,34 @@ class Kernel extends ConsoleKernel $at = $command['at']; switch ($condition) { case 'everyMinute': - $schedule->everyMinute()->withoutOverlapping(); + $schedule->everyMinute(); break; case 'everyFiveMinutes': - $schedule->everyFiveMinutes()->withoutOverlapping(); + $schedule->everyFiveMinutes(); break; case 'everyTenMinutes': - $schedule->everyTenMinutes()->withoutOverlapping(); + $schedule->everyTenMinutes(); break; case 'everyThirtyMinutes': - $schedule->everyThirtyMinutes()->withoutOverlapping(); + $schedule->everyThirtyMinutes(); break; case 'hourly': - $schedule->hourly()->withoutOverlapping(); + $schedule->hourly(); break; case 'daily': - $schedule->daily()->withoutOverlapping(); + $schedule->daily(); break; case 'dailyAt': $this->getConditionWithOption($schedule, $condition, $at); break; case 'weekly': - $schedule->weekly()->withoutOverlapping(); + $schedule->weekly(); break; case 'monthly': - $schedule->monthly()->withoutOverlapping(); + $schedule->monthly(); break; case 'yearly': - $schedule->yearly()->withoutOverlapping(); + $schedule->yearly(); break; } } @@ -97,7 +98,7 @@ class Kernel extends ConsoleKernel { switch ($command) { case 'dailyAt': - $schedule->dailyAt($at)->withoutOverlapping(); + $schedule->dailyAt($at); break; } } diff --git a/app/FaveoStorage/Controllers/SettingsController.php b/app/FaveoStorage/Controllers/SettingsController.php index e7e8685cb..d017fe3ad 100644 --- a/app/FaveoStorage/Controllers/SettingsController.php +++ b/app/FaveoStorage/Controllers/SettingsController.php @@ -11,26 +11,24 @@ use Lang; use RecursiveDirectoryIterator; use RecursiveIteratorIterator; -class SettingsController extends Controller -{ - public function settingsIcon() - { +class SettingsController extends Controller { + + public function settingsIcon() { return '

    - +
    -

    '.Lang::get('storage::lang.storage').'

    +

    ' . Lang::get('storage::lang.storage') . '

    '; } - public function settings() - { + public function settings() { try { $settings = new CommonSettings(); $directories = $this->directories(); @@ -51,8 +49,7 @@ class SettingsController extends Controller } } - public function postSettings(Request $request) - { + public function postSettings(Request $request) { try { $requests = $request->except('_token'); $this->delete(); @@ -70,8 +67,7 @@ class SettingsController extends Controller } } - public function delete() - { + public function delete() { $settings = CommonSettings::where('option_name', 'storage')->get(); if ($settings->count() > 0) { foreach ($settings as $setting) { @@ -80,17 +76,15 @@ class SettingsController extends Controller } } - public function save($key, $value) - { + public function save($key, $value) { CommonSettings::create([ - 'option_name' => 'storage', + 'option_name' => 'storage', 'optional_field' => $key, - 'option_value' => $value, + 'option_value' => $value, ]); } - public function directories($root = '') - { + public function directories($root = '') { if ($root == '') { $root = base_path(); } @@ -109,18 +103,19 @@ class SettingsController extends Controller return $paths; } - public function attachment() - { + public function attachment() { $storage = new StorageController(); $storage->upload(); } - public function activate() - { - $path = 'app'.DIRECTORY_SEPARATOR.'FaveoStorage'.DIRECTORY_SEPARATOR.'database'.DIRECTORY_SEPARATOR.'migrations'; - Artisan::call('migrate', [ - '--path' => $path, - '--force'=> true, + public function activate() { + if (!\Schema::hasColumn('ticket_attachment', 'driver')) { + $path = 'app' . DIRECTORY_SEPARATOR . 'FaveoStorage' . DIRECTORY_SEPARATOR . 'database' . DIRECTORY_SEPARATOR . 'migrations'; + Artisan::call('migrate', [ + '--path' => $path, + '--force' => true, ]); + } } + } diff --git a/app/Http/Controllers/Admin/helpdesk/TemplateController.php b/app/Http/Controllers/Admin/helpdesk/TemplateController.php index 6b10c1e3f..da7a1f56a 100644 --- a/app/Http/Controllers/Admin/helpdesk/TemplateController.php +++ b/app/Http/Controllers/Admin/helpdesk/TemplateController.php @@ -326,14 +326,19 @@ class TemplateController extends Controller if (!$from_address) { throw new Exception('Sorry! We can not find your request'); } - $controller = new PhpMailController(); - $controller->setMailConfig($from_address); - $controller->laravelMail($to, '', $subject, $msg, [], null); + $to_address = [ + 'name' => "", + 'email' => $to + ]; + $message = [ + 'subject' => $subject, + 'scenario' => null, + 'body' => $msg + ]; + $this->PhpMailController->sendmail($from, $to_address, $message,[],[]); return redirect()->back()->with('success', 'Mail has send successfully'); } catch (Exception $e) { - dd($e); - return redirect()->back()->with('fails', $e->getMessage()); } } From 673e549baea18a1ac14d1d5cb019a468626834e3 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Thu, 5 Jan 2017 11:55:08 +0000 Subject: [PATCH 41/41] Apply fixes from StyleCI --- app/Console/Kernel.php | 2 +- .../Controllers/SettingsController.php | 41 +++++++++++-------- .../Admin/helpdesk/TemplateController.php | 11 ++--- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 39a671319..3a5c7c21c 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -30,7 +30,7 @@ class Kernel extends ConsoleKernel protected function schedule(Schedule $schedule) { if (env('DB_INSTALL') == 1) { - if ($this->getCurrentQueue() != "sync") { + if ($this->getCurrentQueue() != 'sync') { $schedule->command('queue:listen '.$this->getCurrentQueue().' --sleep 60')->everyMinute(); } $this->execute($schedule, 'fetching'); diff --git a/app/FaveoStorage/Controllers/SettingsController.php b/app/FaveoStorage/Controllers/SettingsController.php index d017fe3ad..a1fd6f5e4 100644 --- a/app/FaveoStorage/Controllers/SettingsController.php +++ b/app/FaveoStorage/Controllers/SettingsController.php @@ -11,24 +11,26 @@ use Lang; use RecursiveDirectoryIterator; use RecursiveIteratorIterator; -class SettingsController extends Controller { - - public function settingsIcon() { +class SettingsController extends Controller +{ + public function settingsIcon() + { return '
    - +
    -

    ' . Lang::get('storage::lang.storage') . '

    +

    '.Lang::get('storage::lang.storage').'

    '; } - public function settings() { + public function settings() + { try { $settings = new CommonSettings(); $directories = $this->directories(); @@ -49,7 +51,8 @@ class SettingsController extends Controller { } } - public function postSettings(Request $request) { + public function postSettings(Request $request) + { try { $requests = $request->except('_token'); $this->delete(); @@ -67,7 +70,8 @@ class SettingsController extends Controller { } } - public function delete() { + public function delete() + { $settings = CommonSettings::where('option_name', 'storage')->get(); if ($settings->count() > 0) { foreach ($settings as $setting) { @@ -76,15 +80,17 @@ class SettingsController extends Controller { } } - public function save($key, $value) { + public function save($key, $value) + { CommonSettings::create([ - 'option_name' => 'storage', + 'option_name' => 'storage', 'optional_field' => $key, - 'option_value' => $value, + 'option_value' => $value, ]); } - public function directories($root = '') { + public function directories($root = '') + { if ($root == '') { $root = base_path(); } @@ -103,19 +109,20 @@ class SettingsController extends Controller { return $paths; } - public function attachment() { + public function attachment() + { $storage = new StorageController(); $storage->upload(); } - public function activate() { + public function activate() + { if (!\Schema::hasColumn('ticket_attachment', 'driver')) { - $path = 'app' . DIRECTORY_SEPARATOR . 'FaveoStorage' . DIRECTORY_SEPARATOR . 'database' . DIRECTORY_SEPARATOR . 'migrations'; + $path = 'app'.DIRECTORY_SEPARATOR.'FaveoStorage'.DIRECTORY_SEPARATOR.'database'.DIRECTORY_SEPARATOR.'migrations'; Artisan::call('migrate', [ - '--path' => $path, + '--path' => $path, '--force' => true, ]); } } - } diff --git a/app/Http/Controllers/Admin/helpdesk/TemplateController.php b/app/Http/Controllers/Admin/helpdesk/TemplateController.php index da7a1f56a..63c046d4d 100644 --- a/app/Http/Controllers/Admin/helpdesk/TemplateController.php +++ b/app/Http/Controllers/Admin/helpdesk/TemplateController.php @@ -327,16 +327,17 @@ class TemplateController extends Controller throw new Exception('Sorry! We can not find your request'); } $to_address = [ - 'name' => "", - 'email' => $to + 'name' => '', + 'email' => $to, ]; $message = [ - 'subject' => $subject, + 'subject' => $subject, 'scenario' => null, - 'body' => $msg + 'body' => $msg, ]; - $this->PhpMailController->sendmail($from, $to_address, $message,[],[]); + $this->PhpMailController->sendmail($from, $to_address, $message, [], []); + return redirect()->back()->with('success', 'Mail has send successfully'); } catch (Exception $e) { return redirect()->back()->with('fails', $e->getMessage());