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

01 2020

Browse source
This commit is contained in:
Kevin Adametz 2020-02-14 10:18:44 +01:00
parent f117f79bb9
commit 3711fcc8d0
101 changed files with 4027 additions and 918 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.idea/mivita.care.iml generated
View file

@ -69,6 +69,7 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/psy/psysh" />
<excludeFolder url="file://$MODULE_DIR$/vendor/ralouphie/getallheaders" />
<excludeFolder url="file://$MODULE_DIR$/vendor/ramsey/uuid" />
<excludeFolder url="file://$MODULE_DIR$/vendor/reliese/laravel" />
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/diff" />
@ -82,6 +83,8 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/version" />
<excludeFolder url="file://$MODULE_DIR$/vendor/seld/jsonlint" />
<excludeFolder url="file://$MODULE_DIR$/vendor/seld/phar-utils" />
<excludeFolder url="file://$MODULE_DIR$/vendor/setasign/fpdf" />
<excludeFolder url="file://$MODULE_DIR$/vendor/setasign/fpdi" />
<excludeFolder url="file://$MODULE_DIR$/vendor/swiftmailer/swiftmailer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/console" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/css-selector" />
@ -110,7 +113,6 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/var-dumper" />
<excludeFolder url="file://$MODULE_DIR$/vendor/theseer/tokenizer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/tijsverkoyen/css-to-inline-styles" />
<excludeFolder url="file://$MODULE_DIR$/vendor/vladrub/laravel-datatables-oracle" />
<excludeFolder url="file://$MODULE_DIR$/vendor/vlucas/phpdotenv" />
<excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
<excludeFolder url="file://$MODULE_DIR$/vendor/yajra/laravel-datatables-oracle" />

6
.idea/php.xml generated
View file

@ -79,7 +79,6 @@
<path value="$PROJECT_DIR$/vendor/jeremeamia/SuperClosure" />
<path value="$PROJECT_DIR$/vendor/yajra/laravel-datatables-oracle" />
<path value="$PROJECT_DIR$/vendor/fzaninotto/faker" />
<path value="$PROJECT_DIR$/vendor/vladrub/laravel-datatables-oracle" />
<path value="$PROJECT_DIR$/vendor/tijsverkoyen/css-to-inline-styles" />
<path value="$PROJECT_DIR$/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/vendor/doctrine/event-manager" />
@ -111,12 +110,15 @@
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-iconv" />
<path value="$PROJECT_DIR$/vendor/reliese/laravel" />
<path value="$PROJECT_DIR$/vendor/setasign/fpdf" />
<path value="$PROJECT_DIR$/vendor/setasign/fpdi" />
</include_path>
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="7.1" />
<component name="PhpUnit">
<phpunit_settings>
<PhpUnitSettings load_method="CUSTOM_LOADER" custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" />
<PhpUnitSettings custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" />
</phpunit_settings>
</component>
</project>

157
.idea/workspace.xml generated
View file

@ -2,14 +2,103 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="2fbaac5f-25ba-4502-a970-cc14728d7d55" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/RegisterController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Libraries/ContractPDF.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Mail/MailAccountActive.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Mail/MailReleaseAccount.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Repositories/ContractPDFRepository.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Repositories/FileRepository.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/admin/lead/m_register_data.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/emails/info.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/user/wizard/register.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/user/wizard/register_release.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/web/templates/_content_contact.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/web/templates/registrierung.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/web/templates/registrierung_finish.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/mivita.care.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/mivita.care.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.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/Pay/PayoneController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.phpstorm.meta.php" beforeDir="false" afterPath="$PROJECT_DIR$/.phpstorm.meta.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/_ide_helper.php" beforeDir="false" afterPath="$PROJECT_DIR$/_ide_helper.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/_ide_helper_models.php" beforeDir="false" afterPath="$PROJECT_DIR$/_ide_helper_models.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/DataTableController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/DataTableController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/HomeController.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/SalesController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/SalesController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/UserDataController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/UserDataController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/UserUpdatePasswordController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/UserUpdatePasswordController.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$/public/images/payments-assets/sofort.png" beforeDir="false" afterPath="$PROJECT_DIR$/public/images/payments-assets/sofort.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/ContactController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/ContactController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/SiteController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/SiteController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/WizardController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/WizardController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Middleware/Authenticate.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Middleware/Authenticate.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Mail/MailActivateUser.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailActivateUser.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/MailResetPassword.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailResetPassword.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Mail/MailVerifyAccount.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailVerifyAccount.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Mail/MailVerifyContact.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailVerifyContact.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/ShoppingUser.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingUser.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/UserAccount.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/UserAccount.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/UserLevel.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/UserLevel.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Providers/AppServiceProvider.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Providers/AppServiceProvider.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Repositories/UserRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Repositories/UserRepository.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$/app/helpers.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/helpers.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/cache/packages.php" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/cache/packages.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/cache/services.php" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/cache/services.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/app.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/app.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/filesystems.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/filesystems.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$/public/css/application.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/application.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/js/application.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/application.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/js/forms_file-upload.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/forms_file-upload.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/validation.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de/validation.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/attribute/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/attribute/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/category/images.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/category/images.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/category/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/category/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/country/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/country/index.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_data_form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/lead/m_data_form.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/lead/m_data_form_edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/lead/m_data_form_edit.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/level/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/level/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/product/images.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/product/images.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/product/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/product/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/shipping/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/shipping/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/site/images.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/site/images.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/auth/login.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/auth/login.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/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/layouts/includes/layout-sidenav.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/status/not_found.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/status/not_found.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/status/status_error.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/status/status_error.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/status/status_register.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/status/status_register.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/status/status_verify.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/status/status_verify.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/status/user_blocked.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/status/user_blocked.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/status/verify.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/status/verify.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/user/components/user_shop_edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/components/user_shop_edit.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/user/user_form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/user_form.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/user/wizard/show.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/wizard/create.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/aloevera.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/aloevera.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/anforderungsprofil.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/anforderungsprofil.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$/resources/views/web/user/layouts/application.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/user/layouts/application.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/erreichbarkeit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/erreichbarkeit.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/existenzgruendung.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/existenzgruendung.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/karrierechancen.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/karrierechancen.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/kontakt.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/kontakt.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/partner.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/partner.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/ueber-uns.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/ueber-uns.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/vereinbarkeit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/vereinbarkeit.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/vorteile.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/vorteile.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" />
@ -136,7 +225,6 @@
<path value="$PROJECT_DIR$/vendor/jeremeamia/SuperClosure" />
<path value="$PROJECT_DIR$/vendor/yajra/laravel-datatables-oracle" />
<path value="$PROJECT_DIR$/vendor/fzaninotto/faker" />
<path value="$PROJECT_DIR$/vendor/vladrub/laravel-datatables-oracle" />
<path value="$PROJECT_DIR$/vendor/tijsverkoyen/css-to-inline-styles" />
<path value="$PROJECT_DIR$/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/vendor/doctrine/event-manager" />
@ -168,6 +256,9 @@
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
<path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-iconv" />
<path value="$PROJECT_DIR$/vendor/reliese/laravel" />
<path value="$PROJECT_DIR$/vendor/setasign/fpdf" />
<path value="$PROJECT_DIR$/vendor/setasign/fpdi" />
</include_path>
</component>
<component name="ProjectId" id="1Ply2ASLtUbE38LpjzejPOnh0np" />
@ -184,7 +275,7 @@
<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$/resources/views/admin/lead" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/app/Mail" />
<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" />
@ -192,20 +283,38 @@
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/public/vendor/libs/dropzone" />
<recent name="$PROJECT_DIR$/public/vendor/libs" />
<recent name="$PROJECT_DIR$/resources/views/admin/user" />
<recent name="$PROJECT_DIR$/resources/views/admin/lead" />
<recent name="$PROJECT_DIR$/public/download" />
<recent name="$PROJECT_DIR$/resources/views/web/user" />
<recent name="$PROJECT_DIR$/app/Services/Facade" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resources/views/admin/lead" />
<recent name="$PROJECT_DIR$/resources/views/admin/sales" />
<recent name="$PROJECT_DIR$/resources/views/sys/admin" />
<recent name="$PROJECT_DIR$/app/Http/Controllers" />
<recent name="$PROJECT_DIR$/resources/views/admin/level" />
<recent name="$PROJECT_DIR$/app/Mail" />
<recent name="$PROJECT_DIR$/app/Repositories" />
<recent name="$PROJECT_DIR$/app/Libraries" />
<recent name="$PROJECT_DIR$/resources/views/user/wizard" />
<recent name="$PROJECT_DIR$/resources/views/emails" />
</key>
</component>
<component name="RunManager">
<configuration default="true" type="ShConfigurationType">
<option name="SCRIPT_PATH" value="$USER_HOME$/Documents/scripts/composer-post-update.sh" />
<option name="SCRIPT_OPTIONS" value="" />
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="INTERPRETER_PATH" value="/bin/bash" />
<option name="INTERPRETER_OPTIONS" value="" />
<method v="2" />
</configuration>
<configuration name="composer-post-update.sh" type="ShConfigurationType">
<option name="SCRIPT_PATH" value="$USER_HOME$/Documents/scripts/composer-post-update.sh" />
<option name="SCRIPT_OPTIONS" value="" />
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="INTERPRETER_PATH" value="/bin/bash" />
<option name="INTERPRETER_OPTIONS" value="" />
<method v="2" />
</configuration>
</component>
<component name="ServiceViewManager">
<option name="viewStates">
<list>
@ -321,6 +430,16 @@
<workItem from="1578070274627" duration="66000" />
<workItem from="1578493675622" duration="10000" />
<workItem from="1578493690816" duration="11299000" />
<workItem from="1578672302747" duration="1742000" />
<workItem from="1578831425036" duration="6019000" />
<workItem from="1578928076715" duration="559000" />
<workItem from="1579028224750" duration="42000" />
<workItem from="1580139983493" duration="1049000" />
<workItem from="1581156718221" duration="27110000" />
<workItem from="1581245547669" duration="5492000" />
<workItem from="1581502538849" duration="2174000" />
<workItem from="1581517312628" duration="9759000" />
<workItem from="1581604452585" duration="5853000" />
</task>
<servers />
</component>
@ -350,17 +469,27 @@
</option>
</component>
<component name="WindowStateProjectService">
<state x="754" y="395" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1581158802015">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="754" y="395" key="#com.intellij.execution.impl.EditConfigurationsDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1581158802015" />
<state x="968" y="472" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1578493681405">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<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="1581190466051">
<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="1581190466051" />
<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 x="1064" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1578063343693">
<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="926" y="497" width="683" height="486" key="find.popup" timestamp="1578504136004">
<state x="805" y="444" width="1115" height="793" key="find.popup" timestamp="1581619115984">
<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="1581619115984" />
<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="1578504893896">
<screen x="0" y="23" width="2560" height="1417" />

11
.phpstorm.meta.php
View file

