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

59
app/Http/Controllers/WizardController.php
View file

@ -14,7 +14,6 @@ use App\User;
use Auth;
use Hash;
use Illuminate\Support\Facades\Mail;
use Input;
use Request;
use Validator;
use Yard;
@ -154,7 +153,7 @@ class WizardController extends Controller
'accepted_active' => 'required',
'accepted_contract' => 'required'
);
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
$data = [
'user' => Auth::user(),
@ -196,7 +195,7 @@ class WizardController extends Controller
'birthday' => 'required',
);
if (!Input::get('same_as_billing')) {
if (!Request::get('same_as_billing')) {
$rules = array_merge($rules, [
'shipping_firstname' => 'required',
'shipping_lastname' => 'required',
@ -207,14 +206,14 @@ class WizardController extends Controller
'shipping_country_id' => 'required|integer|min:1',
]);
}
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
$user->wizard = 1;
$user->save();
return redirect(route('wizard_register', [1]))->withErrors($validator)->withInput(Input::all());
return redirect(route('wizard_register', [1]))->withErrors($validator)->withInput(Request::all());
}
$data = Input::all();
$data['same_as_billing'] = Input::get('same_as_billing') == NULL ? 0 : 1;
$data = Request::all();
$data['same_as_billing'] = Request::get('same_as_billing') == NULL ? 0 : 1;
$user->account->fill($data)->save();
$user->wizard = 2;
$user->save();
@ -222,13 +221,13 @@ class WizardController extends Controller
}
if ($step == 2) {
if(Input::get('submit') === 'do'){
if(Request::get('submit') === 'do'){
if(File::whereUserId($user->id)->whereIdentifier('id_card')->count() == 0){
$validator = Validator::make(Input::all(), []);
$validator = Validator::make(Request::all(), []);
$validator->errors()->add('field', __('Kein Ausweis hinterlegt, bitte erst hochladen.'));
$user->wizard = 2;
$user->save();
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Input::all());
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Request::all());
}
$user->wizard = 3;
$user->save();
@ -238,20 +237,20 @@ class WizardController extends Controller
$this->fileRepo->_set('dir', '/'.$user->id.'/verification/');
$this->fileRepo->_set('user_id', $user->id);
$this->fileRepo->_set('identifier', 'id_card');
return $this->fileRepo->uploadFile(Input::all());
return $this->fileRepo->uploadFile(Request::all());
}
if ($step == 3) {
if(Input::get('submit') === 'do'){
if(Request::get('submit') === 'do'){
$data = Request::all();
if($data['business_license_choose'] === "now"){
if(File::whereUserId($user->id)->whereIdentifier('business_license')->count() == 0){
$validator = Validator::make(Input::all(), []);
$validator = Validator::make(Request::all(), []);
$validator->errors()->add('field', __('Kein Gewerbeschein hinterlegt, bitte erst hochladen.'));
$user->wizard = 3;
$user->save();
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Input::all());
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Request::all());
}
}
if($data['business_license_choose'] === "later"){
@ -259,11 +258,11 @@ class WizardController extends Controller
}
if($data['business_license_choose'] === "non"){
if(!$data['non_business_license_reason'] || $data['non_business_license_reason'] == ""){
$validator = Validator::make(Input::all(), []);
$validator = Validator::make(Request::all(), []);
$validator->errors()->add('field', __('Bitte gib eine Begründung ein, warum Du keinen Gewerbeschein benötigst.'));
$user->wizard = 3;
$user->save();
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Input::all());
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Request::all());
}else{
$user->account->setNotice('business_license_reason', $data['non_business_license_reason']);
}
@ -279,7 +278,7 @@ class WizardController extends Controller
$this->fileRepo->_set('dir', '/'.$user->id.'/verification/');
$this->fileRepo->_set('user_id', $user->id);
$this->fileRepo->_set('identifier', 'business_license');
return $this->fileRepo->uploadFile(Input::all());
return $this->fileRepo->uploadFile(Request::all());
}
if ($step == 4) {
@ -316,7 +315,7 @@ class WizardController extends Controller
'accepted_data_protection' => 'required',
'accepted_active' => 'required',
);
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
$data = [
'user' => Auth::user(),
@ -355,7 +354,7 @@ class WizardController extends Controller
$rules = array(
'password' => 'required|string|min:6|confirmed',
);
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
$data = [
'user' => Auth::user(),
@ -367,7 +366,7 @@ class WizardController extends Controller
}
$user->fill([
'password' => Hash::make(Input::get('password'))
'password' => Hash::make(Request::get('password'))
])->save();
$user->wizard = 12;
@ -388,7 +387,7 @@ class WizardController extends Controller
'birthday' => 'required',
);
if(!Input::get('same_as_billing')){
if(!Request::get('same_as_billing')){
$rules = array_merge($rules, [
'shipping_firstname'=>'required',
'shipping_lastname'=>'required',
@ -399,13 +398,13 @@ class WizardController extends Controller
]);
}
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
return redirect(route('wizard_create', [12]))->withErrors($validator)->withInput(Input::all());
return redirect(route('wizard_create', [12]))->withErrors($validator)->withInput(Request::all());
}
$data = Input::all();
$data['same_as_billing'] = Input::get('same_as_billing') == NULL ? 0 : 1;
$data = Request::all();
$data['same_as_billing'] = Request::get('same_as_billing') == NULL ? 0 : 1;
$user->account->fill($data)->save();
$user->wizard = 13;
@ -423,12 +422,12 @@ class WizardController extends Controller
public function storePayment($step = 0){
if(Input::get('switchers-package-wizard')){
if(Request::get('switchers-package-wizard')){
$user = User::find(Auth::user()->id);
Yard::instance('shopping')->destroy();
$product = Product::find(Input::get('switchers-package-wizard'));
$product = Product::find(Request::get('switchers-package-wizard'));
$showAboOptions = false;
if(Input::get('abo_options')){
if(Request::get('abo_options')){
$showAboOptions = true;
$user->abo_options = true;
$user->save();
@ -443,8 +442,8 @@ class WizardController extends Controller
Yard::instance('shopping')->add($product->id, $product->getLang('name'), 1, $product->price, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight]);
//set onboarding products
if(Input::get('products_on_board')){
foreach (Input::get('products_on_board') as $product_on_board_id){
if(Request::get('products_on_board')){
foreach (Request::get('products_on_board') as $product_on_board_id){
$product_on_board = Product::find($product_on_board_id);
$image = "";
if($product_on_board->images->count()){