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

Profile edit bug fix patch

Browse Source
This commit is contained in:
Manish Verma
2016-10-20 18:53:07 +05:30
parent 03ff310d1e
commit 98a6bd7b42
3 changed files with 32 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Admin/helpdesk/AgentController.php
View File

@@ -240,7 +240,8 @@ class AgentController extends Controller
if ($request->input('country_code') != '' or $request->input('country_code') != null) { if ($request->input('country_code') != '' or $request->input('country_code') != null) {
$user->country_code = $request->input('country_code'); $user->country_code = $request->input('country_code');
} }
$user->fill($request->except('daylight_save', 'limit_access', 'directory_listing', 'vocation_mode', 'assign_team'))->save(); $user->mobile = ($request->input('mobile') == '') ? null : $request->input('mobile');
$user->fill($request->except('daylight_save', 'limit_access', 'directory_listing', 'vocation_mode', 'assign_team', 'mobile'));
$user->assign_group = $request->group; $user->assign_group = $request->group;
$user->primary_dpt = $request->primary_department; $user->primary_dpt = $request->primary_department;
$user->agent_tzone = $request->agent_time_zone; $user->agent_tzone = $request->agent_time_zone;

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

@@ -610,8 +610,9 @@ class UserController extends Controller
$users->country_code = $request->country_code; $users->country_code = $request->country_code;
} }
} }
// dd($request->input()); $users->mobile = ($request->input('mobile') == '') ? null : $request->input('mobile');
$users->fill($request->input())->save(); $users->fill($request->except('mobile'));
$users->save();
$orgid = $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 */ /* redirect to Index page with Success Message */

67
app/Http/Controllers/Client/helpdesk/GuestController.php
View File

@@ -80,58 +80,43 @@ class GuestController extends Controller
*/ */
public function postProfile(ProfileRequest $request) public function postProfile(ProfileRequest $request)
{ {
$user = User::where('id', '=', Auth::user()->id)->first(); try {
$user->gender = $request->get('gender'); // geet authenticated user details
$user->save(); $user = Auth::user();
if ($user->profile_pic == 'avatar5.png' || $user->profile_pic == 'avatar2.png') {
if ($request->input('gender') == 1) {
$name = 'avatar5.png';
$destinationPath = 'uploads/profilepic';
$user->profile_pic = $name;
} elseif ($request->input('gender') == 0) {
$name = 'avatar2.png';
$destinationPath = 'uploads/profilepic';
$user->profile_pic = $name;
}
}
if (Input::file('profile_pic')) {
//$extension = Input::file('profile_pic')->getClientOriginalExtension();
$name = Input::file('profile_pic')->getClientOriginalName();
$destinationPath = 'uploads/profilepic';
$fileName = rand(0000, 9999).'.'.$name;
//echo $fileName;
Input::file('profile_pic')->move($destinationPath, $fileName);
$user->profile_pic = $fileName;
} else {
if ($request->get('country_code') == '' && ($request->get('phone_number') != '' || $request->get('mobile') != '')) { if ($request->get('country_code') == '' && ($request->get('phone_number') != '' || $request->get('mobile') != '')) {
return redirect()->back()->with(['fails1' => Lang::get('lang.country-code-required-error'), return redirect()->back()->with(['fails' => Lang::get('lang.country-code-required-error'), 'country_code_error' => 1])->withInput();
'country_code' => 1, ])->withInput();
} else { } else {
$code = CountryCode::select('phonecode')->where('phonecode', '=', $request->get('country_code'))->get(); $code = CountryCode::select('phonecode')->where('phonecode', '=', $request->get('country_code'))->get();
if (!count($code)) { if (!count($code)) {
return redirect()->back()->with(['fails1' => Lang::get('lang.incorrect-country-code-error'), return redirect()->back()->with(['fails' => Lang::get('lang.incorrect-country-code-error'), 'country_code_error' => 1])->withInput();
'country_code' => 1, ])->withInput();
} else {
$user->country_code = $request->input('country_code');
} }
$user->country_code = $request->country_code;
}
$user->fill($request->except('profile_pic', 'mobile'));
$user->gender = $request->input('gender');
$user->save();
if (Input::file('profile_pic')) {
// fetching picture name
$name = Input::file('profile_pic')->getClientOriginalName();
// fetching upload destination path
$destinationPath = 'uploads/profilepic';
// adding a random value to profile picture filename
$fileName = rand(0000, 9999).'.'.$name;
// moving the picture to a destination folder
Input::file('profile_pic')->move($destinationPath, $fileName);
// saving filename to database
$user->profile_pic = $fileName;
} }
if ($request->get('mobile')) { if ($request->get('mobile')) {
$mobile = $request->get('mobile'); $user->mobile = $request->get('mobile');
} else { } else {
$mobile = null; $user->mobile = null;
} }
$check = $this->checkMobile($mobile); if ($user->save()) {
if ($check == true) { } else {
return redirect()->back()->with(['fails1' => Lang::get('lang.mobile-has-been-taken'), 'country_code' => 1])->withInput();
} }
$user->fill($request->except('profile_pic', 'gender', 'mobile'));
$user->mobile = $mobile;
$user->save();
return redirect()->back()->with('success1', Lang::get('lang.profile_updated_sucessfully')); } catch (Exception $e) {
}
if ($user->fill($request->except('profile_pic'))->save()) {
return redirect()->back()->with('success1', Lang::get('lang.profile_updated_sucessfully'));
} }
} }