@ -5,7 +5,7 @@ namespace PHPSTORM_META {
/**
* PhpStorm Meta file, to provide autocomplete information for PhpStorm
* Generated on 2020-01-02 16:09:05.
* Generated on 2020-02-12 16:29:05.
*
* @author Barry vd. Heuvel <barryvdh@gmail.com>
* @see https://github.com/barryvdh/laravel-ide-helper
@ -34,6 +34,7 @@ namespace PHPSTORM_META {
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
@ -189,6 +190,7 @@ namespace PHPSTORM_META {
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
@ -344,6 +346,7 @@ namespace PHPSTORM_META {
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
@ -499,6 +502,7 @@ namespace PHPSTORM_META {
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
@ -654,6 +658,7 @@ namespace PHPSTORM_META {
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
@ -809,6 +814,7 @@ namespace PHPSTORM_META {
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
@ -964,6 +970,7 @@ namespace PHPSTORM_META {
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
@ -1119,6 +1126,7 @@ namespace PHPSTORM_META {
'Laracasts\Flash\SessionStore' => \Laracasts\Flash\LaravelSessionStore::class,
'NunoMaduro\Collision\Contracts\Adapters\Phpunit\Listener' => \NunoMaduro\Collision\Adapters\Phpunit\Listener::class,
'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
'Reliese\Coders\Model\Factory' => \Reliese\Coders\Model\Factory::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
@ -1251,6 +1259,7 @@ namespace PHPSTORM_META {
'view.finder' => \Illuminate\View\FileViewFinder::class,
]));
override(\Illuminate\Support\Arr::add(0), type(0));
override(\Illuminate\Support\Arr::except(0), type(0));
override(\Illuminate\Support\Arr::first(0), elementType(0));

413
_ide_helper.php
View file

File diff suppressed because it is too large Load diff

94
_ide_helper_models.php
View file

@ -81,6 +81,16 @@ namespace App{
* @method static \Illuminate\Database\Eloquent\Builder|\App\User wherePaymentAccount($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\User wherePaymentShop($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereWizard($value)
* @property int|null $m_level
* @property int|null $m_sponsor
* @property-read \App\Models\UserLevel|null $user_level
* @property-read \App\User|null $user_sponsor
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereMLevel($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereMSponsor($value)
* @property string|null $release_account
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\File[] $files
* @property-read int|null $files_count
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereReleaseAccount($value)
*/
class User extends \Eloquent {}
}
@ -308,6 +318,10 @@ namespace App\Models{
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereShippingZipcode($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereUpdatedAt($value)
* @mixin \Eloquent
* @property int|null $orders
* @property-read \App\Models\ShoppingOrder $shopping_order
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingOrder[] $shopping_orders
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereOrders($value)
*/
class ShoppingUser extends \Eloquent {}
}
@ -460,6 +474,34 @@ namespace App\Models{
class Shipping extends \Eloquent {}
}
namespace App\Models{
/**
* App\Models\UserLevel
*
* @property int $id
* @property string $name
* @property array|null $trans_name
* @property float|null $margin
* @property int|null $pos
* @property int $active
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel query()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereMargin($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel wherePos($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereTransName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereUpdatedAt($value)
* @mixin \Eloquent
*/
class UserLevel extends \Eloquent {}
}
namespace App\Models{
/**
* App\Models\Country
@ -494,6 +536,10 @@ namespace App\Models{
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereTrans($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereUpdatedAt($value)
* @property string|null $trans_name
* @property array|null $attr
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereAttr($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereTransName($value)
*/
class Country extends \Eloquent {}
}
@ -536,6 +582,41 @@ namespace App\Models{
class ProductImage extends \Eloquent {}
}
namespace App\Models{
/**
* Class File
*
* @property int $id
* @property int $user_id
* @property string $filename
* @property string $dir
* @property string $original_name
* @property string $ext
* @property string $mine
* @property int $size
* @property Carbon $created_at
* @property Carbon $updated_at
* @property User $user
* @package App\Models
* @property string $identifier
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File query()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereDir($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereExt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereFilename($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereIdentifier($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereMine($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereOriginalName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereSize($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\File whereUserId($value)
*/
class File extends \Eloquent {}
}
namespace App\Models{
/**
* App\Models\ShoppingPayment
@ -765,6 +846,7 @@ namespace App\Models{
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\IqSite whereSetProducts($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\IqSite whereSlug($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\IqSite whereUpdatedAt($value)
* @mixin \Eloquent
*/
class IqSite extends \Eloquent {}
}
@ -864,6 +946,18 @@ namespace App\Models{
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereWebsite($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereZipcode($value)
* @property string|null $m_account
* @property string|null $m_salutation
* @property string|null $m_first_name
* @property string|null $m_last_name
* @property string|null $m_notes
* @property int|null $taxable_sales
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMAccount($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMFirstName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMLastName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMNotes($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMSalutation($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereTaxableSales($value)
*/
class UserAccount extends \Eloquent {}
}

5
app/Http/Controllers/Api/PayoneController.php
View file

@ -125,11 +125,11 @@ class PayoneController extends Controller
$user = User::findOrFail($shopping_order->auth_user_id);
foreach ($shopping_order_item->product->action as $do){
if($shopping_order_item->product->getActionName($do) == 'payment_for_account'){
if($shopping_order_item->product->getActionName($do) === 'payment_for_account'){
$user->payment_account = date("Y-m-d H:i:s", strtotime("+1 years"));
$user->wizard = 10;
}
if($shopping_order_item->product->getActionName($do) == 'payment_for_shop'){
if($shopping_order_item->product->getActionName($do) === 'payment_for_shop'){
$user->payment_shop = date("Y-m-d H:i:s", strtotime("+1 years"));
$user->wizard = 10;
}
@ -144,6 +144,7 @@ class PayoneController extends Controller
if($data['txaction'] == 'appointed'){
}
$billing_email = $shopping_order->shopping_user->billing_email;
$user_shop_email = $shopping_order->user_shop->user->email;
if(!$billing_email){

16
app/Http/Controllers/DataTableController.php
View file

@ -25,25 +25,25 @@ class DataTableController extends Controller
return $user->account ? $user->account->last_name : '';
})
->addColumn('id', function (User $user) {
return '<a href="' . route('admin_lead_edit', [$user->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="far fa-edit"></span></a>';
return '<a href="' . route('admin_lead_edit', [$user->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
})
->addColumn('admin', function (User $user) {
return '<a href="#" data-toggle="modal" data-target="#modals-default" data-id="'.$user->id.'" data-email="'.$user->email.'" data-admin="'.$user->admin.'" data-active="'.$user->active.'" data-confirmed="'.$user->confirmed.'">'.HTMLHelper::getRoleLabel($user->admin).'</a>';
})
->addColumn('confirmed', function (User $user) {
return $user->confirmed ? '<span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
return $user->confirmed ? '<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
})
->addColumn('active', function (User $user) {
return $user->active ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
return $user->active ? ' <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
})
->addColumn('shop', function (User $user) {
if($user->shop){
if($user->shop->active){
return '<span class="badge badge-pill badge-success"><i class="far fa-check"></i> active</span>';
return '<span class="badge badge-pill badge-success"><i class="fa fa-check"></i> active</span>';
}
return'<span class="badge badge-pill badge-success"><i class="far fa-check"></i> deactive</span>';
return'<span class="badge badge-pill badge-success"><i class="fa fa-check"></i> deactive</span>';
}
return '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
return '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
})
->addColumn('since', function (User $user) {
if($user->shop){
@ -55,8 +55,8 @@ class DataTableController extends Controller
return "-";
})
->addColumn('action_delete', function (User $user) {
return '<a href="' . route('admin_user_delete', [$user->id]) . '" class="btn icon-btn btn-sm btn-danger" onclick="return confirm(\''.__('Really delete entry?').'\');"><span class="far fa-trash"></span></a>
<a href="' . route('admin_user_login_as', [$user->id]) . '" class="btn icon-btn btn-sm btn-warning" onclick="return confirm(\''.__('Login as User?').'\');"><span class="far fa-sign-in-alt"></span></a>';
return '<a href="' . route('admin_user_delete', [$user->id]) . '" class="btn icon-btn btn-sm btn-danger" onclick="return confirm(\''.__('Really delete entry?').'\');"><span class="fa fa-trash"></span></a>
<a href="' . route('admin_user_login_as', [$user->id]) . '" class="btn icon-btn btn-sm btn-warning" onclick="return confirm(\''.__('Login as User?').'\');"><span class="fa fa-sign-in-alt"></span></a>';
})
->orderColumn('id', 'id $1')
->orderColumn('confirmed', 'confirmed $1')

32
app/Http/Controllers/HomeController.php
View file

@ -22,11 +22,7 @@ class HomeController extends Controller
{
}
/**
* Show the application dashboard.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
if(!Auth::check()){
@ -55,28 +51,28 @@ class HomeController extends Controller
$target = Input::get('target');
$response = "";
if($data == "data_protection"){
if($data === "data_protection"){
$data = [
'modal' => true,
'user_shop' => Util::getUserShop(),
];
$response = view('legal.data_protect_de', $data)->render();
}
if($data == "imprint"){
if($data === "imprint"){
$data = [
'modal' => true,
'user_shop' => Util::getUserShop(),
];
$response = view('legal.imprint_de', $data)->render();
}
if($data == "shop_term_of_use"){
if($data === "shop_term_of_use"){
$data = [
'modal' => true,
'user_shop' => Util::getUserShop(),
];
$response = view('legal.shop_term_of_use_de', $data)->render();
}
if($data == "agb"){
if($data === "agb"){
$data = [
'modal' => true,
'user_shop' => Util::getUserShop(),
@ -169,13 +165,13 @@ class HomeController extends Controller
if ( ! $user)
{
// return redirect('/status/not/found');
return redirect('/home');
return redirect('/status/not/found');
}
$user->confirmed = 1;
$user->confirmation_date = now();
if($user->confirmed === 0){
$user->confirmed = 1;
$user->confirmation_date = now();
}
// $user->confirmation_code = null;
// $user->confirmation_code_to = null;
// $user->confirmation_code_remider = 0;
@ -207,7 +203,7 @@ class HomeController extends Controller
public function checkMail(){
$data = Input::all();
if($data['user_id'] == "new"){
if($data['user_id'] === "new"){
if(User::where('email', $data['email'])->count()){
return json_encode(false);
}
@ -228,9 +224,9 @@ class HomeController extends Controller
if($reference){
$ShoppingPayment = ShoppingPayment::where('reference', $reference)->first();
if($ShoppingPayment->status == 'success'){
if($ShoppingPayment && $ShoppingPayment->status === 'success'){
$user = Auth::user();
if($user->wizard < 4){
if($user && $user->wizard < 4){
$user->wizard = 4;
$user->save();
return redirect(route('wizard', [4]));

108
app/Http/Controllers/LeadController.php
View file

@ -4,8 +4,11 @@ namespace App\Http\Controllers;
use App\Mail\MailVerifyAccount;
use App\Mail\MailVerifyContact;
use App\Mail\MailAccountActive;
use App\Models\UserAccount;
use App\Repositories\ContractPDFRepository;
use App\Repositories\UserRepository;
use App\User;
use Illuminate\Support\Facades\Mail;
@ -58,6 +61,7 @@ class LeadController extends Controller
}
}
$data = [
'show' => Input::get('show'),
'user' => $user,
'can_change_mail' => true,
'm_data_load' => false,
@ -96,6 +100,7 @@ class LeadController extends Controller
}
}
$data = [
'show' => Input::get('show'),
'user' => $user,
'm_data_load' => $m_data_load,
'm_data_error' => $m_data_error,
@ -112,6 +117,8 @@ class LeadController extends Controller
{
$data = Input::all();
$show = Input::get('show');
if ($data['user_id'] === "new" || $data['user_id'] == 0) {
$rules = array(
'salutation' => 'required',
@ -155,7 +162,7 @@ class LeadController extends Controller
$user_id = $user->id;
}
return redirect(route('admin_lead_edit', [$user_id]))->withErrors($validator)->withInput(Input::all());
}else{
}
if ($data['user_id'] === "new" || $data['user_id'] == 0) {
$user = new User();
@ -194,6 +201,9 @@ class LeadController extends Controller
$user->lang = $user->getLandByCountry();
$user->confirmation_code = $confirmation_code;
//10 == start wizard form create Lead
$user->wizard = 10;
$user->save();
@ -204,28 +214,84 @@ class LeadController extends Controller
}
\Session()->flash('alert-save', true);
return redirect(route('admin_lead_edit', [$user->id]));
return redirect(route('admin_lead_edit', [$user->id])."?show=".$show);
}
//user released when register is complete
public function newReleased($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());
}
//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));
\Session()->flash('alert-success', "Berater freigeschaltet!");
return redirect(route('admin_lead_edit', [$user->id]));
}
//send new verfified mail to user
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);
$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");
return redirect(route('admin_lead_edit', [$user->id]));
}
/* @if($user->payment_account )
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('Account aktiv')}}</strong> {{__('bis zum:')}} {{ $user->getPaymentAccountDateFormat() }}</p>
@else
<p><span class="ion ion-md-close-circle-outline text-danger"></span>
<strong>{{__('Account inaktiv')}}</strong></p>
@endif
@if($user->payment_shop)
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('Shop aktiv')}}</strong> {{__('bis zum')}}: {{ $user->getPaymentShopDateFormat() }}</p>
@else
<p><span class="ion ion-md-close-circle-outline text-danger"></span>
<strong>{{__('Shop inaktiv')}}</strong></p>
@endif*/
public function getLeads()
{
@ -242,22 +308,22 @@ class LeadController extends Controller
return '<a href="' . route('admin_lead_edit', [$user->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="far fa-edit"></span></a>';
})
->addColumn('confirmed', function (User $user) {
return $user->confirmed ? '<span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
return $user->confirmed ? '<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
})
->addColumn('active', function (User $user) {
return $user->active ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
return $user->active ? ' <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
})
->addColumn('agreement', function (User $user) {
return $user->agreement ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
return $user->agreement ? ' <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
})
->addColumn('payment_account', function (User $user) {
return $user->payment_account ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
return $user->payment_account ? ' <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
})
->addColumn('payment_account_date', function (User $user) {
return $user->payment_account ? $user->getPaymentAccountDateFormat(false) : "-";
})
->addColumn('payment_shop', function (User $user) {
return $user->payment_shop ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
return $user->payment_shop ? ' <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
})
->addColumn('payment_shop_date', function (User $user) {
return $user->payment_shop ? $user->getPaymentShopDateFormat(false) : "-";

16
app/Http/Controllers/SalesController.php
View file

@ -73,16 +73,16 @@ class SalesController extends Controller
return $ShoppingOrder->user_shop ? '<a href="'.$ShoppingOrder->user_shop->getSubdomain().'" target="_blank">'.$ShoppingOrder->user_shop->getSubdomain().'</span>' : '';
})
->addColumn('id', function (ShoppingOrder $ShoppingOrder) {
return '<a href="' . route('admin_sales_users_detail', [$ShoppingOrder->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="far fa-edit"></span></a>';
return '<a href="' . route('admin_sales_users_detail', [$ShoppingOrder->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
})
/* ->addColumn('confirmed', function (User $user) {
return $user->confirmed ? '<span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
return $user->confirmed ? '<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
})
->addColumn('active', function (User $user) {
return $user->active ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
return $user->active ? ' <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
})
->addColumn('agreement', function (User $user) {
return $user->agreement ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
return $user->agreement ? ' <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
})
->orderColumn('confirmed', 'confirmed $1')
->orderColumn('active', 'active $1')
@ -149,16 +149,16 @@ class SalesController extends Controller
return $ShoppingOrder->user_shop ? '<a href="'.$ShoppingOrder->user_shop->getSubdomain().'" target="_blank">'.$ShoppingOrder->user_shop->getSubdomain().'</span>' : '';
})
->addColumn('id', function (ShoppingOrder $ShoppingOrder) {
return '<a href="' . route('admin_sales_users_detail', [$ShoppingOrder->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="far fa-edit"></span></a>';
return '<a href="' . route('admin_sales_users_detail', [$ShoppingOrder->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
})
/* ->addColumn('confirmed', function (User $user) {
return $user->confirmed ? '<span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
return $user->confirmed ? '<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
})
->addColumn('active', function (User $user) {
return $user->active ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
return $user->active ? ' <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
})
->addColumn('agreement', function (User $user) {
return $user->agreement ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
return $user->agreement ? ' <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
})
->orderColumn('confirmed', 'confirmed $1')
->orderColumn('active', 'active $1')

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

@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use App\Repositories\UserRepository;
use App\User;
use Auth;
use Input;
use Validator;
@ -86,7 +87,7 @@ class UserDataController extends Controller
*/
public function userDataStore(){
$user = Auth::user();
$user = User::findOrFail(Auth::user()->id);
if(!$user->account){
$user->account = new UserAccount();
}

29
app/Http/Controllers/UserUpdatePasswordController.php
View file

@ -54,11 +54,11 @@ class UserUpdatePasswordController extends Controller
// redirect our user back to the form with the errors from the validator
return view('user.update_password')->withErrors($validator);
}else{
$request->user()->fill([
'password' => Hash::make($request->password)
])->save();
}
$request->user()->fill([
'password' => Hash::make($request->password)
])->save();
\Session()->flash('alert-save', '1');
return redirect(route('user_update_password'));
@ -67,22 +67,18 @@ class UserUpdatePasswordController extends Controller
/**
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
*/
public function updatePasswordFirst(){
if(!Auth::user()->isPasswort()){
return view('user.update_password_first');
}
return redirect(route('user_update_password'));
}
/**
* Update the password for the user.
*
* @param Request $request
* @return Response
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
*/
public function updatePasswordFirstStore(Request $request)
{
@ -100,12 +96,13 @@ class UserUpdatePasswordController extends Controller
// redirect our user back to the form with the errors from the validator
return view('user.update_password_first')->withErrors($validator);
}else{
$request->user()->fill([
'password' => Hash::make($request->password)
])->save();
}
$request->user()->fill([
'password' => Hash::make($request->password)
])->save();
\Session()->flash('alert-save', '1');
return redirect('/home');
}

3
app/Http/Controllers/Web/CheckoutController.php
View file

@ -178,7 +178,6 @@ class CheckoutController extends Controller
return redirect(route('checkout.checkout_card'))->withInput(Input::all());
}
if($ret['elv']['status'] === 'APPROVED' && $ret['elv']['mandate_status'] !== "active"){
dd($ret);
\Session::flash('elv-managemandate', 1);
\Session::flash('elv-mandate_identification', $ret['elv']['mandate_identification']);
\Session::flash('elv-mandate_text', $ret['elv']['mandate_text']);
@ -198,7 +197,7 @@ class CheckoutController extends Controller
if(Input::get('payment_method') === 'elv' && Input::get('mandate_identification')) {
$ret['elv']['mandate_identification'] = Input::get('mandate_identification');
$ret['elv']['creditor_identifier'] = Input::get('creditor_identifier');
$ret['elv']['iban'] = $data['iban'];
$ret['elv']['iban'] = $data['elv_iban'];
$ret['elv']['bic'] = $data['elv_bic'];
$ret['elv']['bankaccountholder'] = $data['elv_bankaccountholder'];
}

5
app/Http/Controllers/Web/ContactController.php
View file

@ -57,7 +57,8 @@ class ContactController extends Controller
$validator = Validator::make(Input::all(), $rules);
if ($validator->fails()) {
return back()->withErrors($validator)->withErrors($validator)->withInput(Input::all());
}else{
}
$contact = [];
$contact['first_name'] = Input::get('first_name');
@ -78,8 +79,6 @@ class ContactController extends Controller
'user_shop' => Util::getUserShop(),
];
return view('web.templates.contact-final', $data);
}
}

135
app/Http/Controllers/Web/RegisterController.php Executable file
View file

@ -0,0 +1,135 @@
<?php
namespace App\Http\Controllers\Web;
use App\Http\Controllers\Controller;
use App\Mail\MailContact;
use App\Mail\MailVerifyAccount;
use App\Repositories\UserRepository;
use App\User;
use GuzzleHttp\Client;
use Input;
use Illuminate\Support\Facades\Mail;
use App\Services\Util;
use Validator;
class RegisterController extends Controller
{
private $GOOGLE_ReCAPTCHA_KEY = "6LeeZosUAAAAAG907fMMqO4BFgsiR4ANDodd8FlU";
private $GOOGLE_ReCAPTCHA_SECRET = "6LeeZosUAAAAADIy2fyR4RG3EuM-Zdz7Pa2Qmb1J";
protected $userRepo;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct(UserRepository $userRepo)
{
$this->userRepo = $userRepo;
}
public function index()
{
$data = [
'GOOGLE_ReCAPTCHA_KEY' => $this->GOOGLE_ReCAPTCHA_KEY,
'user_shop' => Util::getUserShop(),
];
return view('web.templates.registrierung', $data);
}
public function register(){
$rules = array(
'first_name'=>'required',
'last_name'=>'required',
'salutation' => 'required',
'email' => 'required|string|email|max:255|unique:users',
'email-confirm' => 'required|same:email',
'password' => 'required|string|min:6|confirmed',
'password_confirmation' => 'required|string|min:6',
// 'g-recaptcha-response'=>'required|recaptcha',
'accepted_data_protection' => 'required',
);
/*Validator::extend('recaptcha', function($attribute, $value, $parameters, $validator) {
return $this->reCaptcha_validate($attribute, $value, $parameters, $validator);
});*/
$validator = Validator::make(Input::all(), $rules);
if ($validator->fails()) {
return back()->withErrors($validator)->withErrors($validator)->withInput(Input::all());
}
$user_shop = Util::getUserShop();
$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);
$user->lang = !empty(\App::getLocale()) ? \App::getLocale() : "de";
$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->m_sponsor = $user_shop->user->id;
$user->m_level = 1;
$user->save();
$user->account->data_protection = now();
$user->account->save();
Mail::to($user->email)->send(new MailVerifyAccount($confirmation_code, $user));
return redirect('/registrierung/finish');
}
public function finish()
{
$data = [
'user_shop' => Util::getUserShop(),
];
return view('web.templates.registrierung_finish', $data);
}
/*
private function reCaptcha_validate($attribute, $value, $parameters, $validator)
{
$client = new Client();
$response = $client->post(
'https://www.google.com/recaptcha/api/siteverify',
['form_params' =>
[
'secret' => $this->GOOGLE_ReCAPTCHA_SECRET,
'response' => $value
]
]
);
$body = json_decode((string)$response->getBody());
return $body->success;
}
*/
}

4
app/Http/Controllers/Web/SiteController.php
View file

@ -63,8 +63,8 @@ class SiteController extends Controller
}
}
if($site == 'produkte'){
if($subsite || $subsite != 'alle-produkte') {
if($site === 'produkte'){
if($subsite || $subsite !== 'alle-produkte') {
$category = Category::where('slug', $subsite)->where('active', true)->first();
if ($category) {
$headline_image = false;

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

@ -2,35 +2,46 @@
namespace App\Http\Controllers;
use App\Mail\MailReleaseAccount;
use App\Models\File;
use App\Models\Product;
use App\Models\ShoppingInstance;
use App\Models\UserAccount;
use App\Repositories\FileRepository;
use App\Services\Util;
use App\User;
use Auth;
use Hash;
use Illuminate\Support\Facades\Mail;
use Input;
use Validator;
use Yard;
class WizardController extends Controller
{
protected $fileRepo;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
public function __construct(FileRepository $fileRepo)
{
$this->fileRepo = $fileRepo;
}
public function show($step = 0)
public function create()
{
if(!Auth::check()){
return redirect('login');
}
$user = Auth::user();
$user = User::findOrFail(Auth::user()->id);
if(!$user->account){
$account = UserAccount::create([]);
$user->account_id = $account->id;
@ -38,7 +49,7 @@ class WizardController extends Controller
return redirect(route('wizard'));
}
$step = (!$user->wizard ? 0 : $user->wizard );
$step = !$user->wizard ? 0 : $user->wizard;
if($step == 10){
return redirect('/');
}
@ -48,18 +59,178 @@ class WizardController extends Controller
'products' => Product::where('active', true)->where('show_at', '=', 3)->orderBy('pos', 'ASC')->get(),
];
return view('user.wizard.show', $data);
return view('user.wizard.create', $data);
}
public function register()
{
public function store($step = 0)
if(!Auth::check()){
return redirect('login');
}
$user = User::findOrFail(Auth::user()->id);
if(!$user->account){
$account = UserAccount::create([]);
$user->account_id = $account->id;
$user->save();
return redirect(route('wizard'));
}
$step = !$user->wizard ? 0 : $user->wizard;
if($step == 10){
return redirect('/');
}
$data = [
'user' => Auth::user(),
'step' => $step,
'products' => Product::where('active', true)->where('show_at', '=', 3)->orderBy('pos', 'ASC')->get(),
];
if($step == 5){
return view('user.wizard.register_release', $data);
}
return view('user.wizard.register', $data);
}
public function storeRegister($step = false)
{
if (!Auth::check()) {
return redirect('login');
}
$user = User::findOrFail(Auth::user()->id);
if (!$user->account) {
$user->account = new UserAccount();
}
if ($step == 0) {
$rules = array(
'accepted_data_protection' => 'required',
'accepted_active' => 'required',
);
$validator = Validator::make(Input::all(), $rules);
if ($validator->fails()) {
$data = [
'user' => Auth::user(),
'step' => $step,
'products' => Product::where('active', true)->where('show_at', '=', 3)->orderBy('pos', 'ASC')->get(),
];
$user->wizard = 0;
$user->save();
return view('user.wizard.register', $data)->withErrors($validator);
}
$account = $user->account;
if($account->data_protection === null){
$account->data_protection = now();
}
if($user->agreement === null){
$user->agreement = now();
}
$user->wizard = 1;
$user->save();
return redirect(route('wizard_register'));
}
if ($step == 1) {
$rules = array(
'salutation' => 'required',
'first_name' => 'required',
'last_name' => 'required',
'address' => 'required',
'zipcode' => 'required',
'city' => 'required',
'phone' => 'required_without:mobil',
'mobil' => 'required_without:phone',
'country_id' => 'required|integer|min:1',
'birthday' => 'required',
);
if (!Input::get('same_as_billing')) {
$rules = array_merge($rules, [
'shipping_firstname' => 'required',
'shipping_lastname' => 'required',
'shipping_address' => 'required',
'shipping_zipcode' => 'required',
'shipping_city' => 'required',
'shipping_salutation' => 'required',
'shipping_country_id' => 'required|integer|min:1',
]);
}
$validator = Validator::make(Input::all(), $rules);
if ($validator->fails()) {
$user->wizard = 1;
$user->save();
return redirect(route('wizard_register', [1]))->withErrors($validator)->withInput(Input::all());
}
$data = Input::all();
$data['same_as_billing'] = Input::get('same_as_billing') == NULL ? 0 : 1;
$user->account->fill($data)->save();
$user->wizard = 2;
$user->save();
return redirect(route('wizard_register'));
}
if ($step == 2) {
if(Input::get('submit') === 'do'){
if(File::whereUserId($user->id)->whereIdentifier('id_card')->count() == 0){
$validator = Validator::make(Input::all(), []);
$validator->errors()->add('field', __('Kein Ausweis hinterlegt, bitte erst hochladen.'));
$user->wizard = 2;
$user->save();
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Input::all());
}
$user->wizard = 3;
$user->save();
return redirect(route('wizard_register'));
}
$this->fileRepo->_set('disk', 'user');
$this->fileRepo->_set('dir', '/'.$user->id.'/verification/');
$this->fileRepo->_set('user_id', $user->id);
$this->fileRepo->_set('identifier', 'id_card');
return $this->fileRepo->uploadFile(Input::all());
}
if ($step == 3) {
if(Input::get('submit') === 'do'){
if(File::whereUserId($user->id)->whereIdentifier('business_license')->count() == 0){
$validator = Validator::make(Input::all(), []);
$validator->errors()->add('field', __('Kein Gewerbeschein hinterlegt, bitte erst hochladen.'));
$user->wizard = 3;
$user->save();
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Input::all());
}
$user->wizard = 4;
$user->save();
return redirect(route('wizard_register'));
}
$this->fileRepo->_set('disk', 'user');
$this->fileRepo->_set('dir', '/'.$user->id.'/verification/');
$this->fileRepo->_set('user_id', $user->id);
$this->fileRepo->_set('identifier', 'business_license');
return $this->fileRepo->uploadFile(Input::all());
}
if ($step == 4) {
$user->wizard = 5;
$user->release_account = now();
$user->save();
Mail::to('kevin@adametz.media')->bcc(['kevin.adametz@me.com'])->send(new MailReleaseAccount($user));
return redirect(route('wizard_register'));
}
}
public function storeCreate($step = 0)
{
if(!Auth::check()){
return redirect('login');
}
$user = Auth::user();
$user = User::findOrFail(Auth::user()->id);
if(!$user->account){
$user->account = new UserAccount();
}
@ -76,6 +247,7 @@ class WizardController extends Controller
'step' => $step,
];
return view('user.wizard.show', $data)->withErrors($validator);
}
$account = $user->account;
$account->data_protection = now();
@ -207,9 +379,21 @@ class WizardController extends Controller
\Session()->flash('alert-error', "Fehler beim Produkt");
return redirect(route('wizard', [3]));
}
}
public function delete($id, $relation){
if($relation === 'upload'){
$user = User::findOrFail(Auth::user()->id);
$file = $user->files()->findOrFail($id);
//remove file
\Storage::disk('user')->delete($file->dir.$file->filename);
$file->delete();
\Session()->flash('alert-success', "Datei gelöscht");
}
return back();
}
}

24
app/Http/Middleware/Authenticate.php
View file

@ -46,15 +46,25 @@ class Authenticate
return redirect(route('user_blocked'));
}
//is wizard
if(in_array('user', $guards) && $this->auth->user()->wizard < 5){
return redirect(route('wizard'));
}
//can use wizard < 10 to repay
if(in_array('user', $guards) && $this->auth->user()->wizard < 10){
//return redirect(route('wizard'));
//100 wizzard is finish
if(in_array('user', $guards) && $this->auth->user()->wizard !== 100){
//0-10 == start wizard form register
if(in_array('user', $guards) && $this->auth->user()->wizard < 10){
return redirect(route('wizard_register'));
}
//10-20 == start wizard form create Lead
if(in_array('user', $guards) && $this->auth->user()->wizard < 20){
return redirect(route('wizard_create'));
}
//is wizard
/*if(in_array('user', $guards) && $this->auth->user()->wizard < 5){
return redirect(route('wizard'));
}
*/
}
return $next($request);
}

29
app/Libraries/ContractPDF.php Normal file
View file

@ -0,0 +1,29 @@
<?php
namespace App\Libraries;
use setasign\Fpdi\Fpdi;
class ContractPDF extends Fpdi
{
protected $_tplIdx;
protected $_site = 1;
public function Header()
{
if (null === $this->_tplIdx) {
$this->setSourceFile('./pdf/mivita_template_contract_de.pdf');
}
$this->_tplIdx = $this->importPage($this->_site++);
$this->useTemplate($this->_tplIdx);
}
function Footer() {
} // end of footer
}

48
app/Mail/MailAccountActive.php Normal file
View file

@ -0,0 +1,48 @@
<?php
namespace App\Mail;
use App\User;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Contracts\Queue\ShouldQueue;
class MailAccountActive extends Mailable
{
use Queueable, SerializesModels;
protected $confirmation_code;
protected $user;
public $subject;
public function __construct(User $user)
{
$this->user = $user;
$this->subject = __('email.account_active');
}
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.",";
}
}
return $this->view('emails.auth')->with([
'url' => route('login'),
'salutation' => $salutation,
'button' => __('Login'),
'copy1line' => __('email.account_active_copy1line'),
'copy2line' => __('email.copy2line'),
'copy3line' => __('email.copy3line'),
'greetings' => __('email.greetings'),
'sender' => __('email.sender'),
]);
}
}

3
app/Mail/MailActivateUser.php
View file

@ -12,6 +12,7 @@ class MailActivateUser extends Mailable
use Queueable, SerializesModels;
protected $token;
protected $user;
public $subject;
public function __construct($token, User $user)
@ -25,7 +26,7 @@ class MailActivateUser extends Mailable
$salutation = __('email.salutation').",";
if($this->user->account){
if($this->user->account->salutation == "mr"){
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.",";

2
app/Mail/MailCheckout.php
View file

@ -41,7 +41,7 @@ class MailCheckout extends Mailable
$salutation = __('email.hello')." ".$this->shopping_order->shopping_user->billing_firstname.",";
//make Adresse
}
if($this->txaction == 'paid'){
if($this->txaction === 'paid'){
return $this->view('emails.checkout')->with([
'salutation' => $salutation,
'copy1line' => __('email.checkout_copy1line'),

64
app/Mail/MailReleaseAccount.php Normal file
View file

@ -0,0 +1,64 @@
<?php
namespace App\Mail;
use App\User;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Contracts\Queue\ShouldQueue;
class MailReleaseAccount extends Mailable
{
use Queueable, SerializesModels;
protected $user;
public $subject;
public function __construct(User $user)
{
$this->user = $user;
$this->subject = 'Berater Registrierung pürfen';
}
public function build()
{
$content = __(strtoupper($this->user->account->salutation))." ";
$content .= $this->user->account->first_name." ".$this->user->account->last_name."\n";
$content .= $this->user->account->address."\n";
$content .= $this->user->account->zipcode." ".$this->user->account->city."\n";
$content .= $this->user->account->country_id ? $this->user->account->country->de."\n\n" : "\n\n";
if($this->user->account->phone){
$content .= "Telefon: ";
$content .= $this->user->account->pre_phone_id ? $this->user->account->pre_phone->phone." " : " ";
$content .= $this->user->account->phone;
}
if($this->user->account->mobil){
$content .= "Mobil: ";
$content .= $this->user->account->pre_mobil_id ? $this->user->account->pre_mobil->phone." " : " ";
$content .= $this->user->account->mobil;
}
$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 .= "+ 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";
return $this->view('emails.info')->with([
'url' => route('admin_lead_edit', $this->user->id).'?show=check_lead',
'salutation' => 'Berater Registrierung pürfen',
'button' => 'zur Berater Prüfung',
'copy1line' => $copy1line,
'copy2line' => __('email.copy2line'),
'content' => $content,
]);
}
}

3
app/Mail/MailResetPassword.php
View file

@ -12,6 +12,7 @@ class MailResetPassword extends Mailable
use Queueable, SerializesModels;
protected $token;
protected $user;
public $subject;
@ -29,7 +30,7 @@ class MailResetPassword extends Mailable
{
$salutation = __('email.salutation').",";
if($this->user->account){
if($this->user->account->salutation == "mr"){
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.",";

8
app/Mail/MailVerifyAccount.php
View file

@ -12,6 +12,7 @@ class MailVerifyAccount extends Mailable
use Queueable, SerializesModels;
protected $confirmation_code;
protected $user;
public $subject;
@ -26,9 +27,8 @@ class MailVerifyAccount extends Mailable
public function build()
{
$salutation = __('email.salutation').",";
if($this->user->account){
if($this->user->account->salutation == "mr"){
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.",";
@ -39,8 +39,8 @@ class MailVerifyAccount extends Mailable
'salutation' => $salutation,
'button' => __('email.email_verify'),
'copy1line' => __('email.email_verify_copy1line'),
'copy2line' => __('email.active_copy2line'),
'copy3line' => __('email.active_copy3line'),
'copy2line' => __('email.copy2line'),
'copy3line' => __('email.copy3line'),
'greetings' => __('email.greetings'),
'sender' => __('email.sender'),

3
app/Mail/MailVerifyContact.php
View file

@ -12,6 +12,7 @@ class MailVerifyContact extends Mailable
use Queueable, SerializesModels;
protected $confirmation_code;
protected $user;
public $subject;
@ -27,7 +28,7 @@ class MailVerifyContact extends Mailable
{
$salutation = __('email.salutation').",";
if($this->user->account){
if($this->user->account->salutation == "mr"){
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.",";

70
app/Models/File.php Normal file
View file

@ -0,0 +1,70 @@
<?php
/**
* Created by Reliese Model.
*/
namespace App\Models;
use App\User;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
/**
* Class File
*
* @property int $id
* @property int $user_id
* @property string $filename
* @property string $dir
* @property string $original_name
* @property string $ext
* @property string $mine
* @property int $size
* @property Carbon $created_at
* @property Carbon $updated_at
*
* @property User $user
*
* @package App\Models
*/
class File extends Model
{
protected $table = 'files';
protected $casts = [
'user_id' => 'int',
'size' => 'int'
];
protected $fillable = [
'user_id',
'identifier',
'filename',
'dir',
'original_name',
'ext',
'mine',
'size'
];
public function user()
{
return $this->belongsTo(User::class);
}
public function formatBytes($precision = 2)
{
$size = $this->size;
if ($size > 0) {
$size = (int) $size;
$base = log($size) / log(1024);
$suffixes = array(' bytes', ' KB', ' MB', ' GB', ' TB');
return round(pow(1024, $base - floor($base)), $precision) . $suffixes[floor($base)];
} else {
return $size;
}
}
}

15
app/Models/ShoppingPayment.php
View file

@ -66,19 +66,22 @@ class ShoppingPayment extends Model
public function getPaymentType(){
if($this->clearingtype == 'wlt') {
if ($this->wallettype == 'PPE') {
if($this->clearingtype === 'wlt') {
if ($this->wallettype === 'PPE') {
return 'PayPal';
}
}
if($this->clearingtype == 'cc') {
if($this->clearingtype === 'cc') {
return 'Kreditkarte';
}
if($this->clearingtype == 'vor') {
if($this->clearingtype === 'vor') {
return 'Vorkasse';
}
if($this->clearingtype == 'sb') {
if ($this->onlinebanktransfertype == 'PNT') {
if($this->clearingtype === 'elv') {
return 'SEPA Lastschrift';
}
if($this->clearingtype === 'sb') {
if ($this->onlinebanktransfertype === 'PNT') {
return 'Sofort Überweisung';
}
}

4
app/Models/ShoppingUser.php
View file

@ -69,6 +69,10 @@ use Illuminate\Database\Eloquent\Model;
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereShippingZipcode($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereUpdatedAt($value)
* @mixin \Eloquent
* @property int|null $orders
* @property-read \App\Models\ShoppingOrder $shopping_order
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingOrder[] $shopping_orders
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereOrders($value)
*/
class ShoppingUser extends Model
{

12
app/Models/UserAccount.php
View file

@ -101,6 +101,18 @@ use Carbon\Carbon;
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereWebsite($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereZipcode($value)
* @property string|null $m_account
* @property string|null $m_salutation
* @property string|null $m_first_name
* @property string|null $m_last_name
* @property string|null $m_notes
* @property int|null $taxable_sales
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMAccount($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMFirstName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMLastName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMNotes($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereMSalutation($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserAccount whereTaxableSales($value)
*/
class UserAccount extends Model
{

24
app/Models/UserLevel.php
View file

@ -4,6 +4,30 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Model;
/**
* App\Models\UserLevel
*
* @property int $id
* @property string $name
* @property array|null $trans_name
* @property float|null $margin
* @property int|null $pos
* @property int $active
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel query()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereMargin($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel wherePos($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereTransName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereUpdatedAt($value)
* @mixin \Eloquent
*/
class UserLevel extends Model
{
protected $table = 'user_levels';

1
app/Providers/AppServiceProvider.php
View file

@ -24,6 +24,7 @@ class AppServiceProvider extends ServiceProvider
*/
public function register()
{
if ($this->app->environment() !== 'production') {
$this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
}

144
app/Repositories/ContractPDFRepository.php Normal file
View file

@ -0,0 +1,144 @@
<?php
namespace App\Repositories;
use App\Libraries\ContractPDF;
use App\Models\File;
use App\User;
use Request;
use Response;
use Storage;
use Util;
use Validator;
class ContractPDFRepository extends BaseRepository {
protected $disk;
protected $dir;
protected $user_id;
protected $identifier;
public function __construct(User $model){
$this->model = $model;
}
public function _set($name, $value){
$this->{$name} = $value;
}
public function createContractPDF() {
$pdf = new ContractPDF();
$pdf->AddPage('P', array(210, 297));
$pdf->SetFont('Helvetica', '', 11);
$pdf->SetDrawColor(160, 160, 160);
$x1 = 16.5;
$x2 = 109;
$y = 70;
$nl = 17.5;
$pdf->SetXY($x1, $y);
$pdf->Write(0, $this->model->account->m_account);
$pdf->SetXY($x2, $y);
$pdf->Write(0, now()->format("d.m.Y"));
$y += $nl;
$pdf->SetXY($x1, $y);
$pdf->Write(0, $this->model->account->company);
$pdf->SetXY($x2, $y);
$pre = $this->model->account->pre_phone_id != "" ? $this->model->account->pre_phone->phone." " : "";
$pdf->Write(0, $pre.$this->model->account->phone);
$y += $nl;
$pdf->SetXY($x1, $y);
$pdf->Write(0, $this->model->account->m_first_name);
$pdf->SetXY($x2, $y);
$pre = $this->model->account->pre_mobil_id != "" ? $this->model->account->pre_mobil->phone." " : "";
$pdf->Write(0, $pre.$this->model->account->mobil);
$y += $nl;
$pdf->SetXY($x1, $y);
$pdf->Write(0, $this->model->account->m_last_name);
$pdf->SetXY($x2, $y);
$pdf->Write(0, $this->model->email);
$y += $nl;
$pdf->SetXY($x1, $y);
$pdf->Write(0, $this->model->account->address);
$pdf->SetXY($x2, $y);
$pdf->Write(0, $this->model->account->birthday);
$y += $nl;
$pdf->SetXY($x1, $y);
$pdf->Write(0, $this->model->account->zipcode." ".$this->model->account->city);
$y += $nl;
$pdf->SetXY($x1, $y);
$pre = $this->model->account->country_id ? $this->model->account->country->de." " : "";
$pdf->Write(0, $pre);
if($this->model->m_sponsor){
$y += 48;
$pdf->SetXY($x1, $y);
$pdf->Write(0, $this->model->user_sponsor->account->company);
$pdf->SetXY($x2, $y);
$pdf->Write(0, $this->model->user_sponsor->account->m_account);
$y += $nl;
$pdf->SetXY($x1, $y);
$pdf->Write(0, $this->model->user_sponsor->account->m_first_name." ".$this->model->user_sponsor->account->m_last_name);
$website = $this->model->user_sponsor->shop()->count() ? $this->model->user_sponsor->shop->getSubdomain() : "www.mivita.care";
}else{
$website = "www.mivita.care";
}
$pdf->AddPage('P', array(210, 297));
$pdf->SetFont('Helvetica', '', 10);
$pdf->SetDrawColor(160, 160, 160);
$pdf->SetXY(52, 56);
$pdf->Write(0, $website);
$pdf->SetXY($x1, 65);
$pdf->Write(0, $this->model->account->m_first_name." ".$this->model->account->m_last_name);
$pdf->SetXY($x2, 65);
$pdf->Write(0, $this->model->account->m_account);
$pdf->AddPage('P', array(210, 297));
if(!Storage::disk($this->disk)->exists( $this->dir )){
Storage::disk($this->disk)->makeDirectory($this->dir); //creates directory
}
$filename = "MIVITA_Beratervertrag.pdf";
Storage::disk($this->disk)->put($this->dir.$filename, $pdf->Output('S'));
$size = Storage::disk($this->disk)->size($this->dir.$filename);
$mine = Storage::disk($this->disk)->getMimeType($this->dir.$filename);
File::create([
'user_id' => $this->model->id,
'identifier' => $this->identifier,
'filename' => $filename,
'dir' => $this->dir,
'original_name' => $filename,
'ext' => "pdf",
'mine' => $mine,
'size' => $size
]);
return true;
}
}

141
app/Repositories/FileRepository.php Normal file
View file

@ -0,0 +1,141 @@
<?php
namespace App\Repositories;
use App\Models\File;
use Request;
use Response;
use Storage;
use Util;
use Validator;
class FileRepository extends BaseRepository {
protected $rules;
protected $messages;
protected $disk;
protected $dir;
protected $user_id;
protected $identifier;
public function __construct(File $model){
$this->model = $model;
$this->rules = [
'file' => 'required|mimes:pdf,jpeg,png|max:32768'
];
$this->messages = [
'file.mimes' => 'Datei ist kein PDF Format',
'file.required' => 'PDF-Datei wird benötigt'
];
}
public function _set($name, $value){
$this->{$name} = $value;
}
/* public function load($id){
$this->model = $id;
}
*/
public function uploadFile( $form_data )
{
$validator = Validator::make($form_data, $this->rules, $this->messages);
if ($validator->fails()) {
return Response::json([
'error' => true,
'message' => $validator->messages()->first(),
'code' => 400
], 400);
}
$file = $form_data['file'];
$originalName = $file->getClientOriginalName();
$extension = $file->getClientOriginalExtension();
$mine = $file->getClientMimeType();
$size = $file->getClientSize();
$originalNameWithoutExt = substr($originalName, 0, strlen($originalName) - strlen($extension) - 1);
$filename = Util::sanitize($originalNameWithoutExt, true, false, true);
$allowed_filename = uniqid() . '_' . $filename.".".$extension;
//$dir = $this->model->getInvoiceStorageAttDir();
if(!Storage::disk($this->disk)->exists( $this->dir )){
Storage::disk($this->disk)->makeDirectory($this->dir); //creates directory
}
Storage::disk($this->disk)->put($this->dir.$allowed_filename, file_get_contents($file->getRealPath()));
File::create([
'user_id' => $this->user_id,
'identifier' => $this->identifier,
'filename' => $allowed_filename,
'dir' => $this->dir,
'original_name' => $originalName,
'ext' => $extension,
'mine' => $mine,
'size' => $size
]);
return Response::json([
'error' => false,
'filename' => $allowed_filename,
'filedata' => 'pdf',
'redirect' => route('wizard_register'),
'code' => 200
], 200);
}
/* public function createFile(Request $request)
{
$locale = \App::getLocale();
$data = [
'step' => 2,
'locale' => $locale,
];
$rules = array(
'network_name' => 'required|max:255',
'input_file_now' => 'required|mimes:png,pdf,jpg,jpeg|max:30000'
);
$validator = Validator::make(Input::all(), $rules);
if ($validator->fails()) {
// get the error messages from the validator
$messages = $validator->messages();
// redirect our user back to the form with the errors from the validator
return view('user.register_complete', $data)->withErrors($validator);
} else {
$user = \Auth::user();
if(!$user->account->network_name){
$file = request()->file('input_file_now');
//$ext = $file->guessClientExtension();
//$file->storeAs('user/' . $user->id .'/verification');
$data = $file->store('user/' . $user->id .'/verification');
$account = $user->account;
$account->network_name = Input::get('network_name');
$account->network_verification = basename($data);
$account->save();
$user->role_id = 2; //set as User by default!
$user->save();
}
return redirect('complete_register');
//return view('user.register_complete', $data);
}
}*/
}

28
app/Repositories/UserRepository.php
View file

@ -4,6 +4,8 @@ namespace App\Repositories;
use App\Models\UserAccount;
use App\User;
use Illuminate\Support\Facades\Hash;
class UserRepository extends BaseRepository {
@ -15,6 +17,7 @@ class UserRepository extends BaseRepository {
}
public function update($data)
{
@ -44,7 +47,30 @@ class UserRepository extends BaseRepository {
$this->model->save();
}
return;
return true;
}
public function create($data){
$this->model = User::create([
'email' => $data['email'],
'password' => Hash::make($data['password']),
]);
$account = UserAccount::create([
'm_salutation' => $data['salutation'],
'm_first_name' => $data['first_name'],
'm_last_name' => $data['last_name'],
'salutation' => $data['salutation'],
'first_name' => $data['first_name'],
'last_name' => $data['last_name'],
]);
$this->model->account_id = $account->id;
$this->model->save();
return $this->model;
}
public function deleteUser(User $user)

19
app/Services/Util.php
View file

@ -120,5 +120,24 @@ class Util
}
return url($uri);
}
public static function sanitize($string, $force_lowercase = true, $anal = false, $substr = false)
{
$strip = array("~", "`", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "=", "+", "[", "{", "]",
"}", "\\", "|", ";", ":", "\"", "'", "&#8216;", "&#8217;", "&#8220;", "&#8221;", "&#8211;", "&#8212;",
"—", "–", ",", "<", ".", ">", "/", "?");
$clean = trim(str_replace($strip, "", strip_tags($string)));
$clean = preg_replace('/\s+/', "_", $clean);
$clean = ($anal) ? preg_replace("/[^a-zA-Z0-9]/", "", $clean) : $clean ;
if($substr){
$clean = (strlen($clean) > 20) ? substr($clean,-20) : $clean;
}
return ($force_lowercase) ?
(function_exists('mb_strtolower')) ?
mb_strtolower($clean, 'UTF-8') :
strtolower($clean) :
$clean;
}
}

61
app/User.php
View file

@ -80,6 +80,12 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @method static \Illuminate\Database\Eloquent\Builder|\App\User wherePaymentAccount($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\User wherePaymentShop($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereWizard($value)
* @property int|null $m_level
* @property int|null $m_sponsor
* @property-read \App\Models\UserLevel|null $user_level
* @property-read \App\User|null $user_sponsor
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereMLevel($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereMSponsor($value)
*/
class User extends Authenticatable
{
@ -110,13 +116,11 @@ class User extends Authenticatable
];
public function account()
{
public function account(){
return $this->belongsTo('App\Models\UserAccount', 'account_id');
}
public function user_level()
{
public function user_level(){
return $this->belongsTo('App\Models\UserLevel', 'm_level');
}
@ -125,7 +129,10 @@ class User extends Authenticatable
}
public function files(){
return $this->hasMany('App\Models\File', 'user_id', '');
}
public function shop()
{
@ -203,6 +210,42 @@ class User extends Authenticatable
public function isActiveAccount(){
return $this->payment_account ? Carbon::parse($this->payment_account)->gt(Carbon::now()) : false;
}
public function isActiveShop(){
return $this->payment_shop ? Carbon::parse($this->payment_shop)->gt(Carbon::now()) : false;
}
public function daysActiveAccount(){
return Carbon::now()->diffInDays(Carbon::parse($this->payment_account), false);
}
public function modifyActiveAccount($add = "1 year"){
return Carbon::parse($this->payment_account)->modify($add)->format(\Util::formatDateTimeDB());
}
public function daysHumansActiveAccount(){
Carbon::setLocale(\App::getLocale());
return Carbon::now()->diffForHumans(Carbon::parse($this->payment_account));
}
public function daysActiveShop(){
return Carbon::now()->diffInDays(Carbon::parse($this->payment_shop), false);
}
public function modifyActiveShop($add = "1 year"){
return Carbon::parse($this->payment_shop)->modify($add)->format(\Util::formatDateTimeDB());
}
public function daysHumansActiveShop(){
Carbon::setLocale(\App::getLocale());
return Carbon::now()->diffForHumans(Carbon::parse($this->payment_shop));
}
/**
* @return string
*/
@ -244,6 +287,16 @@ class User extends Authenticatable
return Carbon::parse($this->attributes['payment_shop'])->format(\Util::formatDateTimeDB());
}
public function getReleaseAccountFormat($time = true){
if(!$this->attributes['release_account']){ return ""; }
if(!$time){
return Carbon::parse($this->attributes['release_account'])->format(\Util::formatDateDB());
}
return Carbon::parse($this->attributes['release_account'])->format(\Util::formatDateTimeDB());
}
/**

1
app/helpers.php
View file

@ -6,3 +6,4 @@ if (! function_exists('make_old_url')) {
return config('app.old_url').$path;
}
}

8
bootstrap/cache/packages.php vendored
View file

@ -108,15 +108,11 @@
0 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
),
),
'vladrub/laravel-datatables-oracle' =>
'reliese/laravel' =>
array (
'providers' =>
array (
0 => 'Yajra\\DataTables\\DataTablesServiceProvider',
),
'aliases' =>
array (
'DataTables' => 'Yajra\\DataTables\\Facades\\DataTables',
0 => 'Reliese\\Coders\\CodersServiceProvider',
),
),
'yajra/laravel-datatables-oracle' =>

50
bootstrap/cache/services.php vendored
View file

@ -35,20 +35,21 @@
31 => 'Collective\\Html\\HtmlServiceProvider',
32 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
33 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
34 => 'Yajra\\DataTables\\DataTablesServiceProvider',
34 => 'Reliese\\Coders\\CodersServiceProvider',
35 => 'Yajra\\DataTables\\DataTablesServiceProvider',
36 => 'Laravel\\Tinker\\TinkerServiceProvider',
37 => 'App\\Providers\\AppServiceProvider',
38 => 'App\\Providers\\AuthServiceProvider',
39 => 'App\\Providers\\EventServiceProvider',
40 => 'App\\Providers\\RouteServiceProvider',
41 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider',
42 => 'Jenssegers\\Date\\DateServiceProvider',
43 => 'Collective\\Html\\HtmlServiceProvider',
44 => 'Intervention\\Image\\ImageServiceProvider',
45 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
46 => 'Yajra\\DataTables\\DataTablesServiceProvider',
47 => 'App\\Providers\\YardServiceProvider',
36 => 'Reliese\\Coders\\CodersServiceProvider',
37 => 'Laravel\\Tinker\\TinkerServiceProvider',
38 => 'App\\Providers\\AppServiceProvider',
39 => 'App\\Providers\\AuthServiceProvider',
40 => 'App\\Providers\\EventServiceProvider',
41 => 'App\\Providers\\RouteServiceProvider',
42 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider',
43 => 'Jenssegers\\Date\\DateServiceProvider',
44 => 'Collective\\Html\\HtmlServiceProvider',
45 => 'Intervention\\Image\\ImageServiceProvider',
46 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
47 => 'Yajra\\DataTables\\DataTablesServiceProvider',
48 => 'App\\Providers\\YardServiceProvider',
),
'eager' =>
array (
@ -71,16 +72,15 @@
16 => 'Laracasts\\Flash\\FlashServiceProvider',
17 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
18 => 'Yajra\\DataTables\\DataTablesServiceProvider',
19 => 'Yajra\\DataTables\\DataTablesServiceProvider',
20 => 'App\\Providers\\AppServiceProvider',
21 => 'App\\Providers\\AuthServiceProvider',
22 => 'App\\Providers\\EventServiceProvider',
23 => 'App\\Providers\\RouteServiceProvider',
24 => 'Jenssegers\\Date\\DateServiceProvider',
25 => 'Intervention\\Image\\ImageServiceProvider',
26 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
27 => 'Yajra\\DataTables\\DataTablesServiceProvider',
28 => 'App\\Providers\\YardServiceProvider',
19 => 'App\\Providers\\AppServiceProvider',
20 => 'App\\Providers\\AuthServiceProvider',
21 => 'App\\Providers\\EventServiceProvider',
22 => 'App\\Providers\\RouteServiceProvider',
23 => 'Jenssegers\\Date\\DateServiceProvider',
24 => 'Intervention\\Image\\ImageServiceProvider',
25 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
26 => 'Yajra\\DataTables\\DataTablesServiceProvider',
27 => 'App\\Providers\\YardServiceProvider',
),
'deferred' =>
array (
@ -191,6 +191,7 @@
'Collective\\Html\\HtmlBuilder' => 'Collective\\Html\\HtmlServiceProvider',
'Collective\\Html\\FormBuilder' => 'Collective\\Html\\HtmlServiceProvider',
'NunoMaduro\\Collision\\Contracts\\Provider' => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
'Reliese\\Coders\\Model\\Factory' => 'Reliese\\Coders\\CodersServiceProvider',
),
'when' =>
array (
@ -242,5 +243,8 @@
'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider' =>
array (
),
'Reliese\\Coders\\CodersServiceProvider' =>
array (
),
),
);

4
composer.json
View file

@ -19,7 +19,9 @@
"laravel/tinker": "^1.0",
"laravelcollective/html": "5.6.x-dev",
"maatwebsite/excel": "2.1.30",
"vladrub/laravel-datatables-oracle": "8.0.x-dev",
"reliese/laravel": "^0.0.14",
"setasign/fpdf": "^1.8",
"setasign/fpdi": "^2.2",
"yajra/laravel-datatables-oracle": "^8.8"
},
"require-dev": {

846
composer.lock generated
View file

File diff suppressed because it is too large Load diff

1
config/app.php
View file

@ -161,6 +161,7 @@ return [
Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
Reliese\Coders\CodersServiceProvider::class,
/*
* Package Service Providers...

6
config/filesystems.php
View file

@ -47,6 +47,12 @@ return [
'driver' => 'local',
'root' => storage_path('app'),
],
'user' => [
'driver' => 'local',
'root' => storage_path('app/users'),
'url' => env('APP_URL').'/storage/users',
'visibility' => 'public',
],
'public' => [
'driver' => 'local',

420
config/models.php Normal file
View file

@ -0,0 +1,420 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Default Configurations
|--------------------------------------------------------------------------
|
| In this section you may define the default configuration for each model
| that will be generated from any database.
|
*/
'*' => [
/*
|--------------------------------------------------------------------------
| Model Files Location
|--------------------------------------------------------------------------
|
| We need a location to store your new generated files. All files will be
| placed within this directory. When you turn on base files, they will
| be placed within a Base directory inside this location.
|
*/
'path' => app_path('Models'),
/*
|--------------------------------------------------------------------------
| Model Namespace
|--------------------------------------------------------------------------
|
| Every generated model will belong to this namespace. It is suggested
| that this namespace should follow PSR-4 convention and be very
| similar to the path of your models defined above.
|
*/
'namespace' => 'App\Models',
/*
|--------------------------------------------------------------------------
| Parent Class
|--------------------------------------------------------------------------
|
| All Eloquent models should inherit from Eloquent Model class. However,
| you can define a custom Eloquent model that suits your needs.
| As an example one custom model has been added for you which
| will allow you to create custom database castings.
|
*/
'parent' => Illuminate\Database\Eloquent\Model::class,
/*
|--------------------------------------------------------------------------
| Traits
|--------------------------------------------------------------------------
|
| Sometimes you may want to append certain traits to all your models.
| If that is what you need, you may list them bellow.
| As an example we have a BitBooleans trait which will treat MySQL bit
| data type as booleans. You might probably not need it, but it is
| an example of how you can customize your models.
|
*/
'use' => [
// Reliese\Database\Eloquent\BitBooleans::class,
// Reliese\Database\Eloquent\BlamableBehavior::class,
],
/*
|--------------------------------------------------------------------------
| Model Connection
|--------------------------------------------------------------------------
|
| If you wish your models had appended the connection from which they
| were generated, you should set this value to true and your
| models will have the connection property filled.
|
*/
'connection' => false,
/*
|--------------------------------------------------------------------------
| Timestamps
|--------------------------------------------------------------------------
|
| If your tables have CREATED_AT and UPDATED_AT timestamps you may
| enable them and your models will fill their values as needed.
| You can also specify which fields should be treated as timestamps
| in case you don't follow the naming convention Eloquent uses.
| If your table doesn't have these fields, timestamps will be
| disabled for your model.
|
*/
'timestamps' => true,
// 'timestamps' => [
// 'enabled' => true,
// 'fields' => [
// 'CREATED_AT' => 'created_at',
// 'UPDATED_AT' => 'updated_at',
// ]
// ],
/*
|--------------------------------------------------------------------------
| Soft Deletes
|--------------------------------------------------------------------------
|
| If your tables support soft deletes with a DELETED_AT attribute,
| you can enable them here. You can also specify which field
| should be treated as a soft delete attribute in case you
| don't follow the naming convention Eloquent uses.
| If your table doesn't have this field, soft deletes will be
| disabled for your model.
|
*/
'soft_deletes' => true,
// 'soft_deletes' => [
// 'enabled' => true,
// 'field' => 'deleted_at',
// ],
/*
|--------------------------------------------------------------------------
| Date Format
|--------------------------------------------------------------------------
|
| Here you may define your models' date format. The following format
| is the default format Eloquent uses. You won't see it in your
| models unless you change it to a more convenient value.
|
*/
'date_format' => 'Y-m-d H:i:s',
/*
|--------------------------------------------------------------------------
| Pagination
|--------------------------------------------------------------------------
|
| Here you may define how many models Eloquent should display when
| paginating them. The default number is 15, so you might not
| see this number in your models unless you change it.
|
*/
'per_page' => 15,
/*
|--------------------------------------------------------------------------
| Base Files
|--------------------------------------------------------------------------
|
| By default, your models will be generated in your models path, but
| when you generate them again they will be replaced by new ones.
| You may want to customize your models and, at the same time, be
| able to generate them as your tables change. For that, you
| can enable base files. These files will be replaced whenever
| you generate them, but your customized files will not be touched.
|
*/
'base_files' => false,
/*
|--------------------------------------------------------------------------
| Snake Attributes
|--------------------------------------------------------------------------
|
| Eloquent treats your model attributes as snake cased attributes, but
| if you have camel-cased fields in your database you can disable
| that behaviour and use camel case attributes in your models.
|
*/
'snake_attributes' => true,
/*
|--------------------------------------------------------------------------
| Indent options
|--------------------------------------------------------------------------
|
| As default indention is done with tabs, but you can change it by setting
| this to the amount of spaces you that you want to use for indentation.
| Usually you will use 4 spaces instead of tabs.
|
*/
'indent_with_space' => 0,
/*
|--------------------------------------------------------------------------
| Qualified Table Names
|--------------------------------------------------------------------------
|
| If some of your tables have cross-database relationships (probably in
| MySQL), you can make sure your models take into account their
| respective database schema.
|
| Can Either be NULL, FALSE or TRUE
| TRUE: Schema name will be prepended on the table
| FALSE:Table name will be set without schema name.
| NULL: Table name will follow laravel pattern,
| i.e if class name(plural) matches table name, then table name will not be added
*/
'qualified_tables' => false,
/*
|--------------------------------------------------------------------------
| Hidden Attributes
|--------------------------------------------------------------------------
|
| When casting your models into arrays or json, the need to hide some
| attributes sometimes arise. If your tables have some fields you
| want to hide, you can define them bellow.
| Some fields were defined for you.
|
*/
'hidden' => [
'*secret*', '*password', '*token',
],
/*
|--------------------------------------------------------------------------
| Mass Assignment Guarded Attributes
|--------------------------------------------------------------------------
|
| You may want to protect some fields from mass assignment. You can
| define them bellow. Some fields were defined for you.
| Your fillable attributes will be those which are not in the list
| excluding your models' primary keys.
|
*/
'guarded' => [
// 'created_by', 'updated_by'
],
/*
|--------------------------------------------------------------------------
| Casts
|--------------------------------------------------------------------------
|
| You may want to specify which of your table fields should be casted as
| something different than a string. For instance, you may want a
| text field be casted as an array or and object.
|
| You may define column patterns which will be casted using the value
| assigned. We have defined some fields for you. Feel free to
| modify them to fit your needs.
|
*/
'casts' => [
'*_json' => 'json',
],
/*
|--------------------------------------------------------------------------
| Excluded Tables
|--------------------------------------------------------------------------
|
| When performing the generation of models you may want to skip some of
| them, because you don't want a model for them or any other reason.
| You can define those tables bellow. The migrations table was
| filled for you, since you may not want a model for it.
|
*/
'except' => [
'migrations',
],
/*
|--------------------------------------------------------------------------
| Specified Tables
|--------------------------------------------------------------------------
|
| You can specify specific tables. This will generate the models only
| for selected tables, ignoring the rest.
|
*/
'only' => [
// 'users',
],
/*
|--------------------------------------------------------------------------
| Table Prefix
|--------------------------------------------------------------------------
|
| If you have a prefix on your table names but don't want it in the model
| and relation names, specify it here.
|
*/
'table_prefix' => '',
/*
|--------------------------------------------------------------------------
| Lower table name before doing studly
|--------------------------------------------------------------------------
|
| If tables names are capitalised using studly produces incorrect name
| this can help fix it ie TABLE_NAME now becomes TableName
|
*/
'lower_table_name_first' => false,
/*
|--------------------------------------------------------------------------
| Relation Name Strategy
|--------------------------------------------------------------------------
|
| How the relations should be named in your models.
|
| 'related' Use the related table as the relation name.
| (post.author --> user.id)
generates Post::user() and User::posts()
|
| 'foreign_key' Use the foreign key as the relation name.
| (post.author --> user.id)
| generates Post::author() and User::posts_author()
| Column id's are ignored.
| (post.author_id --> user.id)
| generates the same as above.
| When the foreign key is redundant, it is omited.
| (post.user_id --> user.id)
| generates User::posts() and not User::posts_user()
*/
'relation_name_strategy' => 'related',
// 'relation_name_strategy' => 'foreign_key',
/*
|--------------------------------------------------------------------------
| Determines need or not to generate constants with properties names like
|
| ...
| const AGE = 'age';
| const USER_NAME = 'user_name';
| ...
|
| that later can be used in QueryBuilder like
|
| ...
| $builder->select([User::USER_NAME])->where(User::AGE, '<=', 18);
| ...
|
| that helps to avoid typos in strings when typing field names and allows to use
| code competition with available model's field names.
*/
'with_property_constants' => false,
/*
|--------------------------------------------------------------------------
| Disable Pluralization Name
|--------------------------------------------------------------------------
|
| You can disable pluralization tables and relations
|
*/
'pluralize' => true,
/*
|--------------------------------------------------------------------------
| Disable Pluralization Except For Certain Tables
|--------------------------------------------------------------------------
|
| You can enable pluralization for certain tables
|
*/
'override_pluralize_for' => [
],
],
/*
|--------------------------------------------------------------------------
| Database Specifics
|--------------------------------------------------------------------------
|
| In this section you may define the default configuration for each model
| that will be generated from a specific database. You can also nest
| table specific configurations.
| These values will override those defined in the section above.
|
*/
// 'shop' => [
// 'path' => app_path(),
// 'namespace' => 'App',
// 'snake_attributes' => false,
// 'qualified_tables' => true,
// 'use' => [
// Reliese\Database\Eloquent\BitBooleans::class,
// ],
// 'except' => ['migrations'],
// 'only' => ['users'],
// // Table Specifics Bellow:
// 'user' => [
// // Don't use any default trait
// 'use' => [],
// ]
// ],
];

1
database/migrations/2014_10_12_000000_create_users_table.php
View file

@ -29,6 +29,7 @@ class CreateUsersTable extends Migration
$table->dateTime('confirmation_code_to')->nullable();
$table->unsignedTinyInteger('confirmation_code_remider')->default(0);
$table->timestamp('release_account')->nullable();
$table->boolean('active')->default(false);
$table->timestamp('active_date')->nullable();
$table->dateTime('agreement')->nullable();

46
database/migrations/2020_02_08_164831_create_files_table.php Normal file
View file

@ -0,0 +1,46 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateFilesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('files', function (Blueprint $table) {
$table->increments('id');
$table->unsignedInteger('user_id')->nullable()->index();
$table->string('identifier')->index();
$table->string('filename');
$table->string('dir');
$table->string('original_name');
$table->string('ext');
$table->string('mine');
$table->unsignedInteger('size');
$table->timestamps();
$table->foreign('user_id')
->references('id')
->on('users')
->onDelete('cascade');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('files');
}
}

10
public/css/application.css
View file

@ -1,4 +1,14 @@
.alert ul {
margin-bottom: 0;
}
.fa-caret-expand:before {
content: "\f0da";
}
a[aria-expanded='true'] > .fa-caret-expand:before {
content: "\f0d7";
}
.dropzone {
border: 2px dashed;
}

14
public/js/application.js
View file

@ -79,7 +79,18 @@ __webpack_require__("./resources/assets/js/bootstrap.js");
if (window.layoutHelpers) {
window.layoutHelpers.setAutoUpdate(true);
}
(function() {
if ($('#layout-sidenav').hasClass('sidenav-horizontal') || window.layoutHelpers.isSmallScreen()) {
return;
}
try {
window.layoutHelpers.setCollapsed(
localStorage.getItem('layoutCollapsed') === 'true',
false
);
} catch (e) {}
})();
$(function () {
// Initialize sidenav
$('#layout-sidenav').each(function () {
@ -92,6 +103,9 @@ $(function () {
$('body').on('click', '.layout-sidenav-toggle', function (e) {
e.preventDefault();
window.layoutHelpers.toggleCollapsed();
if (!window.layoutHelpers.isSmallScreen()) {
try { localStorage.setItem('layoutCollapsed', String(window.layoutHelpers.isCollapsed())); } catch (e) {}
}
});
// Swap dropdown menus in RTL mode

9
public/js/forms_file-upload.js
View file

@ -3,7 +3,7 @@ $(function() {
Dropzone.autoDiscover = false;
$('#dropzone-before').dropzone({
parallelUploads: 1,
@ -21,9 +21,10 @@ $(function() {
// Mock the file upload progress (only for the demo)
//
Dropzone.prototype.uploadFiles = function(files) {
/* Dropzone.prototype.uploadFiles = function(files) {
var minSteps = 6;
var maxSteps = 60;
var timeBetweenSteps = 100;
@ -66,5 +67,5 @@ $(function() {
}(file, totalSteps, step), duration);
}
}
};
});
};*/
});

BIN
public/pdf/mivita_template_contract_de.pdf Normal file
View file

Binary file not shown.

8
resources/lang/de.json
View file

@ -34,10 +34,11 @@
"Confirm Password": "Passwort best\u00e4tigen",
"Confirm E-Mail": "E-Mail wiederholen",
"E-Mail Address": "E-Mail Adresse",
"Confirm E-Mail Address": "E-Mail Adresse wiederholen",
"Forgot your Password?": "Passwort vergessen?",
"Login": "Einloggen",
"Logout": "Ausloggen",
"Password": " Passwort ",
"Password": "Passwort",
"Register": "Registrieren",
"Remember Me": "Angemeldet bleiben",
"Reset Password": "Passwort zur\u00fccksetzen",
@ -95,7 +96,8 @@
"E-Mail address can not be changed!": "E-Mail Adresse ist nicht \u00e4nderbar!",
"E-Mail address can not be changed here!": "E-Mail Adresse kann hier nicht ge\u00e4ndert werden!",
"Thank you for your registration!": "Vielen Dank f\u00fcr Ihre Registrierung!",
"We have sent you an e-mail with a link to activate your data.": "Wir haben Ihnen eine E-Mail mit einem Link zur Freischaltung Ihrer Daten geschickt.",
"We have sent you an e-mail with a link to activate your data.": "Wir haben Dir eine E-Mail mit einem Link zur Freischaltung Deines Accounts gesendet.",
"Please check your emails and confirm the link.": "Bitte rufe Deine E-Mails ab und bestätige den Link.",
"back to the homepage": "zur\u00fcck zur Startseite",
"You have successfully verified your account!": "Sie haben Ihr Konto erfolgreich verifiziert!",
"Now check your data and release the data.": "\u00dcberpr\u00fcfen Sie jetzt Ihre Daten und geben Sie die Daten frei.",
@ -105,6 +107,7 @@
"Data released": "Daten freigeben",
"Data released now": "Daten jetzt freigeben",
"E-Mail verified": "E-Mail verifiziert",
"E-Mail not verified": "E-Mail nicht verifiziert",
"Privacy policy approved": "Datenschutzerkl\u00e4rung zugestimmt",
"Consent for further information": "Einwilligung f\u00fcr weitere Informationen",
"at": "am",
@ -157,6 +160,7 @@
"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.",

24
resources/lang/de/email.php
View file

@ -4,10 +4,11 @@
'reset_passwort' => 'Passwort zurücksetzen',
'mail_confirm' => 'E-Mail bestätigen',
'subject_activate' => 'Account aktivieren',
'account_active' => 'Account freigeschaltet',
'subject_reset' => 'Passwort zurücksetzen',
'salutation' => 'Sehr geehrter Kunde,',
'dear_mrs' => 'Sehr geehrte Frau,',
'dear_sir' => 'Sehr geehrter Herr,',
'salutation' => 'Hallo Kunde',
'dear_mrs' => 'Hallo',
'dear_sir' => 'Hallo',
'hello' => 'Hallo',
'greetings' => 'Mit freundlichen Grüßen',
'sender' => 'Dein mivita.care Team',
@ -21,16 +22,17 @@
'phone' => 'Telefon',
'subject' => 'Betreff',
'message' => 'Nachricht',
'active_copy1line' => 'Sie erhalten diese E-Mail, weil wir eine Anfrage zur Änderung Ihrer E-Mail-Adresse für Ihr Konto erhalten haben.',
'copy2line' => 'Oder kopieren Sie diesen Link in die Adressleiste Ihres Browsers.',
'copy3line' => 'Für weitere Fragen stehen wir Ihnen gerne zur Verfügung.',
'email_verify' => 'Bestätigen Sie Ihre E-Mail-Adresse',
'verify_e_mail' => 'Bestätigen Sie Ihre Daten und E-Mail-Adresse',
'verify_copy1line' => 'Wir haben Daten über Sie in unserem System gespeichert. Bitte folgen Sie dem unten stehenden Link um Ihre E-Mail-Adresse zu bestätigen. Weitherhin können Sie Ihre Daten ändern oder auch löschen.',
'email_verify_copy1line' => 'Vielen Dank für die Erstellung eines Accounts. Bitte folgen Sie dem unten stehenden Link, um Ihre E-Mail-Adresse zu bestätigen.',
'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',
'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:',
'reset_pass_copy1line' => 'Du erhälst diese E-Mail, weil wir eine Anfrage zum Zurücksetzen des Passworts für Dein Konto erhalten haben.',
'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.',
'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.',
'status_copy1line' => 'Status zu Deiner Bestellung auf mivita.care',

5
resources/lang/de/validation.php
View file

@ -147,18 +147,22 @@ return [
*/
'attributes' => [
'salutation' => 'Anrede',
'name' => 'Name',
'username' => 'Benutzername',
'email' => 'E-Mail-Adresse',
'email-confirm' => 'E-Mail-Adresse wiederholen',
'first_name' => 'Vorname',
'last_name' => 'Nachname',
'password' => 'Passwort',
'password_confirmation' => 'Passwort-Bestätigung',
'password-confirm' => 'Passwort-Bestätigung',
'city' => 'Stadt',
'country' => 'Land',
'address' => 'Adresse',
'phone' => 'Telefonnummer',
'mobile' => 'Handynummer',
'mobil' => 'Mobiltelefon',
'age' => 'Alter',
'sex' => 'Geschlecht',
'gender' => 'Geschlecht',
@ -178,6 +182,7 @@ return [
'available' => 'verfügbar',
'size' => 'Größe',
'user_shop_name' => 'Shop Name',
'birthday' => 'Geburtsdatum',
'user_shop_active' => 'Nutzungsbedinungen',
'g-recaptcha-response' => 'google reCaptcha',
'accepted_data_protection' => 'Einwilligung Datenschutzerklärung',

2
resources/views/admin/attribute/index.blade.php
View file

@ -33,7 +33,7 @@
<td>{{ $value->pos }}</td>
<td>{{ $value->name }}</td>
<td>{{ $value->getTranNames() }}</td>
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>@endif</td>
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>@endif</td>
<td><a class="text-danger" href="{{ route('admin_product_attribute_delete', [$value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
</tr>

4
resources/views/admin/category/images.blade.php
View file

@ -36,9 +36,9 @@
<br>
<a href="{{ route('admin_product_category_image_delete', [$category->iq_image->id, $category->id]) }}" class="btn btn-sm btn-primary mt-2 mb-2" onclick="return confirm('Bild wirklich löschen?');">Bild löschen</a>
@if($category->iq_image->active)
<a href="{{ route('admin_product_category_image_attribute', [$category->iq_image->id, 'active', 0]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-success"><i class="far fa-check"></i></span> <i class="far fa-sync"></i></a>
<a href="{{ route('admin_product_category_image_attribute', [$category->iq_image->id, 'active', 0]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> <i class="far fa-sync"></i></a>
@else
<a href="{{ route('admin_product_category_image_attribute', [$category->iq_image->id, 'active', 1]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span> <i class="far fa-sync"></i></a>
<a href="{{ route('admin_product_category_image_attribute', [$category->iq_image->id, 'active', 1]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> <i class="far fa-sync"></i></a>
@endif
</div>
@endif

2
resources/views/admin/category/index.blade.php
View file

@ -31,7 +31,7 @@
<td>@if($value->parent) {{ $value->name }} @else - @endif</td>
<td>{{ $value->headline }}</td>
<!-- <td>{{ $value->getTranNames() }}</td> -->
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>@endif</td>
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>@endif</td>
<td><a class="text-danger" href="{{ route('admin_product_category_delete', [$value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
</tr>

2
resources/views/admin/country/index.blade.php
View file

@ -28,7 +28,7 @@
<td>{{ $value->de }}</td>
<td>{{ $value->code }}</td>
<td>{{ $value->phone }}</td>
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>@endif</td>
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>@endif</td>
</tr>
@endforeach
</tbody>

15
resources/views/admin/lead/edit.blade.php
View file

@ -24,7 +24,7 @@
@endif
</h4>
{!! Form::open(['url' => route('admin_lead_store'), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!}
{!! Form::open(['url' => route('admin_lead_store')."?show=".$show, 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!}
<div class="text-left mt-0 mb-2">
<button type="submit" class="btn btn-submit btn-primary">{{ __('save') }}</button>&nbsp;
@ -33,9 +33,12 @@
@if($m_data_load)
@include('admin.lead.m_data_form_edit')
@else
@include('admin.lead.m_data_form')
@endif
@include('admin.lead.m_register_data')
@if(!$m_data_load)
@include('admin.lead.m_data_form')
@endif
@if(!$user->id || $user->id === 'new')
@ -56,7 +59,7 @@
<!-- Modal template -->
<div class="modal fade" id="modals-edit-m-data">
<div class="modal-dialog">
<form class="modal-content" action="{{route('admin_lead_edit', [$user->id])}}" method="post">
<form class="modal-content" action="{{route('admin_lead_edit', [$user->id])}}?show={{$show}}" method="post">
@csrf
<div class="modal-header">
<h5 class="modal-title"> {{__('Inhalte mivita')}} <span class="font-weight-light">{{__('create/edit')}}</span></h5>
@ -65,8 +68,8 @@
<div class="modal-body">
<div class="form-row">
<div class="form-group col">
<label for="name" class="form-label">{{__('Key')}}</label>
<input type="text" class="form-control" name="edit_m_data_key" placeholder="{{__('Key')}}">
<label for="name" class="form-label">{{__('Passwort')}}</label>
<input type="text" class="form-control" name="edit_m_data_key" placeholder="{{__('Passwort')}}">
</div>
</div>
</div>

9
resources/views/admin/lead/m_data_form.blade.php
View file

@ -10,14 +10,20 @@
</div>
@endif
<div class="card mb-4">
<h5 class="card-header">
{{ __('mivita interne Daten') }}
<a href="#" class="@if($show !== 'check_lead') collapsed @endif" data-toggle="collapse" data-target="#collapseMDataForm" aria-expanded="@if($show !== 'check_lead') false @else true @endif" aria-controls="collapseMDataForm">
<i class="fa fa-caret-expand"></i> {{ __('mivita interne Daten') }}
</a>
<div class="float-right">
<button type="button" class="btn icon-btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-edit-m-data">
<span class="far fa-edit"></span>
</button>
</div>
</h5>
<div class="collapse @if($show === 'check_lead') show @endif" id="collapseMDataForm">
<div class="card-body mb-4 pb-1">
<div class="table-responsive">
<table class="table card-table m-0">
@ -48,5 +54,6 @@
</table>
</div>
</div>
</div>
</div>

3
resources/views/admin/lead/m_data_form_edit.blade.php
View file

@ -44,6 +44,9 @@
<label class="form-label" for="m_notes">{{ __('weitere Daten') }}</label>
{{ Form::textarea('m_notes', $user->account->m_notes , array('placeholder'=>__('weitere Daten'), 'class'=>'form-control', 'id'=>'m_notes', 'rows'=>4)) }}
</div>
<div class="text-left mt-3">
<button type="submit" class="btn btn-submit btn-primary">{{ __('save') }}</button>&nbsp;
</div>
</div>
</div>

153
resources/views/admin/lead/m_register_data.blade.php Normal file
View file

@ -0,0 +1,153 @@
<div class="card mb-4">
<h5 class="card-header">
<a href="#" class="@if($show !== 'check_lead') collapsed @endif" data-toggle="collapse" data-target="#collapseMRegister" aria-expanded="@if($show !== 'check_lead') false @else true @endif" aria-controls="collapseMRegister">
<i class="fa fa-caret-expand"></i> {{__('Activities') }}
</a>
</h5>
<div class="collapse @if($show === 'check_lead') show @endif" id="collapseMRegister">
<div class="card-body mb-2 pb-1">
<div class="row">
<div class="col-sm-6">
@if($user->payment_shop)
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('Berater-Shop aktiv')}}</strong> {{__('bis zum')}}: {{ $user->getPaymentShopDateFormat() }}</p>
@else
<p><span class="ion ion-md-close-circle-outline text-danger"></span>
<strong>{{__('Berater-Shop inaktiv')}}</strong></p>
@endif
@if($user->payment_account )
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('Berater-Account aktiv')}}</strong> {{__('bis zum:')}} {{ $user->getPaymentAccountDateFormat() }}</p>
@else
<p><span class="ion ion-md-close-circle-outline text-danger"></span>
<strong>{{__('Berater-Account inaktiv')}}</strong></p>
@endif
@if($user->active == 1)
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('Daten vollständig, freigeschaltet')}}</strong>: {{ $user->getActiveDateFormat() }}</p>
@if($user->files->count())
@foreach($user->files()->whereIdentifier('contract')->get() as $file)
<a class="btn btn-secondary" href="{{ route('storage_file', [$file->id, 'user']) }}" target="_blank">MIVITA_Beratervertrag.pdf</a>
@endforeach
@endif
@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
@endif
</div>
<div class="col-sm-6">
@if($user->account_id)
@if($user->agreement)
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('Einverständniserklärung')}}</strong>: {{ $user->getAgreementFormat() }}
</p>
@else
<p><span class="ion ion-md-close-circle-outline text-danger"></span>
<strong>{{__('Einverständniserklärung')}}</strong> {{ __('nicht akzeptiert') }}</p>
@endif
@if($user->account->data_protection)
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('Privacy policy approved')}}</strong>: {{ $user->account->getDataProtectionFormat() }}
</p>
@endif
@endif
@if($user->confirmed == 1)
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('E-Mail verified')}}</strong>: {{ $user->getConfirmationDateFormat() }}</p>
@else
<p><span class="ion ion-md-close-circle-outline text-danger"></span>
<strong>{{__('E-Mail not verified')}}</strong></p>
<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>
<hr>
</div>
@if($user->files->count())
<div class="card-body mb-4 pb-1">
<div class="table-responsive">
<table class="table card-table m-0">
<tbody>
<tr>
<th>Ausweisdaten</th>
<th>Name</th>
<th>Größe</th>
<th class="text-right">löschen</th>
</tr>
@foreach($user->files()->whereIdentifier('id_card')->get() as $file)
<tr>
<td><a target="_blank" href="{{ route('storage_file', [$file->id, 'user']) }}">
@if(strtolower($file->ext ) === 'pdf')
<object data="{{ route('storage_file', [$file->id, 'user']) }}" type="application/pdf" width="160"></object>
@else
<img src="{{ route('storage_file', [$file->id, 'user']) }}" alt="" width="160">
@endif
</a>
</td>
<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?');">
<span class="ion ion-md-trash text-danger"></span>
</a>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<hr>
<div class="table-responsive">
<table class="table card-table m-0">
<tbody>
<tr>
<th>Gewerbenachweis</th>
<th>Name</th>
<th>Größe</th>
<th class="text-right">löschen</th>
</tr>
@foreach($user->files()->whereIdentifier('business_license')->get() as $file)
<tr>
<td>
<a target="_blank" href="{{ route('storage_file', [$file->id, 'user']) }}">
@if(strtolower($file->ext ) == 'pdf')
<object data="{{ route('storage_file', [$file->id, 'user']) }}" type="application/pdf" width="160"></object>
@else
<img src="{{ route('storage_file', [$file->id, 'user']) }}" alt="" width="160">
@endif
</a>
</td>
<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?');">
<span class="ion ion-md-trash text-danger"></span>
</a>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
@endif
</div>
</div>

2
resources/views/admin/level/index.blade.php
View file

@ -35,7 +35,7 @@
<td>{{ $value->name }}</td>
<td>{{ $value->getFormattedMargin() }}</td>
<td>{{ $value->getTranNames() }}</td>
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>@endif</td>
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>@endif</td>
<!-- <td><a class="text-danger" href="{{ route('admin_product_attribute_delete', [$value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td> -->
</tr>

4
resources/views/admin/product/images.blade.php
View file

@ -33,9 +33,9 @@
<br>
<a href="{{ route('admin_product_image_delete', [$image->id, $product->id]) }}" class="btn btn-sm btn-primary mt-2 mb-2" onclick="return confirm('Bild wirklich löschen?');">Bild löschen</a>
@if($image->active)
<a href="{{ route('admin_product_image_attribute', [$image->id, 'active', 0]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-success"><i class="far fa-check"></i></span> <i class="far fa-sync"></i></a>
<a href="{{ route('admin_product_image_attribute', [$image->id, 'active', 0]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> <i class="far fa-sync"></i></a>
@else
<a href="{{ route('admin_product_image_attribute', [$image->id, 'active', 1]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span> <i class="far fa-sync"></i></a>
<a href="{{ route('admin_product_image_attribute', [$image->id, 'active', 1]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> <i class="far fa-sync"></i></a>
@endif
<br>
<div class="input-group input-group-sm">

2
resources/views/admin/product/index.blade.php
View file

@ -39,7 +39,7 @@
{{ $category->category->name }}
@endforeach
</td>
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>@endif</td>
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>@endif</td>
<td><a class="text-info" href="{{ route('admin_product_copy', [$value->id]) }}" onclick="return confirm('{{__('Eintrag kopieren?')}}');"><i class="far fa-copy"></i></a> &nbsp;
<a class="text-danger" href="{{ route('admin_product_delete', [$value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>

2
resources/views/admin/shipping/index.blade.php
View file

@ -24,7 +24,7 @@
</a>
</td>
<td>{{ $value->name }}</td>
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>@endif</td>
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>@endif</td>
<td><a class="text-danger" href="{{ route('admin_shipping_delete', [$value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
</tr>

4
resources/views/admin/site/images.blade.php
View file

@ -35,9 +35,9 @@
<br>
<a href="{{ route('admin_sites_image_delete', [$value->slug, $value->iq_image->id]) }}" class="btn btn-sm btn-primary mt-2 mb-2" onclick="return confirm('Bild wirklich löschen?');">Bild löschen</a>
@if($value->iq_image->active)
<a href="{{ route('admin_sites_image_attribute', [$value->slug, $value->iq_image->id, 'active', 0]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-success"><i class="far fa-check"></i></span> <i class="far fa-sync"></i></a>
<a href="{{ route('admin_sites_image_attribute', [$value->slug, $value->iq_image->id, 'active', 0]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> <i class="far fa-sync"></i></a>
@else
<a href="{{ route('admin_sites_image_attribute', [$value->slug, $value->iq_image->id, 'active', 1]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span> <i class="far fa-sync"></i></a>
<a href="{{ route('admin_sites_image_attribute', [$value->slug, $value->iq_image->id, 'active', 1]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> <i class="far fa-sync"></i></a>
@endif
</div>
@endif

2
resources/views/auth/login.blade.php
View file

@ -26,8 +26,6 @@
<!-- Form -->
<form method="POST" class="my-5" action="{{ route('login') }}" aria-label="{{ __('Login') }}">
@csrf
<div class="form-group">
<label class="form-label">{{ __('E-Mail Address') }}</label>
<input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required autofocus>

228
resources/views/emails/info.blade.php Normal file
View file

@ -0,0 +1,228 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>mivita.care</title>
<style type="text/css">
img {
max-width: 600px;
outline: none;
text-decoration: none;
-ms-interpolation-mode: bicubic;
}
a {
text-decoration: none;
border: 0;
outline: none;
color: #919f7a;
}
a:hover {
color: #b6b600;
}
a img {
border: none;
}
td, h1, h2, h3 {
font-family: Helvetica, Verdana, Arial, sans-serif;
font-weight: 400;
}
td {
text-align: left;
}
body {
-webkit-font-smoothing: antialiased;
-webkit-text-size-adjust: none;
width: 100%;
height: 100%;
color: #37302d;
background: #ffffff;
font-size: 15px;
line-height: 26px
}
table {
border-collapse: separate !important;
}
.headline {
color: #37302d;
font-size: 18px;
}
.sub_headline {
color: #788662;
font-size: 15px;
}
.force-full-width {
width: 100% !important;
}
hr {
border: none;
border-top: 1px solid #b7c59e;
}
</style>
<style type="text/css" media="screen">
@media screen {
/*Thanks Outlook 2013! http://goo.gl/XLxpyl*/
td, h1, h2, h3 {
font-family: Helvetica, Verdana, Arial, sans-serif;
}
}
</style>
<style type="text/css" media="only screen and (max-width: 480px)">
/* Mobile styles */
@media only screen and (max-width: 480px) {
table[class="w320"] {
width: 320px !important;
}
}
</style>
<!--[if mso]>
<style type="text/css">
body, table, td {
font-family: Helvetica, Arial, sans-serif !important;
}
</style>
<![endif]-->
</head>
<body class="body" style="padding:0; margin:0; display:block; background:#f8f8f8; -webkit-text-size-adjust:none" bgcolor="#f8f8f8">
<div style="display: none; mso-hide: all; width: 0px; height: 0px; max-width: 0px; max-height: 0px; font-size: 0px; line-height: 0px;">
{{ $copy1line }}
</div>
<table align="left" cellpadding="0" cellspacing="0" width="100%" height="100%">
<tr>
<td align="left" valign="top" bgcolor="#f8f8f8" width="100%">
<br>
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="700" class="w320">
<tr>
<td align="left" valign="top">
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style=" text-align:center;">
<center>
<table width="100%" cellpadding="0" cellspacing="0" border="0" class="">
<tbody class="">
<tr class="">
<td align="center" valign="middle" style="font-size: 0px;" class="">
<center>
<picture style="text-align: center">
<img src="https://my.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
</picture>
</center>
</td>
</tr>
<tr>
<td><br></td>
</tr>
</tbody>
</table>
</center>
</td>
</tr>
</table>
<table cellpadding="10" style="padding: 10px;" cellspacing="0" border="0" width="100%" bgcolor="#ffffff">
<tr>
<td class="headline">
<b>{{ $salutation }} </b>
</td>
</tr>
<tr>
<td style="color:#37302d;">
{!! nl2br($copy1line) !!}
</td>
</tr>
<tr>
<td>
<center>
<table role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
<tbody>
<tr>
<td style="word-wrap:break-word;background:transparent;font-size:0px;padding:10px 25px;padding-top:15px;padding-bottom:15px;padding-right:40px;padding-left:40px;" align="center" valign="top" background="data:image/gif;base64,">
<table role="presentation" cellpadding="0" cellspacing="0" align="center" border="0">
<tbody>
<tr>
<td style="border:none;border-radius:20px;color:#ffffff;cursor:auto;padding:15px 25px;" align="center" valign="middle" bgcolor="#b5c49b">
<p style="text-decoration:none;background:#b5c49b;color:#ffffff;font-family:Arial, sans-serif;font-size:13px;font-weight:normal;line-height:120%;text-transform:none;margin:0px;text-align: center">
<a href="{{ $url }}" style="color:#ffffff;font-size:14px;font-weight:bold;text-align:center;text-decoration:none;-webkit-text-size-adjust:none;">{{ $button }}</a>
</p>
</td>
</tr>
<tr>
<td style="color:#37302d;text-align: center">
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;white-space: pre-line;">{{ $url }}</span>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</center>
</td>
<tr>
<tr>
<td>
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
<tr>
<td>
{!! nl2br($content) !!}
</td>
</tr>
</table>
</td>
</tr>
</table>
<center>
<table cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center">
<tr>
<td style="color:#7B7B7E; font-size:14px; text-align: center">
<p>
{{__('email.footer_copy1')}}
</p>
<br>
<a href="https://www.mivita.care" style="color: #7B7B7E; text-decoration: underline;">www.mivita.care</a>
<br>
</td>
</tr>
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>
</td>
</tr>
</table>
</center>
</td>
</tr>
</table>
</td>
</tr>
</table>
</body>
</html>

50
resources/views/home.blade.php
View file

@ -16,6 +16,26 @@
</div>
@endif
@if($user->payment_account && $user->daysActiveAccount() <= 29)
<div class="card-body" style="background: #fff; border: 1px solid rgba(24, 28, 33, 0.06);">
<h4>{{__('Mitgliedschaft Jahresbeitrag') }}</h4>
@if($user->daysActiveAccount() < 0)
<h5 class="alert badge-danger"><strong>Achtung:</strong> Deine Mitgliedschaft ist vor {{ $user->daysActiveAccount()*-1 }} Tagen ausgelaufen, bitte aktualisiere jetzt Deine Zahlung!</h5>
@elseif($user->daysActiveAccount() < 14)
<h5 class="alert badge-warning"><strong>Achtung:</strong> Deine Mitgliedschaft läuft in {{$user->daysActiveAccount()}} Tagen aus, bitte aktualisiere jetzt Deine Zahlung!</h5>
@else
<h5 class="alert badge-default"><strong>Achtung:</strong> Deine Mitgliedschaft läuft in {{$user->daysActiveAccount()}} Tagen aus, bitte aktualisiere jetzt Deine Zahlung!</h5>
{{--
TODO SEPA
--}}
@endif
<p>Erst wenn Dein Jahresbeitrag bei uns eingeht wird Deine Mitgliedschaft automastisch um ein Jahr verlängert.</p>
<p>Die Verlängerung gibt ab erstes Abschlussdatum ein weiteres volles Jahr, bis zum <strong>{{$user->modifyActiveAccount()}}</strong></p>
<a href="" class="btn btn-primary mb-3">Mitgliedschaft jetzt hier verlängern</a>
</div>
@endif
@if($user->active == 1)
<div class="card-body" style="background: #fff; border: 1px solid rgba(24, 28, 33, 0.06);">
@ -42,33 +62,47 @@
<strong>{{__('Shop nicht gebucht')}}</strong></p>
@endif
</div>
@endif
<div class="card-body" style="background: #fff; border: 1px solid rgba(24, 28, 33, 0.06);">
<h4>{{__('Activities') }}</h4>
@if($user->payment_account )
@if($user->isActiveAccount() )
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('Account aktiv')}}</strong> {{__('bis zum:')}} {{ $user->getPaymentAccountDateFormat() }}</p>
<strong>{{__('Berater-Mitgliedschaft aktiv')}}</strong> {{__('bis zum:')}} {{ $user->getPaymentAccountDateFormat() }}</p>
@else
<p><span class="ion ion-md-close-circle-outline text-danger"></span>
<strong>{{__('Account inaktiv')}}</strong></p>
<strong>{{__('Berater-Account inaktiv')}} </strong>
@if($user->payment_account)
{{__('abgelaufen am')}}: {{ $user->getPaymentAccountDateFormat() }}
@endif
</p>
@endif
@if($user->payment_shop)
@if($user->isActiveShop())
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('Shop aktiv')}}</strong> {{__('bis zum')}}: {{ $user->getPaymentShopDateFormat() }}</p>
<strong>{{__('Berater-Online-Shop aktiv')}}</strong> {{__('bis zum')}}: {{ $user->getPaymentShopDateFormat() }}</p>
@else
<p><span class="ion ion-md-close-circle-outline text-danger"></span>
<strong>{{__('Shop inaktiv')}}</strong></p>
<strong>{{__('Berater-Shop inaktiv')}}</strong>
@if($user->payment_shop)
{{__('abgelaufen am')}}: {{ $user->getPaymentShopDateFormat() }}
@endif
</p>
@endif
<hr>
@if($user->active == 1)
@if($user->files->count())
@foreach($user->files()->whereIdentifier('contract')->get() as $file)
<a class="btn btn-secondary mb-3" href="{{ route('storage_file', [$file->id, 'user']) }}" target="_blank">MIVITA_Beratervertrag.pdf</a>
@endforeach
@endif
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('Daten vervollständigt')}}</strong> {{__('at')}}: {{ $user->getActiveDateFormat() }}</p>
<strong>{{__('Daten vollständig, freigeschaltet')}}</strong> {{__('at')}}: {{ $user->getActiveDateFormat() }}</p>
@endif
@if($user->account_id)

18
resources/views/layouts/application.blade.php
View file

@ -1,6 +1,6 @@
<!DOCTYPE html>
<html lang="{{ app()->getLocale() }}" class="default-style">
<html lang="{{ app()->getLocale() }}" class="default-style layout-collapsed">
<head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="IE=edge,chrome=1">
@ -30,7 +30,6 @@
<link rel="stylesheet" href="{{ mix('/vendor/libs/growl/growl.css') }}">
<link rel="stylesheet" href="{{ asset('/vendor/libs/dropzone/dropzone.css') }}">
<link rel="stylesheet" href="{{ mix('/vendor/libs/bootstrap-select/bootstrap-select.css') }}">
<link rel="stylesheet" href="{{ mix('/vendor/libs/select2/select2.css') }}">
<link rel="stylesheet" href="{{ mix('/vendor/libs/datatables/datatables.css') }}">
@ -39,6 +38,8 @@
<link rel="stylesheet" href="{{ asset('/vendor/libs/summernote/dist/summernote-bs4.css') }}">
<link rel="stylesheet" href="{{ asset('/vendor/libs/slim-image-cropper/slim/slim.css') }}">
<link rel="stylesheet" href="{{ asset('/vendor/libs/dropzone/dropzone.css') }}">
<!-- Layout helpers -->
@ -102,7 +103,6 @@
<script src="{{ mix('/vendor/js/sidenav.js') }}"></script>
<script src="{{ mix('/vendor/libs/growl/growl.js') }}"></script>
<script src="{{asset('/vendor/libs/dropzone/dropzone.js')}}"></script>
<script src="{{ mix('/vendor/libs/validate/validate.js') }}"></script>
<script src="{{ mix('/vendor/libs/bootstrap-select/bootstrap-select.js') }}"></script>
@ -118,19 +118,22 @@
<script src="{{ asset('/vendor/libs/summernote-cleaner/summernote-cleaner.js') }}"></script>
<script src="{{ asset('/js/forms_file-upload.js') }}"></script>
<script src="{{ asset('/vendor/libs/slim-image-cropper/slim/slim.kickstart.min.js') }}"></script>
<script src="{{asset('/vendor/libs/dropzone/dropzone.js')}}"></script>
<script src="{{ asset('/js/forms_file-upload.js') }}"></script>
<!-- Libs -->
<!-- `perfect-scrollbar` library required by SideNav plugin -->
<script src="{{ mix('/vendor/libs/perfect-scrollbar/perfect-scrollbar.js') }}"></script>
@yield('scripts')
<!-- Application javascripts -->
<script src="{{ mix('/js/application.js') }}"></script>
<script src="{{ asset('/js/custom.js') }}"></script>
@yield('scripts')
<script type="text/javascript">
$(document).ready(function() {
@ -199,6 +202,8 @@
});
$('.note-status-output').hide();
});
function _scrollTo(to, offset) {
@ -206,6 +211,7 @@
$('html,body').animate({scrollTop: $(to).offset().top - offset}, 800);
}
</script>
</body>
</html>

8
resources/views/layouts/includes/layout-sidenav.blade.php
View file

@ -17,11 +17,19 @@
<a href="{{ route('user_edit') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-create"></i><div>{{ __('Your Data') }}</div></a>
</li>
@if(Auth::user()->isActiveShop())
<li class="sidenav-item{{ Request::is('user/shop') ? ' active' : '' }}">
<a href="{{ route('user_shop') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-basket"></i><div>{{ __('Your Shop') }}</div></a>
</li>
@endif
<li class="sidenav-item{{ Request::is('user/shop') ? ' active' : '' }}">
<a href="{{ route('user_shop') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-basket"></i><div>{{ __('Your Shop') }}</div></a>
</li>
@endif
@if(Auth::user()->isAdmin())
<li class="sidenav-divider mb-1"></li>
<li class="sidenav-header small font-weight-semibold">ADMIN</li>

26
resources/views/status/not_found.blade.php
View file

@ -1,18 +1,28 @@
@extends('layouts.layout-2')
@extends('layouts.auth')
@section('content')
<div class="authentication-wrapper authentication-2 px-4" style="margin-top: 120px;">
<div class="authentication-inner py-5">
<div class="authentication-wrapper authentication-2 ui-bg-cover ui-bg-overlay-container px-4" style="background-image: url({{asset('images/back.jpg')}});">
<div class="ui-bg-overlay bg-dark opacity-25"></div>
<div class="authentication-inner py-5">
<!-- Form -->
<div class="card">
<div class="p-4 p-sm-5">
<div class="d-flex justify-content-center align-items-center pb-2 mb-2">
<div class="">
<div class="w-100 position-relative">
<a href="https://www.mivita.care"><img src="{{ asset('/images/logo_mivita.png') }}" alt="mivita.care" class=""></a>
</div>
</div>
</div>
<style>
.ui-icon {
width: 90px;
height: 90px;
font-size: 50px;
line-height: calc(90px - 4px);
line-height: calc(90px);
}
</style>
<div class="text-primary mx-auto mb-4 text-center">
@ -21,19 +31,17 @@
</span>
</div>
<p class="text-center text-big mb-4"><strong>{{ __('Your registration has already been completed.') }}</strong></p>
<a href="{{route('login')}}" class="btn btn-lg btn-primary btn-block">{{ __('go to login') }}</a>
<a href="{{route('password.request')}}" class="btn btn-lg btn-secondary btn-block">{{ __('create new password') }}</a>
<p class="text-center text-big mb-4"><strong>{{ __('The link to register is no longer active.') }}</strong></p>
<a href="{{route('login')}}" class="btn btn-primary btn-block">{{ __('go to login') }}</a>
<a href="{{route('password.request')}}" class="btn btn-secondary btn-block">{{ __('create new password') }}</a>
<hr>
<a href="{{route('/')}}" class="btn btn-default btn-block">{{ __('back to the homepage') }}</a>
</div>
</div>
<!-- / Form -->
</div>
</div>
@endsection

15
resources/views/status/status_error.blade.php
View file

@ -1,18 +1,27 @@
@extends('layouts.layout-2')
@extends('layouts.auth')
@section('content')
<div class="authentication-wrapper authentication-2 px-4" style="margin-top: 120px;">
<div class="authentication-wrapper authentication-2 ui-bg-cover ui-bg-overlay-container px-4" style="background-image: url({{asset('images/back.jpg')}});">
<div class="ui-bg-overlay bg-dark opacity-25"></div>
<div class="authentication-inner py-5">
<!-- Form -->
<div class="card">
<div class="p-4 p-sm-5">
<div class="d-flex justify-content-center align-items-center pb-2 mb-2">
<div class="">
<div class="w-100 position-relative">
<a href="https://www.mivita.care"><img src="{{ asset('/images/logo_mivita.png') }}" alt="mivita.care" class=""></a>
</div>
</div>
</div>
<style>
.ui-icon {
width: 90px;
height: 90px;
font-size: 50px;
line-height: calc(90px - 4px);
line-height: calc(90px);
}
</style>
<div class="text-primary mx-auto mb-4 text-center">

15
resources/views/status/status_register.blade.php
View file

@ -1,18 +1,27 @@
@extends('layouts.layout-2')
@extends('layouts.auth')
@section('content')
<div class="authentication-wrapper authentication-2 px-4" style="margin-top: 120px;">
<div class="authentication-wrapper authentication-2 ui-bg-cover ui-bg-overlay-container px-4" style="background-image: url({{asset('images/back.jpg')}});">
<div class="ui-bg-overlay bg-dark opacity-25"></div>
<div class="authentication-inner py-5">
<!-- Form -->
<div class="card">
<div class="p-4 p-sm-5">
<div class="d-flex justify-content-center align-items-center pb-2 mb-2">
<div class="">
<div class="w-100 position-relative">
<a href="https://www.mivita.care"><img src="{{ asset('/images/logo_mivita.png') }}" alt="mivita.care" class=""></a>
</div>
</div>
</div>
<style>
.ui-icon {
width: 90px;
height: 90px;
font-size: 50px;
line-height: calc(90px - 4px);
line-height: calc(90px);
}
</style>
<div class="text-primary mx-auto mb-4 text-center">

9
resources/views/status/status_verify.blade.php
View file

@ -7,12 +7,19 @@
<!-- Form -->
<div class="card">
<div class="p-4 p-sm-5">
<div class="d-flex justify-content-center align-items-center pb-2 mb-2">
<div class="">
<div class="w-100 position-relative">
<a href="https://www.mivita.care"><img src="{{ asset('/images/logo_mivita.png') }}" alt="mivita.care" class=""></a>
</div>
</div>
</div>
<style>
.ui-icon {
width: 90px;
height: 90px;
font-size: 50px;
line-height: calc(90px - 4px);
line-height: calc(90px);
}
</style>
<div class="text-primary mx-auto mb-4 text-center">

15
resources/views/status/user_blocked.blade.php
View file

@ -1,18 +1,27 @@
@extends('layouts.layout-2')
@extends('layouts.auth')
@section('content')
<div class="authentication-wrapper authentication-2 px-4" style="margin-top: 120px;">
<div class="authentication-wrapper authentication-2 ui-bg-cover ui-bg-overlay-container px-4" style="background-image: url({{asset('images/back.jpg')}});">
<div class="ui-bg-overlay bg-dark opacity-25"></div>
<div class="authentication-inner py-5">
<!-- Form -->
<div class="card">
<div class="p-4 p-sm-5">
<div class="d-flex justify-content-center align-items-center pb-2 mb-2">
<div class="">
<div class="w-100 position-relative">
<a href="https://www.mivita.care"><img src="{{ asset('/images/logo_mivita.png') }}" alt="mivita.care" class=""></a>
</div>
</div>
</div>
<style>
.ui-icon {
width: 90px;
height: 90px;
font-size: 50px;
line-height: calc(90px - 4px);
line-height: calc(90px);
}
</style>
<div class="text-primary mx-auto mb-4 text-center">

6
resources/views/status/verify.blade.php
View file

@ -1,7 +1,9 @@
@extends('layouts.layout-2')
@extends('layouts.auth')
@section('content')
<div class="authentication-wrapper authentication-2 px-4" style="margin-top: 120px;">
<div class="authentication-wrapper authentication-2 ui-bg-cover ui-bg-overlay-container px-4" style="background-image: url({{asset('images/back.jpg')}});">
<div class="ui-bg-overlay bg-dark opacity-25"></div>
<div class="authentication-inner py-5">
<!-- Form -->

12
resources/views/user/components/user_shop_edit.blade.php
View file

@ -66,24 +66,24 @@
<div class="text-muted">{{ __('Status') }}</div>
<div class="text-right">
@if($user->shop->getSubdomainStatus())
<span class="badge badge-pill badge-success"><i class="far fa-check"> {{ __('available') }} </i> DNS</span><br>
<span class="badge badge-pill badge-success"><i class="fa fa-check"> {{ __('available') }} </i> DNS</span><br>
@else
<span class="badge badge-pill badge-danger"><i class="far fa-times"> {{ __('not available') }} </i> DNS</span>
<span class="badge badge-pill badge-danger"><i class="fa fa-times"> {{ __('not available') }} </i> DNS</span>
@endif
@if($user->shop->getSubdomainAvailable())
<span class="badge badge-pill badge-success"><i class="far fa-check"> {{ __('available') }} </i>
<span class="badge badge-pill badge-success"><i class="fa fa-check"> {{ __('available') }} </i>
@if($user->shop->getSubdomainSslSin()) HTTPS @else HTTP @endif
</span>
@else
<span class="badge badge-pill badge-danger"><i class="far fa-times"> {{ __('not available') }} </i> HTTP </span>
<span class="badge badge-pill badge-danger"><i class="fa fa-times"> {{ __('not available') }} </i> HTTP </span>
@endif
@if($user->shop->getSubdomainSslSinActive())
<span class="badge badge-pill badge-success"><i class="far fa-check"> {{ __('available') }} </i> SSL
<span class="badge badge-pill badge-success"><i class="fa fa-check"> {{ __('available') }} </i> SSL
</span>
@else
<span class="badge badge-pill badge-danger"><i class="far fa-times"> {{ __('not available') }} </i> SSL </span>
<span class="badge badge-pill badge-danger"><i class="fa fa-times"> {{ __('not available') }} </i> SSL </span>
@endif
</div>

12
resources/views/user/user_form.blade.php
View file

@ -115,6 +115,9 @@
<label class="form-label" for="mobil">{{ __('Mobile Phone') }}</label>
{{ Form::text('mobil', $user->account->mobil, array('placeholder'=>__('Mobile Phone'), 'class'=>'form-control', 'id'=>'mobil', 'tabindex' => 13)) }}
</div>
<div class="form-group col-md-12">
<div class="badge badge-warning">Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*</div>
</div>
</div>
@if(!isset($step))
<hr>
@ -167,7 +170,6 @@
{{ Form::text(' tax_identification_number', $user->account-> tax_identification_number, array('placeholder'=>__('USt-ID Nummer'), 'class'=>'form-control', 'id'=>' tax_identification_number', $user->account->getCountryAttrAs('tax_id_number','required'))) }}
</div>
<div class="form-group col-md-12">
<label class="form-label" for="taxable_sales">{{ __('Umsatzsteuerpflicht') }} @if($user->account->getCountryAttrAs('taxable_sales'))* @endif</label>
<select class="selectpicker" name="taxable_sales" id="taxable_sales" data-style="btn-light" @if($user->account->getCountryAttrAs('taxable_sales')) required @endif>
{!! HTMLHelper::getTaxSaleOptions($user->account->taxable_sales) !!}
@ -302,8 +304,8 @@
<div class="card-body">
<div class="form-row">
<div class="form-group col-md-4">
<label for="birthday" class="form-label">{{ __('Geburtstag') }}</label>
{{ Form::text('birthday', $user->account->birthday, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'class'=>'form-control datepicker-birthday')) }}
<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>
@ -447,6 +449,10 @@
city : {
required: "{{__('This field is required.')}}",
},
birthday : {
required: "{{__('This field is required.')}}",
},
equalTo : "{{__('Please enter the same value again.')}}",
'email-confirm' : {
equalTo : "{{__('Please enter the same value again.')}}",

10
resources/views/user/wizard/show.blade.php → resources/views/user/wizard/create.blade.php
View file

@ -73,7 +73,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', [0]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation-confirm']) !!}
{!! Form::open(['url' => route('wizard_store_create', [0]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation-confirm']) !!}
@include('user.data_confirm')
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary">{{ __('zustimmen und weiter') }}</button>&nbsp;
@ -84,14 +84,14 @@
<div id="smartwizard-3-step-2" class="card animated fadeIn">
<div class="card-body">
@if(!$user->isPasswort())
{!! Form::open(['url' => route('wizard_store', [1])]) !!}
{!! Form::open(['url' => route('wizard_store_create', [1])]) !!}
@include('user.update_password_first_form')
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary">{{ __('erstellen und weiter') }}</button>&nbsp;
</div>
{!! Form::close() !!}
@else
{!! Form::open(['url' => route('wizard_store', [1])]) !!}
{!! Form::open(['url' => route('wizard_store_create', [1])]) !!}
<p>Passwort wurde bereits erstellt.</p>
<button type="submit" class="btn btn-secondary">{{ __('weiter') }}</button>&nbsp;
{!! Form::close() !!}
@ -100,7 +100,7 @@
</div>
<div id="smartwizard-3-step-3" class="card animated fadeIn">
<div class="card-body">
{!! Form::open(['url' => route('wizard_store', [2]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!}
{!! Form::open(['url' => route('wizard_store_create', [2]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!}
@include('user.user_form')
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary">{{ __('speichern und weiter') }}</button>&nbsp;
@ -110,7 +110,7 @@
</div>
<div id="smartwizard-3-step-4" class="card animated fadeIn">
<div class="card-body">
{!! Form::open(['url' => route('wizard_store', [3]), 'class' => 'form-horizontal']) !!}
{!! Form::open(['url' => route('wizard_store_create', [3]), 'class' => 'form-horizontal']) !!}
<div class="table-responsive">
<table class="table table- m-0">
<tbody>

300
resources/views/user/wizard/register.blade.php Normal file
View file

@ -0,0 +1,300 @@
@extends('layouts.layout-2')
@section('content')
@if ($errors->any())
<div class="row">
<div class="col-sm-12">
<div class="alert alert-danger">
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
</div>
</div>
@endif
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Registrierung abschließen') }}
</h4>
<div id="smartwizard-3" class="smartwizard-register">
<ul class="card px-4 pt-3 mb-3">
<li>
<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
<div class="text-muted small">zustimmen</div>
</a>
</li>
<li>
<a href="#smartwizard-3-step-2" class="mb-3">
<span class="sw-done-icon ion ion-md-checkmark"></span>
<span class="sw-number">2</span>
Daten
<div class="text-muted small">anpassen</div>
</a>
</li>
<li>
<a href="#smartwizard-3-step-3" class="mb-3">
<span class="sw-done-icon ion ion-md-checkmark"></span>
<span class="sw-number">3</span>
Ausweis
<div class="text-muted small">hochladen</div>
</a>
</li>
<li>
<a href="#smartwizard-3-step-4" class="mb-3">
<span class="sw-done-icon ion ion-md-checkmark"></span>
<span class="sw-number">4</span>
Gewerbeschein
<div class="text-muted small">hochladen</div>
</a>
</li>
<li>
<a href="#smartwizard-3-step-5" class="mb-3">
<span class="sw-done-icon ion ion-md-checkmark"></span>
<span class="sw-number">5</span>
Registrierung
<div class="text-muted small">abschließen</div>
</a>
</li>
</ul>
<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')
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary">{{ __('zustimmen und weiter') }}</button>&nbsp;
</div>
{!! Form::close() !!}
</div>
</div>
<div id="smartwizard-3-step-2" class="card animated fadeIn">
<div class="card-body">
{!! Form::open(['url' => route('wizard_store_register', [1]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!}
@include('user.user_form')
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary">{{ __('speichern und weiter') }}</button>&nbsp;
</div>
{!! Form::close() !!}
</div>
</div>
<div id="smartwizard-3-step-3" class="card animated fadeIn">
<div class="card-body">
<div class="card mb-4">
<h5 class="card-header">
{{ __('Ausweis hochladen (nur PDF, JPG, PNG)') }}
</h5>
<div class="card-body">
<div class="row">
<div class="col-sm-6">
<div class="mt-4">
{!! Form::open([ 'url' => route('wizard_store_register', [2]), 'method' => 'post', 'files' => true, 'enctype' => 'multipart/form-data', 'class' => 'dropzone', 'id' => 'idcardDropzone' ]) !!}
<div class="fallback">
<input name="file" type="file" multiple>
</div>
{!! 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>
</div>
</div>
<div class="col-sm-6">
@if($user->files->count())
<div class="row">
@foreach($user->files()->whereIdentifier('id_card')->get() as $file)
<div class="col-md-12 col-xl-6">
<div class="card mb-3">
<div class="card-body">
<h6 class="card-title"><a target="_blank" href="{{ route('storage_file', [$file->id, 'user']) }}">{{ $file->original_name }}</a></h6>
<p class="card-text">{{ $file->formatBytes() }}
<a href="{{ route('wizard_delete_file', [$file->id, 'upload']) }}" class="btn btn-sm btn-default float-right" onclick="return confirm('Datei wirklich löschen?');">
<span class="ion ion-md-trash text-danger"></span>
</a>
</p>
</div>
@if(strtolower($file->ext ) == 'pdf')
<object data="{{ route('storage_file', [$file->id, 'user']) }}" type="application/pdf" class="card-img-bottom"></object>
@else
<img src="{{ route('storage_file', [$file->id, 'user']) }}" alt="" class="card-img-bottom">
@endif
</div>
</div>
@endforeach
</div>
@endif
</div>
</div>
</div>
</div>
<div class="text-left mt-3">
{!! Form::open(['url' => route('wizard_store_register', [2])]) !!}
<button type="submit" name="submit" value="do" class="btn btn-secondary">{{ __('speichern und weiter') }}</button>&nbsp;
{!! Form::close() !!}
</div>
</div>
</div>
<div id="smartwizard-3-step-4" class="card animated fadeIn">
<div class="card-body">
<div class="card mb-4">
<h5 class="card-header">
{{ __('Gewerbeschein hochladen (nur PDF, JPG, PNG)') }}
</h5>
<div class="card-body">
<div class="row">
<div class="col-sm-6">
<div class="mt-4">
{!! Form::open([ 'url' => route('wizard_store_register', [3]), 'method' => 'post', 'files' => true, 'enctype' => 'multipart/form-data', 'class' => 'dropzone', 'id' => 'businesslDropzone' ]) !!}
<div class="fallback">
<input name="file" type="file" multiple>
</div>
{!! 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>
</div>
</div>
<div class="col-sm-6">
@if($user->files->count())
<div class="row">
@foreach($user->files()->whereIdentifier('business_license')->get() as $file)
<div class="col-md-12 col-xl-6">
<div class="card mb-3">
<div class="card-body">
<h6 class="card-title"><a target="_blank" href="{{ route('storage_file', [$file->id, 'user']) }}">{{ $file->original_name }}</a></h6>
<p class="card-text">{{ $file->formatBytes() }}
<a href="{{ route('wizard_delete_file', [$file->id, 'upload']) }}" class="btn btn-sm btn-default float-right" onclick="return confirm('Datei wirklich löschen?');">
<span class="ion ion-md-trash text-danger"></span>
</a>
</p>
</div>
@if(strtolower($file->ext ) == 'pdf')
<object data="{{ route('storage_file', [$file->id, 'user']) }}" type="application/pdf" class="card-img-bottom"></object>
@else
<img src="{{ route('storage_file', [$file->id, 'user']) }}" alt="" class="card-img-bottom">
@endif
</div>
</div>
@endforeach
</div>
@endif
</div>
</div>
</div>
</div>
<div class="text-left mt-3">
{!! Form::open(['url' => route('wizard_store_register', [3])]) !!}
<button type="submit" name="submit" value="do" class="btn btn-secondary">{{ __('speichern und weiter') }}</button>&nbsp;
{!! Form::close() !!}
</div>
</div>
</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>
{!! Form::open(['url' => route('wizard_store_register', [4])]) !!}
<button type="submit" name="submit" value="do" class="btn btn-secondary">{{ __('Registrierung abschließen') }}</button>&nbsp;
{!! Form::close() !!}
</div>
</div>
</div>
</div>
@endsection
@section('scripts')
<link rel="stylesheet" href="{{ mix('/vendor/libs/smartwizard/smartwizard.css') }}">
<script src="{{ mix('/vendor/libs/smartwizard/smartwizard.js') }}"></script>
<script type="text/javascript">
$(document).ready(function() {
$('.smartwizard-register').smartWizard({
autoAdjustHeight: true,
backButtonSupport: true,
useURLhash: false,
showStepURLhash: false,
selected: '{{$step}}',
toolbarSettings: {
showNextButton: false,
showPreviousButton: false,
}
});
});
var real_dropzone = {
uploadMultiple: false,
parallelUploads: 1,
maxFilesize: 32,
addRemoveLinks: true,
dictDefaultMessage: 'Hier klicken, oder Datei hier reinziehen (Drag&Drop)',
dictFallbackMessage: 'Ihr Browser unterstützt Drag&Drop Dateiuploads nicht',
dictFallbackText: 'Benutzen Sie das Formular um Ihre Dateien hochzuladen',
dictFileTooBig: "Die Datei ist zu groß. Die maximale Dateigröße beträgt 32 MB",
dictInvalidFileType: 'Eine Datei dieses Typs kann nicht hochgeladen werden',
dictResponseError: "Der Server hat ihre Anfrage mit Status error abgelehnt",
dictCancelUpload: 'Hochladen abbrechen',
dictCancelUploadConfirmation: null,
dictRemoveFile: 'Datei entfernen',
dictMaxFilesExceeded: 'Sie können keine weiteren Dateien mehr hochladen',
acceptedFiles: "image/jpeg,image/pjpeg,image/png,image/gif,application/pdf,text/plain",
// The setting up of the dropzone
init:function() {
this.on("removedfile", function(file) {
var _ele = $('.alert-danger');
_ele.fadeOut();
} );
this.on("addedfile", function (file) {
var _ele = $('.alert-danger');
_ele.fadeOut();
});
},
error: function(file, response) {
var message
if($.type(response) === "string")
message = response; //dropzone sends it's own error messages in string
else
message = response.message;
var _ele = $('.alert-danger');
_ele.fadeIn();
_ele.text(message);
},
success: function(file,response) {
console.log(file);
console.log(response.filename);
console.log(response.filedata);
console.log(response);
if(response.redirect){
window.location.href = response.redirect;
}else{
if(response.error === false){
//true
window.location.href = window.location.href;
}
}
}
};
Dropzone.options.idcardDropzone = real_dropzone;
Dropzone.options.businesslDropzone = real_dropzone;
</script>
@endsection

38
resources/views/user/wizard/register_release.blade.php Normal file
View file

@ -0,0 +1,38 @@
@extends('layouts.layout-2')
@section('content')
@if ($errors->any())
<div class="row">
<div class="col-sm-12">
<div class="alert alert-danger">
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
</div>
</div>
@endif
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Registrierung abgeschlossen') }}
</h4>
<div id="smartwizard-3" class="smartwizard-register">
<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>
</div>
</div>
</div>
</div>
@endsection
@section('scripts')
@endsection

4
resources/views/web/layouts/includes/footer.blade.php
View file

@ -72,8 +72,10 @@
href="{{url('/geschaeftsmodell/karrierechancen')}}">Karrierechancen</a></li>
<li class="{{ Request::is('kontakt') ? ' active' : '' }}"><a
href="{{url('/kontakt')}}">Kontakt</a></li>
<li class="{{ Request::is('partner') ? ' active' : '' }}"><a
<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>
</ul>
<!-- /Links -->
</div>

12
resources/views/web/templates/_content_contact.blade.php Normal file
View file

@ -0,0 +1,12 @@
<div class="col-md-12">
<hr>
<h2>Das klingt spannend für Dich?</h2>
<p>Dann nimm noch heute Kontakt mit uns auf - wir freuen uns, Dich kennenzulernen.</p>
<a href="/registrierung" rel="nofollow" target="_blank" class="btn btn-default btn-lg pull-right">zur
Registrierung</a>
<a href="/kontakt" rel="nofollow" target="_blank" class="btn btn-primary btn-lg">zum
Kontaktformular</a>
</div>

8
resources/views/web/templates/aloevera.blade.php
View file

@ -2,7 +2,7 @@
@section('content')
<section class="page-header page-header-xlg" style="background-image:url('assets/images/vision-min.jpg'); ">
<section class="page-header page-header-xlg" style="background-image:url('/assets/images/vision-min.jpg'); ">
<div class="overlay dark-1"><!-- dark overlay [1 to 9 opacity] --></div>
<div class="container">
@ -170,15 +170,9 @@
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</section>
<!-- / -->

15
resources/views/web/templates/anforderungsprofil.blade.php
View file

@ -46,25 +46,14 @@
<hr>
</div>
<div class="col-md-12">
<div class="embed-responsive embed-responsive-16by9 box-shadow-1">
<iframe width="560" height="315" src="https://www.youtube.com/embed/HScne8-4d60?rel=0"
frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
</div>
</div>
<div class="clearfix"><br></div>
<div class="col-md-12">
<hr>
</div>
<div class="col-md-12">
<h2>Das klingt spannend für Dich?</h2>
<p>Dann nimm noch heute Kontakt mit uns auf - wir freuen uns, Dich kennenzulernen.</p>
<a href="/kontakt" rel="nofollow" target="_blank" class="btn btn-primary btn-lg">zum
Kontaktformular</a>
</div>
@include('web.templates._content_contact')
</div>
<!-- /LEFT COLUMNS -->

2
resources/views/web/templates/checkout-final.blade.php
View file

@ -129,7 +129,7 @@
@endif
<p>
Dein Team von,<br />
<strong> mivita.</strong>
<strong> mivita.care</strong>
</p>
</div>
</div>

11
resources/views/web/templates/erreichbarkeit.blade.php
View file

@ -61,16 +61,7 @@
<img class="img-fluid" src="/assets/images/produktfamilie.jpg" alt="" />
</div>
<div class="col-md-12">
<hr>
</div>
<div class="col-md-12">
<h2>Das klingt spannend für Dich?</h2>
<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
<a href="/kontakt" rel="nofollow" target="_blank" class="btn btn-primary btn-lg">zum Kontaktformular</a>
</div>
@include('web.templates._content_contact')
</div>
<!-- /LEFT COLUMNS -->

12
resources/views/web/templates/existenzgruendung.blade.php
View file

@ -101,17 +101,7 @@
</div>
<div class="col-md-12">
<hr>
</div>
<div class="col-md-12">
<h2>Das klingt spannend für Dich?</h2>
<p>Dann nimm noch heute Kontakt mit uns auf - wir freuen uns, Dich kennenzulernen.</p>
<a href="/kontakt" rel="nofollow" target="_blank" class="btn btn-primary btn-lg">zum
Kontaktformular</a>
</div>
@include('web.templates._content_contact')
</div><!-- /LEFT COLUMNS -->
<!-- RIGHT COLUMNS -->

16
resources/views/web/templates/karrierechancen.blade.php
View file

@ -191,21 +191,7 @@
</div>
<div class="col-md-12">
<hr>
</div>
<div class="col-md-12">
<h2>Das klingt spannend für Dich?</h2>
<p>Dann nimm noch heute Kontakt mit uns auf - wir freuen uns, Dich kennenzulernen.</p>
<a href="/kontakt" rel="nofollow" target="_blank" class="btn btn-primary btn-lg">zum
Kontaktformular</a>
</div>
@include('web.templates._content_contact')
</div>
<!-- /LEFT COLUMNS -->

11
resources/views/web/templates/kontakt.blade.php
View file

@ -52,6 +52,13 @@
border: 6px solid #bbccab;
margin-bottom: 10px;
}
.radio, .checkbox {
font-size: 14px;
line-height: 1.3em;
}
.checkbox i {
top:1px;
}
</style>
<!-- /PAGE HEADER -->
@ -70,6 +77,7 @@
<p>Du interessierst Dich für unser Geschäft oder hast Fragen zu den Produkten? Dann freuen wir uns auf eine Nachricht von Dir. Wir werden uns im Anschluss sobald wie möglich bei Dir zurückmelden.</p>
<div class="box-static box-transparent box-bordered padding-20">
{!! Form::open(['url' => '/kontakt']) !!}
<div class="row contact-row">
<div class="col-md-6">
@ -130,7 +138,7 @@
<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' : ''), 'required']) !!}
<i></i> Hiermit willige ich in die im Rahmen der <a target="_blank" href="{{ url('datenschutz') }}">Datenschutzerklärung</a>
<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.
</label>
@if ($errors->has('accepted_data_protection'))
@ -155,6 +163,7 @@
{!! Form::close() !!}
</div> <!-- end col -->
<!-- /FORM -->
</div>
<!-- INFO -->

2
resources/views/web/templates/partner.blade.php
View file

@ -9,7 +9,7 @@
</style>
<section class="page-header page-header-xlg" style="background-image:url('assets/images/vision-min.jpg'); ">
<section class="page-header page-header-xlg" style="background-image:url('/assets/images/vision-min.jpg'); ">
<div class="overlay dark-1"><!-- dark overlay [1 to 9 opacity] --></div>
<div class="container">

263
resources/views/web/templates/registrierung.blade.php Normal file
View file

@ -0,0 +1,263 @@
@extends($user_shop ?'web.user.layouts.layout' : 'web.layouts.layout')
@section('content')
<section class="page-header page-header-xlg parallax parallax-3"
style="background-image:url('assets/images/vision-min.jpg')">
<div class="overlay dark-1"><!-- dark overlay [1 to 9 opacity] --></div>
<div class="container">
</div>
</section>
<style>
.checkbox.error{
color:#b92c28 !important;
}
</style>
<style type="text/css">
.tp-caption {
text-shadow: none;
}
div.shop-item {
margin-bottom: 30px;
border: 1px solid #ddd;
}
div.shop-item > .thumbnail, .thumbnail {
border: none;
}
div.shop-item-summary {
padding: 8px;
}
div.shop-item-summary h2 a {
color: #9aa983;
font-size: 1.2em;
margin: 0 0 10px 0;
}
div.shop-item-buttons {
padding: 0 8px 10px 8px;
}
div.shop-item-buttons .btn-xs {
padding: 4px;
}
img.avatar {
width: 75%;
max-width: 200px;
border: 6px solid #bbccab;
margin-bottom: 10px;
}
.radio, .checkbox {
font-size: 14px;
line-height: 1.3em;
}
.checkbox i {
top:1px;
}
.alert.error {
padding: 8px;
margin-bottom: 4px;
margin-top: 4px;
font-size: 0.9em;
font-weight: bold;
}
select.form-control:not([size]):not([multiple]) {
height: 40px;
}
</style>
{{-- <script src='https://www.google.com/recaptcha/api.js'></script>--}}
<section>
<div class="container">
<div class="row">
<!-- FORM -->
<div class="col-md-9 col-sm-8">
<h1>Registrierung</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>
<div class="box-static box-transparent box-bordered padding-20">
{!! Form::open(['url' => '/registrierung']) !!}
<div class="row contact-row">
<div class="form-group col-md-12">
{!! Form::label('first_name', __('Salutation').'*') !!}
{!! Form::select('salutation', [''=>'Bitte wählen', 'mr'=>'Herr', 'ms'=>'Frau'], '', ['class' => 'form-control '.($errors->has('salutation') ? 'error is-invalid' : '')]) !!}
@if ($errors->has('salutation'))
<div class="alert alert-danger error"><!-- DANGER -->
{{ $errors->first('salutation') }}
</div>
@endif
</div>
<div class="form-group col-md-6">
{!! Form::label('first_name', __('First name').'*') !!}
{!! Form::text('first_name', '', ['class' => 'form-control '.($errors->has('first_name') ? 'error is-invalid' : ''), 'placeholder'=>__('First name'), '']) !!}
@if ($errors->has('first_name'))
<div class="alert alert-danger error"><!-- DANGER -->
{{ $errors->first('first_name') }}
</div>
@endif
</div>
<div class="form-group col-md-6">
{!! Form::label('last_name', __('Last Name').'*') !!}
{!! Form::text('last_name', '', ['class' => 'form-control '.($errors->has('last_name') ? 'error is-invalid' : ''), 'placeholder'=>__('Last Name'), '']) !!}
@if ($errors->has('last_name'))
<div class="alert alert-danger error"><!-- DANGER -->
{{ $errors->first('last_name') }}
</div>
@endif
</div>
<div class="col-md-12"> <hr> </div>
<div class="form-group col-md-12">
{!! Form::label('email', __('E-Mail Address').'*') !!}
{!! Form::email('email', '', ['class' => 'form-control '.($errors->has('email') ? 'error is-invalid' : ''), 'placeholder'=>__('E-Mail Address'), '']) !!}
@if ($errors->has('email'))
<div class="alert alert-danger error"><!-- DANGER -->
{{ $errors->first('email') }}
</div>
@endif
</div>
<div class="form-group col-md-12">
{!! Form::label('email-confirm', __('Confirm E-Mail Address').'*') !!}
{!! Form::email('email-confirm', '', ['class' => 'form-control '.($errors->has('email-confirm') ? 'error is-invalid' : ''), 'placeholder'=>__('Confirm E-Mail Address'), '']) !!}
@if ($errors->has('email-confirm'))
<div class="alert alert-danger error"><!-- DANGER -->
{{ $errors->first('email-confirm') }}
</div>
@endif
</div>
<div class="col-md-12"> <hr> </div>
<div class="form-group col-md-12">
{!! Form::label('password', __('Password').'*') !!}
{!! Form::password('password', ['class' => 'form-control '.($errors->has('password') ? 'error is-invalid' : ''), 'placeholder'=>__('Password'), '']) !!}
@if ($errors->has('password'))
<div class="alert alert-danger error"><!-- DANGER -->
{{ $errors->first('password') }}
</div>
@endif
</div>
<div class="form-group col-md-12">
{!! Form::label('password_confirmation', __('Confirm Password').'*') !!}
{!! Form::password('password_confirmation', ['class' => 'form-control '.($errors->has('password_confirmation') ? 'error is-invalid' : ''), 'placeholder'=>__('Confirm Password'), '']) !!}
@if ($errors->has('password_confirmation'))
<div class="alert alert-danger error"><!-- DANGER -->
{{ $errors->first('password_confirmation') }}
</div>
@endif
</div>
<div class="col-md-12" style="margin-bottom: 8px; margin-top: 5px;">
<em class="small">* Pflichtpfelder</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.*
</label>
@if ($errors->has('accepted_data_protection'))
<div class="alert alert-danger error"><!-- DANGER -->
{{ $errors->first('accepted_data_protection') }}
</div>
@endif
</div>
</div>
{{-- <div class="row contact-row">
<div class="col-md-12">
<div class="g-recaptcha" data-sitekey="{{$GOOGLE_ReCAPTCHA_KEY}}"></div>
@if ($errors->has('g-recaptcha-response'))
<div class="alert alert-danger error"><!-- DANGER -->
{{ $errors->first('g-recaptcha-response') }}
</div>
@endif
</div>
</div>
--}}
<button type="submit" class="btn btn-primary"><i class="fa fa-check"></i> jetzt registrieren</button>
{!! Form::close() !!}
</div> <!-- end col -->
<!-- /FORM -->
</div>
<!-- INFO -->
<div class="col-md-3 col-sm-4" style="border-left: 1px solid #ddd;">
@if($user_shop)
<h2 class="text-center">Kontakt</h2>
<p class="text-center">Ich freue mich über Deinen Besuch in meinem MIVITA Onlineshop. Ich bin Deine persönliche Beratung rund um die Produkte und ihrer Anwendung.</p>
<div class="text-center">
@if($user_shop->isImage())
<img class="img-responsive rounded avatar" src="{{ url($user_shop->getImage()) }}" alt="">
@else
<img class="img-responsive rounded avatar" src="{{ asset('assets/images/avatar.png') }}" alt="">
@endif
</div>
<p class="text-center">
@if($user_shop->title)
<strong style="color: #97b085; font-size: 1.1em;">{{ $user_shop->title }}</strong><br>
@endif
@if($user_shop->contact)
{!! nl2br($user_shop->contact) !!}
@endif
<br>
{{ $user_shop->getSubdomain() }}
</p>
@if($user_shop->accessibility)
<p class="text-center">
<strong>Meine Erreichbarkeit:</strong><br>
{!! nl2br($user_shop->accessibility) !!}
</p>
@endif
@else
<h2>Kontakt</h2>
<hr/>
<p>
<span class="block"><strong><i class="fa fa-map-marker"></i> Adresse:<br></strong> mivita e.K.<br>
Leinfeld 2<br>
87755 Kirchhaslach</span>
<span class="block"><strong><i class="fa fa-phone"></i> Telefon:</strong> <a
href="tel:0 8333-946 98 90">0 8333-946 98 90</a></span>
<span class="block"><strong><i class="fa fa-envelope"></i> Email:</strong> <a
href="mailto:info@riwa-tec.de">info@mivita.care</a></span>
</p>
<hr/>
<h4 class="font300">Geschäftszeiten</h4>
<p>
<span class="block"><strong>Mo. - Fr.:</strong> 9-12 Uhr u. 13-16 Uhr</span>
</p>
@endif
</div>
</div>
</div>
</section>
<!-- / -->
@endsection

161
resources/views/web/templates/registrierung_finish.blade.php Normal file
View file

@ -0,0 +1,161 @@
@extends($user_shop ?'web.user.layouts.layout' : 'web.layouts.layout')
@section('content')
<section class="page-header page-header-xlg parallax parallax-3"
style="background-image:url('/assets/images/vision-min.jpg')">
<div class="overlay dark-1"><!-- dark overlay [1 to 9 opacity] --></div>
<div class="container">
</div>
</section>
<style>
.checkbox.error{
color:#b92c28 !important;
}
</style>
<style type="text/css">
.tp-caption {
text-shadow: none;
}
div.shop-item {
margin-bottom: 30px;
border: 1px solid #ddd;
}
div.shop-item > .thumbnail, .thumbnail {
border: none;
}
div.shop-item-summary {
padding: 8px;
}
div.shop-item-summary h2 a {
color: #9aa983;
font-size: 1.2em;
margin: 0 0 10px 0;
}
div.shop-item-buttons {
padding: 0 8px 10px 8px;
}
div.shop-item-buttons .btn-xs {
padding: 4px;
}
img.avatar {
width: 75%;
max-width: 200px;
border: 6px solid #bbccab;
margin-bottom: 10px;
}
.radio, .checkbox {
font-size: 14px;
line-height: 1.3em;
}
.checkbox i {
top:1px;
}
.alert.error {
padding: 8px;
margin-bottom: 4px;
margin-top: 4px;
font-size: 0.9em;
font-weight: bold;
}
select.form-control:not([size]):not([multiple]) {
height: 40px;
}
</style>
{{-- <script src='https://www.google.com/recaptcha/api.js'></script>--}}
<section>
<div class="container">
<div class="row">
<!-- FORM -->
<div class="col-md-9 col-sm-8">
<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>
<hr />
<p>
<strong>{{ __('your mivita.care team') }}</strong>
</p>
</div>
</div>
</div>
<!-- INFO -->
<div class="col-md-3 col-sm-4" style="border-left: 1px solid #ddd;">
@if($user_shop)
<h2 class="text-center">Kontakt</h2>
<p class="text-center">Ich freue mich über Deinen Besuch in meinem MIVITA Onlineshop. Ich bin Deine persönliche Beratung rund um die Produkte und ihrer Anwendung.</p>
<div class="text-center">
@if($user_shop->isImage())
<img class="img-responsive rounded avatar" src="{{ url($user_shop->getImage()) }}" alt="">
@else
<img class="img-responsive rounded avatar" src="{{ asset('assets/images/avatar.png') }}" alt="">
@endif
</div>
<p class="text-center">
@if($user_shop->title)
<strong style="color: #97b085; font-size: 1.1em;">{{ $user_shop->title }}</strong><br>
@endif
@if($user_shop->contact)
{!! nl2br($user_shop->contact) !!}
@endif
<br>
{{ $user_shop->getSubdomain() }}
</p>
@if($user_shop->accessibility)
<p class="text-center">
<strong>Meine Erreichbarkeit:</strong><br>
{!! nl2br($user_shop->accessibility) !!}
</p>
@endif
@else
<h2>Kontakt</h2>
<hr/>
<p>
<span class="block"><strong><i class="fa fa-map-marker"></i> Adresse:<br></strong> mivita e.K.<br>
Leinfeld 2<br>
87755 Kirchhaslach</span>
<span class="block"><strong><i class="fa fa-phone"></i> Telefon:</strong> <a
href="tel:0 8333-946 98 90">0 8333-946 98 90</a></span>
<span class="block"><strong><i class="fa fa-envelope"></i> Email:</strong> <a
href="mailto:info@riwa-tec.de">info@mivita.care</a></span>
</p>
<hr/>
<h4 class="font300">Geschäftszeiten</h4>
<p>
<span class="block"><strong>Mo. - Fr.:</strong> 9-12 Uhr u. 13-16 Uhr</span>
</p>
@endif
</div>
</div>
</div>
</section>
<!-- / -->
@endsection

2
resources/views/web/templates/ueber-uns.blade.php
View file

@ -3,7 +3,7 @@
@section('content')
<section class="page-header page-header-xlg parallax parallax-3"
style="background-image:url('assets/images/vision-min.jpg')">
style="background-image:url('/assets/images/vision-min.jpg')">
<div class="overlay dark-1"><!-- dark overlay [1 to 9 opacity] --></div>
<div class="container">

11
resources/views/web/templates/vereinbarkeit.blade.php
View file

@ -68,17 +68,8 @@
zu entwickeln.</p>
</div>
<div class="col-md-12">
<hr>
</div>
<div class="col-md-12">
<h2>Das klingt spannend für Dich?</h2>
<p>Dann nimm noch heute Kontakt mit uns auf - wir freuen uns, Dich kennenzulernen.</p>
<a href="/kontakt" rel="nofollow" target="_blank" class="btn btn-primary btn-lg">zum
Kontaktformular</a>
</div>
@include('web.templates._content_contact')
</div>
</div>
<!-- /LEFT COLUMNS -->

10
resources/views/web/templates/vorteile.blade.php
View file

@ -90,15 +90,7 @@
</ul>
<hr>
<h2>Das klingt spannend für Dich?</h2>
<p>Dann nimm noch heute Kontakt mit uns auf - wir freuen uns, Dich kennenzulernen.</p>
<a href="/kontakt" rel="nofollow" target="_blank" class="btn btn-primary btn-lg">zum
Kontaktformular</a>
@include('web.templates._content_contact')
</div>
<!-- /LEFT COLUMNS -->

2
resources/views/web/user/layouts/includes/footer.blade.php
View file

@ -93,6 +93,8 @@
href="{{url('/kontakt')}}">Kontakt</a></li>
<li class="{{ Request::is('partner') ? ' active' : '' }}"><a
href="{{url('/partner')}}">Partner</a></li>
<li class="{{ Request::is('register_user') ? ' active' : '' }}"><a
href="{{url('/registrierung')}}">Registrierung</a></li>
</ul>
<!-- /Links -->
</div>

Some files were not shown because too many files have changed in this diff Show more