From c2940bcc04237324e956224a99deb3e993ddc7cb Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Wed, 26 Oct 2016 07:48:34 +0000 Subject: [PATCH] Applied fixes from StyleCI --- .../Agent/helpdesk/OrganizationController.php | 18 +++-- .../Agent/helpdesk/UserController.php | 71 +++++++------------ app/Http/routes.php | 2 +- resources/lang/en/lang.php | 40 +++++------ 4 files changed, 56 insertions(+), 75 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 3266672be..d71fda410 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -748,66 +748,49 @@ class UserController extends Controller public function UserAssignOrg($id) { $org_name = Input::get('org'); - - if($org_name){ - - $org= Organization::where('name','=',$org_name)->lists('id')->first(); - if($org){ - $user_org = new User_org(); - $user_org->org_id = $org; - $user_org->user_id = $id; - $user_org->save(); + if ($org_name) { + $org = Organization::where('name', '=', $org_name)->lists('id')->first(); + if ($org) { + $user_org = new User_org(); + $user_org->org_id = $org; + $user_org->user_id = $id; + $user_org->save(); - return 1; - } - else{ - - return 0; - - } - - } - else{ + return 1; + } else { + return 0; + } + } else { return 2; - } } - - /** + /** * Assigning an user to an organization. * * @param type $id - * + * * @return type boolean */ public function UsereditAssignOrg($id) { - $org_name = Input::get('org'); - - if($org_name){ - - $org= Organization::where('name','=',$org_name)->lists('id')->first(); - if($org){ + $org_name = Input::get('org'); - $user_org =User_org::where('user_id','=',$id)->first(); - $user_org->org_id = $org; - $user_org->user_id = $id; - $user_org->save(); + if ($org_name) { + $org = Organization::where('name', '=', $org_name)->lists('id')->first(); + if ($org) { + $user_org = User_org::where('user_id', '=', $id)->first(); + $user_org->org_id = $org; + $user_org->user_id = $id; + $user_org->save(); - return 1; - } - else{ - - return 0; - - } - - } - else{ + return 1; + } else { + return 0; + } + } else { return 2; - } } diff --git a/app/Http/routes.php b/app/Http/routes.php index 7cbddf4c9..a240997ab 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',