From c57a94a9c9118ff5f2316fc6b22fad1c4d04fa2a Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Mon, 24 Oct 2016 09:43:39 +0000 Subject: [PATCH 1/7] Applied fixes from StyleCI --- resources/lang/en/lang.php | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index d296e8e69..2d7ee43db 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1507,26 +1507,26 @@ return [ * User Module * -------------------------------------------------------------------------------------------- */ - 'agent_report' =>'Agent Report', - 'assign_tickets' =>'Assign Tickets', - 'delete_agent' =>'Delete Agent', - 'delete_user' =>'Delete User', - 'confirm_deletion' => 'Confirm Deletion', - 'delete_all_content' => ' Delete all content', - 'agent_profile' => 'Agent Profile', - 'change_role_to_admin' => 'Change Role To Admin', - 'change_role_to_user' => 'Change Role To User', - 'change_role_to_agent' => 'Change Role To Agent', - 'change_password' => 'Change Password', - 'role_change' => 'Role Change', - 'password_generator' => 'Password Generator', - 'depertment' => 'Depertment', - 'duetoday' => 'Due Today', - 'today-due_tickets' => 'Today\'s due ticekts', - 'password_change_successfully' => 'Password Change Successfully', - 'role_change_successfully' => 'Role Change Successfully', - 'user_delete_successfully' => 'User Delete Successfully', - 'agent_delete_successfully' => 'Agent Delete Successfully', + 'agent_report' => 'Agent Report', + 'assign_tickets' => 'Assign Tickets', + 'delete_agent' => 'Delete Agent', + 'delete_user' => 'Delete User', + 'confirm_deletion' => 'Confirm Deletion', + 'delete_all_content' => ' Delete all content', + 'agent_profile' => 'Agent Profile', + 'change_role_to_admin' => 'Change Role To Admin', + 'change_role_to_user' => 'Change Role To User', + 'change_role_to_agent' => 'Change Role To Agent', + 'change_password' => 'Change Password', + 'role_change' => 'Role Change', + 'password_generator' => 'Password Generator', + 'depertment' => 'Depertment', + 'duetoday' => 'Due Today', + 'today-due_tickets' => 'Today\'s due ticekts', + 'password_change_successfully' => 'Password Change Successfully', + 'role_change_successfully' => 'Role Change Successfully', + 'user_delete_successfully' => 'User Delete Successfully', + 'agent_delete_successfully' => 'Agent Delete Successfully', 'select_another_agent' => 'Select Another Agent', 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent Delete Successfully And Ticket Assign TO Another Agent', From f5a8430906bdd91a11b621898d963130c9d4de31 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Mon, 24 Oct 2016 16:09:24 +0530 Subject: [PATCH 2/7] language update --- resources/lang/en/lang.php | 44 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 2d7ee43db..e99cc2fe2 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1507,27 +1507,27 @@ return [ * User Module * -------------------------------------------------------------------------------------------- */ - 'agent_report' => 'Agent Report', - 'assign_tickets' => 'Assign Tickets', - 'delete_agent' => 'Delete Agent', - 'delete_user' => 'Delete User', - 'confirm_deletion' => 'Confirm Deletion', - 'delete_all_content' => ' Delete all content', - 'agent_profile' => 'Agent Profile', - 'change_role_to_admin' => 'Change Role To Admin', - 'change_role_to_user' => 'Change Role To User', - 'change_role_to_agent' => 'Change Role To Agent', - 'change_password' => 'Change Password', - 'role_change' => 'Role Change', - 'password_generator' => 'Password Generator', - 'depertment' => 'Depertment', - 'duetoday' => 'Due Today', - 'today-due_tickets' => 'Today\'s due ticekts', - 'password_change_successfully' => 'Password Change Successfully', - 'role_change_successfully' => 'Role Change Successfully', - 'user_delete_successfully' => 'User Delete Successfully', - 'agent_delete_successfully' => 'Agent Delete Successfully', - 'select_another_agent' => 'Select Another Agent', - 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent Delete Successfully And Ticket Assign TO Another Agent', + 'agent_report' => 'Agent Report', + 'assign_tickets' => 'Assign Tickets', + 'delete_agent' => 'Delete Agent', + 'delete_user' => 'Delete User', + 'confirm_deletion' => 'Confirm Deletion', + 'delete_all_content' => ' Delete all content', + 'agent_profile' => 'Agent Profile', + 'change_role_to_admin' => 'Change role to Admin', + 'change_role_to_user' => 'Change role to User', + 'change_role_to_agent' => 'Change role to Agent', + 'change_password' => 'Change Password', + 'role_change' => 'Role Change', + 'password_generator' => 'Password Generator', + 'depertment' => 'Depertment', + 'duetoday' => 'Due Today', + 'today-due_tickets' => 'Today\'s due ticekts', + 'password_change_successfully' => 'Password changed successfully', + 'role_change_successfully' => 'Role changed successfully', + 'user_delete_successfully' => 'User deleted successfully', + 'agent_delete_successfully' => 'Agent deleted successfully', + 'select_another_agent' => 'Select another agent', + 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent delete successfully and ticket assign to another agent', ]; From 002cbaa8d8e3aabc71dd4ff4b424bc4735b3fdf1 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Mon, 24 Oct 2016 16:59:09 +0530 Subject: [PATCH 3/7] updates for Arindam's bug fix commit --- app/Http/Controllers/Agent/helpdesk/UserController.php | 2 +- resources/lang/en/lang.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index 9a94171de..4f03d6b69 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -491,7 +491,7 @@ class UserController extends Controller $user = User::find($id); $user->delete(); - return redirect('user')->with('success', Lang::get('lang.agent_delete_successfully_and_ticket_assign_to_another_user')); + return redirect('user')->with('success', Lang::get('lang.agent_delete_successfully_and_ticket_assign_to_another_agent')); } if (User_org::where('user_id', '=', $id)) { DB::table('user_assign_organization')->where('user_id', '=', $id)->delete(); diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index e99cc2fe2..66d24af99 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1528,6 +1528,6 @@ return [ 'user_delete_successfully' => 'User deleted successfully', 'agent_delete_successfully' => 'Agent deleted successfully', 'select_another_agent' => 'Select another agent', - 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent delete successfully and ticket assign to another agent', + 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent deleted successfully and ticket assigned to another agent', ]; From c4fe4d5ea30cea1584120b80f2d21bb0f50cf090 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Mon, 24 Oct 2016 18:23:28 +0530 Subject: [PATCH 4/7] Updated cron command info --- app/Http/Controllers/Admin/helpdesk/SettingsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/app/Http/Controllers/Admin/helpdesk/SettingsController.php index a984d6ab7..adba3e508 100644 --- a/app/Http/Controllers/Admin/helpdesk/SettingsController.php +++ b/app/Http/Controllers/Admin/helpdesk/SettingsController.php @@ -356,8 +356,8 @@ class SettingsController extends Controller $workflow = $workflow->whereId('1')->first(); $cron_path = base_path('artisan'); - $command = ":- 
***** php $cron_path schedule:run >> /dev/null 2>&1
"; - $shared = ":- 
/usr/bin/php-cli -q  $cron_path schedule:run >> /dev/null 2>&1
"; + $command = ":- 
***** php $cron_path schedule:run > /dev/null 2>&1
"; + $shared = ":- 
/usr/bin/php-cli -q  $cron_path schedule:run > /dev/null 2>&1
"; $warn = ''; $condition = new \App\Model\MailJob\Condition(); $job = $condition->checkActiveJob(); From a994e3438514345f7c9417d085f9b0af47f5da2c Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Tue, 25 Oct 2016 09:26:14 +0000 Subject: [PATCH 5/7] Applied fixes from StyleCI --- .../Agent/helpdesk/OrganizationController.php | 18 ++++----- .../Agent/helpdesk/UserController.php | 2 +- app/Http/routes.php | 2 +- resources/lang/en/lang.php | 40 +++++++++---------- 4 files changed, 30 insertions(+), 32 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/OrganizationController.php b/app/Http/Controllers/Agent/helpdesk/OrganizationController.php index f642959ce..3d95a517d 100644 --- a/app/Http/Controllers/Agent/helpdesk/OrganizationController.php +++ b/app/Http/Controllers/Agent/helpdesk/OrganizationController.php @@ -61,17 +61,15 @@ class OrganizationController extends Controller } } - /** - * This function is used autofill organizations name . - * - * @return datatable - */ - + /** + * This function is used autofill organizations name . + * + * @return datatable + */ public function organizationAutofill() - { - return view('themes.default1.agent.helpdesk.organization.getautocomplete'); - } - + { + return view('themes.default1.agent.helpdesk.organization.getautocomplete'); + } /** * This function is used to display the list of Organizations. diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index 7e8b7c875..64cf65288 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -748,7 +748,7 @@ class UserController extends Controller public function UserAssignOrg($id) { $org_name = Input::get('org'); - $org= Organization::where('name','=',$org_name)->lists('id')->first(); + $org = Organization::where('name', '=', $org_name)->lists('id')->first(); $user_org = new User_org(); $user_org->org_id = $org; $user_org->user_id = $id; diff --git a/app/Http/routes.php b/app/Http/routes.php index 001cce630..e64bd662a 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -505,7 +505,7 @@ Route::group(['middleware' => ['web']], function () { $breadcrumbs->push(Lang::get('lang.view_organization_profile'), url('organizations/{organizations}')); }); Route::get('org-list', ['as' => 'org.list', 'uses' => 'Agent\helpdesk\OrganizationController@org_list']); - Route::get('organization-autofill', ['as' => 'post.organization.autofill', 'uses' => 'Agent\helpdesk\OrganizationController@organizationAutofill']);//auto fill organization name// + Route::get('organization-autofill', ['as' => 'post.organization.autofill', 'uses' => 'Agent\helpdesk\OrganizationController@organizationAutofill']); //auto fill organization name// Route::get('org/delete/{id}', ['as' => 'org.delete', 'uses' => 'Agent\helpdesk\OrganizationController@destroy']); Route::get('org-chart/{id}', 'Agent\helpdesk\OrganizationController@orgChartData'); // Route::post('org-chart-range', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']); diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index d296e8e69..2d7ee43db 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1507,26 +1507,26 @@ return [ * User Module * -------------------------------------------------------------------------------------------- */ - 'agent_report' =>'Agent Report', - 'assign_tickets' =>'Assign Tickets', - 'delete_agent' =>'Delete Agent', - 'delete_user' =>'Delete User', - 'confirm_deletion' => 'Confirm Deletion', - 'delete_all_content' => ' Delete all content', - 'agent_profile' => 'Agent Profile', - 'change_role_to_admin' => 'Change Role To Admin', - 'change_role_to_user' => 'Change Role To User', - 'change_role_to_agent' => 'Change Role To Agent', - 'change_password' => 'Change Password', - 'role_change' => 'Role Change', - 'password_generator' => 'Password Generator', - 'depertment' => 'Depertment', - 'duetoday' => 'Due Today', - 'today-due_tickets' => 'Today\'s due ticekts', - 'password_change_successfully' => 'Password Change Successfully', - 'role_change_successfully' => 'Role Change Successfully', - 'user_delete_successfully' => 'User Delete Successfully', - 'agent_delete_successfully' => 'Agent Delete Successfully', + 'agent_report' => 'Agent Report', + 'assign_tickets' => 'Assign Tickets', + 'delete_agent' => 'Delete Agent', + 'delete_user' => 'Delete User', + 'confirm_deletion' => 'Confirm Deletion', + 'delete_all_content' => ' Delete all content', + 'agent_profile' => 'Agent Profile', + 'change_role_to_admin' => 'Change Role To Admin', + 'change_role_to_user' => 'Change Role To User', + 'change_role_to_agent' => 'Change Role To Agent', + 'change_password' => 'Change Password', + 'role_change' => 'Role Change', + 'password_generator' => 'Password Generator', + 'depertment' => 'Depertment', + 'duetoday' => 'Due Today', + 'today-due_tickets' => 'Today\'s due ticekts', + 'password_change_successfully' => 'Password Change Successfully', + 'role_change_successfully' => 'Role Change Successfully', + 'user_delete_successfully' => 'User Delete Successfully', + 'agent_delete_successfully' => 'Agent Delete Successfully', 'select_another_agent' => 'Select Another Agent', 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent Delete Successfully And Ticket Assign TO Another Agent', From 8b374bb5ceb9063533129165ea4e3f5cc4ab08a1 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Thu, 27 Oct 2016 16:45:11 +0530 Subject: [PATCH 6/7] Bug-fix patch --- .../Controllers/Agent/helpdesk/UserController.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index 9cf8d89e4..ce4034dca 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -242,8 +242,10 @@ class UserController extends Controller } // save user credentails if ($user->save() == true) { - $orgid = $request->input('org_id'); - $this->storeUserOrgRelation($user->id, $orgid); + if ($request->input('org_id') != ""){ + $orgid = $request->input('org_id'); + $this->storeUserOrgRelation($user->id, $orgid); + } // fetch user credentails to send mail $name = $user->first_name; $email = $user->email; @@ -613,8 +615,10 @@ class UserController extends Controller $users->mobile = ($request->input('mobile') == '') ? null : $request->input('mobile'); $users->fill($request->except('mobile')); $users->save(); - $orgid = $request->input('org_id'); - $this->storeUserOrgRelation($users->id, $orgid); + if($request->input('org_id') != "") { + $orgid = $request->input('org_id'); + $this->storeUserOrgRelation($users->id, $orgid); + } /* redirect to Index page with Success Message */ return redirect('user')->with('success', Lang::get('lang.User-profile-Updated-Successfully')); } catch (Exception $e) { From 2a57341212657144fac91a9c6af356df59968613 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Thu, 27 Oct 2016 11:16:23 +0000 Subject: [PATCH 7/7] Applied fixes from StyleCI --- app/Http/Controllers/Agent/helpdesk/UserController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index ce4034dca..a0382382d 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -242,7 +242,7 @@ class UserController extends Controller } // save user credentails if ($user->save() == true) { - if ($request->input('org_id') != ""){ + if ($request->input('org_id') != '') { $orgid = $request->input('org_id'); $this->storeUserOrgRelation($user->id, $orgid); } @@ -615,9 +615,9 @@ class UserController extends Controller $users->mobile = ($request->input('mobile') == '') ? null : $request->input('mobile'); $users->fill($request->except('mobile')); $users->save(); - if($request->input('org_id') != "") { + if ($request->input('org_id') != '') { $orgid = $request->input('org_id'); - $this->storeUserOrgRelation($users->id, $orgid); + $this->storeUserOrgRelation($users->id, $orgid); } /* redirect to Index page with Success Message */ return redirect('user')->with('success', Lang::get('lang.User-profile-Updated-Successfully'));