cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #269 from ladybirdweb/analysis-8wWbO4

Browse Source 
Applied fixes from StyleCI
This commit is contained in:
Manish Verma
2016-10-26 13:18:57 +05:30
committed by GitHub
parent 7aec2427ea c2940bcc04
commit f7030a1ecd
4 changed files with 56 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/Agent/helpdesk/OrganizationController.php
View File

@@ -61,17 +61,15 @@ class OrganizationController extends Controller
} }
} }
/** /**
* This function is used autofill organizations name . * This function is used autofill organizations name .
* *
* @return datatable * @return datatable
*/ */
public function organizationAutofill() 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. * This function is used to display the list of Organizations.

69
app/Http/Controllers/Agent/helpdesk/UserController.php
View File

@@ -749,33 +749,24 @@ class UserController extends Controller
{ {
$org_name = Input::get('org'); $org_name = Input::get('org');
if($org_name){ 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();
$org= Organization::where('name','=',$org_name)->lists('id')->first(); return 1;
if($org){ } else {
return 0;
$user_org = new User_org(); }
$user_org->org_id = $org; } else {
$user_org->user_id = $id;
$user_org->save();
return 1;
}
else{
return 0;
}
}
else{
return 2; return 2;
} }
} }
/**
/**
* Assigning an user to an organization. * Assigning an user to an organization.
* *
* @param type $id * @param type $id
@@ -784,30 +775,22 @@ class UserController extends Controller
*/ */
public function UsereditAssignOrg($id) public function UsereditAssignOrg($id)
{ {
$org_name = Input::get('org'); $org_name = Input::get('org');
if($org_name){ 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();
$org= Organization::where('name','=',$org_name)->lists('id')->first(); return 1;
if($org){ } else {
return 0;
$user_org =User_org::where('user_id','=',$id)->first(); }
$user_org->org_id = $org; } else {
$user_org->user_id = $id;
$user_org->save();
return 1;
}
else{
return 0;
}
}
else{
return 2; return 2;
} }
} }

2
app/Http/routes.php
View File

@@ -505,7 +505,7 @@ Route::group(['middleware' => ['web']], function () {
$breadcrumbs->push(Lang::get('lang.view_organization_profile'), url('organizations/{organizations}')); $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('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/delete/{id}', ['as' => 'org.delete', 'uses' => 'Agent\helpdesk\OrganizationController@destroy']);
Route::get('org-chart/{id}', 'Agent\helpdesk\OrganizationController@orgChartData'); Route::get('org-chart/{id}', 'Agent\helpdesk\OrganizationController@orgChartData');
// Route::post('org-chart-range', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']); // Route::post('org-chart-range', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']);

40
resources/lang/en/lang.php
View File

@@ -1507,26 +1507,26 @@ return [
* User Module * User Module
* -------------------------------------------------------------------------------------------- * --------------------------------------------------------------------------------------------
*/ */
'agent_report' =>'Agent Report', 'agent_report' => 'Agent Report',
'assign_tickets' =>'Assign Tickets', 'assign_tickets' => 'Assign Tickets',
'delete_agent' =>'Delete Agent', 'delete_agent' => 'Delete Agent',
'delete_user' =>'Delete User', 'delete_user' => 'Delete User',
'confirm_deletion' => 'Confirm Deletion', 'confirm_deletion' => 'Confirm Deletion',
'delete_all_content' => ' Delete all content', 'delete_all_content' => ' Delete all content',
'agent_profile' => 'Agent Profile', 'agent_profile' => 'Agent Profile',
'change_role_to_admin' => 'Change Role To Admin', 'change_role_to_admin' => 'Change Role To Admin',
'change_role_to_user' => 'Change Role To User', 'change_role_to_user' => 'Change Role To User',
'change_role_to_agent' => 'Change Role To Agent', 'change_role_to_agent' => 'Change Role To Agent',
'change_password' => 'Change Password', 'change_password' => 'Change Password',
'role_change' => 'Role Change', 'role_change' => 'Role Change',
'password_generator' => 'Password Generator', 'password_generator' => 'Password Generator',
'depertment' => 'Depertment', 'depertment' => 'Depertment',
'duetoday' => 'Due Today', 'duetoday' => 'Due Today',
'today-due_tickets' => 'Today\'s due ticekts', 'today-due_tickets' => 'Today\'s due ticekts',
'password_change_successfully' => 'Password Change Successfully', 'password_change_successfully' => 'Password Change Successfully',
'role_change_successfully' => 'Role Change Successfully', 'role_change_successfully' => 'Role Change Successfully',
'user_delete_successfully' => 'User Delete Successfully', 'user_delete_successfully' => 'User Delete Successfully',
'agent_delete_successfully' => 'Agent Delete Successfully', 'agent_delete_successfully' => 'Agent Delete Successfully',
'select_another_agent' => 'Select Another Agent', '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 Delete Successfully And Ticket Assign TO Another Agent',