diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6076174..ad2f999 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,58 +2,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
@@ -68,15 +24,46 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
@@ -85,9 +72,6 @@
- update_p
- _scrollTo
- user_update_password_first
logou
log
same_as_billing
@@ -115,6 +99,9 @@
data
data_prote
data_pro
+ birthday
+ datepicker-birthday
+ datepicker
@@ -124,9 +111,9 @@
$PROJECT_DIR$/database/migrations
$PROJECT_DIR$/resources/views/user
$PROJECT_DIR$/resources/views/web
- $PROJECT_DIR$/app
$PROJECT_DIR$/resources/views
$PROJECT_DIR$/resources
+ $PROJECT_DIR$/app
@@ -164,8 +151,6 @@
@@ -366,32 +353,46 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -404,13 +405,15 @@
-
-
+
-
+
+
+
+
@@ -522,11 +525,21 @@
+
+
+
+
+
+
+
+
+
+
-
+
@@ -541,7 +554,7 @@
-
+
@@ -568,127 +581,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -759,20 +651,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -818,13 +696,6 @@
-
-
-
-
-
-
-
@@ -832,13 +703,6 @@
-
-
-
-
-
-
-
@@ -877,13 +741,6 @@
-
-
-
-
-
-
-
@@ -891,13 +748,6 @@
-
-
-
-
-
-
-
@@ -905,13 +755,162 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 79113ad..d13ca57 100755
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -230,9 +230,12 @@ class HomeController extends Controller
$ShoppingPayment = ShoppingPayment::where('reference', $reference)->first();
if($ShoppingPayment->status == 'success'){
$user = Auth::user();
- $user->wizard = 4;
- $user->save();
- return redirect(route('wizard', [4]));
+ if($user->wizard < 4){
+ $user->wizard = 4;
+ $user->save();
+ return redirect(route('wizard', [4]));
+ }
+
}else{
\Session()->flash('alert-error', "Es ist ein Fehler bei der Bestellung aufgetreten");
return redirect(route('wizard'));
diff --git a/app/Http/Controllers/Pay/PayoneController.php b/app/Http/Controllers/Pay/PayoneController.php
index 6978a4d..6f348d6 100644
--- a/app/Http/Controllers/Pay/PayoneController.php
+++ b/app/Http/Controllers/Pay/PayoneController.php
@@ -182,7 +182,7 @@ class PayoneController extends Controller
"clearingtype" => "vor",
"wallettype" => "",
'onlinebanktransfertype' => "",
- "request" => "preauthorization",
+ "request" => "authorization",
];
}
//CreditCard
diff --git a/app/Http/Controllers/WizardController.php b/app/Http/Controllers/WizardController.php
index e8f5e54..bd95985 100755
--- a/app/Http/Controllers/WizardController.php
+++ b/app/Http/Controllers/WizardController.php
@@ -81,7 +81,9 @@ class WizardController extends Controller
$account->data_protection = now();
$account->save();
$user->agreement = now();
- $user->wizard = 1;
+ if($user->wizard < 1){
+ $user->wizard = 1;
+ }
$user->save();
return redirect(route('wizard', [1]));
@@ -89,7 +91,9 @@ class WizardController extends Controller
if($step == 1){
if($user->isPasswort()){
- $user->wizard = 2;
+ if($user->wizard < 2){
+ $user->wizard = 2;
+ }
//has Passwort -> delete Code!
$user->confirmation_code = null;
$user->confirmation_code_to = null;
@@ -111,7 +115,9 @@ class WizardController extends Controller
$user->fill([
'password' => Hash::make(Input::get('password'))
])->save();
- $user->wizard = 2;
+ if($user->wizard < 2){
+ $user->wizard = 2;
+ }
//has Passwort -> delete Code!
$user->confirmation_code = null;
$user->confirmation_code_to = null;
@@ -151,7 +157,9 @@ class WizardController extends Controller
$data = Input::all();
$data['same_as_billing'] = Input::get('same_as_billing') == NULL ? 0 : 1;
$user->account->fill($data)->save();
- $user->wizard = 3;
+ if($user->wizard < 3){
+ $user->wizard = 3;
+ }
$user->active_date = now();
$user->active = 1;
$user->save();
diff --git a/public/images/payments-assets/creditcard.png b/public/images/payments-assets/creditcard.png
index 83b1b4e..53a590f 100644
Binary files a/public/images/payments-assets/creditcard.png and b/public/images/payments-assets/creditcard.png differ
diff --git a/resources/views/emails/checkout_status.blade.php b/resources/views/emails/checkout_status.blade.php
index df0e299..b01c554 100644
--- a/resources/views/emails/checkout_status.blade.php
+++ b/resources/views/emails/checkout_status.blade.php
@@ -171,13 +171,13 @@
{{__('email.checkout_mail_pay_pre')}}
{{__('email.checkout_mail_pay_pre_c1')}} {{ number_format( floatval($shopping_payment->amount/100), 2, ",", ".") }} {{__('email.checkout_mail_pay_pre_c2')}}
- @php($pay_trans = $shopping_payment->payment_transactions->where('request', 'preauthorization')->last())
+ @php($pay_trans = $shopping_payment->payment_transactions->where('request', 'authorization')->last())
{{__('email.checkout_mail_bank_holder')}} {{ $pay_trans->transmitted_data['clearing_bankaccountholder'] }}
{{__('email.checkout_mail_bank_iban')}} {{ $pay_trans->transmitted_data['clearing_bankiban'] }}
{{__('email.checkout_mail_bank_bic')}} {{ $pay_trans->transmitted_data['clearing_bankbic'] }}
{{__('email.checkout_mail_bank_name')}} {{ $pay_trans->transmitted_data['clearing_bankname'] }}
{{__('email.checkout_mail_bank_total')}} {{ number_format( floatval($pay_trans->shopping_payment->amount/100), 2, ",", ".") }} EUR
- {{__('email.checkout_mail_bank_code')}} {{ $pay_trans->transmitted_data['clearing_bankcode'] }}
+ {{__('email.checkout_mail_bank_code')}} {{ $pay_trans->transmitted_data['txid'] }}
@else
diff --git a/resources/views/web/templates/checkout-final.blade.php b/resources/views/web/templates/checkout-final.blade.php
index e89d7ef..521bad4 100644
--- a/resources/views/web/templates/checkout-final.blade.php
+++ b/resources/views/web/templates/checkout-final.blade.php
@@ -109,7 +109,7 @@
BIC: {{ $pay_trans->transmitted_data['clearing_bankbic'] }}
Bank: {{ $pay_trans->transmitted_data['clearing_bankname'] }}
Gesamtbetrag: {{ number_format( floatval($pay_trans->shopping_payment->amount/100), 2, ",", ".") }} EUR
- Verwendungszweck: {{ $pay_trans->transmitted_data['clearing_bankcode'] }}
+ Verwendungszweck: {{ $pay_trans->transmitted_data['txid'] }}
@endif
diff --git a/resources/views/web/templates/checkout.blade.php b/resources/views/web/templates/checkout.blade.php
index 58e8cbb..f9f0807 100644
--- a/resources/views/web/templates/checkout.blade.php
+++ b/resources/views/web/templates/checkout.blade.php
@@ -427,13 +427,14 @@
-