register step
This commit is contained in:
Kevin Adametz
parent
1ada368ed4
commit
f06d2d15a5
50 changed files with 748 additions and 276 deletions
2
.env
2
.env
|
|
@ -17,7 +17,7 @@ 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
|
||||
#APP_CHECKOUT_MAIL=no-reply@mivita.care
|
||||
|
||||
|
||||
LOG_CHANNEL=stack
|
||||
|
|
|
|||
6
.idea/inspectionProfiles/Project_Default.xml
generated
6
.idea/inspectionProfiles/Project_Default.xml
generated
|
|
@ -1,6 +0,0 @@
|
|||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="JSHint" enabled="true" level="ERROR" enabled_by_default="true" />
|
||||
</profile>
|
||||
</component>
|
||||
69
.idea/jsLinters/jshint.xml
generated
69
.idea/jsLinters/jshint.xml
generated
|
|
@ -1,16 +1,85 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="JSHintConfiguration" version="2.9.5" use-config-file="true" use-custom-config-file="true" custom-config-file-path="$PROJECT_DIR$/assets/plugins/footable/js/.jshintrc">
|
||||
<option asi="false" />
|
||||
<option bitwise="true" />
|
||||
<option boss="false" />
|
||||
<option browser="true" />
|
||||
<option browserify="false" />
|
||||
<option camelcase="false" />
|
||||
<option couch="false" />
|
||||
<option curly="true" />
|
||||
<option debug="false" />
|
||||
<option devel="false" />
|
||||
<option dojo="false" />
|
||||
<option elision="false" />
|
||||
<option enforceall="false" />
|
||||
<option eqeqeq="true" />
|
||||
<option eqnull="false" />
|
||||
<option es3="false" />
|
||||
<option es5="false" />
|
||||
<option esnext="false" />
|
||||
<option evil="false" />
|
||||
<option expr="false" />
|
||||
<option forin="true" />
|
||||
<option freeze="false" />
|
||||
<option funcscope="false" />
|
||||
<option futurehostile="false" />
|
||||
<option gcl="false" />
|
||||
<option globalstrict="false" />
|
||||
<option immed="false" />
|
||||
<option iterator="false" />
|
||||
<option jasmine="false" />
|
||||
<option jquery="false" />
|
||||
<option lastsemic="false" />
|
||||
<option latedef="false" />
|
||||
<option laxbreak="false" />
|
||||
<option laxcomma="false" />
|
||||
<option loopfunc="false" />
|
||||
<option maxerr="50" />
|
||||
<option mocha="false" />
|
||||
<option module="false" />
|
||||
<option mootools="false" />
|
||||
<option moz="false" />
|
||||
<option multistr="false" />
|
||||
<option newcap="false" />
|
||||
<option noarg="true" />
|
||||
<option nocomma="false" />
|
||||
<option node="false" />
|
||||
<option noempty="true" />
|
||||
<option nomen="false" />
|
||||
<option nonbsp="false" />
|
||||
<option nonew="true" />
|
||||
<option nonstandard="false" />
|
||||
<option notypeof="false" />
|
||||
<option noyield="false" />
|
||||
<option onevar="false" />
|
||||
<option passfail="false" />
|
||||
<option phantom="false" />
|
||||
<option plusplus="false" />
|
||||
<option proto="false" />
|
||||
<option prototypejs="false" />
|
||||
<option qunit="false" />
|
||||
<option quotmark="false" />
|
||||
<option rhino="false" />
|
||||
<option scripturl="false" />
|
||||
<option shadow="false" />
|
||||
<option shelljs="false" />
|
||||
<option singleGroups="false" />
|
||||
<option smarttabs="false" />
|
||||
<option strict="true" />
|
||||
<option sub="false" />
|
||||
<option supernew="false" />
|
||||
<option trailing="false" />
|
||||
<option typed="false" />
|
||||
<option undef="true" />
|
||||
<option unused="false" />
|
||||
<option validthis="false" />
|
||||
<option varstmt="false" />
|
||||
<option white="false" />
|
||||
<option withstmt="false" />
|
||||
<option worker="false" />
|
||||
<option wsh="false" />
|
||||
<option yui="false" />
|
||||
</component>
|
||||
</project>
|
||||
90
.idea/workspace.xml
generated
90
.idea/workspace.xml
generated
|
|
@ -2,48 +2,53 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="2fbaac5f-25ba-4502-a970-cc14728d7d55" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/app/Mail/MailCustomMessage.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Services/UserService.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/public/pdf/mivita_contract_de.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/lang/de/register.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/jsLinters/jshint.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jsLinters/jshint.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/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/LeadController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/LeadController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/RegisterController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/RegisterController.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/Mail/MailCheckout.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailCheckout.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/ShoppingPayment.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingPayment.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/UserHistory.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/UserHistory.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$/config/app.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/app.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$/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$/database/migrations/2019_02_29_170559_create_user_accounts_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_02_29_170559_create_user_accounts_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/js/custom.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/custom.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/lang/de.json" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/lang/de/email.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de/email.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/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/admin/country/form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/country/form.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/lead/edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/lead/edit.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/lead/m_register_data.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/lead/m_register_data.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/emails/auth.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/auth.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/data_confirm.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/data_confirm.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/_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/_payment.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/membership/_payment.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/membership/_payment_order.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/membership/_payment_order.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/user_new_form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/user_new_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/create_release.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/wizard/create_release.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/user/wizard/register_release.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/wizard/register_release.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/layouts/includes/footer.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/layouts/includes/footer.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/_content_contact.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/_content_contact.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/checkout-final.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/checkout-final.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$/vendor.zip" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/registrierung.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/registrierung.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/registrierung_finish.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/registrierung_finish.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$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -258,13 +263,20 @@
|
|||
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
||||
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/app/Mail" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/resources/lang/de" />
|
||||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
||||
<property name="nodejs_package_manager_path" value="npm" />
|
||||
<property name="settings.editor.selected.configurable" value="reference.webide.settings.project.settings.php.composer" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/resources/lang/de" />
|
||||
<recent name="$PROJECT_DIR$/app/Mail" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/user/membership" />
|
||||
<recent name="$PROJECT_DIR$/config" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/user/members" />
|
||||
</key>
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/public/vendor/libs/dropzone" />
|
||||
<recent name="$PROJECT_DIR$/public/vendor/libs" />
|
||||
|
|
@ -272,13 +284,6 @@
|
|||
<recent name="$PROJECT_DIR$/resources/views/admin/lead" />
|
||||
<recent name="$PROJECT_DIR$/public/download" />
|
||||
</key>
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/app/Mail" />
|
||||
<recent name="$PROJECT_DIR$/resources/lang/de" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/user/membership" />
|
||||
<recent name="$PROJECT_DIR$/config" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/user/members" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunManager">
|
||||
<configuration default="true" type="ShConfigurationType">
|
||||
|
|
@ -432,6 +437,9 @@
|
|||
<workItem from="1583743438432" duration="10157000" />
|
||||
<workItem from="1583757303144" duration="7000" />
|
||||
<workItem from="1583758271548" duration="2118000" />
|
||||
<workItem from="1584782149779" duration="14772000" />
|
||||
<workItem from="1584954914592" duration="54000" />
|
||||
<workItem from="1584965547046" duration="694000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
|
@ -461,6 +469,10 @@
|
|||
</option>
|
||||
</component>
|
||||
<component name="WindowStateProjectService">
|
||||
<state x="880" y="409" key="#JSHint" timestamp="1584782937961">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="880" y="409" key="#JSHint/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1584782937961" />
|
||||
<state x="754" y="395" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1583573436293">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
|
|
@ -470,10 +482,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="1583752214549">
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1584797806264">
|
||||
<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="1583752214549" />
|
||||
<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="1584797806264" />
|
||||
<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" />
|
||||
|
|
@ -487,10 +499,10 @@
|
|||
<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="1583752431870">
|
||||
<state x="805" y="444" width="1115" height="793" key="find.popup" timestamp="1584965671326">
|
||||
<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="1583752431870" />
|
||||
<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="1584965671326" />
|
||||
<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="1583747941947">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
|
|
|
|||
|
|
@ -4,12 +4,15 @@ namespace App\Http\Controllers;
|
|||
|
||||
|
||||
|
||||
use App\Mail\MailCustomMessage;
|
||||
use App\Mail\MailVerifyAccount;
|
||||
use App\Mail\MailVerifyContact;
|
||||
use App\Mail\MailAccountActive;
|
||||
use App\Models\UserAccount;
|
||||
use App\Models\UserHistory;
|
||||
use App\Repositories\ContractPDFRepository;
|
||||
use App\Repositories\UserRepository;
|
||||
use App\Services\UserService;
|
||||
use App\User;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Input;
|
||||
|
|
@ -190,23 +193,13 @@ class LeadController extends Controller
|
|||
|
||||
$user = $this->userRepo->getModel();
|
||||
|
||||
$unique = false;
|
||||
do{
|
||||
$confirmation_code = str_random(30);
|
||||
if( User::where('confirmation_code', '=', $confirmation_code)->count() == 0){
|
||||
$unique = true;
|
||||
}
|
||||
}
|
||||
while(!$unique);
|
||||
$confirmation_code = UserService::createConfirmationCode();
|
||||
|
||||
$user->lang = $user->getLandByCountry();
|
||||
$user->confirmation_code = $confirmation_code;
|
||||
//10 == start wizard form create Lead
|
||||
$user->wizard = 10;
|
||||
|
||||
$user->save();
|
||||
|
||||
|
||||
Mail::to($user->email)->send(new MailVerifyContact($confirmation_code, $user));
|
||||
|
||||
\Session()->flash('alert-save', true);
|
||||
|
|
@ -221,47 +214,74 @@ class LeadController extends Controller
|
|||
|
||||
}
|
||||
//user released when register is complete
|
||||
public function newReleased($id){
|
||||
public function released($action, $id){
|
||||
|
||||
$user = User::findOrFail($id);
|
||||
$validator = Validator::make(Input::all(), []);
|
||||
if(!$user->m_sponsor){
|
||||
$validator->errors()->add('m_sponsor', __('Berater hat keinen Sponsor.'));
|
||||
}
|
||||
if(!$user->account->m_first_name){
|
||||
$validator->errors()->add('m_first_name', __('Berater hat keinen Vornamen.'));
|
||||
}
|
||||
if(!$user->account->m_first_name){
|
||||
$validator->errors()->add('m_last_name', __('Berater hat keinen Nachnamen.'));
|
||||
}
|
||||
if(!$user->account->m_account){
|
||||
$validator->errors()->add('m_account', __('Berater hat keine Account ID'));
|
||||
}
|
||||
if ($validator->errors()->count()) {
|
||||
return back()->withErrors($validator)->withInput(Input::all());
|
||||
|
||||
if($action === 'completed'){
|
||||
$validator = Validator::make(Input::all(), []);
|
||||
if(!$user->m_sponsor){
|
||||
$validator->errors()->add('m_sponsor', __('Berater hat keinen Sponsor.'));
|
||||
}
|
||||
if(!$user->account->m_first_name){
|
||||
$validator->errors()->add('m_first_name', __('Berater hat keinen Vornamen.'));
|
||||
}
|
||||
if(!$user->account->m_first_name){
|
||||
$validator->errors()->add('m_last_name', __('Berater hat keinen Nachnamen.'));
|
||||
}
|
||||
if(!$user->account->m_account){
|
||||
$validator->errors()->add('m_account', __('Berater hat keine Account ID'));
|
||||
}
|
||||
if ($validator->errors()->count()) {
|
||||
return back()->withErrors($validator)->withInput(Input::all());
|
||||
}
|
||||
|
||||
//create PDF
|
||||
$pdf = new ContractPDFRepository($user);
|
||||
$pdf->_set('disk', 'user');
|
||||
$pdf->_set('dir', '/'.$user->id.'/documents/');
|
||||
$pdf->_set('user_id', $user->id);
|
||||
$pdf->_set('identifier', 'contract');
|
||||
$pdf->createContractPDF();
|
||||
|
||||
//set wizard tp payments
|
||||
$user->wizard = 20;
|
||||
$user->active = 1;
|
||||
$user->active_date = now();
|
||||
$user->confirmation_code = null;
|
||||
$user->confirmation_code_to = null;
|
||||
$user->confirmation_code_remider = 0;
|
||||
$user->save();
|
||||
|
||||
//mail with code to user?
|
||||
Mail::to($user->email)->send(new MailAccountActive($user));
|
||||
UserHistory::create(['user_id' => $user->id, 'action'=>'released_completed', 'status'=>0]);
|
||||
\Session()->flash('alert-success', "Berater freigeschaltet!");
|
||||
}
|
||||
|
||||
//create PDF
|
||||
$pdf = new ContractPDFRepository($user);
|
||||
$pdf->_set('disk', 'user');
|
||||
$pdf->_set('dir', '/'.$user->id.'/documents/');
|
||||
$pdf->_set('user_id', $user->id);
|
||||
$pdf->_set('identifier', 'contract');
|
||||
$pdf->createContractPDF();
|
||||
if($action === 'incomplete'){
|
||||
|
||||
//set wizard tp payments
|
||||
$user->wizard = 20;
|
||||
$user->active = 1;
|
||||
$user->active_date = now();
|
||||
$user->confirmation_code = null;
|
||||
$user->confirmation_code_to = null;
|
||||
$user->confirmation_code_remider = 0;
|
||||
$user->save();
|
||||
|
||||
//mail with code to user?
|
||||
Mail::to($user->email)->send(new MailAccountActive($user));
|
||||
\Session()->flash('alert-success', "Berater freigeschaltet!");
|
||||
//reset release
|
||||
$confirmation_code = UserService::createConfirmationCode();
|
||||
$user->confirmation_code = $confirmation_code;
|
||||
$user->confirmation_code_to = date('Y-m-d H:i:s', strtotime('+1 week'));
|
||||
$user->confirmation_code_remider = 0;
|
||||
$user->wizard = 1;
|
||||
$user->release_account = null;
|
||||
$user->save();
|
||||
|
||||
$input = Input::all();
|
||||
$data = [
|
||||
'subject' => $input['account_incomplete_subject'],
|
||||
'message' => $input['account_incomplete_message'],
|
||||
'confirmation_code' => $confirmation_code,
|
||||
];
|
||||
Mail::to($user->email)->send(new MailCustomMessage($user, $data, \Auth::user()));
|
||||
UserHistory::create(['user_id' => $user->id, 'action'=>'released_incomplete', 'status'=>0]);
|
||||
\Session()->flash('alert-success', "E-Mail an Berater gesendet.");
|
||||
|
||||
}
|
||||
return redirect(route('admin_lead_edit', [$user->id]));
|
||||
}
|
||||
|
||||
|
|
@ -270,28 +290,35 @@ class LeadController extends Controller
|
|||
public function newMailVerified($id){
|
||||
|
||||
$user = User::findOrFail($id);
|
||||
$unique = false;
|
||||
do{
|
||||
$confirmation_code = str_random(30);
|
||||
if(User::where('confirmation_code', '=', $confirmation_code)->count() == 0){
|
||||
$unique = true;
|
||||
}
|
||||
}
|
||||
while(!$unique);
|
||||
|
||||
$confirmation_code = UserService::createConfirmationCode();
|
||||
$user->confirmation_code = $confirmation_code;
|
||||
$user->confirmation_code_to = date('Y-m-d H:i:s', strtotime('+1 week'));
|
||||
$user->confirmation_code_remider = 0;
|
||||
$user->save();
|
||||
|
||||
Mail::to($user->email)->send(new MailVerifyAccount($confirmation_code, $user));
|
||||
\Session()->flash('alert-success', "E-Mail erneut gesendet");
|
||||
UserHistory::create(['user_id' => $user->id, 'action'=>'new_mail_verified', 'status'=>0]);
|
||||
|
||||
\Session()->flash('alert-success', "E-Mail erneut gesendet");
|
||||
return redirect(route('admin_lead_edit', [$user->id]));
|
||||
|
||||
}
|
||||
|
||||
|
||||
public function deleteFile($user_id, $file_id, $relation){
|
||||
|
||||
if($relation === 'upload'){
|
||||
$user = User::findOrFail($user_id);
|
||||
$file = $user->files()->findOrFail($file_id);
|
||||
//remove file
|
||||
\Storage::disk('user')->delete($file->dir.$file->filename);
|
||||
$file->delete();
|
||||
\Session()->flash('alert-success', "Datei gelöscht");
|
||||
}
|
||||
return back();
|
||||
}
|
||||
|
||||
|
||||
public function getLeads()
|
||||
{
|
||||
|
||||
|
|
|
|||
|
|
@ -76,15 +76,7 @@ class RegisterController extends Controller
|
|||
$data = Input::all();
|
||||
$user = $this->userRepo->create($data);
|
||||
|
||||
$unique = false;
|
||||
do{
|
||||
$confirmation_code = str_random(30);
|
||||
if(User::where('confirmation_code', '=', $confirmation_code)->count() == 0){
|
||||
$unique = true;
|
||||
}
|
||||
}
|
||||
while(!$unique);
|
||||
|
||||
$confirmation_code = UserService::createConfirmationCode();
|
||||
|
||||
$user->lang = !empty(\App::getLocale()) ? \App::getLocale() : "de";
|
||||
$user->confirmation_code = $confirmation_code;
|
||||
|
|
|
|||
|
|
@ -149,6 +149,7 @@ class WizardController extends Controller
|
|||
$rules = array(
|
||||
'accepted_data_protection' => 'required',
|
||||
'accepted_active' => 'required',
|
||||
'accepted_contract' => 'required'
|
||||
);
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
|
|
@ -162,12 +163,17 @@ class WizardController extends Controller
|
|||
return view('user.wizard.register', $data)->withErrors($validator);
|
||||
}
|
||||
$account = $user->account;
|
||||
if($account->accepted_contract === null){
|
||||
$account->accepted_contract = now();
|
||||
}
|
||||
if($account->data_protection === null){
|
||||
$account->data_protection = now();
|
||||
}
|
||||
$account->save();
|
||||
if($user->agreement === null){
|
||||
$user->agreement = now();
|
||||
}
|
||||
|
||||
$user->wizard = 1;
|
||||
$user->save();
|
||||
return redirect(route('wizard_register'));
|
||||
|
|
@ -254,6 +260,7 @@ class WizardController extends Controller
|
|||
if ($step == 4) {
|
||||
$user->wizard = 5;
|
||||
$user->release_account = now();
|
||||
UserHistory::create(['user_id' => $user->id, 'action'=>'release_account', 'status'=>0]);
|
||||
$user->save();
|
||||
|
||||
if($user->isTestMode()){
|
||||
|
|
@ -297,14 +304,16 @@ class WizardController extends Controller
|
|||
|
||||
}
|
||||
$account = $user->account;
|
||||
if($account->accepted_contract === null){
|
||||
$account->accepted_contract = now();
|
||||
}
|
||||
if($account->data_protection === null){
|
||||
$account->data_protection = now();
|
||||
}
|
||||
$account->save();
|
||||
if($user->agreement === null){
|
||||
$user->agreement = now();
|
||||
}
|
||||
$account->save();
|
||||
$user->agreement = now();
|
||||
$user->wizard = 11;
|
||||
$user->save();
|
||||
|
||||
|
|
|
|||
73
app/Mail/MailCustomMessage.php
Normal file
73
app/Mail/MailCustomMessage.php
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
<?php
|
||||
namespace App\Mail;
|
||||
|
||||
use App\Models\UserMessage;
|
||||
use App\User;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Mail\Mailable;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
|
||||
class MailCustomMessage extends Mailable
|
||||
{
|
||||
use Queueable, SerializesModels;
|
||||
|
||||
protected $data;
|
||||
protected $user;
|
||||
protected $sender;
|
||||
public $subject;
|
||||
public $message;
|
||||
|
||||
|
||||
public function __construct(User $user, $data, $sender)
|
||||
{
|
||||
$this->data = $data;
|
||||
$this->user = $user;
|
||||
$this->sender = $sender;
|
||||
$this->subject = isset($data['subject']) ? $data['subject'] : __('email.email_subject');
|
||||
$this->message = isset($data['message']) ? $data['message'] : '';
|
||||
}
|
||||
|
||||
|
||||
public function build()
|
||||
{
|
||||
$salutation = __('email.salutation').",";
|
||||
if($this->user->account){
|
||||
if($this->user->account->salutation === "mr"){
|
||||
$salutation = __('email.dear_sir')." ".$this->user->account->first_name.",";
|
||||
}else{
|
||||
$salutation = __('email.dear_mrs')." ".$this->user->account->first_name.",";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
UserMessage::create([
|
||||
'user_id' => $this->user->id,
|
||||
'send_user_id' => $this->sender->id,
|
||||
'email' => $this->user->email,
|
||||
'subject' => $this->subject,
|
||||
'message' => $this->message,
|
||||
'send' => true,
|
||||
'sent_at' => now(),
|
||||
]);
|
||||
$url = "";
|
||||
$button = "";
|
||||
if(isset($this->data['confirmation_code'])){
|
||||
$url = route('register_verify', $this->data['confirmation_code']);
|
||||
$button = __('email.button_account');
|
||||
|
||||
}
|
||||
return $this->view('emails.auth')->with([
|
||||
'url' => $url,
|
||||
'salutation' => $salutation,
|
||||
'button' => $button,
|
||||
'copy1line' => $this->message,
|
||||
'copy2line' => __('email.copy2line'),
|
||||
'copy3line' => __('email.copy3line'),
|
||||
'greetings' => __('email.greetings'),
|
||||
'sender' => __('email.sender'),
|
||||
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
@ -42,15 +42,14 @@ class MailReleaseAccount extends Mailable
|
|||
$content .= "E-Mail: ".$this->user->email;
|
||||
|
||||
|
||||
$copy1line = "Ein neuer Berater hat sich Registriert und wartet auf die Überprüfung und Freigabe seiner Daten."."\n";
|
||||
$copy1line .= "+ Überprüfung Ausweisdaten"."\n";
|
||||
$copy1line .= "+ Überprüfung Gewerbenachweis"."\n";
|
||||
$copy1line = "Ein neuer Berater hat sich registriert und wartet auf die Überprüfung und Freigabe seiner Daten:"."\n";
|
||||
$copy1line .= "+ Überprüfung der Ausweisdate"."\n";
|
||||
$copy1line .= "+ Überprüfung des Gewerbenachweises"."\n";
|
||||
$copy1line .= "+ Eintrag Account ID"."\n";
|
||||
$copy1line .= "+ Überprüfung Karriere-Level/Sponsor"."\n";
|
||||
$copy1line .= "+ Überprüfung Rechnungsdaten"."\n";
|
||||
|
||||
$copy1line .= 'Nach erfolgreicher Überprüfung mit dem Button "Daten vollständigt => Berater freischalten" den Berater freischalten.'."\n";
|
||||
$copy1line .= 'Der Berater erhält eine Mail, dass sein Account freigeschaltet worden ist. In den Vertrag wird automatisch mit den eingetragenden Inhalten erstellt.'."\n";
|
||||
$copy1line .= "+ Überprüfung / Kenntnisnahme Sponsor"."\n";
|
||||
$copy1line .= "+ Überprüfung der Rechnungsdaten"."\n";
|
||||
$copy1line .= 'Nach erfolgreicher Überprüfung mit dem Button „Daten vollständig => Berater freischalten“ den Berater freischalten.'."\n";
|
||||
$copy1line .= 'Der Berater erhält eine Mail, dass sein Account freigeschaltet wurde. Der Vertrag wird automatisch mit den Daten des Vertriebspartners erstellt.'."\n";
|
||||
|
||||
return $this->view('emails.info')->with([
|
||||
'url' => route('admin_lead_edit', $this->user->id).'?show=check_lead',
|
||||
|
|
|
|||
|
|
@ -176,11 +176,16 @@ class UserAccount extends Model
|
|||
$this->attributes['birthday'] = isset($value) ? (new Carbon($value))->format('Y-m-d') : NULL;
|
||||
}
|
||||
|
||||
public function getDataProtectionFormat(){
|
||||
public function getDataProtectionFormat(){
|
||||
if(!$this->attributes['data_protection']){ return ""; }
|
||||
return Carbon::parse($this->attributes['data_protection'])->format(\Util::formatDateTimeDB());
|
||||
}
|
||||
|
||||
public function getAcceptContractFormat(){
|
||||
if(!$this->attributes['accept_contract']){ return ""; }
|
||||
return Carbon::parse($this->attributes['accept_contract'])->format(\Util::formatDateTimeDB());
|
||||
}
|
||||
|
||||
|
||||
public function getCountryAttrAs($attr, $as = false){
|
||||
if($this->country){
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ class UserHistory extends Model
|
|||
protected $table = 'user_histories';
|
||||
|
||||
protected $status_types = [
|
||||
0 => 'info',
|
||||
1 => 'store_payment',
|
||||
2 => 'checkout_payment',
|
||||
3 => 'payment_error',
|
||||
|
|
@ -63,6 +64,7 @@ class UserHistory extends Model
|
|||
50 => 'delete_membership'
|
||||
];
|
||||
protected $status_colors = [
|
||||
0 => 'info',
|
||||
1 => 'warning',
|
||||
2 => 'warning',
|
||||
3 => 'danger',
|
||||
|
|
|
|||
69
app/Models/UserMessage.php
Normal file
69
app/Models/UserMessage.php
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* Created by Reliese Model.
|
||||
*/
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
/**
|
||||
* Class UserMessage
|
||||
*
|
||||
* @property int $id
|
||||
* @property int $user_id
|
||||
* @property int $send_user_id
|
||||
* @property string $email
|
||||
* @property string $subject
|
||||
* @property string $message
|
||||
* @property bool $send
|
||||
* @property bool $fail
|
||||
* @property string $error
|
||||
* @property Carbon $sent_at
|
||||
* @property Carbon $scheduled_at
|
||||
* @property Carbon $delivered_at
|
||||
* @property Carbon $created_at
|
||||
* @property Carbon $updated_at
|
||||
*
|
||||
* @property User $user
|
||||
*
|
||||
* @package App\Models
|
||||
*/
|
||||
class UserMessage extends Model
|
||||
{
|
||||
protected $table = 'user_messages';
|
||||
|
||||
protected $casts = [
|
||||
'user_id' => 'int',
|
||||
'send_user_id' => 'int',
|
||||
'send' => 'bool',
|
||||
'fail' => 'bool'
|
||||
];
|
||||
|
||||
protected $dates = [
|
||||
'sent_at',
|
||||
'scheduled_at',
|
||||
'delivered_at'
|
||||
];
|
||||
|
||||
protected $fillable = [
|
||||
'user_id',
|
||||
'send_user_id',
|
||||
'email',
|
||||
'subject',
|
||||
'message',
|
||||
'send',
|
||||
'fail',
|
||||
'error',
|
||||
'sent_at',
|
||||
'scheduled_at',
|
||||
'delivered_at'
|
||||
];
|
||||
|
||||
public function user()
|
||||
{
|
||||
return $this->belongsTo(User::class);
|
||||
}
|
||||
}
|
||||
21
app/Services/UserService.php
Normal file
21
app/Services/UserService.php
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
<?php
|
||||
namespace App\Services;
|
||||
|
||||
|
||||
use App\User;
|
||||
|
||||
class UserService
|
||||
{
|
||||
|
||||
public static function createConfirmationCode() {
|
||||
$unique = false;
|
||||
do{
|
||||
$confirmation_code = str_random(30);
|
||||
if(User::where('confirmation_code', '=', $confirmation_code)->count() == 0){
|
||||
$unique = true;
|
||||
}
|
||||
}
|
||||
while(!$unique);
|
||||
return $confirmation_code;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +1,6 @@
|
|||
<?php
|
||||
namespace App\Services;
|
||||
|
||||
|
||||
|
||||
use App\Models\UserHistory;
|
||||
|
||||
class Util
|
||||
|
|
|
|||
|
|
@ -60,9 +60,9 @@ return [
|
|||
'pre_url_main' => env('APP_URL_MAIN', ''),
|
||||
'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_mail' => env('APP_CHECKOUT_MAIL', 'no-reply@mivita.care'),
|
||||
'checkout_test_mail' => env('APP_CHECKOUT_TEST_MAIL', 'devtest@mivita.care'),
|
||||
'info_mail' => env('APP_INFO_MAIL', 'no-replay@mivita.care'),
|
||||
'info_mail' => env('APP_INFO_MAIL', 'no-reply@mivita.care'),
|
||||
'info_test_mail' => env('APP_INFO_TEST_MAIL', 'devtest@mivita.care'),
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -53,14 +53,12 @@ return [
|
|||
'url' => env('APP_URL').'/storage/users',
|
||||
'visibility' => 'public',
|
||||
],
|
||||
|
||||
'public' => [
|
||||
'driver' => 'local',
|
||||
'root' => storage_path('app/public'),
|
||||
'url' => env('APP_URL').'/storage',
|
||||
'visibility' => 'public',
|
||||
],
|
||||
|
||||
's3' => [
|
||||
'driver' => 's3',
|
||||
'key' => env('AWS_ACCESS_KEY_ID'),
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ class CreateUserAccountsTable extends Migration
|
|||
$table->text('payment_data')->nullable();
|
||||
|
||||
$table->timestamp('data_protection')->nullable();
|
||||
$table->timestamp('accepted_contract')->nullable();
|
||||
|
||||
$table->timestamps();
|
||||
$table->softDeletes();
|
||||
|
|
|
|||
|
|
@ -0,0 +1,59 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
|
||||
class CreateUserMessagesTable extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function up()
|
||||
{
|
||||
Schema::create('user_messages', function (Blueprint $table) {
|
||||
$table->increments('id');
|
||||
|
||||
$table->unsignedInteger('user_id');
|
||||
$table->unsignedInteger('send_user_id');
|
||||
|
||||
|
||||
$table->string('email', 255);
|
||||
$table->string('subject', 255);
|
||||
$table->text('message')->nullable();
|
||||
|
||||
$table->boolean('send')->default(false);
|
||||
$table->boolean('fail')->default(false);
|
||||
$table->text('error')->nullable();
|
||||
|
||||
$table->timestamp('sent_at')->nullable();
|
||||
$table->timestamp('scheduled_at')->nullable();
|
||||
$table->timestamp('delivered_at')->nullable();
|
||||
|
||||
$table->timestamps();
|
||||
|
||||
$table->foreign('user_id')
|
||||
->references('id')
|
||||
->on('users')
|
||||
->onDelete('cascade');
|
||||
|
||||
$table->foreign('send_user_id')
|
||||
->references('id')
|
||||
->on('users')
|
||||
->onDelete('cascade');
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function down()
|
||||
{
|
||||
Schema::dropIfExists('user_messages');
|
||||
}
|
||||
}
|
||||
|
|
@ -45,8 +45,49 @@ jQuery(document).ready(function() {
|
|||
e.preventDefault();
|
||||
update_modal_data_load(e, $(this));
|
||||
});
|
||||
|
||||
$('.datepicker-base').datepicker({
|
||||
orientation: 'auto right',
|
||||
calendarWeeks: true,
|
||||
todayBtn: 'linked',
|
||||
//daysOfWeekDisabled: '1',
|
||||
todayHighlight: true,
|
||||
multidate: false,
|
||||
daysOfWeekHighlighted: '0,6',
|
||||
autoclose: true,
|
||||
format: 'dd.mm.yyyy',
|
||||
language: 'de',
|
||||
clearBtn: true,
|
||||
});
|
||||
|
||||
$('.datepicker-birthday').datepicker({
|
||||
todayBtn: 'linked',
|
||||
// daysOfWeekDisabled: '1',
|
||||
multidate: false,
|
||||
daysOfWeekHighlighted: '0,6',
|
||||
autoclose: true,
|
||||
format: 'dd.mm.yyyy',
|
||||
language: 'de',
|
||||
clearBtn: true,
|
||||
startView: 2,
|
||||
|
||||
});
|
||||
|
||||
$('.b-material-datetime-picker').bootstrapMaterialDatePicker({
|
||||
weekStart: 1,
|
||||
format : 'DD.MM.YYYY HH:mm',
|
||||
shortTime: false,
|
||||
nowButton : true,
|
||||
clearButton: true,
|
||||
lang: 'de',
|
||||
//currentDate: ''
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
function _scrollTo(to, offset) {
|
||||
$('html,body').animate({scrollTop: $(to).offset().top - offset}, 800);
|
||||
}
|
||||
|
||||
/*
|
||||
$(function() {
|
||||
|
|
|
|||
64
public/pdf/mivita_contract_de.php
Normal file
64
public/pdf/mivita_contract_de.php
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
<h2 class="text-center">Beratervertrag / Sales Contract</h2>
|
||||
<h5 class="text-center">für die Vertriebspartnerschaft mit der mivita e.K.</h5>
|
||||
|
||||
<p> Durch die Freischaltung dieses Vertrages durch MIVITA e.K. - Leinfeld 2 - 87755 Kirchhaslach, im Folgenden „MIVITA“ genannt,
|
||||
erhält der/die registrierte Vertriebspartner/in
|
||||
im Folgenden „Berater“ genannt, das Recht, MIVITA Produkte als selbständiger Produktberater in eigenem Namen und auf
|
||||
eigene Rechnung zu verkaufen.</p>
|
||||
<hr>
|
||||
<ol>
|
||||
<li class="mb-3">
|
||||
Der Berater vertreibt MIVITA Produkte als Verkaufskommissionär gegen Kommission in seinem eigenen Namen.
|
||||
Er fördert den Verkauf von MIVITA Produkten und befolgt die von MIVITA festgelegten Richtlinien und Regeln,
|
||||
die von Zeit zu Zeit für den Vertrieb der MIVITA Produkte herausgegeben werden. Der Berater ist verpflichtet, die
|
||||
ein schlägigen gesetzlichen Regelungen im Zusammenhang mit dem Vertrieb der MIVITA Produkte einzuhalten.
|
||||
</li>
|
||||
<li class="mb-3">
|
||||
Der Berater ist ein unabhängiger Gewerbetreibender und kein Angestellter oder Vertreter von MIVITA oder
|
||||
eines anderen MIVITA Beraters.
|
||||
</li>
|
||||
<li class="mb-3">
|
||||
MIVITA überlässt dem Berater gegen Zahlung einer Sicherheit die vom Berater benötigten MIVITA Produkte.
|
||||
Es besteht keine Verpflichtung, eine Mindestmenge von MIVITA Produkten zu beziehen.
|
||||
</li>
|
||||
<li class="mb-3">
|
||||
Im Rahmen seiner Geschäftstätigkeit wahrt der Berater die Interessen von MIVITA. Dies schließt insbesondere
|
||||
aus, dass der Berater Aloe Vera Wettbewerbsprodukte vertreibt oder sonstige Produkte gleichzeitig mit den
|
||||
MIVITA Produkten anbietet. Der Berater behandelt die Geschäftsgeheimnisse, von denen er während der Laufzeit
|
||||
dieses Vertrages Kenntnis erhalten hat, als vertraulich. Diese Verpflichtung gilt auch nach Beendigung des
|
||||
Vertrages. Der Vertrieb über Internetplattformen (z. B. Ebay, Amazon, Handelsketten etc.) ist untersagt.
|
||||
</li>
|
||||
<li class="mb-3">
|
||||
Der Berater ist nicht verpflichtet, MIVITA Produkte zu erwerben. Der Erwerb eines Stater Kits wird jedoch empfohlen.
|
||||
Weiterhin empfiehlt sich, an Schulungen zur Erweiterung der Kenntnisse des Beraters über die MIVITA
|
||||
Produkte und, sofern Interesse daran besteht, über Aufbau und Führung einer Vertriebsorganisation teilzunehmen.
|
||||
Solche Schulungen werden von MIVITA bzw. MIVITA Beratern angeboten. Der Berater ist zur Teilnahme
|
||||
nicht verpflichtet.
|
||||
</li>
|
||||
<li class="mb-3">
|
||||
Handelt der Berater den Regelungen dieses Vertrages zuwider, behält sich MIVITA vor, ihm die Verkaufskommission
|
||||
zu entziehen. Dieser Vertrag ist vom Berater mit einer Frist von vier Wochen schriftlich kündbar. lm Falle
|
||||
der Kündigung kann der Berater die von MIVITA auf Kommissionsbasis bezogenen MIVITA Produkte gemäß der
|
||||
MIVITA Rückerstattungsregelung zurückgeben. Es gelten ausschlieBlich die Allgemeinen Geschäftsbedingungen
|
||||
von MIVITA.
|
||||
</li>
|
||||
<li class="mb-3">
|
||||
Die Unwirksamkeit einer Bestimmung dieses Vertrages hat keine Wirkung auf die Gültigkeit der übrigen
|
||||
Vertragsbestimmungen.
|
||||
</li>
|
||||
<li class="mb-3">
|
||||
Der Berater hat sein Gewerbe bei der Ordnungsbehörde seines Wohnsitzes anzumelden. Dem Berater ist bekannt, dass er
|
||||
mit seinen Einkünften aus dem Vertrieb von mivita Produkten der Besteuerung unterliegt. Diesem Vertrag ist eine leserliche
|
||||
beidseitige Kopie Ihres Personalausweises oder bei Ausländern mit deutschem Wohnsitz die Kopie des Reisepasses und
|
||||
der Aufenthaltsgenehmigung oder eine Kopie Ihres Reisepasses und einem Nachweis des legalen Wohnsitzes beizufügen.
|
||||
</li>
|
||||
<li class="mb-3">
|
||||
Der Berater erklärt sich darnit einverstanden, dass seine personenbezogenen Daten zum Zwecke der Durchführung dieses
|
||||
Vertrages verarbeitet, insbesondere gespeichert und genutzt werden ($ 4 Bundesdatenschutzgesetz) und (DSGVO 2018).
|
||||
Die Übermittlung an Dritte erfolgt nur in dem Geschäftszwecke erforderlichen Umfang.
|
||||
</li>
|
||||
</ol>
|
||||
<hr>
|
||||
<p class="text-center">mivita e.K. • Leinfeld 2 • D-87755 Kirchhaslach<br>
|
||||
Tel: 08333-9469890 • Fax :08333-7268 • info@mivita.care • www.mivita.care<br>
|
||||
für die Vertriebspartnerschaft mit der mivita e.K.</p>
|
||||
|
|
@ -155,14 +155,13 @@
|
|||
"waiting for activation since": "wartet auf Aktivierung seit",
|
||||
"edit": "bearbeiten",
|
||||
"delete": "l\u00f6schen",
|
||||
"your mivita.care team": "Dein mivita.care Team",
|
||||
"your mivita.care team": "Dein Team von mivita.care",
|
||||
"create new password": "neues Passwort erstellen",
|
||||
"Now assign a password.": "Vergeben Sie jetzt Ihr Passwort für den Zugriff auf Ihren Account.",
|
||||
"to your data":"zu Deinen Daten",
|
||||
"Your registration has already been completed.":"Deine Registrierung wurde bereits abgeschlossen.",
|
||||
"The link to register is no longer active.":"Der Link zur Registrierung ist nicht mehr aktiv, oder die Registrierung ist bereits abgeschlossen",
|
||||
"go to login": "zur Anmeldung",
|
||||
"Declaration of consent": "Einverst\u00e4ndniserkl\u00e4rung: Hiermit willige ich in die Verarbeitung der von mir freiwillig angegebenen personenbezogenen Daten ein. Ich wurde dar\u00fcber informiert, dass ich diese Einwilligung jederzeit widerrufen kann.",
|
||||
"Please confirm your data first.": "Bitte überprüfen Sie Ihre Daten als erstes und bestätigen Sie diese.",
|
||||
"yes, data checked and share":"Ja, Daten überprüft und jetzt freigeben",
|
||||
"Declaration of shop": "Hiermit bestätige und akzeptiere ich die Nutzungsbedinungen zu meinem mivita-Shop.",
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
'dear_sir' => 'Hallo',
|
||||
'hello' => 'Hallo',
|
||||
'greetings' => 'Mit freundlichen Grüßen',
|
||||
'sender' => 'Dein mivita.care Team',
|
||||
'sender' => 'Dein Team von mivita.care',
|
||||
'request_from' => 'Anfrage von mivita.care',
|
||||
'your_request_from' => 'Deine Anfrage von',
|
||||
'checkout_subject' => 'Deine Bestellung auf',
|
||||
|
|
@ -22,16 +22,20 @@
|
|||
'phone' => 'Telefon',
|
||||
'subject' => 'Betreff',
|
||||
'message' => 'Nachricht',
|
||||
'button_account' => 'zum Account',
|
||||
'active_copy1line' => 'Du erhältst diese E-Mail, weil wir eine Anfrage zur Änderung Deiner E-Mail-Adresse für Dein Konto erhalten haben.',
|
||||
'copy2line' => 'Oder kopiere diesen Link in die Adressleiste Deines Browsers.',
|
||||
'copy3line' => 'Für weitere Fragen stehen wir Dir gerne zur Verfügung.',
|
||||
'email_verify' => 'Bestätige Deine E-Mail-Adresse',
|
||||
'email_subject' => 'Nachricht von mivita.care',
|
||||
'email_incomplete' => 'Deine Daten sind nicht vollständig.',
|
||||
'account_incomplete_copy1line' => 'Dein Account wurde nicht freigeschaltet, Deine Daten sind nicht vollständig. Bitte folge dem unten stehenden Link um Deine Daten zu vervollständigen. ',
|
||||
'verify_e_mail' => 'Bestätige Deine Daten und E-Mail-Adresse',
|
||||
'verify_copy1line' => 'Wir haben Daten über Dich in unserem System gespeichert. Bitte folge dem unten stehenden Link um Deine E-Mail-Adresse zu bestätigen. Weitherhin kannst Du Deine Daten ändern oder auch löschen.',
|
||||
'email_verify_copy1line' => 'Vielen Dank für Deine Registrierung. Bitte folge dem unten stehenden Link, um Deine E-Mail-Adresse zu bestätigen.',
|
||||
'copy_to_browser' => 'Oder kopiere diesen Link in die Adressleiste Deines Browsers.',
|
||||
'activate_copy' => 'Bitte bestätige Deine E-Mail und aktiviere Deinen Account über diesen Link:',
|
||||
'account_active_copy1line' => 'Dein Account wurde nach erfolgreicher Prüfung freigeschatet. Deinen Beratervertag findest du auf der Startseite im Loginbereich von my.mivita.care. Melde dich mit deinen Benutzerdaten an, um weitere Schritte zu unternehmen.',
|
||||
'account_active_copy1line' => 'Dein Account wurde nach erfolgreicher Prüfung freigeschaltet. Deinen Beratervertag findest du auf der Startseite im Loginbereich von my.mivita.care. Melde dich mit deinen Benutzerdaten an, um weitere Schritte zu unternehmen.',
|
||||
'reset_pass_copy1line' => 'Du erhälst diese E-Mail, weil wir eine Anfrage zum Zurücksetzen Deines Passworts für Dein Konto erhalten haben.',
|
||||
'checkout_copy1line' => 'vielen Dank für Deine Bestellung bei mivita.care. Nachfolgend haben wir zur Kontrolle Deine Bestellung noch einmal aufgelistet.',
|
||||
'checkout_copy3line' => 'Bei Fragen sind wir jederzeit für Dich da.',
|
||||
|
|
|
|||
|
|
@ -16,5 +16,8 @@ return [
|
|||
'payment_not_found' => 'Zahlung nicht gefunden',
|
||||
'checkout_cancel' => ' Zahlungsvorgang Abbruch',
|
||||
'checkout_error' => 'Zahlungsvorgang Fehler',
|
||||
'auto_renewal_hl' => 'Automatische Verlängerung',
|
||||
'auto_renewal_line_1' => 'Sicher ist sicher! Wir empfehlen, diese Option zu aktivieren, wenn Du Deine jährliche Mitgliedschaft dauerhaft bestehen lassen möchtest. Denn geht eine manuelle Zahlung nach Ablauf der Jahresmitgliedschaft nicht zeitig ein, deaktiviert das System Deinen Onlineshop bzw. Deinen Zugang zum Salescenter. Dann kannst Du keine Bestellungen mehr tätigen oder Einblick in Deinen Statistiken erhalten, bis eine erneute Zahlung Deinen Account reaktiviert. Daher raten wir Dir, die Zahlung per SEPA-Lastschrift zu tätigen. Wir speichern dieses Mandat und buchen 14 Tage vor Ablauf Deine Jahresgebühr automatisch ab. So hast Du einen reibungslosen Prozess, ohne dass Du darauf achten musst.',
|
||||
'auto_renewal_line_2' => 'Du kannst diese Option natürlich jederzeit in Deinem Account rückgängig machen bzw. Deinen Account / Deine Vertriebspartnerschaft bei MIVITA kündigen.'
|
||||
],
|
||||
];
|
||||
24
resources/lang/de/register.php
Normal file
24
resources/lang/de/register.php
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
<?php
|
||||
|
||||
return [
|
||||
'declaration-of-consent' => 'Einverständniserklärung: Hiermit willige ich in die Verarbeitung der von mir freiwillig angegebenen personenbezogenen Daten ein. Ich wurde darüber informiert, dass ich diese Einwilligung jederzeit widerrufen kann.',
|
||||
'accept-contract' => 'Ich habe den hier aufgeführten Vertrag gelesen und akzeptiere diesen.',
|
||||
'reg_hl' => 'Registrierung',
|
||||
'reg_line_1' => 'Dieses Formular ist für die Registrierung neuer Vertriebspartner. Nach dem Absenden des Formulars erhälst du eine E Mail mit weiteren Informationen sowie den Freischaltlink.',
|
||||
'reg_checked' => 'Hiermit willige ich in die im Rahmen der <a target="_blank" href=":link">Datenschutzerklärung</a> genannte Datenverarbeitung ein. Ich wurde darüber informiert, dass ich diese Einwilligung jederzeit widerrufen kann',
|
||||
'reg_finisch_hl' => 'Vielen Dank für Ihre Registrierung!',
|
||||
'reg_finisch_line_1' => 'Wir haben Dir eine E-Mail mit einem Link zur Freischaltung Deines Accounts gesendet.',
|
||||
'reg_finisch_line_2' => 'Bitte rufe Deine E-Mails ab und bestätige den Link.',
|
||||
'wizard_verification_hl' => 'Verifizierung (Personalausweis oder Pass; PDF, JPG, PNG)',
|
||||
'wizard_verification_line_1' => 'Bitte lade einen Scan / ein Foto Deines Personalausweises oder Deines Reisepasses hoch. Die Vorderseite genügt. Wir benötigen den Ausweis als Identitätsnachweis, um Deinen Account freizuschalten.',
|
||||
'wizard_business_license_hl' => 'Gewerbeschein hochladen (nur PDF, JPG, PNG)',
|
||||
'wizard_business_license_line_1' => 'Ein gültiger Gewerbeschein ist gesetzlich Pflicht, um als Vertriebspartner bei MIVITA teilnehmen zu können. Bitte lade entsprechende Kopie von Deinem aktuellen Gewerbeschein hier hoch, damit wir Deinen Account freischalten können.',
|
||||
'wizard_finish_hl' => 'Registrierung abschließen',
|
||||
'wizard_finish_line_1' => 'Sind alle Daten richtig und vollständig ausgefüllt? Falls nicht, kannst Du oben die einzelnen Punkte anklicken und noch Änderungen vornehmen. Passt alles, dann klicke jetzt auf den Button „Registrierung abschließen“. Wir werden Deine Daten dann im Anschluss prüfen und uns ggf. bei Rückfragen melden. Sobald wir Deinen Account freigeschaltet haben erhälst Du eine weitere E-Mail.',
|
||||
'wizard_create_release_hl' => 'Vielen Dank',
|
||||
'wizard_create_release_line_1' => 'Deine Registrierung und Buchung der Mitgliedschaft ist abgeschlossen!<br>Sobald die Zahlung bei uns eingegangen ist, erhälst Du automatisch eine E-Mail und Deine Mitgliedschaft wird automatisch freigeschaltet.',
|
||||
'wizard_reg_release_hl' => 'Wartet auf Überprüfung',
|
||||
'wizard_reg_release_line_1' => 'Deine Registrierung ist abgeschlossen, Deine Daten werden geprüft.<br> Nach erfolgreicher Prüfung wird dein Account freigeschaltet und Du erhälst Du eine E-Mail.',
|
||||
'sender' => 'Dein Team von mivita.care',
|
||||
'required_fields' => 'Pflichtfelder',
|
||||
];
|
||||
|
|
@ -54,7 +54,7 @@
|
|||
|
||||
<div class="card mb-2">
|
||||
<h5 class="card-header">
|
||||
{{ __('Pflichtfelder') }}
|
||||
{{trans('register.required_fields')}}
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
<div class="form-row">
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
<div class="form-row">
|
||||
<div class="form-group col">
|
||||
<label for="name" class="form-label">{{__('Passwort')}}</label>
|
||||
<input type="text" class="form-control" name="edit_m_data_key" placeholder="{{__('Passwort')}}">
|
||||
<input type="text" class="form-control" name="edit_m_data_key" placeholder="mivita">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -81,4 +81,41 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Modal template -->
|
||||
<div class="modal fade" id="modals-register-m-data">
|
||||
<div class="modal-dialog">
|
||||
<form class="modal-content" action="{{route('admin_lead_released', ['incomplete', $user->id])}}?show={{$show}}" method="post">
|
||||
@csrf
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title"> {{__('Berater Daten nicht vollständig')}}</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p>Berater eine E-Mail senden, dass die Daten nicht vollständig sind?<br>
|
||||
Vervollständige die Nachricht welche Daten fehlerhaft sind, die Nachricht wird an den Berater gesendet. Anrede, Links, Absender wird automatisch in die E-Mail eingefügt. </p>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col">
|
||||
<label for="name" class="form-label">{{__('Betreff')}}</label>
|
||||
<input type="text" class="form-control" name="account_incomplete_subject" value="{{__('email.email_incomplete')}}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col">
|
||||
<label for="name" class="form-label">{{__('Nachricht')}}</label>
|
||||
<textarea name="account_incomplete_message" class="form-control" rows="6">{{__('email.account_incomplete_copy1line')}}</textarea>
|
||||
</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">{{__('save')}}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
@endsection
|
||||
|
|
@ -34,15 +34,9 @@
|
|||
<a class="btn btn-secondary" href="{{ route('storage_file', [$file->id, 'user']) }}" target="_blank">MIVITA_Beratervertrag.pdf</a>
|
||||
@endforeach
|
||||
@endif
|
||||
@else
|
||||
@else
|
||||
<p><span class="ion ion-md-close-circle-outline text-danger"></span>
|
||||
<strong>{{__('Daten nicht vollständigt, inaktiv')}}</strong><br>
|
||||
@if($user->release_account)
|
||||
Registrierung abgeschlossen {{ $user->getReleaseAccountFormat() }}<br><br>
|
||||
<a class="btn btn-info" href="{{route('admin_lead_new_released', $user->id)}}" onclick="return confirm('Alle Daten vollständig und Berater freischalten?');">Daten vollständigt => Berater freischalten</a>
|
||||
@else
|
||||
<span class="text-danger">Berater muss Registrierung noch abschließen</span></p>
|
||||
@endif
|
||||
<strong>{{__('Daten nicht vollständigt, inaktiv')}}</strong></p>
|
||||
@endif
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
|
|
@ -70,6 +64,21 @@
|
|||
<a class="btn btn-warning btn-sm" href="{{route('admin_lead_new_mail_verified', $user->id)}}">Neue E-Mail für die Registrierung zusenden</a>
|
||||
@endif
|
||||
</div>
|
||||
<div class="col-sm-12">
|
||||
@if(!$user->active)
|
||||
<hr>
|
||||
@if($user->release_account)
|
||||
<strong>Registrierung abgeschlossen {{ $user->getReleaseAccountFormat() }}</strong><br>
|
||||
<a href="{{route('admin_lead_released', ['completed', $user->id])}}" class="btn btn-info" onclick="return confirm('Alle Daten vollständig und Berater freischalten?');">Daten vollständigt => Berater freischalten</a>
|
||||
<button type="button" class="btn btn-sm btn-danger float-right" data-toggle="modal" data-target="#modals-register-m-data">
|
||||
nicht vollständigt => E-Mail senden
|
||||
</button>
|
||||
|
||||
@else
|
||||
<strong><span class="text-danger">Berater muss Registrierung noch abschließen</span></strong>
|
||||
@endif
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
|
|
@ -100,7 +109,7 @@
|
|||
<td><a target="_blank" href="{{ route('storage_file', [$file->id, 'user']) }}">{{ $file->original_name }}</a></td>
|
||||
<td>{{ $file->formatBytes() }}</td>
|
||||
<td class="text-right">
|
||||
<a href="{{ route('wizard_delete_file', [$file->id, 'upload']) }}" class="btn btn-sm" onclick="return confirm('Datei wirklich löschen?');">
|
||||
<a href="{{ route('admin_lead_delete_file', [$user->id, $file->id, 'upload']) }}" class="btn btn-sm" onclick="return confirm('Datei wirklich löschen?');">
|
||||
<span class="ion ion-md-trash text-danger"></span>
|
||||
</a>
|
||||
</td>
|
||||
|
|
@ -133,7 +142,7 @@
|
|||
<td><a target="_blank" href="{{ route('storage_file', [$file->id, 'user']) }}">{{ $file->original_name }}</a></td>
|
||||
<td>{{ $file->formatBytes() }}</td>
|
||||
<td class="text-right">
|
||||
<a href="{{ route('wizard_delete_file', [$file->id, 'upload']) }}" class="btn btn-sm" onclick="return confirm('Datei wirklich löschen?');">
|
||||
<a href="{{ route('admin_lead_delete_file', [$user->id, $file->id, 'upload']) }}" class="btn btn-sm" onclick="return confirm('Datei wirklich löschen?');">
|
||||
<span class="ion ion-md-trash text-danger"></span>
|
||||
</a>
|
||||
</td>
|
||||
|
|
@ -146,8 +155,5 @@
|
|||
|
||||
@endif
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@
|
|||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<br>
|
||||
{{ $copy1line }}
|
||||
{!! nl2br($copy1line) !!}
|
||||
<br>
|
||||
<br>
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
@else
|
||||
<h5 class="alert badge-default">Dein Zahlungsfrist läuft in {{$user->daysActiveAccount()}} Tagen aus, bitte aktualisiere jetzt Deine Mitgliedschaft!</h5>
|
||||
@if($user->abo_options && $user->payment_account)
|
||||
<p>Deine Abo-Option ist aktiv, wir werden am <strong>{!! Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y') !!}</strong> Deine Mitgliedschaftsgebühr automatisch per SEPA Mandat einziehen.<br>
|
||||
<p>Deine automatische Verlängerung ist aktiv, wir werden am <strong>{!! Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y') !!}</strong> Deine Mitgliedschaftsgebühr automatisch per SEPA Mandat einziehen.<br>
|
||||
@endif
|
||||
@endif
|
||||
<p>Erst wenn Dein Jahresbeitrag bei uns eingeht wird Deine Mitgliedschaft automastisch für ein Jahr verlängert. Die Verlängerung gilt ab erstes Abschlussdatum ein weiteres volles Jahr, bis zum <strong>{{$user->modifyActiveAccount()}}</strong>.
|
||||
|
|
|
|||
|
|
@ -133,37 +133,13 @@
|
|||
|
||||
<!-- Application javascripts -->
|
||||
<script src="{{ mix('/js/application.js') }}"></script>
|
||||
<script src="{{ asset('/js/custom.js') }}"></script>
|
||||
<script src="{{ asset('/js/custom.js') }}?v=1"></script>
|
||||
|
||||
@yield('scripts')
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
|
||||
$('.datepicker-base').datepicker({
|
||||
orientation: 'auto right',
|
||||
calendarWeeks: true,
|
||||
todayBtn: 'linked',
|
||||
daysOfWeekDisabled: '1',
|
||||
todayHighlight: true,
|
||||
multidate: false,
|
||||
daysOfWeekHighlighted: '0,6',
|
||||
autoclose: true,
|
||||
format: 'dd.mm.yyyy',
|
||||
language: 'de',
|
||||
clearBtn: true,
|
||||
});
|
||||
|
||||
$('.b-material-datetime-picker').bootstrapMaterialDatePicker({
|
||||
weekStart: 1,
|
||||
format : 'DD.MM.YYYY HH:mm',
|
||||
shortTime: false,
|
||||
nowButton : true,
|
||||
clearButton: true,
|
||||
lang: 'de',
|
||||
//currentDate: ''
|
||||
});
|
||||
|
||||
$('.summernote').summernote({
|
||||
height: 140,
|
||||
lang: 'de-DE',
|
||||
|
|
@ -213,16 +189,9 @@
|
|||
}
|
||||
});
|
||||
$('.note-status-output').hide();
|
||||
|
||||
|
||||
|
||||
});
|
||||
|
||||
function _scrollTo(to, offset) {
|
||||
|
||||
$('html,body').animate({scrollTop: $(to).offset().top - offset}, 800);
|
||||
|
||||
}
|
||||
|
||||
|
||||
</script>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<div class="card mb-4">
|
||||
<h5 class="card-header">
|
||||
{{ __('Einwilligung & Datenschutz') }}
|
||||
{{ __('Vertrag & Datenschutz') }}
|
||||
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
<div class="form-group">
|
||||
|
|
@ -13,9 +14,23 @@
|
|||
<div class="form-group">
|
||||
<label class="custom-control custom-checkbox m-0">
|
||||
<input type="checkbox" class="custom-control-input" name="accepted_active" id="accepted_active" @if($user->agreement) checked="checked" @endif required>
|
||||
<span class="custom-control-label">{!! __('Declaration of consent') !!}</span>
|
||||
<span class="custom-control-label">{!! trans('register.declaration-of-consent') !!}*</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="container-p-x py-4 bg-light rounded mb-2" >
|
||||
<div class="" style="max-height: 400px; overflow-y: auto">
|
||||
{!! File::get(public_path('pdf/mivita_contract_de.php')); !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="custom-control custom-checkbox m-0">
|
||||
<input type="checkbox" class="custom-control-input" name="accepted_contract" id="accepted_contract" required @if($user->account && $user->account->accept_contract) checked="checked" @endif>
|
||||
<span class="custom-control-label">{!! trans('register.accept-contract') !!}*</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -31,6 +46,9 @@
|
|||
'accepted_active': {
|
||||
required: true
|
||||
},
|
||||
'accepted_contract': {
|
||||
required: true
|
||||
},
|
||||
},
|
||||
errorPlacement: function errorPlacement(error, element) {
|
||||
$(element).parents('.form-group').append(
|
||||
|
|
@ -55,6 +73,9 @@
|
|||
accepted_active : {
|
||||
required: "{{__('This field is required.')}}",
|
||||
},
|
||||
accepted_contract : {
|
||||
required: "{{__('This field is required.')}}",
|
||||
},
|
||||
|
||||
},
|
||||
onkeyup: false
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<div class="card mb-4">
|
||||
<h5 class="card-header">
|
||||
{{ __('Rechnungsdaten') }}
|
||||
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
<div class="form-row">
|
||||
|
|
@ -104,6 +105,11 @@
|
|||
@endif
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-4">
|
||||
<label for="birthday" class="form-label">{{ __('Geburtsdatum') }}*</label>
|
||||
{{ Form::text('birthday', $user->account->birthday, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'required'=>true, 'class'=>'form-control datepicker-birthday')) }}
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
@if(!isset($step))
|
||||
@if($user->email)
|
||||
|
|
@ -227,8 +233,6 @@
|
|||
{{ __('weiteres') }}
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-4">
|
||||
<label for="birthday" class="form-label">{{ __('Geburtstag') }}</label>
|
||||
|
|
@ -245,7 +249,6 @@
|
|||
{{ Form::text('instagram', $user->account->instagram, array('placeholder'=>__('instagram'), 'class'=>'form-control', 'id'=>'instagram')) }}
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
|
|
@ -259,10 +262,7 @@
|
|||
{{ Form::text('facebook_fanpage', $user->account->facebook_fanpage, array('placeholder'=>__('facebook_fanpage'), 'class'=>'form-control', 'id'=>'facebook_fanpage')) }}
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<hr>
|
||||
<label class="custom-control custom-checkbox">
|
||||
<input type="checkbox" class="custom-control-input" name="abo_options" @if($user && $user->abo_options) checked="checked" @endif>
|
||||
<span class="custom-control-label secondary"><strong>Abo-Option:</strong> Klicke dieses Box an, wenn Du Deine jährlichen Mitgliedschaft-Beiträge automatisch abbuchen lassen willst. Wir speichern Dein SEPA-Lastschrift Mandart und buchen {{config('mivita.abo_booking_days')}} Tage vor Ablauf Deine Jahresgebühr automatisch ab.</span>
|
||||
<p class="text-muted">Du kannst Deine Abo-Option jederzeit im Login-Bereich rückgängig machen. Ohne Abo-Option musst du vor Ablauf der Frist selbstänig im Login-Bereich die Zahlung ausführen.</p>
|
||||
<span class="custom-control-label secondary"><strong>{{__('payment.status.auto_renewal_hl')}}:</strong> {{__('payment.status.auto_renewal_line_1')}}</span>
|
||||
<p class="text-muted">{{__('payment.status.auto_renewal_line_2')}}</p>
|
||||
</label>
|
||||
<hr>
|
||||
|
|
@ -42,8 +42,8 @@
|
|||
<hr>
|
||||
<label class="custom-control custom-checkbox">
|
||||
<input type="checkbox" class="custom-control-input" name="abo_options">
|
||||
<span class="custom-control-label secondary"><strong>Abo-Option:</strong> Klicke dieses Box an, wenn Du Deine jährlichen Mitgliedschaft-Beiträge automatisch abbuchen lassen willst. Wähle dann bei der Zahlung SEPA-Lastschrift aus, wir speichern Dein SEPA-Lastschrift Mandart und buchen {{config('mivita.abo_booking_days')}} Tage vor ablauf deine Jahresgebühr automatisch ab.</span>
|
||||
<p class="text-muted">Du kannst Deine Abo-Option jederzeit im Login-Bereich rückgängig machen. Ohne Abo-Option musst du vor Ablauf der Frist selbstänig im Login-Bereich die Zahlung ausführen.</p>
|
||||
<span class="custom-control-label secondary"><strong>{{__('payment.status.auto_renewal_hl')}}:</strong> {{__('payment.status.auto_renewal_line_1')}}</span>
|
||||
<p class="text-muted">{{__('payment.status.auto_renewal_line_2')}}</p>
|
||||
</label>
|
||||
<hr>
|
||||
<button type="submit" class="btn btn-secondary">{{ __('wählen und weiter zur Kasse') }}</button>
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@
|
|||
<hr>
|
||||
<label class="custom-control custom-checkbox">
|
||||
<input type="checkbox" class="custom-control-input" name="abo_options">
|
||||
<span class="custom-control-label secondary"><strong>Abo-Option:</strong> Klicke dieses Box an, wenn Du Deine jährlichen Mitgliedschaft-Beiträge automatisch abbuchen lassen willst. Wähle dann bei der Zahlung SEPA-Lastschrift aus, wir speichern Dein SEPA-Lastschrift Mandart und buchen {{config('mivita.abo_booking_days')}} Tage vor ablauf deine Jahresgebühr automatisch ab.</span>
|
||||
<p class="text-muted">Du kannst Deine Abo-Option jederzeit im Login-Bereich rückgängig machen. Ohne Abo-Option musst du vor Ablauf der Frist selbstänig im Login-Bereich die Zahlung ausführen.</p>
|
||||
<span class="custom-control-label secondary"><strong>{{__('payment.status.auto_renewal_hl')}}:</strong> {{__('payment.status.auto_renewal_line_1')}}</span>
|
||||
<p class="text-muted">{{__('payment.status.auto_renewal_line_2')}}</p>
|
||||
</label>
|
||||
<hr>
|
||||
@else
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
<h6 class="alert badge-{{$userHistoryPaymentOrder->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryPaymentOrder->getStatusType())}}</h6>
|
||||
@endif
|
||||
@if($user->abo_options && $user->payment_account)
|
||||
<p class="alert py-2 px-2 badge-secondary">Deine Abo-Option ist aktiv, wir werden am <strong>{!! Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y') !!}</strong> Deine Mitgliedschaftsgebühr automatisch per SEPA Mandat einziehen.<br>
|
||||
<p class="alert py-2 px-2 badge-secondary">Deine automatische Verlängerung ist aktiv, wir werden am <strong>{!! Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y') !!}</strong> Deine Mitgliedschaftsgebühr automatisch per SEPA Mandat einziehen.<br>
|
||||
@else
|
||||
@if($user->payment_order_id && $user->payment_order_product->identifier === 'show_upgrade')
|
||||
<p></p>
|
||||
|
|
@ -87,17 +87,17 @@
|
|||
@if($user->abo_options && $user->payment_account)
|
||||
<div class="card w-100 mb-4">
|
||||
{!! Form::open(['url' => route('user_membership_store', ['remove_abo']), 'class' => 'form-horizontal']) !!}
|
||||
<h5 class="card-header">{{__('Abo-Option')}} {{__('deaktivieren')}}</h5>
|
||||
<h5 class="card-header">{{__('payment.status.auto_renewal_hl')}} {{__('deaktivieren')}}</h5>
|
||||
|
||||
<div class="card-body">
|
||||
<p>Abo-Option dekativeren und SEPA Mandat zurückziehen.<br>
|
||||
<p>Automatische Verlängerung dekativeren und SEPA Mandat zurückziehen.<br>
|
||||
Die nächste Buchung ist am: <strong>{!! Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y') !!}</strong></p>
|
||||
|
||||
<label class="custom-control custom-checkbox">
|
||||
<input type="checkbox" class="custom-control-input" name="abo_options_remove">
|
||||
<span class="custom-control-label secondary">Hiermit bestätige ich, mein SEPA zu löschen und die Abo-Option dekativeren.</span>
|
||||
<span class="custom-control-label secondary">Hiermit bestätige ich, mein SEPA zu löschen und die automatische Verlängerung dekativeren.</span>
|
||||
</label>
|
||||
<button type="submit" class="btn btn-secondary btn-sm">{{ __('Abo-Option') }} {{__('deaktivieren')}}</button>
|
||||
<button type="submit" class="btn btn-secondary btn-sm">{{__('payment.status.auto_renewal_hl')}} {{__('deaktivieren')}}</button>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
</div>
|
||||
|
|
@ -215,7 +215,7 @@
|
|||
@endif
|
||||
|
||||
<li class="list-group-item d-flex justify-content-between align-items-center">
|
||||
<div class="text-muted">{{__('Abo-Option')}}</div>
|
||||
<div class="text-muted">{{__('payment.status.auto_renewal_hl')}}</div>
|
||||
<div class="text-right">
|
||||
@if($user->abo_options)
|
||||
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i> {{ __('aktiv') }}</span>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
<div class="card mb-4">
|
||||
<h5 class="card-header">
|
||||
{{ __('Rechnungsdaten') }}
|
||||
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
|
||||
</h5>
|
||||
|
||||
<div class="card-body">
|
||||
<input type="hidden" name="user_id" value="{{$user->id}}">
|
||||
<div class="form-row">
|
||||
|
|
@ -54,9 +56,15 @@
|
|||
</span>
|
||||
@endif
|
||||
</div>
|
||||
<div class="form-group {{ $errors->has('address_2') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
|
||||
{{ Form::text('address_2', $user->account->address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'address_2', 'tabindex' => 6)) }}
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-7 {{ $errors->has('address_2') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
|
||||
{{ Form::text('address_2', $user->account->address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'address_2', 'tabindex' => 6)) }}
|
||||
</div>
|
||||
<div class="form-group col-md-5">
|
||||
<label for="birthday" class="form-label">{{ __('Geburtsdatum') }}*</label>
|
||||
{{ Form::text('birthday', $user->account->birthday, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'required'=>true, 'class'=>'form-control datepicker-birthday')) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-2 {{ $errors->has('zipcode') ? 'has-error' : '' }}">
|
||||
|
|
@ -301,16 +309,12 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card mb-4">
|
||||
{{-- <div class="card mb-4">
|
||||
<h5 class="card-header">
|
||||
{{ __('weiteres') }}
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-4">
|
||||
<label for="birthday" class="form-label">{{ __('Geburtsdatum') }}*</label>
|
||||
{{ Form::text('birthday', $user->account->birthday, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'required'=>true, 'class'=>'form-control datepicker-birthday')) }}
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
<label class="form-label" for="website">{{ __('Webseite') }}</label>
|
||||
{{ Form::text('website', $user->account->website, array('placeholder'=>__('Webseite'), 'class'=>'form-control', 'id'=>'website')) }}
|
||||
|
|
@ -336,7 +340,7 @@
|
|||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>--}}
|
||||
|
||||
<script type="application/javascript">
|
||||
|
||||
|
|
@ -353,19 +357,6 @@
|
|||
});
|
||||
});
|
||||
|
||||
$('.datepicker-birthday').datepicker({
|
||||
todayBtn: 'linked',
|
||||
daysOfWeekDisabled: '1',
|
||||
multidate: false,
|
||||
daysOfWeekHighlighted: '0,6',
|
||||
autoclose: true,
|
||||
format: 'dd.mm.yyyy',
|
||||
language: 'de',
|
||||
clearBtn: true,
|
||||
startView: 2,
|
||||
|
||||
});
|
||||
|
||||
$.extend( $.validator.messages, {
|
||||
required: "Dieses Feld ist ein Pflichtfeld.",
|
||||
maxlength: $.validator.format( "Geben Sie bitte maximal {0} Zeichen ein." ),
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
<div class="card mb-4">
|
||||
<h5 class="card-header">
|
||||
{{ __('Rechnungsdaten') }}
|
||||
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
<input type="hidden" name="user_id" value="{{$user->id}}">
|
||||
|
|
@ -145,19 +146,7 @@
|
|||
});
|
||||
});
|
||||
|
||||
$('.datepicker-birthday').datepicker({
|
||||
todayBtn: 'linked',
|
||||
daysOfWeekDisabled: '1',
|
||||
multidate: false,
|
||||
daysOfWeekHighlighted: '0,6',
|
||||
autoclose: true,
|
||||
format: 'dd.mm.yyyy',
|
||||
language: 'de',
|
||||
clearBtn: true,
|
||||
startView: 2,
|
||||
|
||||
});
|
||||
|
||||
|
||||
$.extend( $.validator.messages, {
|
||||
required: "Dieses Feld ist ein Pflichtfeld.",
|
||||
maxlength: $.validator.format( "Geben Sie bitte maximal {0} Zeichen ein." ),
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@
|
|||
<hr>
|
||||
<label class="custom-control custom-checkbox">
|
||||
<input type="checkbox" class="custom-control-input" name="abo_options">
|
||||
<span class="custom-control-label secondary"><strong>Abo-Option:</strong> Klicke dieses Box an, wenn Du Deine jährlichen Mitgliedschaft-Beiträge automatisch abbuchen lassen willst. Wähle dann bei der Zahlung SEPA-Lastschrift aus, wir speichern Dein SEPA-Lastschrift Mandart und buchen {{config('mivita.abo_booking_days')}} Tage vor ablauf deine Jahresgebühr automatisch ab.</span>
|
||||
<p class="text-muted">Du kannst Deine Abo-Option jederzeit im Login-Bereich rückgängig machen. Ohne Abo-Option musst du vor Ablauf der Frist selbstänig im Login-Bereich die Zahlung ausführen.</p>
|
||||
<span class="custom-control-label secondary"><strong>{{__('payment.status.auto_renewal_hl')}}:</strong> {{__('payment.status.auto_renewal_line_1')}}</span>
|
||||
<p class="text-muted">{{__('payment.status.auto_renewal_line_2')}}</p>
|
||||
</label>
|
||||
<hr>
|
||||
<button type="submit" class="btn btn-secondary">{{ __('wählen und weiter zur Kasse') }}</button>
|
||||
|
|
|
|||
|
|
@ -24,9 +24,8 @@
|
|||
<div class="mb-3">
|
||||
<div id="smartwizard-3-step-6" class="card animated fadeIn">
|
||||
<div class="card-body">
|
||||
<h4>Vielen Dank,</h4>
|
||||
<p>Deine Registrierung und Buchung der Mitgliedschaft ist abgeschlossen!</p>
|
||||
<p>Sobald die Zahlung bei uns eingegangen ist, erhälst Du automatisch eine E-Mail und Deine Mitgliedschaft wird automatisch freigeschaltet.</p>
|
||||
<h4>{{ trans('register.wizard_create_release_hl') }}</h4>
|
||||
<p>{!! trans('register.wizard_create_release_line_1') !!}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
<a href="#smartwizard-3-step-1" class="mb-3">
|
||||
<span class="sw-done-icon ion ion-md-checkmark"></span>
|
||||
<span class="sw-number">1</span>
|
||||
Datenschutz
|
||||
Vertrag
|
||||
<div class="text-muted small">zustimmen</div>
|
||||
|
||||
</a>
|
||||
|
|
@ -69,6 +69,7 @@
|
|||
|
||||
<div class="mb-3">
|
||||
<div id="smartwizard-3-step-1" class="card animated fadeIn">
|
||||
|
||||
<div class="card-body">
|
||||
{!! Form::open(['url' => route('wizard_store_register', [0]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation-confirm']) !!}
|
||||
@include('user.data_confirm')
|
||||
|
|
@ -92,7 +93,7 @@
|
|||
<div class="card-body">
|
||||
<div class="card mb-4">
|
||||
<h5 class="card-header">
|
||||
{{ __('Ausweis hochladen (nur PDF, JPG, PNG)') }}
|
||||
{{ trans('register.wizard_verification_hl') }}
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
|
|
@ -105,7 +106,7 @@
|
|||
{!! Form::close() !!}
|
||||
<br>
|
||||
<div class="alert alert-danger alert-dismissable" style="display:none;"></div>
|
||||
<p>Bitte lade eine Kopie, Vorder- und Rückseite Deines Ausweises (Personalausweis / Reisepass) als Foto oder PDF hoch. Wir benötigen den Ausweis als Identitätsnachweis, um Deinen Account freizuschalten.</p>
|
||||
<p>{{ trans('register.wizard_verification_line_1') }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
|
|
@ -147,7 +148,7 @@
|
|||
<div class="card-body">
|
||||
<div class="card mb-4">
|
||||
<h5 class="card-header">
|
||||
{{ __('Gewerbeschein hochladen (nur PDF, JPG, PNG)') }}
|
||||
{{ trans('register.wizard_business_license_hl') }}
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
|
|
@ -160,7 +161,7 @@
|
|||
{!! Form::close() !!}
|
||||
<br>
|
||||
<div class="alert alert-danger alert-dismissable" style="display:none;"></div>
|
||||
<p>Bitte lade eine Kopie Deines Gewerbeschein / Gewerbenachweis als Foto oder PDF hoch. Wir benötigen den Nachweis, um Deinen Account freizuschalten.</p>
|
||||
<p>{{ trans('register.wizard_business_license_line_1') }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
|
|
@ -200,10 +201,8 @@
|
|||
</div>
|
||||
<div id="smartwizard-3-step-5" class="card animated fadeIn">
|
||||
<div class="card-body">
|
||||
<h4>Registrierung abschließen</h4>
|
||||
<p>Sind alle Daten richtig und vollständig? Falls nicht kannst du oben die einzelen Punkt anklicken und noch Änderungen vornehmen.</p>
|
||||
<p>Passt alles, dann drücke jetzt auf den Button "Registrierung abschließen", wir werden Deine Daten prüfen und uns falls nötig bei Dir melden.</p>
|
||||
<p>Sobald wir Deinen Account freigeschaltet haben erhälst Du eine E-Mail.</p>
|
||||
<h4>{{ trans('register.wizard_finish_hl') }}</h4>
|
||||
<p>{{ trans('register.wizard_finish_line_1') }}.</p>
|
||||
{!! Form::open(['url' => route('wizard_store_register', [4])]) !!}
|
||||
<button type="submit" name="submit" value="do" class="btn btn-secondary">{{ __('Registrierung abschließen') }}</button>
|
||||
{!! Form::close() !!}
|
||||
|
|
|
|||
|
|
@ -24,9 +24,8 @@
|
|||
<div class="mb-3">
|
||||
<div id="smartwizard-3-step-6" class="card animated fadeIn">
|
||||
<div class="card-body">
|
||||
<h4>Wartet auf Überprüfung.</h4>
|
||||
<p>Deine Registrierung ist abgeschlossen, Deine Daten werden geprüft.</p>
|
||||
<p>Nach erfolgreicher Prüfung wird dein Account freigeschaltet und Du erhälst Du eine E-Mail.</p>
|
||||
<h4>{{ trans('register.wizard_reg_release_hl') }}</h4>
|
||||
<p>{!! trans('register.wizard_reg_release_line_1') !!}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -74,8 +74,7 @@
|
|||
href="{{url('/kontakt')}}">Kontakt</a></li>
|
||||
<li class="{{ Request::is('partner') ? ' register_user' : '' }}"><a
|
||||
href="{{url('/partner')}}">Partner</a></li>
|
||||
<li class="{{ Request::is('register_user') ? ' active' : '' }}"><a
|
||||
href="{{url('/registrierung')}}">Registrierung</a></li>
|
||||
<li class="{{ Request::is('register_user') ? ' active' : '' }}">
|
||||
</ul>
|
||||
<!-- /Links -->
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
<hr>
|
||||
<h2>Das klingt spannend für Dich?</h2>
|
||||
<p>Dann nimm noch heute Kontakt mit uns auf - wir freuen uns, Dich kennenzulernen.</p>
|
||||
|
||||
@if($user_shop)
|
||||
<a href="/registrierung" rel="nofollow" target="_blank" class="btn btn-default btn-lg pull-right">zur
|
||||
Registrierung</a>
|
||||
|
||||
@endif
|
||||
<a href="/kontakt" rel="nofollow" target="_blank" class="btn btn-primary btn-lg">zum
|
||||
Kontaktformular</a>
|
||||
|
||||
|
|
|
|||
|
|
@ -128,8 +128,7 @@
|
|||
@endif
|
||||
@endif
|
||||
<p>
|
||||
Dein Team von,<br />
|
||||
<strong> mivita.care</strong>
|
||||
<strong>Dein Team von mivita.care</strong>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -555,7 +555,7 @@
|
|||
{!! Form::text('elv_bic', '', ['class' => 'form-control', 'id'=>'elv_bic', 'placeholder'=>'Beisp.: PBNKDEFF']) !!}
|
||||
</div>
|
||||
@if($shopping_user->abo_options)
|
||||
<p>Abo-Option wurde ausgewählt. Dein SEPA-Mandart wird gespeichert und die jährliche Zahlung automatisch ausgeführt.</p>
|
||||
<p>Automatische Verlängerung wurde ausgewählt. Dein SEPA-Mandart wird gespeichert und die jährliche Zahlung automatisch ausgeführt.</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -81,9 +81,9 @@
|
|||
<!-- FORM -->
|
||||
<div class="col-md-9 col-sm-8">
|
||||
|
||||
<h1>Registrierung</h1>
|
||||
<h1>{{ trans('register.reg_hl') }}</h1>
|
||||
|
||||
<p>Dieses Formular ist für die Registrierung neuer Vertriebspartner. Nach dem Absenden des Formulars erhälst du eine E Mail mit weiteren Informationen sowie den Freischaltlink.</p>
|
||||
<p>{{ trans('register.reg_line_1') }}</p>
|
||||
|
||||
<div class="box-static box-transparent box-bordered padding-20">
|
||||
|
||||
|
|
@ -163,13 +163,15 @@
|
|||
|
||||
|
||||
<div class="col-md-12" style="margin-bottom: 8px; margin-top: 5px;">
|
||||
<em class="small">* Pflichtpfelder</em>
|
||||
<em class="small">* {{trans('register.required_fields')}}</em>
|
||||
</div>
|
||||
<div class="col-md-12" style="margin-bottom: 8px; margin-top: 8px;">
|
||||
<label class="checkbox {{ ($errors->has('accepted_data_protection') ? 'error' : '') }}" for="accepted_data_protection">
|
||||
{!! Form::checkbox('accepted_data_protection', 1, false, ['id'=>'accepted_data_protection', 'class' => 'form-control '.($errors->has('accepted_data_protection') ? 'error' : ''), '']) !!}
|
||||
<i></i> <span class="fa fa-angle-double-left text-success fa-lg"></span> Hiermit willige ich in die im Rahmen der <a target="_blank" href="{{ url('datenschutz') }}">Datenschutzerklärung</a>
|
||||
genannte Datenverarbeitung ein. Ich wurde darüber informiert, dass ich diese Einwilligung jederzeit widerrufen kann.*
|
||||
<i></i> <span class="fa fa-angle-double-left text-success fa-lg"></span>
|
||||
{!! trans('register.reg_checked', ['link' => url('datenschutz')]) !!}
|
||||
|
||||
.*
|
||||
</label>
|
||||
@if ($errors->has('accepted_data_protection'))
|
||||
<div class="alert alert-danger error"><!-- DANGER -->
|
||||
|
|
|
|||
|
|
@ -84,12 +84,12 @@
|
|||
<h1>Registrierung</h1>
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-body">
|
||||
<h3>{{ __('Thank you for your registration!') }}</h3>
|
||||
<h4>{{ __('We have sent you an e-mail with a link to activate your data.') }}</h4>
|
||||
<p>{{ __('Please check your emails and confirm the link.') }}</p>
|
||||
<h3>{{ trans('register.reg_finisch_hl') }}</h3>
|
||||
<p>{{ trans('register.reg_finisch_line_1') }}<br>
|
||||
{{ trans('register.reg_finisch_line_2') }}</p>
|
||||
<hr />
|
||||
<p>
|
||||
<strong>{{ __('your mivita.care team') }}</strong>
|
||||
<strong>{{ trans('register.sender') }}</strong>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -97,8 +97,10 @@
|
|||
href="{{url('/kontakt')}}">Kontakt</a></li>
|
||||
<li class="{{ Request::is('partner') ? ' active' : '' }}"><a
|
||||
href="{{url('/partner')}}">Partner</a></li>
|
||||
@if($user_shop)
|
||||
<li class="{{ Request::is('register_user') ? ' active' : '' }}"><a
|
||||
href="{{url('/registrierung')}}">Registrierung</a></li>
|
||||
@endif
|
||||
</ul>
|
||||
<!-- /Links -->
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -286,11 +286,13 @@ Route::domain(config('app.pre_url_crm').config('app.domain').config('app.tld_car
|
|||
Route::get('/admin/lead/change_mail/{id}', 'UserUpdateEmailController@adminChangeMail')->name('admin_lead_change_mail');
|
||||
Route::post('/admin/lead/change_mail/{id}', 'UserUpdateEmailController@adminUpdateMail')->name('admin_lead_change_mail');
|
||||
Route::get('/admin/lead/new_mail/verified/{id}', 'LeadController@newMailVerified')->name('admin_lead_new_mail_verified');
|
||||
Route::get('/admin/lead/new/released/{id}', 'LeadController@newReleased')->name('admin_lead_new_released');
|
||||
Route::get('/admin/lead/released/{action}/{id}', 'LeadController@released')->name('admin_lead_released');
|
||||
Route::post('/admin/lead/released/{action}/{id}', 'LeadController@released')->name('admin_lead_released');
|
||||
|
||||
|
||||
Route::get('/admin/lead/delete/file/{user_id}/{file_id}/{relation}', 'LeadController@deleteFile')->name('admin_lead_delete_file');
|
||||
|
||||
Route::post('/admin/lead/store', 'LeadController@store')->name('admin_lead_store');
|
||||
|
||||
Route::get('/admin/leads/datatable', 'LeadController@getLeads')->name('admin_leads_datatable');
|
||||
|
||||
//sales
|
||||
|
|
@ -303,11 +305,6 @@ Route::domain(config('app.pre_url_crm').config('app.domain').config('app.tld_car
|
|||
Route::get('/admin/sales/customers/detail/{id}', 'SalesController@customersDetail')->name('admin_sales_customers_detail');
|
||||
Route::get('/admin/sales/customers/datatable', 'SalesController@customersDatatable')->name('admin_sales_customers_datatable');
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
});
|
||||
|
||||
//login pages for superadmin
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue