gitmedia/mivita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Customers Add+Edit, API WP

Browse source
This commit is contained in:
Kevin Adametz 2020-06-12 14:46:51 +02:00
parent dc63fa9fb2
commit 75a0f9a38a
120 changed files with 11894 additions and 6134 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/Http/Controllers/UserDataController.php
View file

@ -5,7 +5,7 @@ namespace App\Http\Controllers;
use App\Repositories\UserRepository;
use App\User;
use Auth;
use Input;
use Request;
use Validator;
@ -55,7 +55,7 @@ class UserDataController extends Controller
'email' => 'required|string|email|max:255|exists:users,email',
'email-confirm' => 'required|same:email',
);
if(!Input::get('same_as_billing')){
if(!Request::get('same_as_billing')){
$rules = array_merge($rules, [
'shipping_firstname'=>'required',
'shipping_lastname'=>'required',
@ -69,14 +69,14 @@ class UserDataController extends Controller
$data = [
'user' => $user,
];
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
return view('user.edit', $data)->withErrors($validator);
} else {
$this->userRepo->update(Input::all());
$this->userRepo->update(Request::all());
\Session()->flash('alert-save', true);
return redirect('/user/edit');
}
@ -103,7 +103,7 @@ class UserDataController extends Controller
$rules['accepted_active'] = 'required';
}
if(Input::get('company') == 1){
if(Request::get('company') == 1){
$rules['company_name'] = 'required|max:255';
$rules['company_country_id'] = 'required|integer|min:1';
}
@ -112,7 +112,7 @@ class UserDataController extends Controller
'user' => $user,
];
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
@ -122,7 +122,7 @@ class UserDataController extends Controller
return view('user.edit', $data)->withErrors($validator);
} else {
$this->userRepo->update(Input::all());
$this->userRepo->update(Request::all());
if($user->active == 0) {
$account = $user->account;
@ -134,7 +134,7 @@ class UserDataController extends Controller
$user->save();
}
if(Input::get('accepted_active') == "on"){
if(Request::get('accepted_active') == "on"){
$user->agreement = now();
}else{
$user->agreement = null;
@ -152,7 +152,7 @@ class UserDataController extends Controller
public function userDataAcceptedForm(){
$user = Auth::user();
if(Input::get('accepted_active') == "on"){
if(Request::get('accepted_active') == "on"){
$user->agreement = now();
}else {
$user->agreement = null;
@ -189,7 +189,7 @@ class UserDataController extends Controller
$data = [
'user' => $user,
];
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
// get the error messages from the validator
@ -201,7 +201,7 @@ class UserDataController extends Controller
$account->data_protection = now();
$account->save();
if(Input::get('accepted_active') == "on"){
if(Request::get('accepted_active') == "on"){
$user->agreement = now();
}else{
$user->agreement = null;