add User, Mail verify, rights, Change Mail, fewo invoice PDF
This commit is contained in:
parent
26ecb09cdc
commit
7abfe3f700
44 changed files with 3041 additions and 1125 deletions
|
|
@ -24,12 +24,9 @@ class UserDataController extends Controller
|
|||
*/
|
||||
public function userEdit(){
|
||||
$user = Auth::user();
|
||||
|
||||
/*if(!$user->account){
|
||||
$user->account = new UserAccount();
|
||||
}*/
|
||||
$data = [
|
||||
'user' => $user,
|
||||
'isFromAdmin' => false,
|
||||
];
|
||||
return view('user.edit', $data);
|
||||
}
|
||||
|
|
@ -40,37 +37,18 @@ class UserDataController extends Controller
|
|||
public function userEditStore(){
|
||||
|
||||
$user = Auth::user();
|
||||
/*if(!$user->account){
|
||||
$user->account = new UserAccount();
|
||||
}*/
|
||||
|
||||
$rules = array(
|
||||
'salutation' => 'required',
|
||||
'last_name' => 'required|max:255',
|
||||
'country_id' => 'required|integer|min:1',
|
||||
'email' => 'required|string|email|max:255|exists:users,email',
|
||||
'email-confirm' => 'required|same:email',
|
||||
'name' => 'required'
|
||||
);
|
||||
|
||||
if(Input::get('company') == 1){
|
||||
$rules['company_name'] = 'required|max:255';
|
||||
$rules['company_country_id'] = 'required|integer|min:1';
|
||||
}
|
||||
|
||||
$data = [
|
||||
'user' => $user,
|
||||
];
|
||||
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
|
||||
if ($validator->fails()) {
|
||||
|
||||
// get the error messages from the validator
|
||||
$messages = $validator->messages();
|
||||
// redirect our user back to the form with the errors from the validator
|
||||
return view('user.edit', $data)->withErrors($validator);
|
||||
|
||||
return back()->withInput(Input::all())->withErrors($validator);
|
||||
} else {
|
||||
$this->userRepo->update(Input::all());
|
||||
$data = Input::all();
|
||||
$user->name = $data['name'];
|
||||
$user->save();
|
||||
\Session()->flash('alert-save', true);
|
||||
return redirect('/user/edit');
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue