Berater Register, Mitgliedschat live
https://dev.adametz.media:3000/cliquers/mivita.care/issues/3
This commit is contained in:
Kevin Adametz
parent
21abafb8db
commit
1ada368ed4
43 changed files with 286 additions and 114 deletions
9
.env
9
.env
|
|
@ -11,10 +11,15 @@ APP_URL_MAIN=
|
|||
APP_URL_CHECKOUT=checkout.
|
||||
#APP_URL_MAIN=dev.
|
||||
APP_URL_CRM=my.
|
||||
APP_CHECKOUT_MAIL=register@adametz.media
|
||||
APP_INFO_MAIL=register@adametz.media
|
||||
APP_CHECKOUT_MAIL=kevin.adametz@me.com
|
||||
APP_INFO_MAIL=info@adametz.media
|
||||
|
||||
APP_CHECKOUT_TEST_MAIL=devtest@mivita.care
|
||||
APP_INFO_TEST_MAIL=devtest@mivita.care
|
||||
|
||||
#APP_CHECKOUT_MAIL=no-replay@mivita.care
|
||||
|
||||
|
||||
LOG_CHANNEL=stack
|
||||
|
||||
DB_CONNECTION=mysql
|
||||
|
|
|
|||
64
.idea/workspace.xml
generated
64
.idea/workspace.xml
generated
|
|
@ -2,55 +2,48 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="2fbaac5f-25ba-4502-a970-cc14728d7d55" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Mail/MailInfo.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/config/mivita.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/lang/de/payment.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/user/membership/_change.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/user/membership/_payment.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/user/membership/_payment_order.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.phpstorm.meta.php" beforeDir="false" afterPath="$PROJECT_DIR$/.phpstorm.meta.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/_ide_helper.php" beforeDir="false" afterPath="$PROJECT_DIR$/_ide_helper.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/AdminUserController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/AdminUserController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/PayoneController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/PayoneController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/CronController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CronController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/DataTableController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/DataTableController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/MembershipController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/MembershipController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/CardController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/CardController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/SalesController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/SalesController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/CheckoutController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/CheckoutController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/WizardController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/WizardController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Middleware/Checkout.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Middleware/Checkout.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Middleware/Subdomain.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Middleware/Subdomain.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Mail/MailCheckout.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailCheckout.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/File.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/File.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/Product.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Product.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/ShoppingInstance.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingInstance.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Mail/MailInfo.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailInfo.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Mail/MailReleaseAccount.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailReleaseAccount.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/PaymentTransaction.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/PaymentTransaction.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/ShoppingOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingOrder.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/ShoppingUser.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingUser.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/UserAccount.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/UserAccount.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/ShoppingPayment.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingPayment.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/Util.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Util.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/User.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/User.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/app.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/app.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2018_10_21_164001_create_products_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2018_10_21_164001_create_products_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2019_02_21_195012_create_shopping_instances_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_02_21_195012_create_shopping_instances_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/payone.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/payone.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2014_10_12_000000_create_users_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2014_10_12_000000_create_users_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2019_02_23_163527_create_shopping_orders_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_02_23_163527_create_shopping_orders_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/product/form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/product/form.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2019_02_23_163832_create_shopping_payments_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_02_23_163832_create_shopping_payments_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2019_02_25_090014_create_payment_transactions_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_02_25_090014_create_payment_transactions_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/lang/de/payment.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de/payment.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/sales/users.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/sales/users.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/user/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/user/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/auth/login.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/auth/login.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/emails/checkout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/checkout.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/emails/checkout_status.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/checkout_status.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/emails/info.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/info.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/home.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/home.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/layouts/application.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/application.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/membership/_abo_options.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/membership/_abo_options.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/membership/_upgrade.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/membership/_upgrade.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/form.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/membership/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/membership/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/user_form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/user_form.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/wizard/_payment.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/wizard/_payment.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/wizard/create.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/wizard/create.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/wizard/register.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/wizard/register.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/wizard/register_payment.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/wizard/register_payment.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/user/layouts/includes/footer.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/user/layouts/includes/footer.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/user/layouts/includes/header.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/user/layouts/includes/header.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/vendor.zip" beforeDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -436,6 +429,9 @@
|
|||
<workItem from="1582975911467" duration="18419000" />
|
||||
<workItem from="1583498764097" duration="142000" />
|
||||
<workItem from="1583572250584" duration="19295000" />
|
||||
<workItem from="1583743438432" duration="10157000" />
|
||||
<workItem from="1583757303144" duration="7000" />
|
||||
<workItem from="1583758271548" duration="2118000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
|
@ -474,10 +470,10 @@
|
|||
</state>
|
||||
<state x="968" y="472" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1581691507125" />
|
||||
<state x="968" y="472" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/-2560.23.2560.1417/2560.-571.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1578493681405" />
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1583605520212">
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1583752214549">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1583605520212" />
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1583752214549" />
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/-2560.23.2560.1417/2560.-571.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1578836311908" />
|
||||
<state width="239" height="457" key="HiddenNamespacesPopup" timestamp="1583573337041">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
|
|
@ -491,15 +487,15 @@
|
|||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="1064" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-2560.23.2560.1417/2560.-571.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1578063343693" />
|
||||
<state x="805" y="444" width="1115" height="793" key="find.popup" timestamp="1583605700904">
|
||||
<state x="805" y="444" width="1115" height="793" key="find.popup" timestamp="1583752431870">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="805" y="444" width="1115" height="793" key="find.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1583605700904" />
|
||||
<state x="805" y="444" width="1115" height="793" key="find.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1583752431870" />
|
||||
<state x="926" y="497" width="683" height="486" key="find.popup/-2560.23.2560.1417/2560.-571.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1578504136004" />
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup" timestamp="1581771399932">
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup" timestamp="1583747941947">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1581771399932" />
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1583747941947" />
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup/-2560.23.2560.1417/2560.-571.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1578504893896" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
|
|
|
|||
|
|
@ -110,6 +110,11 @@ class AdminUserController extends Controller
|
|||
$user->payment_shop = \Carbon::parse(str_replace("- ", "", $data['payment_shop']));
|
||||
}
|
||||
}
|
||||
|
||||
if(isset($data['save-test_mode'])){
|
||||
$user->test_mode = isset($data['test_mode']) ? true : false;;
|
||||
}
|
||||
|
||||
$user->save();
|
||||
|
||||
\Session()->flash('alert-save', true);
|
||||
|
|
|
|||
|
|
@ -112,6 +112,7 @@ class PayoneController extends Controller
|
|||
'key' => $data['key'],
|
||||
'txaction' => $data['txaction'],
|
||||
'transmitted_data' => Util::utf8ize($data),
|
||||
'mode' => $data['mode'],
|
||||
]);
|
||||
|
||||
$shopping_order->txaction = $data['txaction'];
|
||||
|
|
@ -179,13 +180,22 @@ class PayoneController extends Controller
|
|||
$billing_email = $shopping_order->shopping_user->billing_email;
|
||||
$user_shop_email = $shopping_order->user_shop->user->email;
|
||||
if(!$billing_email){
|
||||
$billing_email = config('app.checkout_mail');
|
||||
if($data['mode'] === 'test'){
|
||||
$billing_email = config('app.checkout_test_mail');
|
||||
}else{
|
||||
$billing_email = config('app.checkout_mail');
|
||||
}
|
||||
}
|
||||
$checkout_mail = config('app.checkout_mail');
|
||||
if($user_shop_email){
|
||||
Mail::to($billing_email)->bcc([$user_shop_email, $checkout_mail])->send(new MailCheckout($data['txaction'], $shopping_order, $shopping_payment, $send_link));
|
||||
if($data['mode'] === 'test'){
|
||||
$checkout_mail = config('app.checkout_test_mail');
|
||||
}else{
|
||||
Mail::to($billing_email)->bcc($checkout_mail)->send(new MailCheckout($data['txaction'], $shopping_order, $shopping_payment, $send_link));
|
||||
$checkout_mail = config('app.checkout_mail');
|
||||
}
|
||||
|
||||
if($user_shop_email){
|
||||
Mail::to($billing_email)->bcc([$user_shop_email, $checkout_mail])->send(new MailCheckout($data['txaction'], $shopping_order, $shopping_payment, $send_link, $data['mode']));
|
||||
}else{
|
||||
Mail::to($billing_email)->bcc($checkout_mail)->send(new MailCheckout($data['txaction'], $shopping_order, $shopping_payment, $send_link, $data['mode']));
|
||||
}
|
||||
|
||||
print("TSOK");
|
||||
|
|
|
|||
|
|
@ -28,7 +28,10 @@ class CronController extends Controller
|
|||
|
||||
public function index()
|
||||
{
|
||||
$this->checkConfirmation();
|
||||
//$this->checkConfirmation();
|
||||
//TODO
|
||||
//SEPA Booking
|
||||
//Mail reminder
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -75,12 +75,17 @@ class DataTableController extends Controller
|
|||
return '<a href="' . route('admin_user_delete', [$user->id]) . '" class="btn icon-btn btn-sm btn-danger" onclick="return confirm(\''.__('Really delete entry?').'\');"><span class="fa fa-trash"></span></a>
|
||||
<a href="' . route('admin_user_login_as', [$user->id]) . '" class="btn icon-btn btn-sm btn-warning" onclick="return confirm(\''.__('Login as User?').'\');"><span class="fa fa-sign-in-alt"></span></a>';
|
||||
})
|
||||
->addColumn('test_mode', function (User $user) {
|
||||
$link = '<a href="#" data-toggle="modal" data-target="#modals-test_mode" data-id="'.$user->id.'" data-email="'.$user->email.'" data-test_mode="'.$user->test_mode.'">';
|
||||
return $user->test_mode ? $link.'<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span></a>' : $link.'<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span></a>';
|
||||
|
||||
})
|
||||
->orderColumn('id', 'id $1')
|
||||
->orderColumn('confirmed', 'confirmed $1')
|
||||
->orderColumn('active', 'active $1')
|
||||
->orderColumn('shop', 'shop $1')
|
||||
->orderColumn('admin', 'active $1')
|
||||
->rawColumns(['id', 'admin', 'confirmed', 'active', 'account', 'shop', 'action_delete'])
|
||||
->rawColumns(['id', 'admin', 'confirmed', 'active', 'account', 'shop', 'test_mode', 'action_delete'])
|
||||
->make(true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145,7 +145,11 @@ class MembershipController extends Controller
|
|||
if(Input::get('delete_membership_mivita')){
|
||||
//TODO
|
||||
$user = User::find(Auth::user()->id);
|
||||
$mail = config('app.info_mail');
|
||||
if($user->isTestMode()){
|
||||
$mail = config('app.info_test_mail');
|
||||
}else{
|
||||
$mail = config('app.info_mail');
|
||||
}
|
||||
Mail::to($mail)->send(new MailInfo($user, 'delete_membership'));
|
||||
UserHistory::create(['user_id' => $user->id, 'action'=>$action, 'status'=>50]);
|
||||
\Session()->flash('alert-success', "Mitgliedschaft beenden ist beantragt");
|
||||
|
|
|
|||
|
|
@ -105,8 +105,10 @@ class PayoneController extends Controller
|
|||
'reference' => $this->reference,
|
||||
'amount' => $amount,
|
||||
'currency' => $currency,
|
||||
'mode' => $this->shopping_order->mode,
|
||||
]);
|
||||
|
||||
$this->default['mode'] = $this->shopping_order->mode;
|
||||
return $this->reference;
|
||||
}
|
||||
|
||||
|
|
@ -232,6 +234,7 @@ class PayoneController extends Controller
|
|||
'errormessage' => $response['errormessage'],
|
||||
'customermessage' => $response['customermessage'],
|
||||
'status' => $response['status'],
|
||||
'mode' => $this->shopping_payment->mode,
|
||||
]);
|
||||
Util::setUserHistoryValue(['status'=>3]);
|
||||
\Session::flash('errormessage', $response['errormessage']);
|
||||
|
|
@ -247,6 +250,8 @@ class PayoneController extends Controller
|
|||
'txid' => $response['txid'],
|
||||
'userid' => $response['userid'],
|
||||
'status' => $response['status'],
|
||||
'mode' => $this->shopping_payment->mode,
|
||||
|
||||
]);
|
||||
Util::setUserHistoryValue(['status'=>4]);
|
||||
return redirect()->away($response["redirecturl"]);
|
||||
|
|
@ -263,6 +268,8 @@ class PayoneController extends Controller
|
|||
'userid' => $response['userid'],
|
||||
'status' => $response['status'],
|
||||
'transmitted_data' => $response,
|
||||
'mode' => $this->shopping_payment->mode,
|
||||
|
||||
]);
|
||||
Util::setUserHistoryValue(['status'=>5]);
|
||||
if($payt->shopping_payment->clearingtype === "vor"){
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ namespace App\Http\Controllers;
|
|||
|
||||
use App\Models\Country;
|
||||
use App\Models\ShoppingOrder;
|
||||
use App\Models\UserShop;
|
||||
use Input;
|
||||
|
||||
|
||||
|
|
@ -45,7 +46,7 @@ class SalesController extends Controller
|
|||
|
||||
public function usersDatatable(){
|
||||
|
||||
$query = ShoppingOrder::with('shopping_user')->where('shopping_orders.auth_user_id', '!=', NULL);
|
||||
$query = ShoppingOrder::with('shopping_user', 'user_shop')->where('shopping_orders.auth_user_id', '!=', NULL);
|
||||
|
||||
return \DataTables::eloquent($query)
|
||||
->addColumn('billing_firstname', function (ShoppingOrder $ShoppingOrder) {
|
||||
|
|
@ -61,6 +62,9 @@ class SalesController extends Controller
|
|||
return $ShoppingOrder->created_at->format("d.m.Y");
|
||||
})
|
||||
->addColumn('txaction', function (ShoppingOrder $ShoppingOrder) {
|
||||
if($ShoppingOrder->mode === 'test'){
|
||||
return '<span class="badge badge-pill badge-default">TEST - '.$ShoppingOrder->getFormattedTxaction().'</span>';
|
||||
}
|
||||
return '<span class="badge badge-pill badge-'.$ShoppingOrder->getFormattedTxactionColor().'">'.$ShoppingOrder->getFormattedTxaction().'</span>';
|
||||
})
|
||||
->addColumn('total_shipping', function (ShoppingOrder $ShoppingOrder) {
|
||||
|
|
@ -72,6 +76,12 @@ class SalesController extends Controller
|
|||
->addColumn('user_shop_id', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->user_shop ? '<a href="'.$ShoppingOrder->user_shop->getSubdomain().'" target="_blank">'.$ShoppingOrder->user_shop->getSubdomain().'</span>' : '';
|
||||
})
|
||||
->addColumn('auth_user_shop', function (ShoppingOrder $ShoppingOrder) {
|
||||
$auth_user_shop = UserShop::whereUserId($ShoppingOrder->auth_user_id)->first();
|
||||
|
||||
return $auth_user_shop ? '<a href="'.$auth_user_shop->getSubdomain().'" target="_blank">'.$auth_user_shop->getSubdomain().'</span>' : '-';
|
||||
})
|
||||
|
||||
->addColumn('id', function (ShoppingOrder $ShoppingOrder) {
|
||||
return '<a href="' . route('admin_sales_users_detail', [$ShoppingOrder->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
|
||||
})
|
||||
|
|
@ -92,7 +102,7 @@ class SalesController extends Controller
|
|||
->orderColumn('txaction', 'txaction $1')
|
||||
->orderColumn('user_shop_id', 'user_shop_id $1')
|
||||
|
||||
->rawColumns(['id', 'txaction', 'user_shop_id'])
|
||||
->rawColumns(['id', 'txaction', 'user_shop_id', 'auth_user_shop'])
|
||||
->make(true);
|
||||
}
|
||||
|
||||
|
|
@ -137,6 +147,9 @@ class SalesController extends Controller
|
|||
return $ShoppingOrder->created_at->format("d.m.Y");
|
||||
})
|
||||
->addColumn('txaction', function (ShoppingOrder $ShoppingOrder) {
|
||||
if($ShoppingOrder->mode === 'test'){
|
||||
return '<span class="badge badge-pill badge-default">TEST - '.$ShoppingOrder->getFormattedTxaction().'</span>';
|
||||
}
|
||||
return '<span class="badge badge-pill badge-'.$ShoppingOrder->getFormattedTxactionColor().'">'.$ShoppingOrder->getFormattedTxaction().'</span>';
|
||||
})
|
||||
->addColumn('total_shipping', function (ShoppingOrder $ShoppingOrder) {
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ class CheckoutController extends Controller
|
|||
$data = [
|
||||
'user_shop' => Util::getUserShop(),
|
||||
'shopping_user' => $shopping_user,
|
||||
'shopping_mode' => Util::getUserShoppingMode(),
|
||||
];
|
||||
return view('web.templates.checkout', $data);
|
||||
}
|
||||
|
|
@ -329,6 +330,7 @@ class CheckoutController extends Controller
|
|||
'tax' => Yard::instance('shopping')->subtotalWithShipping(2, '.', ','),
|
||||
'total_shipping' => Yard::instance('shopping')->totalWithShipping(2, '.', ','),
|
||||
'weight' => Yard::instance('shopping')->weight(),
|
||||
'mode' => Util::getUserShoppingMode(),
|
||||
];
|
||||
$shopping_order= false;
|
||||
if($this->getPayments('shopping_order_id')){
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ use App\Models\File;
|
|||
use App\Models\Product;
|
||||
use App\Models\ShoppingInstance;
|
||||
use App\Models\UserAccount;
|
||||
use App\Models\UserHistory;
|
||||
use App\Repositories\FileRepository;
|
||||
use App\Services\Util;
|
||||
use App\User;
|
||||
|
|
@ -51,12 +52,16 @@ class WizardController extends Controller
|
|||
$step = !$user->wizard ? 0 : $user->wizard;
|
||||
|
||||
if($step >= 20){
|
||||
return redirect('/');
|
||||
return redirect('/home');
|
||||
}
|
||||
$userHistoryWizardPayment = UserHistory::whereUserId($user->id)->whereAction('wizard_payment')->get()->last();
|
||||
|
||||
$data = [
|
||||
'user' => Auth::user(),
|
||||
'step' => $step,
|
||||
'products' => Product::where('active', true)->where('show_at', '=', 3)->orderBy('pos', 'ASC')->get(),
|
||||
'userHistoryWizardPayment' => $userHistoryWizardPayment,
|
||||
|
||||
];
|
||||
|
||||
if($step == 15){
|
||||
|
|
@ -83,7 +88,7 @@ class WizardController extends Controller
|
|||
$step = !$user->wizard ? 0 : $user->wizard;
|
||||
|
||||
if($step >= 10){
|
||||
return redirect('/');
|
||||
return redirect('/home');
|
||||
}
|
||||
$data = [
|
||||
'user' => Auth::user(),
|
||||
|
|
@ -111,10 +116,14 @@ class WizardController extends Controller
|
|||
return redirect(route('wizard_payment'));
|
||||
}
|
||||
|
||||
$userHistoryWizardPayment = UserHistory::whereUserId($user->id)->whereAction('wizard_payment')->get()->last();
|
||||
|
||||
|
||||
$data = [
|
||||
'user' => Auth::user(),
|
||||
'step' => 0,
|
||||
'products' => Product::where('active', true)->where('show_at', '=', 3)->orderBy('pos', 'ASC')->get(),
|
||||
'userHistoryWizardPayment' => $userHistoryWizardPayment,
|
||||
];
|
||||
|
||||
if($user->wizard == 20){
|
||||
|
|
@ -137,7 +146,6 @@ class WizardController extends Controller
|
|||
}
|
||||
|
||||
if ($step == 0) {
|
||||
|
||||
$rules = array(
|
||||
'accepted_data_protection' => 'required',
|
||||
'accepted_active' => 'required',
|
||||
|
|
@ -244,11 +252,16 @@ class WizardController extends Controller
|
|||
}
|
||||
|
||||
if ($step == 4) {
|
||||
|
||||
$user->wizard = 5;
|
||||
$user->release_account = now();
|
||||
$user->save();
|
||||
Mail::to('kevin@adametz.media')->bcc(['kevin.adametz@me.com'])->send(new MailReleaseAccount($user));
|
||||
|
||||
if($user->isTestMode()){
|
||||
$mail = config('app.info_test_mail');
|
||||
}else{
|
||||
$mail = config('app.info_mail');
|
||||
}
|
||||
Mail::to($mail)->send(new MailReleaseAccount($user));
|
||||
|
||||
return redirect(route('wizard_register'));
|
||||
}
|
||||
|
|
@ -371,13 +384,16 @@ class WizardController extends Controller
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
public function storePayment($step = 0){
|
||||
if(Input::get('switchers-package-wizard')){
|
||||
$user = Auth::user();
|
||||
$user = User::find(Auth::user()->id);
|
||||
Yard::instance('shopping')->destroy();
|
||||
$product = Product::find(Input::get('switchers-package-wizard'));
|
||||
$showAboOptions = false;
|
||||
|
||||
if(Input::get('abo_options')){
|
||||
$showAboOptions = true;
|
||||
$user->abo_options = true;
|
||||
$user->save();
|
||||
}
|
||||
|
|
@ -396,7 +412,7 @@ class WizardController extends Controller
|
|||
'identifier' => $identifier,
|
||||
'user_shop_id' => 1, //is first faker shop for buy intern
|
||||
'auth_user_id' => Auth::user()->id,
|
||||
'payment' => 4,
|
||||
'payment' => 4, //Berater Wizard
|
||||
'subdomain' => url('/'),
|
||||
'country_id' => Yard::instance('shopping')->getShippingCountryId(),
|
||||
|
||||
|
|
@ -404,6 +420,7 @@ class WizardController extends Controller
|
|||
Yard::instance('shopping')->store($identifier);
|
||||
//add to DB
|
||||
$path = route('checkout.checkout_card', ['identifier'=>$identifier]);
|
||||
UserHistory::create(['user_id' => $user->id, 'action'=>'wizard_payment', 'status'=>1, 'product_id'=>$product->id, 'identifier'=>$identifier, 'abo_options'=>$showAboOptions]);
|
||||
//$path = str_replace('http', 'https', $path);
|
||||
return redirect()->secure($path);
|
||||
|
||||
|
|
|
|||
|
|
@ -12,21 +12,23 @@ class MailCheckout extends Mailable
|
|||
{
|
||||
use Queueable, SerializesModels;
|
||||
|
||||
public $txaction;
|
||||
public $shopping_order;
|
||||
public $shopping_payment;
|
||||
protected $txaction;
|
||||
protected $shopping_order;
|
||||
protected $shopping_payment;
|
||||
protected $send_link;
|
||||
protected $mode;
|
||||
|
||||
public $subject;
|
||||
public $data;
|
||||
|
||||
|
||||
public function __construct($txaction, $shopping_order, $shopping_payment, $send_link)
|
||||
public function __construct($txaction, $shopping_order, $shopping_payment, $send_link, $mode)
|
||||
{
|
||||
$this->txaction = $txaction;
|
||||
$this->shopping_order = $shopping_order;
|
||||
$this->shopping_payment = $shopping_payment;
|
||||
$this->send_link = $send_link;
|
||||
$this->mode = $mode;
|
||||
|
||||
$this->subject = __('email.checkout_subject')." mivita.care";
|
||||
if($shopping_order->user_shop){
|
||||
|
|
@ -45,7 +47,6 @@ class MailCheckout extends Mailable
|
|||
}
|
||||
if($this->txaction === 'paid'){
|
||||
|
||||
|
||||
if($this->send_link){
|
||||
|
||||
}
|
||||
|
|
@ -60,6 +61,7 @@ class MailCheckout extends Mailable
|
|||
'send_link' => $this->send_link,
|
||||
'url' => Util::getMyMivitaUrl(),
|
||||
'button' => Util::getMyMivitaUrl(false),
|
||||
'mode' => $this->mode
|
||||
]);
|
||||
}else{
|
||||
return $this->view('emails.checkout_status')->with([
|
||||
|
|
@ -72,6 +74,7 @@ class MailCheckout extends Mailable
|
|||
'greetings' => __('email.greetings'),
|
||||
'sender' => __('email.sender'),
|
||||
'send_link' => false,
|
||||
'mode' => $this->mode
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -48,16 +48,16 @@ class MailInfo extends Mailable
|
|||
|
||||
|
||||
if($this->action === "delete_membership"){
|
||||
$copy1line = "Ein Berater möchte seine Mitgliedschaft beenden."."\n";
|
||||
$copy1line = "Infos zum Berater:"."\n";
|
||||
$button = "zum Berater";
|
||||
$title = "Ein Berater möchte seine Mitgliedschaft beenden.";
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
return $this->view('emails.info')->with([
|
||||
'url' => route('admin_lead_edit', $this->user->id).'?show=check_lead',
|
||||
'salutation' => 'Berater Registrierung pürfen',
|
||||
'button' => 'zur Berater Prüfung',
|
||||
'title' => $title,
|
||||
'button' => $button,
|
||||
'copy1line' => $copy1line,
|
||||
'copy2line' => __('email.copy2line'),
|
||||
'content' => $content,
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ class MailReleaseAccount extends Mailable
|
|||
public function __construct(User $user)
|
||||
{
|
||||
$this->user = $user;
|
||||
$this->subject = 'Berater Registrierung pürfen';
|
||||
$this->subject = 'Neuer Berater Registrierung prüfen';
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -54,7 +54,7 @@ class MailReleaseAccount extends Mailable
|
|||
|
||||
return $this->view('emails.info')->with([
|
||||
'url' => route('admin_lead_edit', $this->user->id).'?show=check_lead',
|
||||
'salutation' => 'Berater Registrierung pürfen',
|
||||
'title' => 'Berater Registrierung prüfen',
|
||||
'button' => 'zur Berater Prüfung',
|
||||
'copy1line' => $copy1line,
|
||||
'copy2line' => __('email.copy2line'),
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ class PaymentTransaction extends Model
|
|||
'errorcode',
|
||||
'errormessage',
|
||||
'customermessage',
|
||||
'mode',
|
||||
];
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ class ShoppingOrder extends Model
|
|||
'tax',
|
||||
'total_shipping',
|
||||
'weight',
|
||||
'mode',
|
||||
];
|
||||
|
||||
protected $txaction_text = [
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ class ShoppingPayment extends Model
|
|||
'reference',
|
||||
'amount',
|
||||
'currency',
|
||||
'mode'
|
||||
];
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -117,6 +117,14 @@ class Util
|
|||
return null;
|
||||
}
|
||||
|
||||
public static function getUserShoppingMode(){
|
||||
if($auth_user = self::getAuthUser()){
|
||||
if($auth_user->isTestMode()){
|
||||
return 'test';
|
||||
}
|
||||
}
|
||||
return 'live';
|
||||
}
|
||||
public static function addRoute($p = []){
|
||||
$b = [];
|
||||
if(\Session::has('user_shop')){
|
||||
|
|
|
|||
|
|
@ -217,6 +217,15 @@ class User extends Authenticatable
|
|||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
public function isTestMode()
|
||||
{
|
||||
return $this->test_mode ? true : false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
|
|
|
|||
BIN
archiv.tar
Normal file
BIN
archiv.tar
Normal file
Binary file not shown.
|
|
@ -61,7 +61,10 @@ return [
|
|||
'pre_url_crm' => env('APP_URL_CRM', 'my.'),
|
||||
'checkout_url' => env('APP_URL_CHECKOUT', 'checkout.'),
|
||||
'checkout_mail' => env('APP_CHECKOUT_MAIL', 'no-replay@mivita.care'),
|
||||
'checkout_test_mail' => env('APP_CHECKOUT_TEST_MAIL', 'devtest@mivita.care'),
|
||||
'info_mail' => env('APP_INFO_MAIL', 'no-replay@mivita.care'),
|
||||
'info_test_mail' => env('APP_INFO_TEST_MAIL', 'devtest@mivita.care'),
|
||||
|
||||
|
||||
/* 'url_backend' => env('APP_URL', 'http://mivita.local/'),
|
||||
'url_backend' => env('APP_URL', 'http://mivita.local/'),
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ return [
|
|||
"mid" => '42504',//"your_merchant_id",
|
||||
"portalid" => '2030693',
|
||||
"key" => hash("md5", "Zjop5cvP2UeB7Qhy"), // the key has to be hashed as md5
|
||||
"mode" => "test", // can be "live" for actual transactions
|
||||
"mode" => "live", // can be "live" for actual transactions
|
||||
"api_version" => "3.11",
|
||||
"encoding" => "UTF-8"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -50,6 +50,8 @@ class CreateUsersTable extends Migration
|
|||
$table->timestamp('payment_shop')->nullable();
|
||||
$table->boolean('abo_options')->default(false);
|
||||
|
||||
$table->boolean('test_mode')->default(false);
|
||||
|
||||
|
||||
$table->timestamps();
|
||||
$table->softDeletes();
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@ class CreateShoppingOrdersTable extends Migration
|
|||
$table->boolean('paid')->default(false);
|
||||
$table->string('txaction', 20)->nullable()->index();
|
||||
|
||||
$table->char('mode', 4)->nullable();
|
||||
|
||||
|
||||
$table->timestamps();
|
||||
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@ class CreateShoppingPaymentsTable extends Migration
|
|||
$table->string('status', 10)->nullable()->index();
|
||||
$table->string('txaction', 20)->nullable()->index();
|
||||
|
||||
$table->char('mode', 4)->nullable();
|
||||
|
||||
$table->timestamps();
|
||||
|
||||
$table->foreign('shopping_order_id')
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ class CreatePaymentTransactionsTable extends Migration
|
|||
$table->string('errormessage')->nullable();
|
||||
$table->string('customermessage')->nullable();
|
||||
|
||||
$table->char('mode', 4)->nullable();
|
||||
|
||||
$table->timestamps();
|
||||
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ return [
|
|||
'store_payment' => 'Zahlung gespeichert',
|
||||
'checkout_payment' => 'Checkout',
|
||||
'payment_error' => 'Zahlung Fehler',
|
||||
'payment_redirect' => 'Zahlung weitergeleitet',
|
||||
'payment_approved' => 'Zahlung genehmigt',
|
||||
'txaction_failed' => 'Zahlung fehlgeschlagen',
|
||||
'txaction_appointed' => 'Zahlung genehmigt',
|
||||
'txaction_paid' => 'Zahlung bestätigt',
|
||||
'payment_redirect' => 'Zahlung in Bearbeitung - bitte auf E-Mail warten',
|
||||
'payment_approved' => 'Zahlung genehmigt - bitte auf E-Mail warten',
|
||||
'txaction_failed' => 'Zahlung fehlgeschlagen - E-Mail wurde gesendet',
|
||||
'txaction_appointed' => 'Zahlung genehmigt - E-Mail wurde gesendet, bitte warten auf Bestätigung',
|
||||
'txaction_paid' => 'Zahlung bestätigt - E-Mail wurde gesendet',
|
||||
'success_payment' => 'Zahlung erflogreich',
|
||||
'success' => 'Erflogreich ausgeführt',
|
||||
'payment_not_found' => 'Zahlung nicht gefunden',
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
<th>{{__('Käufe')}}</th>
|
||||
<th>{{__('Shop')}}</th>
|
||||
<th>{{__('User-Shop')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'total_shipping', name: 'shopping_orders.total_shipping' },
|
||||
{ data: 'orders', name: 'shopping_user.orders' },
|
||||
{ data: 'user_shop_id', name: 'user_shop_id' },
|
||||
{ data: 'auth_user_shop', name: 'auth_user_shop' },
|
||||
],
|
||||
"bLengthChange": false,
|
||||
"iDisplayLength": 100,
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
<th>{{__('Account')}} (bis)</th>
|
||||
<th>{{__('Shop')}} (bis)</th>
|
||||
<th>{{__('Shop')}} ab</th>
|
||||
<th>{{__('Test Modus')}}</th>
|
||||
<th>{{__('delete')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -60,10 +61,12 @@
|
|||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
|
||||
<button type="submit" class="btn btn-primary" name="save-admin" value="save-admin">{{__('save')}}</button>
|
||||
<div class="form-group">
|
||||
<label class="custom-control custom-checkbox m-0">
|
||||
<input type="checkbox" class="custom-control-input" name="confirmed" checked>
|
||||
<span class="custom-control-label">{{__('verified')}}</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
|
@ -218,6 +221,42 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Modal test modus -->
|
||||
<div class="modal fade" id="modals-test_mode">
|
||||
<div class="modal-dialog">
|
||||
<form class="modal-content" action="{{ route('admin_user_store') }}" method="post">
|
||||
@csrf
|
||||
<input type="hidden" class="form-control" name="id">
|
||||
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">{{__('User')}} <span class="font-weight-light">{{__('create/edit')}}</span></h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col">
|
||||
<label for="email" class="form-label">{{__('E-Mail')}}</label>
|
||||
<input type="text" class="form-control" name="email" placeholder="{{__('E-Mail')}}" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<p>Aktiviert den Testmodus beim den Zahlungsdiensten. Käufe werden als TEST markiert und die Mails gehen an devtest@mivita.care</p>
|
||||
<p><a target="_blank" href="https://docs.payone.com/display/public/PLATFORM/Testdata">Zu den Testdaten für den Kauf von Payone</a>.</p>
|
||||
<label class="custom-control custom-checkbox m-0">
|
||||
<input type="checkbox" class="custom-control-input" name="test_mode" checked>
|
||||
<span class="custom-control-label">{{__('Test Mode')}}</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
|
||||
<button type="submit" class="btn btn-primary" name="save-test_mode" value="save-test_mode">{{__('save')}}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
$( document ).ready(function() {
|
||||
$('#modals-admin').on('show.bs.modal', function (event) {
|
||||
|
|
@ -258,6 +297,12 @@
|
|||
$(this).find(".modal-body input[name='payment_shop']").val(button.data('payment_shop'));
|
||||
});
|
||||
|
||||
$('#modals-test_mode').on('show.bs.modal', function (event) {
|
||||
var button = $(event.relatedTarget);
|
||||
$(this).find(".modal-content input[name='id']").val(button.data('id'));
|
||||
$(this).find(".modal-body input[name='email']").val(button.data('email'));
|
||||
$(this).find(".modal-body input[name='test_mode']").prop( "checked", button.data('test_mode'));
|
||||
});
|
||||
|
||||
|
||||
$('.datatables-users').dataTable({
|
||||
|
|
@ -276,6 +321,7 @@
|
|||
{ data: 'account', name: 'account' },
|
||||
{ data: 'shop', name: 'shop' },
|
||||
{ data: 'since', name: 'since' },
|
||||
{ data: 'test_mode', name: 'test_mode' },
|
||||
{ data: 'action_delete', orderable: false, searchable: false},
|
||||
],
|
||||
"bLengthChange": false,
|
||||
|
|
|
|||
|
|
@ -141,6 +141,13 @@
|
|||
</table>
|
||||
|
||||
<table cellpadding="10" style="padding: 10px;" cellspacing="0" border="0" width="100%" bgcolor="#ffffff">
|
||||
@if($mode === 'test')
|
||||
<tr>
|
||||
<td class="headline">
|
||||
<b>##### TEST MODE ##### TEST MODE ##### TEST MODE #####</b>
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
<tr>
|
||||
<td class="headline">
|
||||
<b>{{ $salutation }} </b>
|
||||
|
|
|
|||
|
|
@ -141,6 +141,13 @@
|
|||
</table>
|
||||
|
||||
<table cellpadding="10" style="padding: 10px;" cellspacing="0" border="0" width="100%" bgcolor="#ffffff">
|
||||
@if($mode === 'test')
|
||||
<tr>
|
||||
<td class="headline">
|
||||
<b>##### TEST MODE ##### TEST MODE ##### TEST MODE #####</b>
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
<tr>
|
||||
<td class="headline">
|
||||
<b>{{ $salutation }} </b>
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@
|
|||
<table cellpadding="10" style="padding: 10px;" cellspacing="0" border="0" width="100%" bgcolor="#ffffff">
|
||||
<tr>
|
||||
<td class="headline">
|
||||
<b>{{ $salutation }} </b>
|
||||
<b>{{ $title }} </b>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -170,8 +170,8 @@
|
|||
</h5>
|
||||
<div class="card-body">
|
||||
|
||||
@if($user->active == 1)
|
||||
@if($user->payment_shop)
|
||||
@if($user->isActiveAccount())
|
||||
@if($user->isActiveShop())
|
||||
@if($user->shop)
|
||||
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
|
||||
<strong>{{__('open since')}}</strong> {{__('at')}} {{ $user->shop->getActiveDateFormat() }}</p>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
<link rel="stylesheet" href="{{ asset('/vendor/libs/summernote/dist/summernote-bs4.css') }}">
|
||||
<link rel="stylesheet" href="{{ asset('/vendor/libs/slim-image-cropper/slim/slim.css') }}">
|
||||
<link rel="stylesheet" href="{{ asset('/vendor/libs/dropzone/dropzone.css') }}">
|
||||
<link rel="stylesheet" href="{{ asset('/vendor/libs/dropzone/dropzone.css?v=1') }}">
|
||||
|
||||
|
||||
<!-- Layout helpers -->
|
||||
|
|
@ -122,8 +122,8 @@
|
|||
|
||||
|
||||
<script src="{{ asset('/vendor/libs/slim-image-cropper/slim/slim.kickstart.min.js') }}"></script>
|
||||
<script src="{{ asset('/vendor/libs/dropzone/dropzone.js')}}"></script>
|
||||
<script src="{{ asset('/js/forms_file-upload.js') }}"></script>
|
||||
<script src="{{ asset('/vendor/libs/dropzone/dropzone.js?v=1')}}"></script>
|
||||
<script src="{{ asset('/js/forms_file-upload.js?v=1') }}"></script>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -77,6 +77,11 @@
|
|||
<label class="form-label" for="phone">{{ __('Phone') }}</label>
|
||||
{{ Form::text('phone', $user->account->phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'phone', 'tabindex' => 18)) }}
|
||||
</div>
|
||||
@if ($errors->has('phone'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('phone') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
|
||||
|
|
@ -92,6 +97,11 @@
|
|||
<label class="form-label" for="mobil">{{ __('Mobile Phone') }}</label>
|
||||
{{ Form::text('mobil', $user->account->mobil, array('placeholder'=>__('Mobile Phone'), 'class'=>'form-control', 'id'=>'mobil', 'tabindex' => 19)) }}
|
||||
</div>
|
||||
@if ($errors->has('mobil'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('mobil') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
|
|
|
|||
|
|
@ -48,12 +48,26 @@
|
|||
@endif
|
||||
@endif
|
||||
|
||||
|
||||
@include('user.membership._payment_order')
|
||||
</div>
|
||||
</div>
|
||||
@else
|
||||
|
||||
{{-- no Shop - Upgrade --}}
|
||||
@if($user->isActiveAccount() && !$user->isActiveShop())
|
||||
<div class="card w-100 mb-4">
|
||||
<h5 class="card-header">{{__('MIVITA BUSINESS Paket')}} {{__('Upgrade')}}</h5>
|
||||
<div class="card-body">
|
||||
@if($userHistoryUpgradeOrder && $userHistoryUpgradeOrder->status > 2)
|
||||
<h6 class="alert badge-{{$userHistoryUpgradeOrder->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryUpgradeOrder->getStatusType())}}</h6>
|
||||
@endif
|
||||
<h5 class="d-block text-dark">Erweitere jetzt Deine Mitglidschaft auf MIVITA BUSINESS Paket!</h5>
|
||||
<p>Berechnet werden die restlichen Monate bis zur Berater-Mitgliedschaft Verlängerung. Danach wird jährlich der MIVITA BUSINESS Paketpreis berechnet.</p>
|
||||
@include('user.membership._upgrade')
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
{{-- upgrade downgrade next booking --}}
|
||||
@if($user->payment_account)
|
||||
<div class="card w-100 mb-4">
|
||||
|
|
@ -66,17 +80,7 @@
|
|||
</div>
|
||||
@endif
|
||||
|
||||
{{-- no Shop - Upgrade --}}
|
||||
@if($user->isActiveAccount() && !$user->isActiveShop())
|
||||
<div class="card w-100 mb-4">
|
||||
<h5 class="card-header">{{__('MIVITA BUSINESS Paket')}} {{__('Upgrade')}}</h5>
|
||||
<div class="card-body">
|
||||
<h5 class="d-block text-dark">Erweitere jetzt Deine Mitglidschaft auf MIVITA BUSINESS Paket!</h5>
|
||||
<p>Berechnet werden die restlichen Monate bis zur Berater-Mitgliedschaft Verlängerung. Danach wird jährlich der MIVITA BUSINESS Paketpreis berechnet.</p>
|
||||
@include('user.membership._upgrade')
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
|
||||
{{-- remove ABO Options --}}
|
||||
|
|
@ -127,9 +131,6 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
{{--
|
||||
TODO
|
||||
//cron sepa
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@
|
|||
{!! HTMLHelper::getContriesCodes($user->account->pre_phone_id) !!}
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group col-md-8">
|
||||
<div class="form-group col-md-8 {{ $errors->has('phone') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="phone">{{ __('Phone') }}</label>
|
||||
{{ Form::text('phone', $user->account->phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'phone', 'tabindex' => 11)) }}
|
||||
</div>
|
||||
|
|
@ -110,14 +110,18 @@
|
|||
{!! HTMLHelper::getContriesCodes($user->account->pre_mobil_id) !!}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-8">
|
||||
<div class="form-group col-md-8 {{ $errors->has('mobil') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="mobil">{{ __('Mobile Phone') }}</label>
|
||||
{{ Form::text('mobil', $user->account->mobil, array('placeholder'=>__('Mobile Phone'), 'class'=>'form-control', 'id'=>'mobil', 'tabindex' => 13)) }}
|
||||
</div>
|
||||
<div class="form-group col-md-12">
|
||||
<div class="badge badge-warning">Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*</div>
|
||||
@if($errors->has('phone') || $errors->has('mobil'))
|
||||
<div class="alert badge-danger block p-2">Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*</div>
|
||||
@else
|
||||
<div class="badge badge-warning">Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@if(!isset($step))
|
||||
<hr>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,5 @@
|
|||
|
||||
@if($user->shopping_orders->count())
|
||||
@php
|
||||
$last_shopping_order = $user->shopping_orders->last();
|
||||
$last_shopping_payments = $last_shopping_order->shopping_payments->last();
|
||||
@endphp
|
||||
|
||||
<div class="alert alert-secondary">
|
||||
Es wurde eine Zahlung ausgeführt. Referenz: {{$last_shopping_payments->reference }}.
|
||||
<br>Bitte warte die Zahlungs-Bestätiung per E-Mail.
|
||||
</div>
|
||||
@endif
|
||||
{!! Form::open(['url' => route('wizard_store_payment', [20]), 'class' => 'form-horizontal']) !!}
|
||||
<div class="table-responsive">
|
||||
<table class="table table- m-0">
|
||||
|
|
|
|||
|
|
@ -100,6 +100,9 @@
|
|||
</div>
|
||||
<div id="smartwizard-3-step-4" class="card animated fadeIn">
|
||||
<div class="card-body">
|
||||
@if($userHistoryWizardPayment && $userHistoryWizardPayment->status > 2)
|
||||
<h6 class="alert badge-{{$userHistoryWizardPayment->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryWizardPayment->getStatusType())}}</h6>
|
||||
@endif
|
||||
@include('user.wizard._payment')
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -249,7 +249,6 @@
|
|||
acceptedFiles: "image/jpeg,image/pjpeg,image/png,image/gif,application/pdf,text/plain",
|
||||
// The setting up of the dropzone
|
||||
init:function() {
|
||||
|
||||
this.on("removedfile", function(file) {
|
||||
var _ele = $('.alert-danger');
|
||||
_ele.fadeOut();
|
||||
|
|
|
|||
|
|
@ -35,6 +35,9 @@
|
|||
<div class="mb-3">
|
||||
<div id="smartwizard-3-step-1" class="card animated fadeIn">
|
||||
<div class="card-body">
|
||||
@if($userHistoryWizardPayment && $userHistoryWizardPayment->status > 2)
|
||||
<h6 class="alert badge-{{$userHistoryWizardPayment->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryWizardPayment->getStatusType())}}</h6>
|
||||
@endif
|
||||
@include('user.wizard._payment')
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -435,7 +435,9 @@
|
|||
</div>
|
||||
|
||||
<div class="col-lg-5 col-sm-5">
|
||||
|
||||
@if($shopping_mode === 'test')
|
||||
<strong>#### TEST MODE #### TEST MODE ####</strong>
|
||||
@endif
|
||||
<!-- PAYMENT METHOD -->
|
||||
<fieldset class="box-border-shadow p-20">
|
||||
<h4>Zahlungsart</h4>
|
||||
|
|
|
|||
BIN
vendor.zip
BIN
vendor.zip
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue