Registierung Korrekturen
This commit is contained in:
Kevin Adametz
parent
8e4bb0c2f6
commit
d8b5206031
70 changed files with 1192 additions and 569 deletions
18
.env
18
.env
|
|
@ -2,32 +2,32 @@ APP_NAME=mivita.care
|
|||
APP_ENV=local
|
||||
APP_DEBUG=true
|
||||
APP_KEY=base64:HrWQ9AV3Zt2TU0iq1OeUUpTUaXwNUdh8xHmx7RXTif4=
|
||||
APP_URL=https://mivita.local/
|
||||
APP_URL=https://mivita.test/
|
||||
APP_DOMAIN=mivita
|
||||
APP_TLD_CARE=.local
|
||||
APP_TLD_CARE=.test
|
||||
APP_TLD_SHOP=.lshop
|
||||
APP_PROTOCOL=https://
|
||||
APP_URL_MAIN=
|
||||
APP_URL_CHECKOUT=checkout.
|
||||
#APP_URL_MAIN=dev.
|
||||
APP_URL_CRM=my.
|
||||
#APP_CHECKOUT_MAIL=no-reply@mivita.care
|
||||
|
||||
APP_CHECKOUT_MAIL=kevin.adametz@me.com
|
||||
APP_INFO_MAIL=info@adametz.media
|
||||
|
||||
APP_DEFAULT_MAIL=info@mivita.care
|
||||
APP_CHECKOUT_TEST_MAIL=devtest@mivita.care
|
||||
APP_INFO_TEST_MAIL=devtest@mivita.care
|
||||
|
||||
#APP_CHECKOUT_MAIL=no-reply@mivita.care
|
||||
|
||||
|
||||
LOG_CHANNEL=stack
|
||||
|
||||
DB_CONNECTION=mysql
|
||||
DB_HOST=localhost
|
||||
DB_HOST=192.168.1.8
|
||||
DB_PORT=3306
|
||||
DB_DATABASE=mivita
|
||||
DB_USERNAME=root
|
||||
DB_PASSWORD=KT32vQ7
|
||||
DB_USERNAME=kadmin
|
||||
DB_PASSWORD=KT32vQ7ix
|
||||
|
||||
#DB_DATABASE=d02c1ed2
|
||||
#DB_USERNAME=d02c1ed2
|
||||
|
|
@ -68,3 +68,5 @@ MIVITA_REMIND_FIRST_DAYS=21
|
|||
MIVITA_REMIND_SEC_DAYS=14
|
||||
MIVITA_ABO_BOOKING_DAYS=7
|
||||
MIVITA_REMIND_LAST_DAYS=2
|
||||
MIVITA_EDIT_DATA_PASS=mivita
|
||||
MIVITA_ADD_NUMBER_ID=946
|
||||
2
.idea/deployment.xml
generated
2
.idea/deployment.xml
generated
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="PublishConfigData" serverName="http://mivita.local" />
|
||||
<component name="PublishConfigData" serverName="my.mivita.test" />
|
||||
</project>
|
||||
150
.idea/workspace.xml
generated
150
.idea/workspace.xml
generated
|
|
@ -2,37 +2,75 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="2fbaac5f-25ba-4502-a970-cc14728d7d55" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/resources/lang/de/membership.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/lang/de/reminder.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/emails/custom.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/sys/admin/cronjobs.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Http/Controllers/User/ShopSalesController.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Http/Controllers/User/TeamController.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/lang/de/navigation.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/admin/sales/customer_detail.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/admin/sales/user_detail.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/user/shop/sales/orders.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/user/team/members.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/AdminUserController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/AdminUserController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/PayoneController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/PayoneController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/CronController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CronController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/LeadController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/LeadController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Sys/AdminToolsController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Sys/AdminToolsController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/CheckoutController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/CheckoutController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/ProductController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/ProductController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/SalesController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/SalesController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/RegisterController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/RegisterController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/WizardController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/WizardController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Mail/MailCustomMessage.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailCustomMessage.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Mail/MailCheckout.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailCheckout.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/Product.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Product.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/UserHistory.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/UserHistory.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/Util.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Util.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/UserAccount.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/UserAccount.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/UserShop.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/UserShop.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Repositories/ContractPDFRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Repositories/ContractPDFRepository.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/User.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/User.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/logging.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/logging.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/helpers.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/helpers.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/app.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/app.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/mivita.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/mivita.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2018_10_21_164001_create_products_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2018_10_21_164001_create_products_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2014_10_12_000000_create_users_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2014_10_12_000000_create_users_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2019_02_29_170559_create_user_accounts_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_02_29_170559_create_user_accounts_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/css/application.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/application.css" 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/views/admin/product/form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/product/form.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/lang/de/lead.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de/lead.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/lang/de/register.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de/register.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/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/lead/m_register_data.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/lead/m_register_data.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/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/sales/customers.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/sales/customers.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/emails/_auth.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/_auth.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/emails/auth.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/auth.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/home.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/home.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/emails/checkout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/checkout.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/emails/checkout_status.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/checkout_status.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/emails/contact.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/contact.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/emails/custom.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/custom.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/emails/info.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/info.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/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/user/membership/_abo_options.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/membership/_abo_options.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/membership/_payment_order.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/membership/_payment_order.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/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/components/user_shop_register.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/components/user_shop_register.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/membership/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/membership/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/shop.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/shop.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/user_form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/user_form.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/user_new_form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/user_new_form.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/wizard/_payment.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/wizard/_payment.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/wizard/create.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/wizard/create.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/wizard/register.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/wizard/register.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/wizard/register_payment.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/wizard/register_payment.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/card.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/card.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/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/produkte-item.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/produkte-item.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/produkte-show.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/produkte-show.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/registrierung.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/registrierung.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/registrierung_finish.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/registrierung_finish.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/user/layouts/includes/footer.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/user/layouts/includes/footer.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/user/start.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/user/start.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" />
|
||||
|
|
@ -239,22 +277,29 @@
|
|||
</component>
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showExcludedFiles" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
|
||||
<property name="DatabaseDriversLRU" value="mysql" />
|
||||
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
||||
<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/lang/de" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/resources/views/user/shop/sales" />
|
||||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
||||
<property name="nodejs_package_manager_path" value="npm" />
|
||||
<property name="settings.editor.selected.configurable" value="reference.webide.settings.project.settings.php.composer" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/resources/views/user/shop/sales" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/admin/sales" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/user/team" />
|
||||
<recent name="$PROJECT_DIR$/app/Http/Controllers/User" />
|
||||
<recent name="$PROJECT_DIR$/resources/lang/de" />
|
||||
</key>
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/public/vendor/libs/dropzone" />
|
||||
<recent name="$PROJECT_DIR$/public/vendor/libs" />
|
||||
|
|
@ -262,44 +307,31 @@
|
|||
<recent name="$PROJECT_DIR$/resources/views/admin/lead" />
|
||||
<recent name="$PROJECT_DIR$/public/download" />
|
||||
</key>
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/resources/lang/de" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/emails" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/sys/admin" />
|
||||
<recent name="$PROJECT_DIR$/app/Mail" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/user/membership" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunManager">
|
||||
<configuration default="true" type="ShConfigurationType">
|
||||
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
|
||||
<option name="SCRIPT_PATH" value="$USER_HOME$/Documents/scripts/composer-post-update.sh" />
|
||||
<option name="SCRIPT_OPTIONS" value="" />
|
||||
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
|
||||
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
|
||||
<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="INDEPENDENT_SCRIPT_PATH" value="true" />
|
||||
<option name="SCRIPT_PATH" value="$USER_HOME$/Documents/scripts/composer-post-update.sh" />
|
||||
<option name="SCRIPT_OPTIONS" value="" />
|
||||
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
|
||||
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
|
||||
<option name="INTERPRETER_PATH" value="/bin/bash" />
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
</component>
|
||||
<component name="ServiceViewManager">
|
||||
<option name="viewStates">
|
||||
<list>
|
||||
<serviceView>
|
||||
<treeState>
|
||||
<expand />
|
||||
<select />
|
||||
</treeState>
|
||||
</serviceView>
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="SvnConfiguration">
|
||||
<configuration />
|
||||
</component>
|
||||
|
|
@ -429,7 +461,15 @@
|
|||
<workItem from="1585400638388" duration="9592000" />
|
||||
<workItem from="1585576417290" duration="2940000" />
|
||||
<workItem from="1585666412873" duration="6324000" />
|
||||
<workItem from="1585729859738" duration="13087000" />
|
||||
<workItem from="1585729859738" duration="21452000" />
|
||||
<workItem from="1585760254632" duration="571000" />
|
||||
<workItem from="1587107320088" duration="1592000" />
|
||||
<workItem from="1587109717986" duration="1617000" />
|
||||
<workItem from="1587749609220" duration="1211000" />
|
||||
<workItem from="1587975636191" duration="17000" />
|
||||
<workItem from="1588146697363" duration="6072000" />
|
||||
<workItem from="1588153881658" duration="6306000" />
|
||||
<workItem from="1588167994966" duration="10515000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
|
@ -443,22 +483,25 @@
|
|||
</todo-panel>
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="1" />
|
||||
<option name="version" value="2" />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State>
|
||||
<option name="COLUMN_ORDER" />
|
||||
</State>
|
||||
<State />
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
<option name="oldMeFiltersMigrated" value="true" />
|
||||
</component>
|
||||
<component name="WindowStateProjectService">
|
||||
<state x="880" y="397" key="#Deployment" timestamp="1587107443381">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="880" y="397" key="#Deployment/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1587107443381" />
|
||||
<state x="880" y="409" key="#JSHint" timestamp="1584782937961">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
|
|
@ -471,13 +514,12 @@
|
|||
<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.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1581691507125" />
|
||||
<state x="968" y="472" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/-2560.23.2560.1417/2560.-571.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1578493681405" />
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1585733837456">
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1587109063136">
|
||||
<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="1584797806264" />
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/-2560.23.2560.1417/2560.-571.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1578836311908" />
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/2560.-493.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1585733837456" />
|
||||
<state x="1019" y="499" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1587109063136" />
|
||||
<state width="239" height="457" key="HiddenNamespacesPopup" timestamp="1583573337041">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
|
|
@ -486,22 +528,20 @@
|
|||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="1143" y="547" key="com.intellij.database.view.ui.DbObjectDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1583573350583" />
|
||||
<state x="1064" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1585407329042">
|
||||
<state x="1064" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1585748173200">
|
||||
<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="1064" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/2560.-493.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1585407329042" />
|
||||
<state x="863" y="438" width="1115" height="793" key="find.popup" timestamp="1585747938758">
|
||||
<state x="1064" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/2560.-493.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1585748173200" />
|
||||
<state x="805" y="444" width="1115" height="793" key="find.popup" timestamp="1588182686967">
|
||||
<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="1584965671326" />
|
||||
<state x="926" y="497" width="683" height="486" key="find.popup/-2560.23.2560.1417/2560.-571.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1578504136004" />
|
||||
<state x="863" y="438" width="1115" height="793" key="find.popup/2560.-493.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1585747938758" />
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup" timestamp="1585408665805">
|
||||
<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="1588182686967" />
|
||||
<state x="863" y="438" width="1115" height="793" key="find.popup/2560.-493.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1585758694219" />
|
||||
<state x="863" y="438" width="1115" height="793" key="find.popup/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1587109016568" />
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup" timestamp="1588159426101">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1583747941947" />
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup/-2560.23.2560.1417/2560.-571.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1578504893896" />
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1588159426101" />
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup/2560.-493.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1585408665805" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
|
|
|
|||
|
|
@ -99,6 +99,7 @@ class AdminUserController extends Controller
|
|||
if(!isset($data['payment_account']) || $data['payment_account'] == ""){
|
||||
$user->payment_account = null;
|
||||
}else{
|
||||
$user->wizard = 100;
|
||||
$user->payment_account = \Carbon::parse(str_replace("- ", "", $data['payment_account']));
|
||||
}
|
||||
}
|
||||
|
|
@ -107,6 +108,7 @@ class AdminUserController extends Controller
|
|||
if(!isset($data['payment_shop']) || $data['payment_shop'] == ""){
|
||||
$user->payment_shop = null;
|
||||
}else{
|
||||
$user->wizard = 100;
|
||||
$user->payment_shop = \Carbon::parse(str_replace("- ", "", $data['payment_shop']));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -157,14 +157,12 @@ class PayoneController extends Controller
|
|||
$user->payment_account = $date;
|
||||
$user->wizard = 100;
|
||||
$shopping_order->setUserHistoryValue(['status' => 9]);
|
||||
|
||||
}
|
||||
if($shopping_order_item->product->getActionName($do) === 'payment_for_shop'){
|
||||
$user->payment_order_id = $shopping_order_item->product->id; //35
|
||||
$user->payment_shop = $date;
|
||||
$user->wizard = 100;
|
||||
$shopping_order->setUserHistoryValue(['status' => 9]);
|
||||
|
||||
}
|
||||
if($shopping_order_item->product->getActionName($do) === 'payment_for_shop_upgrade'){
|
||||
if($shopping_order_item->product->upgrade_to_id){
|
||||
|
|
@ -173,6 +171,11 @@ class PayoneController extends Controller
|
|||
$user->payment_shop = $user->payment_account; //same Date, is upgrade
|
||||
$shopping_order->setUserHistoryValue(['status' => 9]);
|
||||
}
|
||||
if($shopping_order_item->product->getActionName($do) === 'payment_for_lead_upgrade'){
|
||||
if($shopping_order_item->product->upgrade_to_id){
|
||||
$user->m_level = $shopping_order_item->product->upgrade_to_id;
|
||||
}
|
||||
}
|
||||
$user->save();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,8 +74,7 @@ class CronController extends Controller
|
|||
$user->save();
|
||||
}
|
||||
}
|
||||
die("okay");
|
||||
|
||||
return "TOSK";
|
||||
}
|
||||
|
||||
public function checkPaymentsAccounts(){
|
||||
|
|
@ -92,51 +91,37 @@ class CronController extends Controller
|
|||
*/
|
||||
//max Date for reminder
|
||||
$renewalDate = Carbon::now()->modify('+'.(config('mivita.remind_first_days')+1).' days');
|
||||
dump($renewalDate);
|
||||
//dump($renewalDate);
|
||||
$users = User::where('payment_account', '!=', NULL)
|
||||
->where('active', '=', 1)
|
||||
->where('blocked', '!=', 1)
|
||||
->where('payment_account', '<', $renewalDate)
|
||||
->get();
|
||||
|
||||
|
||||
$user = User::find(2);
|
||||
|
||||
/* $this->checkReminderPayments($user);
|
||||
/* $user = User::find(2);
|
||||
$this->checkReminderPayments($user);
|
||||
dump($user->daysActiveAccount());
|
||||
dump($user->email." | ".$user->getPaymentAccountDateFormat());
|
||||
die();*/
|
||||
foreach ($users as $user){
|
||||
|
||||
|
||||
//$this->checkReminderPayments($user);
|
||||
|
||||
|
||||
// dump($user->nextRenewalAccount());
|
||||
//$userHistoryWizardPayment = UserHistory::whereUserId($user->id)->whereAction('wizard_payment')->get()->last();
|
||||
|
||||
//UserHistory::create(['user_id' => $user->id, 'action'=>'released_completed', 'status'=>0]);
|
||||
|
||||
dump($user->daysActiveAccount());
|
||||
$this->checkReminderPayments($user);
|
||||
/*dump($user->daysActiveAccount());
|
||||
dump($user->email." | ".$user->getPaymentAccountDateFormat());
|
||||
|
||||
dump('-------------------');*/
|
||||
}
|
||||
die("");
|
||||
return "TOSK";
|
||||
}
|
||||
|
||||
|
||||
private function checkReminderPayments(User $user){
|
||||
|
||||
|
||||
$isSend = $this->checkIsReminderSend($user, 31);
|
||||
/* $isSend = $this->checkIsReminderSend($user, 31);
|
||||
$isSend = $this->checkIsReminderSend($user, 32);
|
||||
$isSend = $this->checkIsReminderSend($user, 33);
|
||||
$isSend = $this->checkIsReminderSend($user, 34);
|
||||
$isSend = $this->checkIsReminderSend($user, 35);
|
||||
$isSend = $this->checkIsReminderSend($user, 36);
|
||||
|
||||
return ;
|
||||
|
||||
return ;*/
|
||||
|
||||
//35 reminder_deaktiv, 36 reminder_deaktiv_sepa
|
||||
if(!$user->isActiveAccount()){
|
||||
|
|
@ -170,7 +155,6 @@ class CronController extends Controller
|
|||
}
|
||||
$isSend = $this->checkIsReminderSend($user, 31);
|
||||
return $isSend;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -184,7 +168,7 @@ class CronController extends Controller
|
|||
->get()->last();
|
||||
|
||||
if($isSend){
|
||||
// return true;
|
||||
return true;
|
||||
}
|
||||
$referenz = $this->sendReminderMail($user, $status);
|
||||
//is not sent create
|
||||
|
|
@ -200,9 +184,10 @@ class CronController extends Controller
|
|||
$days = $days*-1;
|
||||
}
|
||||
|
||||
//dump($days);
|
||||
//dump($status);
|
||||
$pay_date = Carbon::parse($user->payment_account)->modify('- '.config('mivita.abo_booking_days').' days')->format('d.m.Y');
|
||||
$datetime = $user->getPaymentAccountDateFormat();
|
||||
|
||||
$price = "";
|
||||
if($user->payment_order_id && isset($user->payment_order_product->price)){
|
||||
$price = 'von '.$user->payment_order_product->getFormattedPrice().' EUR';
|
||||
|
|
@ -222,9 +207,8 @@ class CronController extends Controller
|
|||
'url' => route('user_membership'),
|
||||
'button' => $button,
|
||||
];
|
||||
dump($data);
|
||||
//dump($data);
|
||||
$sender = User::find(1);
|
||||
|
||||
$customer_mail = UserMessage::create([
|
||||
'user_id' => $user->id,
|
||||
'send_user_id' => $sender->id,
|
||||
|
|
@ -232,10 +216,13 @@ class CronController extends Controller
|
|||
'subject' => $data['subject'],
|
||||
'message' => $data['message']." ".$data['message_last'],
|
||||
]);
|
||||
|
||||
try{
|
||||
if($status >= 34){
|
||||
Mail::to($user->email)->bcc(config('app.default_mail'))->send(new MailCustomMessage($user, $data, $sender, false));
|
||||
}else{
|
||||
Mail::to($user->email)->send(new MailCustomMessage($user, $data, $sender, false));
|
||||
}
|
||||
}
|
||||
catch(\Exception $e){
|
||||
\Log::channel('cron')->error('Mail Error: '.$e->getMessage());
|
||||
// Never reached
|
||||
|
|
|
|||
|
|
@ -82,13 +82,12 @@ class LeadController extends Controller
|
|||
$m_data_load = false;
|
||||
$m_data_error = false;
|
||||
$data = Input::all();
|
||||
if(!isset($data['edit_m_data_key']) && $data['edit_m_data_key'] !== "mivita"){
|
||||
$m_data_error = "Der Key ist falsch.";
|
||||
if(!isset($data['edit_m_data_key']) && $data['edit_m_data_key'] !== config('mivita.edit_data_pass')){
|
||||
$m_data_error = "Das Passwort ist falsch.";
|
||||
}else{
|
||||
$m_data_load = true;
|
||||
}
|
||||
|
||||
|
||||
if($id === "new"){
|
||||
$user = new User();
|
||||
$user->account = new UserAccount();
|
||||
|
|
@ -102,12 +101,14 @@ class LeadController extends Controller
|
|||
$user->account = new UserAccount();
|
||||
}
|
||||
}
|
||||
$next_account_id = UserAccount::max('m_account') +1;
|
||||
$data = [
|
||||
'show' => Input::get('show'),
|
||||
'show' => 'check_lead',
|
||||
'user' => $user,
|
||||
'm_data_load' => $m_data_load,
|
||||
'm_data_error' => $m_data_error,
|
||||
'can_change_mail' => true,
|
||||
'next_account_id' => $next_account_id
|
||||
];
|
||||
return view('admin.lead.edit', $data);
|
||||
}
|
||||
|
|
@ -152,9 +153,14 @@ class LeadController extends Controller
|
|||
|
||||
]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if(isset($data['m_account']) && $data['m_account']){
|
||||
$user = User::findOrFail($data['user_id']);
|
||||
$rules['m_account'] = 'unique:user_accounts,m_account,'.$user->account->id.',id';
|
||||
|
||||
|
||||
}
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
|
||||
|
|
@ -164,7 +170,7 @@ class LeadController extends Controller
|
|||
$user = User::findOrFail($data['user_id']);
|
||||
$user_id = $user->id;
|
||||
}
|
||||
return redirect(route('admin_lead_edit', [$user_id]))->withErrors($validator)->withInput(Input::all());
|
||||
return redirect(route('admin_lead_edit', [$user_id])."?show=".$show)->withErrors($validator)->withInput(Input::all());
|
||||
}
|
||||
|
||||
if ($data['user_id'] === "new" || $data['user_id'] == 0) {
|
||||
|
|
@ -181,7 +187,6 @@ class LeadController extends Controller
|
|||
|
||||
$this->userRepo->update($data);
|
||||
|
||||
|
||||
if(isset($data['m_data_edit']) && $data['m_data_edit'] === "TSOK"){
|
||||
$user = $this->userRepo->getModel();
|
||||
$user->m_level = isset($data['m_level']) ? $data['m_level'] : NULL;
|
||||
|
|
@ -277,7 +282,13 @@ class LeadController extends Controller
|
|||
'message' => $input['account_incomplete_message'],
|
||||
'confirmation_code' => $confirmation_code,
|
||||
];
|
||||
try {
|
||||
Mail::to($user->email)->send(new MailCustomMessage($user, $data, \Auth::user(), true));
|
||||
}
|
||||
catch(\Exception $e){
|
||||
dump($e->getMessage());
|
||||
dd("error");
|
||||
}
|
||||
UserHistory::create(['user_id' => $user->id, 'action'=>'released_incomplete', 'status'=>0]);
|
||||
\Session()->flash('alert-success', "E-Mail an Berater gesendet.");
|
||||
|
||||
|
|
@ -296,7 +307,14 @@ class LeadController extends Controller
|
|||
$user->confirmation_code_to = date('Y-m-d H:i:s', strtotime('+1 week'));
|
||||
$user->confirmation_code_remider = 0;
|
||||
$user->save();
|
||||
|
||||
try {
|
||||
Mail::to($user->email)->send(new MailVerifyAccount($confirmation_code, $user));
|
||||
}
|
||||
catch(\Exception $e){
|
||||
dump($e->getMessage());
|
||||
dd("error");
|
||||
}
|
||||
UserHistory::create(['user_id' => $user->id, 'action'=>'new_mail_verified', 'status'=>0]);
|
||||
|
||||
\Session()->flash('alert-success', "E-Mail erneut gesendet");
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ use App\Models\Product;
|
|||
use App\Models\ProductImage;
|
||||
use App\Repositories\ProductRepository;
|
||||
use Input;
|
||||
use Request;
|
||||
use Validator;
|
||||
|
||||
|
||||
|
|
@ -23,8 +24,18 @@ class ProductController extends Controller
|
|||
|
||||
public function index()
|
||||
{
|
||||
if(Request::get('show_active_products')){
|
||||
\Auth::user()->setSetting(['show_active_products' => Request::get('show_active_products')]);
|
||||
}
|
||||
if(\Auth::user()->getSetting('show_active_products') === "true"){
|
||||
$values = Product::where('active', true)->orderBy('pos', 'DESC')->orderBy('id', 'DESC')->get();
|
||||
|
||||
}else{
|
||||
$values = Product::orderBy('pos', 'DESC')->orderBy('id', 'DESC')->get();
|
||||
|
||||
}
|
||||
$data = [
|
||||
'values' => Product::orderBy('pos', 'DESC')->orderBy('id', 'DESC')->get(),
|
||||
'values' => $values
|
||||
];
|
||||
return view('admin.product.index', $data);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,10 +19,6 @@ class SalesController extends Controller
|
|||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function users()
|
||||
{
|
||||
$data = [
|
||||
|
|
@ -31,19 +27,14 @@ class SalesController extends Controller
|
|||
return view('admin.sales.users', $data);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function usersDetail()
|
||||
{
|
||||
$data = [
|
||||
// 'values' => Country::all(),
|
||||
];
|
||||
return view('admin.sales.index', $data);
|
||||
return view('admin.sales.user_detail', $data);
|
||||
}
|
||||
|
||||
|
||||
public function usersDatatable(){
|
||||
|
||||
$query = ShoppingOrder::with('shopping_user', 'user_shop')->where('shopping_orders.auth_user_id', '!=', NULL);
|
||||
|
|
@ -74,12 +65,12 @@ class SalesController extends Controller
|
|||
return $ShoppingOrder->shopping_user ? $ShoppingOrder->shopping_user->orders : '';
|
||||
})
|
||||
->addColumn('user_shop_id', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->user_shop ? '<a href="'.$ShoppingOrder->user_shop->getSubdomain().'" target="_blank">'.$ShoppingOrder->user_shop->getSubdomain().'</span>' : '';
|
||||
return $ShoppingOrder->user_shop ? '<a href="'.$ShoppingOrder->user_shop->getSubdomain(false).'" target="_blank">'.$ShoppingOrder->user_shop->getSubdomain(false).'</span>' : '';
|
||||
})
|
||||
->addColumn('auth_user_shop', function (ShoppingOrder $ShoppingOrder) {
|
||||
$auth_user_shop = UserShop::whereUserId($ShoppingOrder->auth_user_id)->first();
|
||||
|
||||
return $auth_user_shop ? '<a href="'.$auth_user_shop->getSubdomain().'" target="_blank">'.$auth_user_shop->getSubdomain().'</span>' : '-';
|
||||
return $auth_user_shop ? '<a href="'.$auth_user_shop->getSubdomain(false).'" target="_blank">'.$auth_user_shop->getSubdomain(false).'</span>' : '-';
|
||||
})
|
||||
|
||||
->addColumn('id', function (ShoppingOrder $ShoppingOrder) {
|
||||
|
|
@ -106,10 +97,6 @@ class SalesController extends Controller
|
|||
->make(true);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function customers()
|
||||
{
|
||||
$data = [
|
||||
|
|
@ -118,15 +105,12 @@ class SalesController extends Controller
|
|||
return view('admin.sales.customers', $data);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function customersDetail()
|
||||
{
|
||||
$data = [
|
||||
// 'values' => Country::all(),
|
||||
];
|
||||
return view('admin.sales.index', $data);
|
||||
return view('admin.sales.customer_detail', $data);
|
||||
}
|
||||
|
||||
public function customersDatatable(){
|
||||
|
|
@ -159,7 +143,7 @@ class SalesController extends Controller
|
|||
return $ShoppingOrder->shopping_user ? $ShoppingOrder->shopping_user->orders : '';
|
||||
})
|
||||
->addColumn('user_shop_id', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->user_shop ? '<a href="'.$ShoppingOrder->user_shop->getSubdomain().'" target="_blank">'.$ShoppingOrder->user_shop->getSubdomain().'</span>' : '';
|
||||
return $ShoppingOrder->user_shop ? '<a href="'.$ShoppingOrder->user_shop->getSubdomain(false).'" target="_blank">'.$ShoppingOrder->user_shop->getSubdomain(false).'</span>' : '';
|
||||
})
|
||||
->addColumn('id', function (ShoppingOrder $ShoppingOrder) {
|
||||
return '<a href="' . route('admin_sales_users_detail', [$ShoppingOrder->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
|
||||
|
|
|
|||
91
app/Http/Controllers/User/ShopSalesController.php
Executable file
91
app/Http/Controllers/User/ShopSalesController.php
Executable file
|
|
@ -0,0 +1,91 @@
|
|||
<?php
|
||||
|
||||
|
||||
namespace App\Http\Controllers\User;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\ShoppingOrder;
|
||||
use App\User;
|
||||
|
||||
|
||||
class ShopSalesController extends Controller
|
||||
{
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('active.shop');
|
||||
}
|
||||
|
||||
public function orders()
|
||||
{
|
||||
$data = [
|
||||
];
|
||||
return view('user.shop.sales.orders', $data);
|
||||
}
|
||||
|
||||
public function orderDetail()
|
||||
{
|
||||
$data = [
|
||||
// 'values' => Country::all(),
|
||||
];
|
||||
return view('admin.sales.customer_detail', $data);
|
||||
}
|
||||
|
||||
public function ordersDatatable(){
|
||||
|
||||
$user = User::find(\Auth::user()->id);
|
||||
$query = ShoppingOrder::with('shopping_user')->where('user_shop_id', $user->shop->id);
|
||||
|
||||
return \DataTables::eloquent($query)
|
||||
->addColumn('billing_firstname', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->shopping_user ? $ShoppingOrder->shopping_user->billing_firstname : '';
|
||||
})
|
||||
->addColumn('billing_lastname', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->shopping_user ? $ShoppingOrder->shopping_user->billing_lastname : '';
|
||||
})
|
||||
->addColumn('billing_email', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->shopping_user ? $ShoppingOrder->shopping_user->billing_email : '';
|
||||
})
|
||||
->addColumn('created_at', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->created_at->format("d.m.Y");
|
||||
})
|
||||
->addColumn('txaction', function (ShoppingOrder $ShoppingOrder) {
|
||||
if($ShoppingOrder->mode === 'test'){
|
||||
return '<span class="badge badge-pill badge-default">TEST - '.$ShoppingOrder->getFormattedTxaction().'</span>';
|
||||
}
|
||||
return '<span class="badge badge-pill badge-'.$ShoppingOrder->getFormattedTxactionColor().'">'.$ShoppingOrder->getFormattedTxaction().'</span>';
|
||||
})
|
||||
->addColumn('total_shipping', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->getFormattedTotalShipping();
|
||||
})
|
||||
->addColumn('orders', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->shopping_user ? $ShoppingOrder->shopping_user->orders : '';
|
||||
})
|
||||
->addColumn('user_shop_id', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->user_shop ? '<a href="'.$ShoppingOrder->user_shop->getSubdomain(false).'" target="_blank">'.$ShoppingOrder->user_shop->getSubdomain(false).'</span>' : '';
|
||||
})
|
||||
->addColumn('id', function (ShoppingOrder $ShoppingOrder) {
|
||||
return '<a href="' . route('admin_sales_users_detail', [$ShoppingOrder->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
|
||||
})
|
||||
/* ->addColumn('confirmed', function (User $user) {
|
||||
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="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="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')
|
||||
->orderColumn('agreement', 'agreement $1')
|
||||
*/
|
||||
->orderColumn('id', 'id $1')
|
||||
->orderColumn('txaction', 'txaction $1')
|
||||
->orderColumn('user_shop_id', 'user_shop_id $1')
|
||||
->rawColumns(['id', 'txaction', 'user_shop_id'])
|
||||
->make(true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
31
app/Http/Controllers/User/TeamController.php
Executable file
31
app/Http/Controllers/User/TeamController.php
Executable file
|
|
@ -0,0 +1,31 @@
|
|||
<?php
|
||||
|
||||
|
||||
namespace App\Http\Controllers\User;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\User;
|
||||
|
||||
|
||||
class TeamController extends Controller
|
||||
{
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('active.shop');
|
||||
}
|
||||
|
||||
public function members()
|
||||
{
|
||||
$user = User::find(\Auth::user()->id);
|
||||
if($user->isActiveShop() && $user->shop){
|
||||
$shop_register_link = $user->shop->getSubdomain(false)."/reg";
|
||||
}else{
|
||||
$member_id = 'm'.($user->id + config('mivita.add_number_id'));
|
||||
$shop_register_link = config('app.protocol').config('app.domain').config('app.tld_care').'/reg/'.$member_id;
|
||||
}
|
||||
$data = [
|
||||
'shop_register_link' => $shop_register_link
|
||||
];
|
||||
return view('user.team.members', $data);
|
||||
}
|
||||
}
|
||||
|
|
@ -38,14 +38,29 @@ class RegisterController extends Controller
|
|||
|
||||
public function index()
|
||||
{
|
||||
|
||||
|
||||
$data = [
|
||||
'GOOGLE_ReCAPTCHA_KEY' => $this->GOOGLE_ReCAPTCHA_KEY,
|
||||
'user_shop' => Util::getUserShop(),
|
||||
];
|
||||
return view('web.templates.registrierung', $data);
|
||||
}
|
||||
|
||||
public function member($member_id = false)
|
||||
{
|
||||
if(!$member_id){
|
||||
return redirect('/registrierung');
|
||||
}
|
||||
$user_id = (int) str_replace('m', '', $member_id) - config('mivita.add_number_id');
|
||||
$user = User::find($user_id);
|
||||
if(!$user || !$user->isActive() || !$user->isActiveAccount()){
|
||||
return redirect('/registrierung');
|
||||
}
|
||||
$data = [
|
||||
'GOOGLE_ReCAPTCHA_KEY' => $this->GOOGLE_ReCAPTCHA_KEY,
|
||||
'user_shop' => Util::getUserShop(),
|
||||
'from_member_id' => $member_id
|
||||
];
|
||||
return view('web.templates.registrierung', $data);
|
||||
}
|
||||
|
||||
public function register(){
|
||||
|
|
@ -78,12 +93,18 @@ class RegisterController extends Controller
|
|||
$user = $this->userRepo->create($data);
|
||||
|
||||
$confirmation_code = UserService::createConfirmationCode();
|
||||
|
||||
$m_sponsor_id = 1;
|
||||
if($user_shop){
|
||||
$m_sponsor_id = $user_shop->user->id;
|
||||
}
|
||||
if(isset($data['from_member_id'])){
|
||||
$m_sponsor_id = (int) str_replace('m', '', $data['from_member_id']) - config('mivita.add_number_id');
|
||||
}
|
||||
$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_sponsor = $m_sponsor_id;
|
||||
$user->m_level = 1;
|
||||
$user->save();
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ use Auth;
|
|||
use Hash;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Input;
|
||||
use Request;
|
||||
use Validator;
|
||||
use Yard;
|
||||
|
||||
|
|
@ -60,8 +61,8 @@ class WizardController extends Controller
|
|||
'user' => Auth::user(),
|
||||
'step' => $step,
|
||||
'products' => Product::where('active', true)->where('show_at', '=', 3)->orderBy('pos', 'ASC')->get(),
|
||||
'products_on_board' => Product::where('active', true)->where('show_at', '=', 5)->orderBy('pos', 'ASC')->get(),
|
||||
'userHistoryWizardPayment' => $userHistoryWizardPayment,
|
||||
|
||||
];
|
||||
|
||||
if($step == 15){
|
||||
|
|
@ -90,10 +91,12 @@ class WizardController extends Controller
|
|||
if($step >= 10){
|
||||
return redirect('/home');
|
||||
}
|
||||
|
||||
$data = [
|
||||
'user' => Auth::user(),
|
||||
'step' => $step,
|
||||
'products' => Product::where('active', true)->where('show_at', '=', 3)->orderBy('pos', 'ASC')->get(),
|
||||
'products_on_board' => Product::where('active', true)->where('show_at', '=', 5)->orderBy('pos', 'ASC')->get(),
|
||||
];
|
||||
if($step == 5){
|
||||
return view('user.wizard.register_release', $data);
|
||||
|
|
@ -118,11 +121,11 @@ class WizardController extends Controller
|
|||
|
||||
$userHistoryWizardPayment = UserHistory::whereUserId($user->id)->whereAction('wizard_payment')->get()->last();
|
||||
|
||||
|
||||
$data = [
|
||||
'user' => Auth::user(),
|
||||
'step' => 0,
|
||||
'products' => Product::where('active', true)->where('show_at', '=', 3)->orderBy('pos', 'ASC')->get(),
|
||||
'products_on_board' => Product::where('active', true)->where('show_at', '=', 5)->orderBy('pos', 'ASC')->get(),
|
||||
'userHistoryWizardPayment' => $userHistoryWizardPayment,
|
||||
];
|
||||
|
||||
|
|
@ -157,6 +160,7 @@ class WizardController extends Controller
|
|||
'user' => Auth::user(),
|
||||
'step' => $step,
|
||||
'products' => Product::where('active', true)->where('show_at', '=', 3)->orderBy('pos', 'ASC')->get(),
|
||||
'products_on_board' => Product::where('active', true)->where('show_at', '=', 5)->orderBy('pos', 'ASC')->get(),
|
||||
];
|
||||
$user->wizard = 0;
|
||||
$user->save();
|
||||
|
|
@ -239,6 +243,9 @@ class WizardController extends Controller
|
|||
|
||||
if ($step == 3) {
|
||||
if(Input::get('submit') === 'do'){
|
||||
$data = Request::all();
|
||||
|
||||
if($data['business_license_choose'] === "now"){
|
||||
if(File::whereUserId($user->id)->whereIdentifier('business_license')->count() == 0){
|
||||
$validator = Validator::make(Input::all(), []);
|
||||
$validator->errors()->add('field', __('Kein Gewerbeschein hinterlegt, bitte erst hochladen.'));
|
||||
|
|
@ -246,8 +253,26 @@ class WizardController extends Controller
|
|||
$user->save();
|
||||
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Input::all());
|
||||
}
|
||||
}
|
||||
if($data['business_license_choose'] === "later"){
|
||||
|
||||
}
|
||||
if($data['business_license_choose'] === "non"){
|
||||
if(!$data['non_business_license_reason'] || $data['non_business_license_reason'] == ""){
|
||||
$validator = Validator::make(Input::all(), []);
|
||||
$validator->errors()->add('field', __('Bitte gib eine Begründung ein, warum Du keinen Gewerbeschein benötigst.'));
|
||||
$user->wizard = 3;
|
||||
$user->save();
|
||||
return redirect(route('wizard_register'))->withErrors($validator)->withInput(Input::all());
|
||||
}else{
|
||||
$user->account->setNotice('business_license_reason', $data['non_business_license_reason']);
|
||||
}
|
||||
}
|
||||
|
||||
$user->account->setNotice('business_license', $data['business_license_choose']);
|
||||
$user->wizard = 4;
|
||||
$user->save();
|
||||
|
||||
return redirect(route('wizard_register'));
|
||||
}
|
||||
$this->fileRepo->_set('disk', 'user');
|
||||
|
|
@ -297,6 +322,7 @@ class WizardController extends Controller
|
|||
'user' => Auth::user(),
|
||||
'step' => $step,
|
||||
'products' => Product::where('active', true)->where('show_at', '=', 3)->orderBy('pos', 'ASC')->get(),
|
||||
'products_on_board' => Product::where('active', true)->where('show_at', '=', 5)->orderBy('pos', 'ASC')->get(),
|
||||
];
|
||||
$user->wizard = 10;
|
||||
$user->save();
|
||||
|
|
@ -335,6 +361,7 @@ class WizardController extends Controller
|
|||
'user' => Auth::user(),
|
||||
'step' => $step,
|
||||
'products' => Product::where('active', true)->where('show_at', '=', 3)->orderBy('pos', 'ASC')->get(),
|
||||
'products_on_board' => Product::where('active', true)->where('show_at', '=', 5)->orderBy('pos', 'ASC')->get(),
|
||||
];
|
||||
return view('user.wizard.create', $data)->withErrors($validator);
|
||||
}
|
||||
|
|
@ -395,6 +422,7 @@ class WizardController extends Controller
|
|||
|
||||
|
||||
public function storePayment($step = 0){
|
||||
|
||||
if(Input::get('switchers-package-wizard')){
|
||||
$user = User::find(Auth::user()->id);
|
||||
Yard::instance('shopping')->destroy();
|
||||
|
|
@ -405,13 +433,27 @@ class WizardController extends Controller
|
|||
$user->abo_options = true;
|
||||
$user->save();
|
||||
}
|
||||
|
||||
if($product && $product->active && $product->show_at == 3){
|
||||
//set membership product
|
||||
$image = "";
|
||||
if($product->images->count()){
|
||||
$image = $product->images->first()->slug;
|
||||
}
|
||||
Yard::instance('shopping')->add($product->id, $product->getLang('name'), 1, $product->price, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight]);
|
||||
|
||||
//set onboarding products
|
||||
if(Input::get('products_on_board')){
|
||||
foreach (Input::get('products_on_board') as $product_on_board_id){
|
||||
$product_on_board = Product::find($product_on_board_id);
|
||||
$image = "";
|
||||
if($product_on_board->images->count()){
|
||||
$image = $product_on_board->images->first()->slug;
|
||||
}
|
||||
Yard::instance('shopping')->add($product_on_board->id, $product_on_board->getLang('name'), 1, $product_on_board->price, ['image' => $image, 'slug' => $product_on_board->slug, 'weight' => $product_on_board->weight]);
|
||||
}
|
||||
}
|
||||
|
||||
do {
|
||||
$identifier = Util::getToken();
|
||||
} while( ShoppingInstance::where('identifier', $identifier)->count() );
|
||||
|
|
|
|||
|
|
@ -30,10 +30,16 @@ class MailCheckout extends Mailable
|
|||
$this->send_link = $send_link;
|
||||
$this->mode = $mode;
|
||||
|
||||
$this->subject = __('email.checkout_subject')." mivita.care";
|
||||
if($shopping_order->user_shop){
|
||||
$this->subject = __('email.checkout_subject')." ".$shopping_order->user_shop->slug.'.mivita.care';
|
||||
if($this->txaction === 'paid'){
|
||||
$this->subject = __('email.checkout_subject_paid')." ";
|
||||
}else{
|
||||
$this->subject = __('email.checkout_subject')." ";
|
||||
}
|
||||
|
||||
if($shopping_order->user_shop){
|
||||
$this->subject .= $shopping_order->user_shop->slug.".";
|
||||
}
|
||||
$this->subject .= "mivita.care";
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -154,7 +154,9 @@ class Product extends Model
|
|||
'' => '-',
|
||||
'show_upgrade' => 'Kann gepdatet werden',
|
||||
'show_order' => 'Wird immer als Option angezeigt',
|
||||
'upgrade' => 'Produktupgrade zur Upgrade to ID',
|
||||
'upgrade' => 'Produktupgrade zur Produkt ID',
|
||||
'upgrade_member' => 'Beraterupgrade zur Karriere ID',
|
||||
|
||||
];
|
||||
public $unitTypes = [
|
||||
0 => '',
|
||||
|
|
@ -178,6 +180,8 @@ class Product extends Model
|
|||
0 => 'payment_for_account',
|
||||
1 => 'payment_for_shop',
|
||||
2 => 'payment_for_shop_upgrade',
|
||||
4 => 'payment_for_lead_upgrade',
|
||||
|
||||
];
|
||||
|
||||
public function sluggable()
|
||||
|
|
@ -258,11 +262,11 @@ class Product extends Model
|
|||
$unit = $this->attributes['unit'];
|
||||
//ml g
|
||||
if($unit === 1 || $unit === 2){
|
||||
return Util::formatNumber($price) . ' € 100/'.$this->getUnitType();
|
||||
return Util::formatNumber($price) . ' € / 100 '.$this->getUnitType();
|
||||
}
|
||||
//l kg
|
||||
if($unit === 3 || $unit === 4){
|
||||
return Util::formatNumber($price) . ' € 1/'.$this->getUnitType();
|
||||
return Util::formatNumber($price) . ' € / 1 '.$this->getUnitType();
|
||||
}
|
||||
}
|
||||
return "";
|
||||
|
|
|
|||
|
|
@ -123,11 +123,13 @@ class UserAccount extends Model
|
|||
'm_account', 'm_salutation', 'm_first_name', 'm_last_name', 'm_notes', 'company', 'salutation', 'first_name', 'last_name', 'address', 'address_2', 'zipcode', 'city', 'country_id', 'pre_phone_id', 'phone', 'pre_mobil_id', 'mobil',
|
||||
'tax_number', 'tax_identification_number', 'taxable_sales', 'same_as_billing',
|
||||
'shipping_salutation', 'shipping_company', 'shipping_firstname', 'shipping_lastname', 'shipping_address', 'shipping_address_2', 'shipping_zipcode', 'shipping_city', 'shipping_country_id', 'shipping_pre_phone_id', 'shipping_phone',
|
||||
'birthday', 'website', 'facebook', 'facebook_fanpage', 'instagram'
|
||||
'birthday', 'website', 'facebook', 'facebook_fanpage', 'instagram', 'notice'
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'payment_data' => 'array',
|
||||
'notice' => 'array',
|
||||
|
||||
];
|
||||
|
||||
use SoftDeletes;
|
||||
|
|
@ -202,7 +204,15 @@ class UserAccount extends Model
|
|||
return "";
|
||||
}
|
||||
|
||||
public function setNotice($key, $value){
|
||||
$notice = $this->notice;
|
||||
$notice[$key] = $value;
|
||||
$this->notice = $notice;
|
||||
$this->save();
|
||||
}
|
||||
|
||||
|
||||
public function getNotice($key){
|
||||
return isset($this->notice[$key]) ? $this->notice[$key] : false;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,9 +112,9 @@ class UserShop extends Model
|
|||
return Carbon::parse($this->attributes['active_date'])->format("d.m.Y");
|
||||
}
|
||||
|
||||
public function getSubdomain()
|
||||
public function getSubdomain($session=true)
|
||||
{
|
||||
if(\Session::has('user_shop_domain')){
|
||||
if($session && \Session::has('user_shop_domain')){
|
||||
return \Session::get('user_shop_domain');
|
||||
}
|
||||
return config('app.protocol').$this->attributes['slug'].".".config('app.domain').config('app.tld_care');
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ class ContractPDFRepository extends BaseRepository {
|
|||
$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";
|
||||
$website = $this->model->user_sponsor->shop()->count() ? $this->model->user_sponsor->shop->getSubdomain(false) : "www.mivita.care";
|
||||
|
||||
}else{
|
||||
$website = "www.mivita.care";
|
||||
|
|
|
|||
23
app/User.php
23
app/User.php
|
|
@ -114,10 +114,15 @@ class User extends Authenticatable
|
|||
*
|
||||
* @var array
|
||||
*/
|
||||
|
||||
protected $fillable = [
|
||||
'email', 'password', 'token',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'settings' => 'array',
|
||||
];
|
||||
|
||||
/**
|
||||
* The attributes that should be hidden for arrays.
|
||||
*
|
||||
|
|
@ -242,6 +247,10 @@ class User extends Authenticatable
|
|||
public function isAboOption(){
|
||||
return ($this->abo_options && $this->account && $this->account->payment_data) ? true : false;
|
||||
}
|
||||
|
||||
public function isActive(){
|
||||
return ($this->active == 1 && $this->blocked == 0) ? true : false;
|
||||
}
|
||||
public function isActiveAccount(){
|
||||
return $this->payment_account ? Carbon::parse($this->payment_account)->gt(Carbon::now()) : false;
|
||||
}
|
||||
|
|
@ -336,8 +345,20 @@ class User extends Authenticatable
|
|||
}
|
||||
|
||||
|
||||
public function setSetting(array $revisions, bool $save = true){
|
||||
if(!$this->settings){
|
||||
$this->settings = [];
|
||||
}
|
||||
$this->settings = array_merge($this->settings, $revisions);
|
||||
if ($save) {
|
||||
$this->save();
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
public function getSetting($key, $default = null){
|
||||
return isset($this->settings[$key]) ? $this->settings[$key] : $default;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string
|
||||
|
|
|
|||
|
|
@ -7,3 +7,10 @@ if (! function_exists('make_old_url')) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
if (! function_exists('make_old_url')) {
|
||||
function make_old_url($path)
|
||||
{
|
||||
return config('app.old_url').$path;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ return [
|
|||
'checkout_mail' => env('APP_CHECKOUT_MAIL', 'no-reply@mivita.care'),
|
||||
'checkout_test_mail' => env('APP_CHECKOUT_TEST_MAIL', 'devtest@mivita.care'),
|
||||
'info_mail' => env('APP_INFO_MAIL', 'no-reply@mivita.care'),
|
||||
'default_mail' => env('APP_DEFAULT_MAIL', 'info@mivita.care'),
|
||||
'info_test_mail' => env('APP_INFO_TEST_MAIL', 'devtest@mivita.care'),
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
<?php
|
||||
|
||||
return [
|
||||
|
||||
|
||||
'renewal_days' => env('MIVITA_RENEWAL_DAYS', '29'),
|
||||
'abo_booking_days' => env('MIVITA_ABO_BOOKING_DAYS', '7'),
|
||||
'remind_first_days' => env('MIVITA_REMIND_FIRST_DAYS', '21'),
|
||||
'remind_sec_days' => env('MIVITA_REMIND_SEC_DAYS', '14'),
|
||||
'remind_last_days' => env('MIVITA_REMIND_LAST_DAYS', '2'),
|
||||
|
||||
|
||||
'edit_data_pass' => env('MIVITA_EDIT_DATA_PASS', 'iq1OeUUpTUaXwNUdh8xHmx7RXTif4='),
|
||||
'add_number_id' => env('MIVITA_ADD_NUMBER_ID', '946'),
|
||||
];
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ class CreateUsersTable extends Migration
|
|||
$table->unsignedInteger('m_level')->nullable();
|
||||
$table->unsignedInteger('m_sponsor')->nullable();
|
||||
|
||||
|
||||
$table->boolean('confirmed')->default(false);
|
||||
$table->string('confirmation_code', 30)->index()->nullable();
|
||||
$table->timestamp('confirmation_date')->nullable();
|
||||
|
|
@ -51,7 +50,7 @@ class CreateUsersTable extends Migration
|
|||
$table->boolean('abo_options')->default(false);
|
||||
|
||||
$table->boolean('test_mode')->default(false);
|
||||
|
||||
$table->text('settings')->nullable();
|
||||
|
||||
$table->timestamps();
|
||||
$table->softDeletes();
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class CreateUserAccountsTable extends Migration
|
|||
Schema::create('user_accounts', function (Blueprint $table) {
|
||||
$table->increments('id');
|
||||
|
||||
$table->string('m_account')->nullable();
|
||||
$table->unsignedInteger('m_account')->unique()->nullable();
|
||||
$table->char('m_salutation', 2)->nullable();
|
||||
$table->string('m_first_name')->nullable();
|
||||
$table->string('m_last_name')->nullable();
|
||||
|
|
@ -69,6 +69,7 @@ class CreateUserAccountsTable extends Migration
|
|||
|
||||
$table->timestamp('data_protection')->nullable();
|
||||
$table->timestamp('accepted_contract')->nullable();
|
||||
$table->text('notice')->nullable();
|
||||
|
||||
$table->timestamps();
|
||||
$table->softDeletes();
|
||||
|
|
|
|||
|
|
@ -27,3 +27,7 @@ a[aria-expanded='true'] > .fa-caret-expand:before {
|
|||
border-color: #d7d700;
|
||||
background-color: #d7d700;
|
||||
}
|
||||
|
||||
.custom-control-label::before {
|
||||
border: 1px solid rgba(182, 117, 16, 0.8);
|
||||
}
|
||||
|
|
@ -21,10 +21,10 @@
|
|||
"Salutation": "Anrede",
|
||||
"Title": "Titel",
|
||||
"First name": "Vorname",
|
||||
"Last Name": "Nachname",
|
||||
"Last name": "Nachname",
|
||||
"Mobile Phone": "Mobiltelefon",
|
||||
"Your interests": "Ihre Interessen",
|
||||
"Your contact person": "Ihr Ansprechpartner",
|
||||
"Your interests": "Deine Interessen",
|
||||
"Your contact person": "Dein Ansprechpartner",
|
||||
"Name": "Name",
|
||||
"Consent & Privacy": "Einwilligung & Datenschutz",
|
||||
"New Password": "Neues Passwort",
|
||||
|
|
@ -48,25 +48,25 @@
|
|||
"save changes": "\u00c4nderungen speichern",
|
||||
"abort": "abbrechen",
|
||||
"This field is required.": "Dieses Feld ist ein Pflichtfeld.",
|
||||
"Please enter a valid email address.": "Bitte geben Sie eine g\u00fcltige E-Mail-Adresse ein.",
|
||||
"Please enter a valid email address.": "Bitte gebe eine g\u00fcltige E-Mail-Adresse ein.",
|
||||
"This E-mail is already in use.": "Diese E-Mail wird bereits verwendet.",
|
||||
"Please enter the same value again.": "Die E-Mail Adressen sind nicht gleich.",
|
||||
"a valid e-mail address": "Geben Sie bitte eine g\u00fcltige E-Mail-Adresse ein.",
|
||||
"Already have an account?": "Sie haben schon einen Account?",
|
||||
"a valid e-mail address": "Gebe bitte eine g\u00fcltige E-Mail-Adresse ein.",
|
||||
"Already have an account?": "Hast Du schon einen Account?",
|
||||
"Login to your account": "Melde Dich in Deinem Account an",
|
||||
"Dont have an account yet?": "Sie haben noch keinen Account?",
|
||||
"We keep you up to date on product news": "Gerne informieren wir Sie \u00fcber Produktneuheiten, Relevantes aus der Branche und Beispiele zu unseren Anwendungen:",
|
||||
"Dont have an account yet?": "Du hast noch keinen Account?",
|
||||
"We keep you up to date on product news": "Gerne informieren wir Dich \u00fcber Produktneuheiten, Relevantes aus der Branche und Beispiele zu unseren Anwendungen:",
|
||||
"Registration": "Registrierung",
|
||||
"that\u2019s how it\u2019s done": "so geht\u2019s",
|
||||
"Just register": "Einfach registrieren",
|
||||
"Just fill out the fields": "F\u00fcllen Sie einfach die Felder in der Eingabemaske aus. Danach erhalten Sie von uns per E-Mail einen Link. Mit einen Klick auf den Link best\u00e4tigen Sie die Registrierung.",
|
||||
"Just fill out the fields": "F\u00fclle einfach die Felder in der Eingabemaske aus. Danach erhälst Du von uns per E-Mail einen Link. Mit einen Klick auf den Link best\u00e4tigst Du Deine Registrierung.",
|
||||
"Changeable at any time": "Jederzeit \u00e4nderbar",
|
||||
"With your e-mail address and password": "Mit Ihrer E-Mailadresse und Ihrem Passwort k\u00f6nnen Sie jederzeit Ihre Daten einsehen oder \u00e4ndern.",
|
||||
"With your e-mail address and password": "Mit Deiner E-Mailadresse und Deinem Passwort kannst Du jederzeit Deine Daten einsehen oder \u00e4ndern.",
|
||||
"Absolutely safe": "Absolut sicher",
|
||||
"Your data will be stored on": "Deine Daten werden auf deutschen Servern unter Ber\u00fccksichtigung aktueller Sicherheitsstandards gespeichert.",
|
||||
"now register data": "jetzt Daten registieren",
|
||||
"Required fields": "Pflichtfelder",
|
||||
"You will receive an e-mail for confirmation": "Sie erhalten eine E-Mail zur Best\u00e4tigung, \u00fcber den Link in der E-Mail schalten Sie Ihren Daten frei.",
|
||||
"You will receive an e-mail for confirmation": "Du erhälst eine E-Mail zur Best\u00e4tigung, \u00fcber den Link in der E-Mail schaltest Du Deine Daten frei.",
|
||||
"Industry sectors": "Branchen",
|
||||
"Interests": "Interessen",
|
||||
"Leads": "Kontakte",
|
||||
|
|
@ -81,26 +81,26 @@
|
|||
"error": "Fehler",
|
||||
"Delete Account": "Account l\u00f6schen",
|
||||
"account deleted": "Account gel\u00f6schen",
|
||||
"Here you can adjust your data.": "Hier k\u00f6nnen Sie Ihre Daten anpassen.",
|
||||
"Here you can adjust your data.": "Hier kannst du Deine Daten anpassen.",
|
||||
"Overview": "\u00dcbersicht",
|
||||
"Adjust data": "Daten anpassen",
|
||||
"Data, Login & Security": "Daten, Anmeldung & Sicherheit",
|
||||
"Sign in with your e-mail:": "Anmeldung mit Ihrer E-Mail:",
|
||||
"Change your password here to access your account.": "\u00c4ndern Sie hier Ihr Passwort f\u00fcr den Zugriff auf Ihren Account.",
|
||||
"Sign in with your e-mail:": "Anmeldung mit Deiner E-Mail:",
|
||||
"Change your password here to access your account.": "\u00c4ndere hier Dein Passwort f\u00fcr den Zugriff auf Deinen Account.",
|
||||
"Activities": "Aktivit\u00e4ten",
|
||||
"Delete": "L\u00f6schen",
|
||||
"If you no longer want to use our offer, you can delete your account here.": "Wenn Sie unser Angebot nicht mehr nutzen m\u00f6chten, k\u00f6nnen Sie hier Ihren Account l\u00f6schen.",
|
||||
"Confirm your identity with your password before proceeding.": "Best\u00e4tigen Sie mit Ihrem Passwort Ihre Identit\u00e4t, bevor Sie fortfahren.",
|
||||
"If you no longer want to use our offer, you can delete your account here.": "Wenn Du unser Angebot nicht mehr nutzen m\u00f6chten, kannst Du hier Deinen Account l\u00f6schen.",
|
||||
"Confirm your identity with your password before proceeding.": "Best\u00e4tige mit Deinem Passwort Deine Identit\u00e4t, bevor du weiter machst.",
|
||||
"imprint": "Impressum",
|
||||
"data protections": "Datenschutz",
|
||||
"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!",
|
||||
"Thank you for your registration!": "Vielen Dank f\u00fcr Deine Registrierung!",
|
||||
"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.",
|
||||
"You have successfully verified your account!": "Du hast Dein Konto erfolgreich verifiziert!",
|
||||
"Now check your data and release the data.": "\u00dcberpr\u00fcfe jetzt Deine Daten und gebe Deine die Daten frei.",
|
||||
"Check and release data": "Daten \u00fcberpr\u00fcfen und freigeben",
|
||||
"Check data": "Daten \u00fcberpr\u00fcfen",
|
||||
"Page not available": "Seite nicht verf\u00fcgbar",
|
||||
|
|
@ -111,14 +111,14 @@
|
|||
"Privacy policy approved": "Datenschutzerkl\u00e4rung zugestimmt",
|
||||
"Consent for further information": "Einwilligung f\u00fcr weitere Informationen",
|
||||
"at": "am",
|
||||
"Assign a password for your account.": "Vergeben Sie ein Passwort f\u00fcr Ihren Account.",
|
||||
"Assign a password for your account.": "Gib ein Passwort f\u00fcr Deinen Account ein.",
|
||||
"Create Password": "Passwort erstellen",
|
||||
"back": "zur\u00fcck",
|
||||
"If you have checked your data, share your data here!": "Wenn Sie Ihre Daten \u00fcberpr\u00fcft haben, geben Sie Ihre Daten hier frei!",
|
||||
"If you have checked your data, share your data here!": "Wenn Du Deine Daten \u00fcberpr\u00fcft hast, gib Deine Daten hier frei!",
|
||||
"Contacts all": "gesamte Kontakte",
|
||||
"Contacts verify": "Kontakte verifiziert",
|
||||
"Contacts active": "Kontakte freigeschaltet",
|
||||
"This website uses cookies in order to guarantee the best possible service. With your visit to this site you agree to our use of cookies.": "Diese Webseite verwendet Cookies, um Ihnen den bestm\u00f6glichen Service zu gew\u00e4hrleisten. Mit Ihrem Besuch auf dieser Seite stimmen Sie der Verwendung von Cookies zu.",
|
||||
"This website uses cookies in order to guarantee the best possible service. With your visit to this site you agree to our use of cookies.": "Diese Webseite verwendet Cookies, um Ihnen den bestm\u00f6glichen Service zu gew\u00e4hrleisten. Mit Deinem Besuch auf dieser Seite stimmst Du der Verwendung von Cookies zu.",
|
||||
"OK": "OK",
|
||||
"Contacts": "Kontake",
|
||||
"active": "aktiviert",
|
||||
|
|
@ -138,14 +138,14 @@
|
|||
"Create new interest": "Neues Interesse erstellen",
|
||||
"Really delete entry?": "Eintrag wirklich l\u00f6schen?",
|
||||
"Create a new industry": "Neue Branche erstellen",
|
||||
"Your e-mail has been changed.": "Ihre E-Mail wurde ge\u00e4ndert.",
|
||||
"We sent you an activation code. Check your email!": "Wir haben Ihnen einen Aktivierungscode gesendet. \u00dcberpr\u00fcfen Sie Ihre E-Mails!",
|
||||
"Your e-mail has been changed.": "Deine E-Mail wurde ge\u00e4ndert.",
|
||||
"We sent you an activation code. Check your email!": "Wir haben Dir einen Aktivierungscode gesendet. \u00dcberpr\u00fcfen Deine E-Mails!",
|
||||
"An activation code was sent to the account by e-mail!": "An den Kontkat wurde per E-Mail ein Aktivierungscode gesendet!",
|
||||
"New E-Mail Address": "Neue E-Mail Adresse",
|
||||
"Confirm new E-Mail": "Neue E-Mail Adresse wiederholen",
|
||||
"Change E-Mail": "E-Mail Adresse \u00e4ndern",
|
||||
"Change your e-mail address here. We will send you a new activation link to your new e-mail address to verify it.": "\u00c4ndern Sie hier Ihre E-Mail-Adresse. Wir senden Ihnen einen neuen Aktivierungslink an Ihre neue E-Mail-Adresse, um diese zu verifizieren.",
|
||||
"Change the e-mail address of the contact here. We will send the contact a new activation link to the new e-mail address to verify it.": "\u00c4ndern Sie hier die E-Mail-Adresse des Kontakts. Wir senden dem Kontakt einen neuen Aktivierungslink an die neue E-Mail-Adresse, um diese zu verifizieren.",
|
||||
"Change your e-mail address here. We will send you a new activation link to your new e-mail address to verify it.": "\u00c4ndere hier Deine E-Mail-Adresse. Wir senden Dir einen neuen Aktivierungslink an Deine neue E-Mail-Adresse, um diese zu verifizieren.",
|
||||
"Change the e-mail address of the contact here. We will send the contact a new activation link to the new e-mail address to verify it.": "\u00c4nder hier Deine E-Mail-Adresse des Kontakts. Wir senden dem Kontakt einen neuen Aktivierungslink an die neue E-Mail-Adresse, um diese zu verifizieren.",
|
||||
"business": "gesch\u00e4ftlich",
|
||||
"private": "privat",
|
||||
"business or private": "gesch\u00e4ftlich oder privat",
|
||||
|
|
@ -157,12 +157,12 @@
|
|||
"delete": "l\u00f6schen",
|
||||
"your mivita.care team": "Dein Team von mivita.care",
|
||||
"create new password": "neues Passwort erstellen",
|
||||
"Now assign a password.": "Vergeben Sie jetzt Ihr Passwort für den Zugriff auf Ihren Account.",
|
||||
"Now assign a password.": "Vergebe jetzt Dein Passwort für den Zugriff auf Deinen 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",
|
||||
"Please confirm your data first.": "Bitte überprüfen Sie Ihre Daten als erstes und bestätigen Sie diese.",
|
||||
"Please confirm your data first.": "Bitte überprüfen Deine Daten als erstes und bestätige diese.",
|
||||
"yes, data checked and share":"Ja, Daten überprüft und jetzt freigeben",
|
||||
"Declaration of shop": "Hiermit bestätige und akzeptiere ich die Nutzungsbedinungen zu meinem mivita-Shop.",
|
||||
"Your Shop": "Dein Shop",
|
||||
|
|
@ -188,14 +188,14 @@
|
|||
"open since":"Eröffnet seit",
|
||||
"Domain":"Domain",
|
||||
"name":"Name",
|
||||
"not available copy":" Bei neu angelegten Shops dauert es einige Minuten, bis die Domain zu erreichen ist. Bitte schauen Sie in einigen Minuten noch einmal nach.",
|
||||
"not available copy":" Bei neu angelegten Shops dauert es einige Minuten, bis die Domain zu erreichen ist. Bitte schaue in einigen Minuten noch einmal nach.",
|
||||
"shop image":"Dein Shop Bild",
|
||||
"shop image copy":"Lade hier ein Foto / Bild / Logo von Dir hoch.",
|
||||
"shop on site":"Für Dich vor Ort:",
|
||||
"shop on site copy":"Warst du auf der Aloe Vera Farm auf Mallorca? Lade hier bis zu 6 Bilder von Dir hoch.",
|
||||
"open your shop": "Eröffne Deinen eigenen mivita-Shop",
|
||||
"settings your shop":"Deine Shop-Einstellungen",
|
||||
"taxable_sales_1":"umsatzsteuerpflichtig (Sie machen einen UST-Voranmeldung pro Monat / Quartal / Jahr ans Finanzamt)",
|
||||
"taxable_sales_1":"umsatzsteuerpflichtig (Ich mache eine UST-Voranmeldung pro Monat / Quartal / Jahr ans Finanzamt)",
|
||||
"taxable_sales_2":"nicht umsatzsteuerpflichtig (Kleinunternehmer im Sinne von § 19)",
|
||||
"": ""
|
||||
}
|
||||
|
|
@ -14,7 +14,8 @@
|
|||
'sender' => 'Dein Team von mivita.care',
|
||||
'request_from' => 'Anfrage von mivita.care',
|
||||
'your_request_from' => 'Deine Anfrage von',
|
||||
'checkout_subject' => 'Deine Bestellung auf',
|
||||
'checkout_subject' => 'Deine Bestellung bei',
|
||||
'checkout_subject_paid' => 'Zahlungsbestätigung - Deine Bestellung bei',
|
||||
'change_e_mail' => 'E-Mail Adresse ändern',
|
||||
'first_name' => 'Vorname',
|
||||
'last_name' => 'Nachname',
|
||||
|
|
|
|||
|
|
@ -22,8 +22,6 @@ return array (
|
|||
'Title' => 'Titel',
|
||||
'First name' => 'Vorname',
|
||||
'Last Name' => 'Nachname',
|
||||
'Your interests' => 'Ihre Interessen',
|
||||
'Your contact at JACKON' => 'Ihr Ansprechpartner bei JACKON',
|
||||
'Name' => 'Name',
|
||||
'Consent & Privacy' => 'Einwilligung & Datenschutz',
|
||||
"Confirm Password" => "Passwort bestätigen",
|
||||
|
|
|
|||
27
resources/lang/de/navigation.php
Executable file
27
resources/lang/de/navigation.php
Executable file
|
|
@ -0,0 +1,27 @@
|
|||
<?php
|
||||
|
||||
return [
|
||||
'home' => 'Home',
|
||||
'my_data' => 'Meine Daten',
|
||||
'my_shop' => 'Mein Shop',
|
||||
'settings' => 'Einstellungen',
|
||||
'my_team' => 'Mein Team',
|
||||
'member_register' => 'Berater registrieren',
|
||||
'member'=>'Berater',
|
||||
'orders'=>'Bestellungen',
|
||||
'clients'=>'Kunden',
|
||||
'products'=>'Produkte',
|
||||
'overview'=>'Übersicht',
|
||||
'categories'=>'Kategorien',
|
||||
'attribute'=>'Attribute',
|
||||
'contents'=>'Inhalte',
|
||||
'start_site'=>'Startseite',
|
||||
'translate'=>'Übersetzungen',
|
||||
'general'=>'Allgemein',
|
||||
'modules'=>'Module',
|
||||
'user_roles'=>'User Rechte',
|
||||
'shipping_costs'=>'Versandkosten',
|
||||
'career_level'=>'Karriere-Level',
|
||||
'countries'=>'Länder',
|
||||
'logout'=>'Logout',
|
||||
];
|
||||
|
|
@ -21,4 +21,8 @@ return [
|
|||
'wizard_reg_release_line_1' => 'Deine Registrierung ist abgeschlossen, Deine Daten werden geprüft.<br> Nach erfolgreicher Prüfung wird dein Account freigeschaltet und Du erhälst Du eine E-Mail.',
|
||||
'sender' => 'Dein Team von mivita.care',
|
||||
'required_fields' => 'Pflichtfelder',
|
||||
'business_license_now' => 'Gewerbeschein jetzt hochladen',
|
||||
'business_license_later' => 'Ich reiche meinen Gewerbeschein innerhalb der nächsten 4 Wochen nach',
|
||||
'business_license_non' => 'Ich benötige keinen Gewerbeschein',
|
||||
'business_license_non_text' => 'Außerhalb Deutschlands gibt es unterschiedliche Regelungen um Thema Gewerbeschein (z. B. Österreich oder Schweiz). Solltest Du für dieses Business oder zur Zeit keinen Gewerbeschein haben müssen, begründe dies hier bitte kurz:'
|
||||
];
|
||||
|
|
|
|||
|
|
@ -199,7 +199,8 @@ return [
|
|||
'shipping_lastname'=>'Nachname',
|
||||
'shipping_address'=>'Adresse',
|
||||
'shipping_zipcode'=>'PLZ',
|
||||
'shipping_city' => 'Stadt'
|
||||
'shipping_city' => 'Stadt',
|
||||
'm_account' => 'Account ID',
|
||||
|
||||
],
|
||||
];
|
||||
|
|
|
|||
|
|
@ -31,16 +31,8 @@
|
|||
<a href="{{ route('admin_leads') }}" class="btn btn-default">{{ __('back') }}</a>
|
||||
</div>
|
||||
|
||||
@if($m_data_load)
|
||||
@include('admin.lead.m_data_form_edit')
|
||||
@endif
|
||||
|
||||
@include('admin.lead.m_register_data')
|
||||
|
||||
@if(!$m_data_load)
|
||||
@include('admin.lead.m_data_form')
|
||||
@endif
|
||||
|
||||
@if(!$user->id || $user->id === 'new')
|
||||
@include('user.user_new_form')
|
||||
@include('user.data_verify')
|
||||
|
|
@ -62,20 +54,20 @@
|
|||
<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>
|
||||
<h5 class="modal-title"> {{__('Daten mivita')}} <span class="font-weight-light">{{__('edit')}}</span></h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="form-row">
|
||||
<div class="form-group col">
|
||||
<label for="name" class="form-label">{{__('Passwort')}}</label>
|
||||
<label for="name" class="form-label">{{__('Passwort eingeben')}}</label>
|
||||
<input type="text" class="form-control" name="edit_m_data_key" placeholder="mivita">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
|
||||
<button type="submit" class="btn btn-primary">{{__('save')}}</button>
|
||||
<button type="submit" class="btn btn-primary">{{__('öffnen')}}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -9,22 +9,12 @@
|
|||
</div>
|
||||
</div>
|
||||
@endif
|
||||
<div class="card mb-4">
|
||||
|
||||
|
||||
<h5 class="card-header">
|
||||
<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="card-body">
|
||||
<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 type="button" class="btn btn-sm btn-secondary" data-toggle="modal" data-target="#modals-edit-m-data">
|
||||
<span class="far fa-edit"></span> Berater Daten bearbeiten
|
||||
</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">
|
||||
<tbody>
|
||||
|
|
@ -54,6 +44,6 @@
|
|||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,10 @@
|
|||
<div class="card mb-4">
|
||||
<h5 class="card-header">
|
||||
{{ __('mivita interne Daten') }}
|
||||
</h5>
|
||||
<input type="hidden" name="m_data_edit" value="TSOK">
|
||||
|
||||
<input type="hidden" name="m_data_edit" value="TSOK">
|
||||
<div class="card-body">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-4">
|
||||
<label for="m_account" class="form-label">{{ __('Account ID') }}</label>
|
||||
<label for="m_account" class="form-label">{{ __('Account ID') }} (unique)</label>
|
||||
<span class="badge badge-secondary float-right">Nächste freie ID: {{$next_account_id}}</span>
|
||||
{{ Form::text('m_account', $user->account->m_account, array('placeholder'=>__('Account ID'), 'class'=>'form-control', 'id'=>'m_account')) }}
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
|
|
@ -47,7 +44,6 @@
|
|||
<div class="text-left mt-3">
|
||||
<button type="submit" class="btn btn-submit btn-primary">{{ __('save') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,18 @@
|
|||
|
||||
<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 href="#" class="@if($show !== 'check_lead' || !$m_data_load) collapsed @endif" data-toggle="collapse" data-target="#collapseMRegister" aria-expanded="@if($show !== 'check_lead' || !$m_data_load) false @else true @endif" aria-controls="collapseMRegister">
|
||||
<i class="fa fa-caret-expand"></i> {{__('Berater Status') }}
|
||||
</a>
|
||||
</h5>
|
||||
<div class="collapse @if($show === 'check_lead') show @endif" id="collapseMRegister">
|
||||
<div class="collapse @if($show === 'check_lead' || $m_data_load) show @endif" id="collapseMRegister">
|
||||
@if($m_data_load)
|
||||
@include('admin.lead.m_data_form_edit')
|
||||
@endif
|
||||
@if(!$m_data_load)
|
||||
@include('admin.lead.m_data_form')
|
||||
@endif
|
||||
|
||||
|
||||
<div class="card-body mb-2 pb-1">
|
||||
<div class="row">
|
||||
|
|
@ -69,11 +76,10 @@
|
|||
<hr>
|
||||
@if($user->release_account)
|
||||
<strong>Registrierung abgeschlossen {{ $user->getReleaseAccountFormat() }}</strong><br>
|
||||
<a href="{{route('admin_lead_released', ['completed', $user->id])}}" class="btn btn-info" onclick="return confirm('Alle Daten vollständig und Berater freischalten?');">Daten vollständigt => Berater freischalten</a>
|
||||
<a href="{{route('admin_lead_released', ['completed', $user->id])}}" class="btn btn-success" onclick="return confirm('Alle Daten vollständig und Berater freischalten?');">Die Daten sind vollständigt => Berater freischalten</a>
|
||||
<button type="button" class="btn btn-sm btn-danger float-right" data-toggle="modal" data-target="#modals-register-m-data">
|
||||
nicht vollständigt => E-Mail senden
|
||||
Berater eine E-Mail senden => Daten nicht vollständigt
|
||||
</button>
|
||||
|
||||
@else
|
||||
<strong><span class="text-danger">Berater muss Registrierung noch abschließen</span></strong>
|
||||
@endif
|
||||
|
|
@ -81,9 +87,6 @@
|
|||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
@if($user->files->count())
|
||||
<div class="card-body mb-4 pb-1">
|
||||
|
|
@ -119,6 +122,29 @@
|
|||
</table>
|
||||
</div>
|
||||
<hr>
|
||||
@if($user->account_id)
|
||||
|
||||
@if($user->account->getNotice('business_license') === 'later')
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="bg-warning rounded py-2 px-3">
|
||||
{{__('register.business_license_later')}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@if($user->account->getNotice('business_license') === 'non')
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="bg-warning rounded py-2 px-3">
|
||||
<div class="font-weight-semibold mb-1">{{__('register.business_license_non')}}</div>
|
||||
<em>{{$user->account->getNotice('business_license_reason')}}</em>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="table card-table m-0">
|
||||
<tbody>
|
||||
|
|
|
|||
|
|
@ -2,22 +2,30 @@
|
|||
|
||||
@section('content')
|
||||
<div class="card">
|
||||
|
||||
<h6 class="card-header">
|
||||
{{__('Produkte')}}
|
||||
<label class="custom-control custom-checkbox float-right mb-0">
|
||||
<input type="checkbox" class="custom-control-input show-active-products" name="show_active_products" @if(Auth::user()->getSetting('show_active_products') === "true") checked @endif>
|
||||
<span class="custom-control-label font-style-normal font-weight-normal">nur aktive anzeigen</span>
|
||||
</label>
|
||||
</h6>
|
||||
<div class="card-datatable table-responsive">
|
||||
<table class="datatables-style table table-striped table-bordered">
|
||||
<table class="datatables-product table table-striped table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="max-width: 60px;"> </th>
|
||||
<th>{{__('Pos')}}</th>
|
||||
<th>{{__('Bild')}}</th>
|
||||
<th>{{__('Name')}}</th>
|
||||
<th>{{__('Artikelnummer')}}</th>
|
||||
<th>{{__('Kategorie')}}</th>
|
||||
<th>{{__('Points')}}</th>
|
||||
<th>{{__('Preis')}}</th>
|
||||
<th>{{__('Inhalt')}}</th>
|
||||
<th>{{__('Einheit')}}</th>
|
||||
<th>{{__('Grundpreis')}}</th>
|
||||
<th>{{__('Gewicht')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
|
|
@ -37,15 +45,18 @@
|
|||
@endif
|
||||
</td>
|
||||
<td>{{ $value->name }}</td>
|
||||
<td>{{ $value->number }}</td>
|
||||
<td>
|
||||
@foreach($value->categories as $category)
|
||||
{{ $category->category->name }}
|
||||
<div style="white-space: nowrap">{{ $category->category->name }}</div>
|
||||
@endforeach
|
||||
</td>
|
||||
<td>{{ $value->points }}</td>
|
||||
<td>{{ $value->getFormattedPrice() }}</td>
|
||||
<td>{{ $value->contents_total }}</td>
|
||||
<td>{{ $value->getUnitType() }}</td>
|
||||
<td>{{ $value->getBasePriceFormatted() }}</td>
|
||||
<td>{{ $value->weight }}</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>
|
||||
<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>
|
||||
|
|
@ -63,23 +74,22 @@
|
|||
|
||||
<script>
|
||||
$( document ).ready(function() {
|
||||
|
||||
$('.datatables-style').dataTable({
|
||||
$('.datatables-product').dataTable({
|
||||
"bLengthChange": false,
|
||||
"iDisplayLength": 50,
|
||||
"aoColumns": [
|
||||
{ "sWidth": "6%" },
|
||||
{ "sWidth": "8%" },
|
||||
{ "sWidth": "19%" },
|
||||
{ "sWidth": "19%" },
|
||||
{ "sWidth": "30%" },
|
||||
{ "sWidth": "10%" },
|
||||
{ "sWidth": "10%" },
|
||||
],
|
||||
"language": {
|
||||
"url": "/js/German.json"
|
||||
}
|
||||
});
|
||||
$('.show-active-products').on('change', function () {
|
||||
console.log($(this));
|
||||
console.log($(this).prop('checked'));
|
||||
document.location.search = $(this).attr('name')+"="+$(this).prop('checked');
|
||||
// window.location.reload(true);
|
||||
|
||||
})
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
@endsection
|
||||
|
|
|
|||
15
resources/views/admin/sales/customer_detail.blade.php
Normal file
15
resources/views/admin/sales/customer_detail.blade.php
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
@extends('layouts.layout-2')
|
||||
|
||||
@section('content')
|
||||
|
||||
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
{{ __('Bestellung Kunde') }}
|
||||
</h4>
|
||||
|
||||
|
||||
|
||||
<div class="card">
|
||||
<p>Ansicht Bestellung</p>
|
||||
</div>
|
||||
@endsection
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
{{ __('Bestellungen Berater') }}
|
||||
{{ __('Bestellungen Kunden') }}
|
||||
</h4>
|
||||
|
||||
|
||||
|
|
|
|||
14
resources/views/admin/sales/user_detail.blade.php
Normal file
14
resources/views/admin/sales/user_detail.blade.php
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
@extends('layouts.layout-2')
|
||||
|
||||
@section('content')
|
||||
|
||||
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
{{ __('Bestellung Berater') }}
|
||||
</h4>
|
||||
|
||||
|
||||
<div class="card">
|
||||
<p>Ansicht Bestellung</p>
|
||||
</div>
|
||||
@endsection
|
||||
|
|
@ -4,10 +4,9 @@
|
|||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1"/>
|
||||
<title>mivita</title>
|
||||
<title>mivita.care</title>
|
||||
|
||||
<style type="text/css">
|
||||
@import url(https://fonts.googleapis.com/css?family=Roboto);
|
||||
img {
|
||||
max-width: 600px;
|
||||
outline: none;
|
||||
|
|
@ -19,18 +18,17 @@
|
|||
text-decoration: none;
|
||||
border: 0;
|
||||
outline: none;
|
||||
color: #b5c49b;
|
||||
color: #919f7a;
|
||||
}
|
||||
|
||||
a:hover {
|
||||
color:#d7d700;
|
||||
color: #b6b600;
|
||||
}
|
||||
a img {
|
||||
border: none;
|
||||
}
|
||||
|
||||
td, h1, h2, h3 {
|
||||
font-family: "Roboto", Helvetica, Arial, sans-serif;
|
||||
font-family: Helvetica, Verdana, Arial, sans-serif;
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
|
|
@ -54,7 +52,7 @@
|
|||
}
|
||||
|
||||
.headline {
|
||||
color: #b5c49b;
|
||||
color: #37302d;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
|
|
@ -69,7 +67,7 @@
|
|||
@media screen {
|
||||
/*Thanks Outlook 2013! http://goo.gl/XLxpyl*/
|
||||
td, h1, h2, h3 {
|
||||
font-family: 'Roboto', 'Helvetica Neue', 'Arial', 'sans-serif' !important;
|
||||
font-family: Helvetica, Verdana, Arial, sans-serif;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -97,7 +95,12 @@
|
|||
<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 }}
|
||||
@if(isset($copy1line))
|
||||
{{ strip_tags($copy1line) }}
|
||||
@endif
|
||||
@if(isset($content))
|
||||
{{ strip_tags($content) }}
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<table align="center" cellpadding="0" cellspacing="0" width="100%" height="100%">
|
||||
|
|
@ -118,7 +121,7 @@
|
|||
<tr class="">
|
||||
<td align="center" valign="top" style="font-size: 0px;" class="">
|
||||
<picture class="">
|
||||
<img src="https://mein.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
|
||||
<img src="https://my.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
|
||||
</picture>
|
||||
|
||||
</td>
|
||||
|
|
@ -141,6 +144,7 @@
|
|||
<b>{{ $salutation }} </b>
|
||||
</td>
|
||||
</tr>
|
||||
@if(isset($copy1line))
|
||||
<tr>
|
||||
<td>
|
||||
<center>
|
||||
|
|
@ -148,7 +152,7 @@
|
|||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<br>
|
||||
{{ $copy1line }}
|
||||
{!! nl2br($copy1line) !!}
|
||||
<br>
|
||||
<br>
|
||||
</td>
|
||||
|
|
@ -157,6 +161,20 @@
|
|||
</center>
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
@if(isset($content))
|
||||
<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>
|
||||
@endif
|
||||
<tr>
|
||||
<td>
|
||||
<center>
|
||||
|
|
@ -189,10 +207,11 @@
|
|||
<td style="color:#37302d;">
|
||||
<br>
|
||||
{{ $copy2line }}<br>
|
||||
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;">{{ $url }}</span>
|
||||
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;white-space: pre-line;">{{ $url }}</span>
|
||||
<br><br>
|
||||
{{ $greetings }} <br><b>Ihr Team von mivita</b>
|
||||
<br>
|
||||
{{ $copy3line }}
|
||||
<br><br>
|
||||
{{ $greetings }} <br><b>{{ $sender }}</b>
|
||||
<br>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -208,13 +227,12 @@
|
|||
|
||||
|
||||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" class="force-full-width"
|
||||
bgcolor="#f8f8f8" style="margin: 0 auto">
|
||||
bgcolor="#f8f8f8">
|
||||
<tr>
|
||||
<td style="color:#7B7B7E; font-size:14px;">
|
||||
<br>
|
||||
mivita e.K. | Leinfeld 2 | 87755 Kirchhaslach<br>
|
||||
Telefon: +49 (0) 8333 946 98 90 | Fax: +49 (0) 8333 7268<br>
|
||||
E-Mail: info@mivita.care<br></p>
|
||||
<p>
|
||||
{{__('email.footer_copy1')}}
|
||||
</p>
|
||||
<br>
|
||||
<a href="https://www.mivita.care" style="color: #7B7B7E; text-decoration: underline;">www.mivita.care</a>
|
||||
<br>
|
||||
|
|
@ -222,13 +240,10 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td style="color:#bbbbbb; font-size:12px;">
|
||||
|
||||
<p>Geschäftsinhaber: Alois Ried | Registergericht: Memmingen<br>
|
||||
|
||||
Registernummer: HRA 12236 | USt-ID-Nr.: DE 244162340</p>
|
||||
|
||||
<p>{{__('email.footer_copy2')}}</p>
|
||||
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
|
||||
© 2018 All Rights Reserved <br>
|
||||
<p>{{__('email.footer_copy3')}}</p>
|
||||
<br>
|
||||
<br>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -59,38 +59,7 @@
|
|||
.force-full-width {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
|
||||
</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">
|
||||
|
||||
|
|
@ -111,7 +80,6 @@
|
|||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="700" class="w320">
|
||||
<tr>
|
||||
<td align="center" valign="top">
|
||||
|
||||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style=" text-align:center;">
|
||||
|
|
@ -139,7 +107,7 @@
|
|||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%"
|
||||
bgcolor="#ffffff">
|
||||
<tr>
|
||||
<td class="headline">
|
||||
<td class="headline" align="center">
|
||||
<br><br>
|
||||
<b>{{ $salutation }} </b>
|
||||
</td>
|
||||
|
|
@ -150,7 +118,7 @@
|
|||
<center>
|
||||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="90%">
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<td style="color:#37302d;line-height:1.6em;" align="center">
|
||||
<br>
|
||||
{!! nl2br($copy1line) !!}
|
||||
<br>
|
||||
|
|
@ -165,7 +133,7 @@
|
|||
@if(isset($content))
|
||||
<tr>
|
||||
<td>
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
|
||||
<table style="padding: 20px;line-height:1.6em; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" align="center" width="100%">
|
||||
<tr>
|
||||
<td>
|
||||
{!! nl2br($content) !!}
|
||||
|
|
@ -204,7 +172,7 @@
|
|||
<center>
|
||||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="90%">
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<td style="color:#37302d;padding:20px;line-height:1.6em" align="center">
|
||||
<br>
|
||||
{{ $copy2line }}<br>
|
||||
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;white-space: pre-line;">{{ $url }}</span>
|
||||
|
|
@ -229,7 +197,7 @@
|
|||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" class="force-full-width"
|
||||
bgcolor="#f8f8f8">
|
||||
<tr>
|
||||
<td style="color:#7B7B7E; font-size:14px;">
|
||||
<td style="color:#7B7B7E; font-size:14px;padding:20px;line-height:1.6em" align="center">
|
||||
<p>
|
||||
{{__('email.footer_copy1')}}
|
||||
</p>
|
||||
|
|
@ -239,7 +207,7 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#bbbbbb; font-size:12px;">
|
||||
<td style="color:#bbbbbb; font-size:12px;padding:20px;line-height:1.6em" align="center">
|
||||
<p>{{__('email.footer_copy2')}}</p>
|
||||
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
|
||||
<p>{{__('email.footer_copy3')}}</p>
|
||||
|
|
|
|||
|
|
@ -71,18 +71,14 @@
|
|||
}
|
||||
|
||||
</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"] {
|
||||
|
|
@ -91,15 +87,6 @@
|
|||
|
||||
}
|
||||
</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">
|
||||
|
||||
|
|
@ -154,7 +141,7 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
{!! nl2br($copy1line) !!}
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -167,16 +154,16 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
|
||||
@foreach($shopping_order->shopping_order_items as $shopping_order_item)
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top; width: 10%; " >
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top; width: 10%;line-height:1.6em;">
|
||||
{{ $shopping_order_item->qty }} x
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order_item->product->name }}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order_item->getFormattedPrice() }} EUR
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -187,13 +174,13 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{__('email.checkout_mail_shipping')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedShipping() }} EUR
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -203,13 +190,13 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{__('email.checkout_mail_total')}}</b>
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{ $shopping_order->getFormattedTotalShipping() }} EUR</b>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -260,15 +247,15 @@
|
|||
</tr>
|
||||
@endif
|
||||
<tr>
|
||||
<td class="sub_headline">
|
||||
<td class="sub_headline" style="line-height:1.6em;">
|
||||
<b>{{__('email.checkout_mail_pay_info')}}</b>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td>
|
||||
<td style="line-height:1.6em;">
|
||||
<b>{{__('email.checkout_mail_pay_success')}} </b><br>
|
||||
{{__('email.checkout_mail_pay_with')}} {{$shopping_payment->getPaymentType()}}<br>
|
||||
{{__('email.checkout_mail_pay_ref')}} {{$shopping_payment->reference}}<br>
|
||||
|
|
@ -290,9 +277,9 @@
|
|||
<tr>
|
||||
<td style="color:#37302d; ">
|
||||
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="0" cellspacing="0" width="100%">
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->billing_company)
|
||||
{{ $shopping_order->shopping_user->billing_company }}<br>
|
||||
@endif
|
||||
|
|
@ -321,15 +308,15 @@
|
|||
|
||||
|
||||
<tr>
|
||||
<td class="sub_headline">
|
||||
<td class="sub_headline" style="line-height:1.6em;">
|
||||
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="0" cellspacing="0" width="100%">
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->same_as_billing)
|
||||
{{__('email.checkout_mail_same_address')}}
|
||||
@else
|
||||
|
|
@ -368,10 +355,10 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d;font-size: 14px;">
|
||||
<td style="color:#37302d;font-size: 14px;line-height:1.6em;">
|
||||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
{{ $copy3line }}
|
||||
<br>
|
||||
@if($shopping_order->user_shop)
|
||||
|
|
@ -381,7 +368,7 @@
|
|||
@if($shopping_order->user_shop->contact)
|
||||
{!! nl2br($shopping_order->user_shop->contact) !!}<br>
|
||||
@endif
|
||||
<a href="{{ $shopping_order->user_shop->getSubdomain() }}">{{ $shopping_order->user_shop->getSubdomain() }}</a>
|
||||
<a href="{{ $shopping_order->user_shop->getSubdomain(true) }}">{{ $shopping_order->user_shop->getSubdomain(true) }}</a>
|
||||
|
||||
@endif
|
||||
<hr><br>
|
||||
|
|
@ -400,7 +387,7 @@
|
|||
<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">
|
||||
<td style="color:#7B7B7E; font-size:14px; text-align: center;line-height:1.6em;" align="center">
|
||||
<p>
|
||||
{{__('email.footer_copy1')}}
|
||||
</p>
|
||||
|
|
@ -410,7 +397,7 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#bbbbbb; font-size:12px; text-align: center">
|
||||
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
|
||||
<p>{{__('email.footer_copy2')}}</p>
|
||||
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
|
||||
<p>{{__('email.footer_copy3')}}</p>
|
||||
|
|
|
|||
|
|
@ -71,18 +71,14 @@
|
|||
}
|
||||
|
||||
</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"] {
|
||||
|
|
@ -91,15 +87,6 @@
|
|||
|
||||
}
|
||||
</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">
|
||||
|
||||
|
|
@ -154,7 +141,7 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
{!! nl2br($copy1line) !!}
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -166,9 +153,9 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td>
|
||||
<td style="line-height:1.6em;">
|
||||
@if($txaction == 'failed')
|
||||
<b>{{__('email.checkout_mail_pay_error')}}</b><br>
|
||||
@elseif($txaction == 'appointed')
|
||||
|
|
@ -212,16 +199,16 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
|
||||
@foreach($shopping_order->shopping_order_items as $shopping_order_item)
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top; width: 10%; " >
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top; width: 10%;line-height:1.6em;">
|
||||
{{ $shopping_order_item->qty }} x
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order_item->product->name }}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order_item->getFormattedPrice() }} EUR
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -232,13 +219,13 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{__('email.checkout_mail_shipping')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedShipping() }} EUR
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -248,13 +235,13 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{__('email.checkout_mail_total')}}</b>
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{ $shopping_order->getFormattedTotalShipping() }} EUR</b>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -276,7 +263,7 @@
|
|||
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->billing_company)
|
||||
{{ $shopping_order->shopping_user->billing_company }}<br>
|
||||
@endif
|
||||
|
|
@ -317,7 +304,7 @@
|
|||
<td style="color:#37302d;">
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->same_as_billing)
|
||||
{{__('email.checkout_mail_same_address')}}
|
||||
@else
|
||||
|
|
@ -359,7 +346,7 @@
|
|||
<td style="color:#37302d;font-size: 14px;">
|
||||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
{{ $copy3line }}
|
||||
<br>
|
||||
|
||||
|
|
@ -370,7 +357,7 @@
|
|||
@if($shopping_order->user_shop->contact)
|
||||
{!! nl2br($shopping_order->user_shop->contact) !!}<br>
|
||||
@endif
|
||||
<a href="{{ $shopping_order->user_shop->getSubdomain() }}">{{ $shopping_order->user_shop->getSubdomain() }}</a>
|
||||
<a href="{{ $shopping_order->user_shop->getSubdomain(true) }}">{{ $shopping_order->user_shop->getSubdomain(true) }}</a>
|
||||
|
||||
@endif
|
||||
<hr><br>
|
||||
|
|
@ -389,7 +376,7 @@
|
|||
<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">
|
||||
<td style="color:#7B7B7E; font-size:14px; text-align: center;line-height:1.6em;" align="center">
|
||||
<p>
|
||||
{{__('email.footer_copy1')}}
|
||||
</p>
|
||||
|
|
@ -399,7 +386,7 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#bbbbbb; font-size:12px; text-align: center">
|
||||
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
|
||||
<p>{{__('email.footer_copy2')}}</p>
|
||||
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
|
||||
<p>{{__('email.footer_copy3')}}</p>
|
||||
|
|
|
|||
|
|
@ -62,18 +62,14 @@
|
|||
|
||||
|
||||
</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"] {
|
||||
|
|
@ -82,15 +78,6 @@
|
|||
|
||||
}
|
||||
</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">
|
||||
|
||||
|
|
@ -134,7 +121,7 @@
|
|||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%"
|
||||
bgcolor="#ffffff">
|
||||
<tr>
|
||||
<td class="headline">
|
||||
<td class="headline" align="center">
|
||||
<br><br>
|
||||
<b>{{ $salutation }} </b>
|
||||
</td>
|
||||
|
|
@ -144,7 +131,7 @@
|
|||
<center>
|
||||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="90%">
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<td style="color:#37302d;line-height:1.6em;" align="center">
|
||||
<br>
|
||||
{{ $copy1line }}
|
||||
<br>
|
||||
|
|
@ -163,10 +150,10 @@
|
|||
|
||||
@foreach($data as $key=>$value)
|
||||
<tr>
|
||||
<td style="color:#37302d; width: 30%; text-align: right; vertical-align: top;">
|
||||
<td style="color:#37302d; width: 30%; text-align: right; vertical-align: top;line-height:1.6em;" align="center">
|
||||
{{__('email.'.$key)}}:
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;">
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;" align="center">
|
||||
{!! nl2br($value) !!}
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -182,7 +169,7 @@
|
|||
<center>
|
||||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="90%">
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<td style="color:#37302d;line-height:1.6em;" align="center">
|
||||
<br><br>
|
||||
{{ $copy3line }}
|
||||
<br><br>
|
||||
|
|
@ -201,19 +188,19 @@
|
|||
</table>
|
||||
<center>
|
||||
<table cellpadding="0" cellspacing="0" class="force-full-width"
|
||||
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center">
|
||||
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center;line-height:1.6em;">
|
||||
<tr>
|
||||
<td style="color:#7B7B7E; font-size:14px; text-align: center">
|
||||
<td style="color:#7B7B7E; font-size:14px; text-align: center;line-height:1.6em;" align="center">
|
||||
<p>
|
||||
{{__('email.footer_copy1')}}
|
||||
</p>
|
||||
<br>
|
||||
<a href="https://www.mivita.care" style="color: #7B7B7E; text-decoration: underline;">www.mivita.care</a>
|
||||
<a href="https://www.mivita.care" style="color: #7B7B7E; text-decoration: underline;line-height:1.6em;">www.mivita.care</a>
|
||||
<br>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#bbbbbb; font-size:12px; text-align: center">
|
||||
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
|
||||
<p>{{__('email.footer_copy2')}}</p>
|
||||
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
|
||||
<p>{{__('email.footer_copy3')}}</p>
|
||||
|
|
|
|||
|
|
@ -71,18 +71,14 @@
|
|||
}
|
||||
|
||||
</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"] {
|
||||
|
|
@ -91,15 +87,6 @@
|
|||
|
||||
}
|
||||
</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">
|
||||
|
||||
|
|
@ -142,7 +129,7 @@
|
|||
|
||||
<table cellpadding="10" style="padding: 10px;" cellspacing="0" border="0" width="100%" bgcolor="#ffffff">
|
||||
<tr>
|
||||
<td class="headline" style="text-align: center">
|
||||
<td class="headline" style="text-align: center" align="center">
|
||||
<center>
|
||||
<b>{{ $title }}</b>
|
||||
</center>
|
||||
|
|
@ -150,7 +137,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<table style="padding: 0px 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
|
||||
<table style="padding: 0px 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td>
|
||||
{!! nl2br($content) !!}
|
||||
|
|
@ -188,7 +175,7 @@
|
|||
<center>
|
||||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="90%">
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: center">
|
||||
<td style="color:#37302d; text-align: center;line-height:1.6em;" align="center">
|
||||
{{ $copy2line }}<br>
|
||||
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;white-space: pre-line;">{{ $url }}</span>
|
||||
</td>
|
||||
|
|
@ -202,7 +189,7 @@
|
|||
@if(isset($content_last) && $content_last != "")
|
||||
<tr>
|
||||
<td>
|
||||
<table style="padding: 0px 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
|
||||
<table style="padding: 0px 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td>
|
||||
{!! nl2br($content_last) !!}
|
||||
|
|
@ -215,10 +202,10 @@
|
|||
<tr>
|
||||
<td style="color:#37302d;font-size: 14px;">
|
||||
<center>
|
||||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="90%">
|
||||
<table style="margin: 0 auto;line-height:1.6em;" cellpadding="0" cellspacing="0" width="90%">
|
||||
<tr>
|
||||
|
||||
<td style="color:#37302d; text-align: center">
|
||||
<td style="color:#37302d; text-align: center;line-height:1.6em;" align="center">
|
||||
{{ $copy3line }}
|
||||
<br>
|
||||
{{ $greetings }} <br><br><b>{{ $sender }}</b>
|
||||
|
|
@ -236,9 +223,9 @@
|
|||
</table>
|
||||
<center>
|
||||
<table cellpadding="0" cellspacing="0" class="force-full-width"
|
||||
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center">
|
||||
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center;line-height:1.6em;">
|
||||
<tr>
|
||||
<td style="color:#7B7B7E; font-size:14px; text-align: center">
|
||||
<td style="color:#7B7B7E; font-size:14px; text-align: center;line-height:1.6em;" align="center">
|
||||
<p>
|
||||
{{__('email.footer_copy1')}}
|
||||
</p>
|
||||
|
|
@ -247,7 +234,7 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#bbbbbb; font-size:12px; text-align: center">
|
||||
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
|
||||
<p>{{__('email.footer_copy2')}}</p>
|
||||
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
|
||||
<p>{{__('email.footer_copy3')}}</p>
|
||||
|
|
|
|||
|
|
@ -71,18 +71,14 @@
|
|||
}
|
||||
|
||||
</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"] {
|
||||
|
|
@ -91,15 +87,6 @@
|
|||
|
||||
}
|
||||
</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">
|
||||
|
||||
|
|
@ -147,7 +134,7 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
{!! nl2br($copy1line) !!}
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -183,7 +170,7 @@
|
|||
<tr>
|
||||
<tr>
|
||||
<td>
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td>
|
||||
{!! nl2br($content) !!}
|
||||
|
|
@ -195,9 +182,9 @@
|
|||
</table>
|
||||
<center>
|
||||
<table cellpadding="0" cellspacing="0" class="force-full-width"
|
||||
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center">
|
||||
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center;line-height:1.6em;">
|
||||
<tr>
|
||||
<td style="color:#7B7B7E; font-size:14px; text-align: center">
|
||||
<td style="color:#7B7B7E; font-size:14px; text-align: center;line-height:1.6em;" align="center">
|
||||
<p>
|
||||
{{__('email.footer_copy1')}}
|
||||
</p>
|
||||
|
|
@ -207,7 +194,7 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#bbbbbb; font-size:12px; text-align: center">
|
||||
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
|
||||
<p>{{__('email.footer_copy2')}}</p>
|
||||
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
|
||||
<p>{{__('email.footer_copy3')}}</p>
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@
|
|||
<script src="{{ asset('/vendor/libs/dropzone/dropzone.js?v=1')}}"></script>
|
||||
<script src="{{ asset('/js/forms_file-upload.js?v=1') }}"></script>
|
||||
|
||||
|
||||
<script src="{{ asset('/vendor/libs/clipboard/clipboard.min.js')}}"></script>
|
||||
|
||||
<!-- `perfect-scrollbar` library required by SideNav plugin -->
|
||||
<script src="{{ mix('/vendor/libs/perfect-scrollbar/perfect-scrollbar.js') }}"></script>
|
||||
|
|
|
|||
|
|
@ -9,70 +9,82 @@
|
|||
<ul class="sidenav-inner{{ empty($layout_sidenav_horizontal) ? ' py-1' : '' }}">
|
||||
|
||||
<li class="sidenav-item{{ Request::is('home') ? ' active' : '' }}">
|
||||
<a href="{{ route('home') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-home"></i><div>{{__('Home')}}</div></a>
|
||||
<a href="{{ route('home') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-home"></i><div>{{__('navigation.home')}}</div></a>
|
||||
</li>
|
||||
|
||||
@if(Auth::user()->showSideNav())
|
||||
<li class="sidenav-item{{ Request::is('user/edit') ? ' active' : '' }}">
|
||||
<a href="{{ route('user_edit') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-create"></i><div>{{ __('Your Data') }}</div></a>
|
||||
<a href="{{ route('user_edit') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-create"></i><div>{{ __('navigation.my_data') }}</div></a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
@if(Auth::user()->isActiveShop())
|
||||
<li class="sidenav-item @if(Request::is('user/shop', 'user/shop/*')) open @endif">
|
||||
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
|
||||
<i class="sidenav-icon ion ion-ios-basket"></i>
|
||||
<div>{{ __('navigation.my_shop') }}</div>
|
||||
</a>
|
||||
<ul class="sidenav-menu">
|
||||
<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>
|
||||
<a href="{{ route('user_shop') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-cog"></i><div>{{ __('navigation.settings') }}</div></a>
|
||||
</li>
|
||||
<li class="sidenav-item{{ Request::is('user/shop/orders') ? ' active' : '' }}">
|
||||
<a href="{{ route('user_shop_orders') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-cart"></i><div>{{ __('navigation.orders') }}</div></a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if(Auth::user()->isActiveAccount())
|
||||
|
||||
<li class="sidenav-item @if(Request::is('user/team/*')) open @endif">
|
||||
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
|
||||
<i class="sidenav-icon ion ion-ios-people"></i>
|
||||
<div>{{ __('navigation.my_team') }}</div>
|
||||
</a>
|
||||
<ul class="sidenav-menu">
|
||||
<li class="sidenav-item{{ Request::is('user/team/members') ? ' active' : '' }}">
|
||||
<a href="{{ route('user_team_members') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-person-add"></i><div>{{ __('navigation.member') }}</div></a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@endif
|
||||
|
||||
|
||||
@if(Auth::user()->isAdmin())
|
||||
<li class="sidenav-divider mb-1"></li>
|
||||
<li class="sidenav-header small font-weight-semibold">ADMIN</li>
|
||||
|
||||
|
||||
|
||||
<li class="sidenav-item{{ Request::is('admin/leads') ? ' active' : '' }} {{ Request::is('admin/lead/edit/*') ? ' active' : '' }}">
|
||||
<a href="{{ route('admin_leads') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-contacts"></i><div>{{ __('Berater') }}</div></a>
|
||||
<a href="{{ route('admin_leads') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-contacts"></i><div>{{ __('navigation.member') }}</div></a>
|
||||
</li>
|
||||
|
||||
<li class="sidenav-item @if(Request::is('admin/sales/*')) open @endif">
|
||||
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
|
||||
<i class="sidenav-icon ion ion-ios-cart"></i>
|
||||
<div>{{ __('Bestellungen') }}</div>
|
||||
<div>{{ __('navigation.orders') }}</div>
|
||||
</a>
|
||||
<ul class="sidenav-menu">
|
||||
<li class="sidenav-item{{ Request::is('admin/sales/users') ? ' active' : '' }}">
|
||||
<a href="{{ route('admin_sales_users') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-contacts"></i><div>{{ __('Berater') }}</div></a>
|
||||
<li class="sidenav-item{{ Request::is('admin/sales/users', 'admin/sales/users/*') ? ' active' : '' }}">
|
||||
<a href="{{ route('admin_sales_users') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-contacts"></i><div>{{ __('navigation.member') }}</div></a>
|
||||
</li>
|
||||
<li class="sidenav-item{{ Request::is('admin/sales/customers') ? ' active' : '' }}">
|
||||
<a href="{{ route('admin_sales_customers') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-contacts"></i><div>{{ __('Kunden') }}</div></a>
|
||||
<li class="sidenav-item{{ Request::is('admin/sales/customers', 'admin/sales/customers/*') ? ' active' : '' }}">
|
||||
<a href="{{ route('admin_sales_customers') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-contacts"></i><div>{{ __('navigation.clients') }}</div></a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
<li class="sidenav-item @if(Request::is('admin/product/*')) open @endif">
|
||||
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
|
||||
<i class="sidenav-icon ion ion-md-cube"></i>
|
||||
<div>{{ __('Produkte') }}</div>
|
||||
<div>{{ __('navigation.products') }}</div>
|
||||
</a>
|
||||
<ul class="sidenav-menu">
|
||||
<li class="sidenav-item{{ Request::is('admin/product/show') ? ' active' : '' }}">
|
||||
<a href="{{ route('admin_product_show') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-cube"></i><div>{{ __('Übersicht') }}</div></a>
|
||||
<a href="{{ route('admin_product_show') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-cube"></i><div>{{ __('navigation.overview') }}</div></a>
|
||||
</li>
|
||||
<li class="sidenav-item{{ Request::is('admin/product/categories') ? ' active' : '' }}">
|
||||
<a href="{{ route('admin_product_categories') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-list"></i><div>{{ __('Kategorien') }}</div></a>
|
||||
<a href="{{ route('admin_product_categories') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-list"></i><div>{{ __('navigation.categories') }}</div></a>
|
||||
</li>
|
||||
<li class="sidenav-item{{ Request::is('admin/product/attributes') ? ' active' : '' }}">
|
||||
<a href="{{ route('admin_product_attributes') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-apps"></i><div>{{ __('Attribute') }}</div></a>
|
||||
<a href="{{ route('admin_product_attributes') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-apps"></i><div>{{ __('navigation.attribute') }}</div></a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
|
@ -80,11 +92,11 @@
|
|||
<li class="sidenav-item @if(Request::is('admin/sites/*')) open @endif">
|
||||
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
|
||||
<i class="sidenav-icon ion ion-md-albums"></i>
|
||||
<div>{{ __('Inhalte') }}</div>
|
||||
<div>{{ __('navigation.contents') }}</div>
|
||||
</a>
|
||||
<ul class="sidenav-menu">
|
||||
<li class="sidenav-item{{ Request::is('admin/sites/start') ? ' active' : '' }}">
|
||||
<a href="{{route('admin_sites', ['start'])}}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-document"></i><div>{{ __('Startseite') }}</div></a>
|
||||
<a href="{{route('admin_sites', ['start'])}}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-document"></i><div>{{ __('navigation.start_site') }}</div></a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
|
@ -92,15 +104,15 @@
|
|||
<li class="sidenav-item{{ Request::is('admin/translate/*') ? ' open' : '' }}">
|
||||
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
|
||||
<i class="sidenav-icon ion ion-ios-browsers"></i>
|
||||
<div>{{ __('Translate') }}</div>
|
||||
<div>{{ __('navigation.translate') }}</div>
|
||||
</a>
|
||||
<ul class="sidenav-menu">
|
||||
<li class="sidenav-item{{ Request::is('admin/translate/all/*') ? ' active' : '' }}">
|
||||
<a href="{{ route('admin_translate_all') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-browsers"></i><div>{{ __('Allgemein') }}</div></a>
|
||||
<a href="{{ route('admin_translate_all') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-browsers"></i><div>{{ __('navigation.general') }}</div></a>
|
||||
|
||||
</li>
|
||||
<li class="sidenav-item{{ Request::is('admin/translate/file/*') ? ' active' : '' }}">
|
||||
<a href="{{ route('admin_translate_file') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-browsers"></i><div>{{ __('Module') }}</div></a>
|
||||
<a href="{{ route('admin_translate_file') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-browsers"></i><div>{{ __('navigation.modules') }}</div></a>
|
||||
|
||||
</li>
|
||||
</ul>
|
||||
|
|
@ -112,17 +124,17 @@
|
|||
<li class="sidenav-header small font-weight-semibold">SUPERADMIN</li>
|
||||
|
||||
<li class="sidenav-item{{ Request::is('admin/users') ? ' active' : '' }} {{ Request::is('admin/user/edit/*') ? ' active' : '' }}">
|
||||
<a href="{{ route('admin_users') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-ribbon"></i><div>{{ __('User Rechte') }}</div></a>
|
||||
<a href="{{ route('admin_users') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-ribbon"></i><div>{{ __('navigation.user_roles') }}</div></a>
|
||||
</li>
|
||||
<li class="sidenav-item{{ Request::is('admin/shippings') ? ' active' : '' }} {{ Request::is('admin/shipping/edit/*') ? ' active' : '' }}">
|
||||
<a href="{{ route('admin_shippings') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-gift"></i><div>{{ __('Versandkosten') }}</div></a>
|
||||
<a href="{{ route('admin_shippings') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-gift"></i><div>{{ __('navigation.shipping_costs') }}</div></a>
|
||||
</li>
|
||||
<li class="sidenav-item{{ Request::is('admin/levels') ? ' active' : '' }} {{ Request::is('admin/level/edit/*') ? ' active' : '' }}">
|
||||
<a href="{{ route('admin_levels') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-trending-up"></i><div>{{ __(' Karriere-Level') }}</div></a>
|
||||
<a href="{{ route('admin_levels') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-trending-up"></i><div>{{ __('navigation.career_level') }}</div></a>
|
||||
</li>
|
||||
|
||||
<li class="sidenav-item{{ Request::is('admin/countries') ? ' active' : '' }} {{ Request::is('admin/country/edit/*') ? ' active' : '' }}">
|
||||
<a href="{{ route('admin_countries') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-globe"></i><div>{{ __('Länder') }}</div></a>
|
||||
<a href="{{ route('admin_countries') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-globe"></i><div>{{ __('navigation.countries') }}</div></a>
|
||||
</li>
|
||||
@endif
|
||||
@if(Auth::user()->isSySAdmin())
|
||||
|
|
@ -132,17 +144,17 @@
|
|||
<li class="sidenav-item{{ Request::is('sysadmin/tools/*') ? ' open' : '' }}">
|
||||
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
|
||||
<i class="sidenav-icon ion ion-ios-settings"></i>
|
||||
<div>{{ __('Tools') }}</div>
|
||||
<div>Tools</div>
|
||||
</a>
|
||||
<ul class="sidenav-menu">
|
||||
<li class="sidenav-item{{ Request::is('sysadmin/tools/cronjobs') ? ' active' : '' }}">
|
||||
<a href="{{ route('sysadmin_tools_cronjobs') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-settings"></i><div>{{ __('Cron Jobs') }}</div></a>
|
||||
<a href="{{ route('sysadmin_tools_cronjobs') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-settings"></i><div>Cron Jobs</div></a>
|
||||
</li>
|
||||
<li class="sidenav-item{{ Request::is('sysadmin/tools/domainssl') ? ' active' : '' }}">
|
||||
<a href="{{ route('sysadmin_tools_domainssl') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-lock"></i><div>{{ __('Domain SSL') }}</div></a>
|
||||
<a href="{{ route('sysadmin_tools_domainssl') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-lock"></i><div>Domain SSL</div></a>
|
||||
</li>
|
||||
<li class="sidenav-item{{ Request::is('sysadmin/tools/shopping_orders') ? ' active' : '' }}">
|
||||
<a href="{{ route('sysadmin_tools_shopping_orders') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-analytics"></i><div>{{ __('Shopping Orders') }}</div></a>
|
||||
<a href="{{ route('sysadmin_tools_shopping_orders') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-analytics"></i><div>Shopping Orders</div></a>
|
||||
|
||||
</li>
|
||||
</ul>
|
||||
|
|
@ -151,7 +163,7 @@
|
|||
<li class="sidenav-divider mb-1"></li>
|
||||
|
||||
<li class="sidenav-item">
|
||||
<a href="{{ route('logout') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-power"></i><div>{{ __('Logout') }}</div></a>
|
||||
<a href="{{ route('logout') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-power"></i><div>{{ __('navigation.logout') }}</div></a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
<li class="list-group-item d-flex justify-content-between align-items-center">
|
||||
<div class="text-muted">{{ __('Domain') }}</div>
|
||||
<div>
|
||||
<a href="{{ $user->shop->getSubdomain() }}" target="_blank">{{ $user->shop->getSubdomain() }}
|
||||
<a href="{{ $user->shop->getSubdomain(false) }}" target="_blank">{{ $user->shop->getSubdomain(false) }}
|
||||
</a>
|
||||
</div>
|
||||
</li>
|
||||
|
|
@ -108,9 +108,6 @@
|
|||
</ul>
|
||||
</div>
|
||||
<!-- / Project details -->
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
|
||||
<p class="mt-2">
|
||||
Wähle das Präfix Deines Shopnamens - z. B. vorname(.mivita.care) - Du musst nicht "mivita.care" eingeben. Wähle einen kurzen und prägnanten Namen, damit Du diese URL auch auf kleinen Werbemitteln unterbringen kannst. Achte auch darauf, dass Du keine Markenrechte Dritter verletzt. Dafür kann MIVITA keine Haftung übernehmen. Daher versucht Phantasiebegriffe zu vermeiden, es sei denn Ihr habt sie als Marke angemeldet.
|
||||
Wähle das Präfix Deines Shopnamens - z. B. vorname(.mivita.care) - Du musst nicht "mivita.care" eingeben. Wähle einen kurzen und prägnanten Namen, damit Du diese URL auch auf kleinen Werbemitteln unterbringen kannst. Achte auch darauf, dass Du keine Markenrechte Dritter verletzt. Dafür kann MIVITA keine Haftung übernehmen. Daher versucht Phantasiebegriffe zu vermeiden, es sei denn Du hast sie als Marke angemeldet.
|
||||
<br><br>
|
||||
Deine Internetadresse kann später mit „www.“ und ohne aufgerufen werden.
|
||||
<br><br>
|
||||
|
|
@ -77,19 +77,19 @@
|
|||
$( document ).ready(function() {
|
||||
$.extend($.validator.messages, {
|
||||
required: "Dieses Feld ist ein Pflichtfeld.",
|
||||
maxlength: $.validator.format("Geben Sie bitte maximal {0} Zeichen ein."),
|
||||
minlength: $.validator.format("Geben Sie bitte mindestens {0} Zeichen ein."),
|
||||
rangelength: $.validator.format("Geben Sie bitte mindestens {0} und maximal {1} Zeichen ein."),
|
||||
email: "Geben Sie bitte eine gültige E-Mail Adresse ein.",
|
||||
url: "Geben Sie bitte eine gültige URL ein.",
|
||||
date: "Bitte geben Sie ein gültiges Datum ein.",
|
||||
number: "Geben Sie bitte eine Nummer ein.",
|
||||
digits: "Geben Sie bitte nur Ziffern ein.",
|
||||
maxlength: $.validator.format("Gib bitte maximal {0} Zeichen ein."),
|
||||
minlength: $.validator.format("Gib bitte mindestens {0} Zeichen ein."),
|
||||
rangelength: $.validator.format("Gib bitte mindestens {0} und maximal {1} Zeichen ein."),
|
||||
email: "Gib bitte eine gültige E-Mail Adresse ein.",
|
||||
url: "Gib bitte eine gültige URL ein.",
|
||||
date: "Bitte gib ein gültiges Datum ein.",
|
||||
number: "Gib bitte eine Nummer ein.",
|
||||
digits: "Gib bitte nur Ziffern ein.",
|
||||
equalTo: "Bitte denselben Wert wiederholen.",
|
||||
range: $.validator.format("Geben Sie bitte einen Wert zwischen {0} und {1} ein."),
|
||||
max: $.validator.format("Geben Sie bitte einen Wert kleiner oder gleich {0} ein."),
|
||||
min: $.validator.format("Geben Sie bitte einen Wert größer oder gleich {0} ein."),
|
||||
creditcard: "Geben Sie bitte eine gültige Kreditkarten-Nummer ein."
|
||||
range: $.validator.format("Gib bitte einen Wert zwischen {0} und {1} ein."),
|
||||
max: $.validator.format("Gib bitte einen Wert kleiner oder gleich {0} ein."),
|
||||
min: $.validator.format("Gib bitte einen Wert größer oder gleich {0} ein."),
|
||||
creditcard: "Gib bitte eine gültige Kreditkarten-Nummer ein."
|
||||
});
|
||||
|
||||
// Set up validator
|
||||
|
|
|
|||
|
|
@ -55,8 +55,20 @@
|
|||
<p><strong>Eine Änderung Deines Berater-Paketes ist nicht mehr möglich.</strong></p>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@if($userHistoryPaymentOrder && $userHistoryPaymentOrder->status > 2)
|
||||
<h5 class="card-header bg-light">
|
||||
<a href="#" class="" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
|
||||
<i class="fa fa-caret-expand"></i> {{ __('Zahlungsoptionen öffnen') }}
|
||||
</a>
|
||||
</h5>
|
||||
<div class="collapse" id="collapsePaymentForm">
|
||||
@include('user.membership._payment_order')
|
||||
</div>
|
||||
@else
|
||||
@include('user.membership._payment_order')
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@else
|
||||
|
||||
|
|
@ -70,8 +82,20 @@
|
|||
@endif
|
||||
<h5 class="d-block text-dark">Erweitere jetzt Deine Mitglidschaft auf MIVITA BUSINESS Paket!</h5>
|
||||
<p>Berechnet werden die restlichen Monate bis zur Berater-Mitgliedschaft Verlängerung. Danach wird jährlich der MIVITA BUSINESS Paketpreis berechnet.</p>
|
||||
@if($userHistoryUpgradeOrder && $userHistoryUpgradeOrder->status > 2)
|
||||
<h5 class="card-header bg-light">
|
||||
<a href="#" class="" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
|
||||
<i class="fa fa-caret-expand"></i> {{ __('Zahlungsoptionen öffnen') }}
|
||||
</a>
|
||||
</h5>
|
||||
<div class="collapse" id="collapsePaymentForm">
|
||||
@include('user.membership._upgrade')
|
||||
</div>
|
||||
@else
|
||||
@include('user.membership._upgrade')
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
@endif
|
||||
--}}
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
{{ __('Your Shop') }}
|
||||
{{ __('navigation.my_shop') }}
|
||||
</h4>
|
||||
@if($user->shop)
|
||||
@include('user.components.user_shop_edit')
|
||||
|
|
|
|||
52
resources/views/user/shop/sales/orders.blade.php
Normal file
52
resources/views/user/shop/sales/orders.blade.php
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
@extends('layouts.layout-2')
|
||||
|
||||
@section('content')
|
||||
|
||||
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
{{ __('Bestellungen Kunden') }}
|
||||
</h4>
|
||||
|
||||
|
||||
<div class="card">
|
||||
<div class="card-datatable table-responsive">
|
||||
<table class="datatable-customers table table-striped table-bordered">
|
||||
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{__('First name')}}</th>
|
||||
<th>{{__('Last name')}}</th>
|
||||
<th>{{__('E-Mail')}}</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
$( document ).ready(function() {
|
||||
$('.datatable-customers').dataTable({
|
||||
"processing": true,
|
||||
"serverSide": true,
|
||||
"ajax": '{!! route('user_shop_orders_datatable') !!}',
|
||||
"order": [[0, "desc" ]],
|
||||
"columns": [
|
||||
// { data: 'id', searchable: false },
|
||||
{ data: 'billing_firstname', name: 'shopping_user.billing_firstname' },
|
||||
{ data: 'billing_lastname', name: 'shopping_user.billing_lastname' },
|
||||
{ data: 'billing_email', name: 'shopping_user.billing_email' },
|
||||
{ data: 'created_at', name: 'shopping_orders.created_at' },
|
||||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'total_shipping', name: 'shopping_orders.total_shipping' },
|
||||
],
|
||||
"bLengthChange": false,
|
||||
"iDisplayLength": 100,
|
||||
"language": {
|
||||
"url": "/js/German.json"
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@endsection
|
||||
56
resources/views/user/team/members.blade.php
Normal file
56
resources/views/user/team/members.blade.php
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
@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">
|
||||
{{ __('navigation.my_shop') }}
|
||||
</h4>
|
||||
<div class="card">
|
||||
<h5 class="card-header">Berater registrieren</h5>
|
||||
<div class="row no-gutters row-bordered">
|
||||
<div class="col-md-12 p-4">
|
||||
<h6 class="mb-4">Link für Beraterregistrierung</h6>
|
||||
<div class="form-group">
|
||||
<div class="input-group">
|
||||
<span class="input-group-prepend">
|
||||
<button class="btn btn-secondary" type="button" title="Kopiert!" data-clipboard-demo data-clipboard-target="#shop_register_link"><i class="ion ion-ios-copy"></i> Link kopieren</button>
|
||||
</span>
|
||||
<input type="text" class="form-control" name="shop_register_link" value="{{$shop_register_link}}" id="shop_register_link" placeholder="">
|
||||
</div>
|
||||
</div>
|
||||
<p>Du möchtest einen neuen Berater registrieren? Super, das freut uns. Sende ihm einfach nachfolgenden Link per Mail, WhatsApp oder SMS zu. Er gelangt damit auf die Registrierungsseite von www.mivita.care. Wichtig ist, dass Du diesen Link nicht veränderst, denn die angehängte Berater-ID identifiziert Dich als Sponsor von dem neuen Berater. Nur so können Dir künftige Provisionen durch Umsätze von ihm zugeordnet werden. Nutze das „Kopier-Symbol“, um den Link gleich in Deine Zwischenablage zu kopieren.
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div><!-- Target -->
|
||||
<script>
|
||||
$( document ).ready(function() {
|
||||
var clipboardDemos = new ClipboardJS('[data-clipboard-demo]');
|
||||
clipboardDemos.on('success', function (e) {
|
||||
e.clearSelection();
|
||||
$(e.trigger).tooltip('enable').tooltip('show');
|
||||
});
|
||||
clipboardDemos.on('error', function (e) {
|
||||
console.error('Action:', e.action);
|
||||
console.error('Trigger:', e.trigger);
|
||||
});
|
||||
|
||||
$('button[data-clipboard-demo]').on('mouseout', function () {
|
||||
$(this).tooltip('disable');
|
||||
})
|
||||
});
|
||||
</script>
|
||||
@endsection
|
||||
|
|
@ -173,6 +173,13 @@
|
|||
<div class="card mb-4">
|
||||
<div class="card-body">
|
||||
<div class="form-row">
|
||||
<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) !!}
|
||||
</select>
|
||||
<p class="badge">Wähle Kleinunternehmer, wenn Du nicht mehr als 22.000 EUR Umsatz pro Jahr mit Deinem Gewerbe erwirtschaftest.</p>
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
<label class="form-label" for="tax_number">{{ __('Steuernummer') }} @if($user->account->getCountryAttrAs('tax_number'))* @endif</label>
|
||||
{{ Form::text('tax_number', $user->account->tax_number, array('placeholder'=>__('Steuernummer'), 'class'=>'form-control', 'id'=>'tax_number', $user->account->getCountryAttrAs('tax_number','required'))) }}
|
||||
|
|
@ -181,12 +188,7 @@
|
|||
<label class="form-label" for=" tax_identification_number">{{ __('USt-ID Nummer') }} @if($user->account->getCountryAttrAs('tax_id_number'))* @endif</label>
|
||||
{{ 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) !!}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -149,19 +149,19 @@
|
|||
|
||||
$.extend( $.validator.messages, {
|
||||
required: "Dieses Feld ist ein Pflichtfeld.",
|
||||
maxlength: $.validator.format( "Geben Sie bitte maximal {0} Zeichen ein." ),
|
||||
minlength: $.validator.format( "Geben Sie bitte mindestens {0} Zeichen ein." ),
|
||||
rangelength: $.validator.format( "Geben Sie bitte mindestens {0} und maximal {1} Zeichen ein." ),
|
||||
email: "Geben Sie bitte eine gültige E-Mail Adresse ein.",
|
||||
url: "Geben Sie bitte eine gültige URL ein.",
|
||||
date: "Bitte geben Sie ein gültiges Datum ein.",
|
||||
number: "Geben Sie bitte eine Nummer ein.",
|
||||
digits: "Geben Sie bitte nur Ziffern ein.",
|
||||
maxlength: $.validator.format( "Gib bitte maximal {0} Zeichen ein." ),
|
||||
minlength: $.validator.format( "Gib bitte mindestens {0} Zeichen ein." ),
|
||||
rangelength: $.validator.format( "Gib bitte mindestens {0} und maximal {1} Zeichen ein." ),
|
||||
email: "Gib bitte eine gültige E-Mail Adresse ein.",
|
||||
url: "Gib bitte eine gültige URL ein.",
|
||||
date: "Bitte gib ein gültiges Datum ein.",
|
||||
number: "Gib bitte eine Nummer ein.",
|
||||
digits: "Gib bitte nur Ziffern ein.",
|
||||
equalTo: "Bitte denselben Wert wiederholen.",
|
||||
range: $.validator.format( "Geben Sie bitte einen Wert zwischen {0} und {1} ein." ),
|
||||
max: $.validator.format( "Geben Sie bitte einen Wert kleiner oder gleich {0} ein." ),
|
||||
min: $.validator.format( "Geben Sie bitte einen Wert größer oder gleich {0} ein." ),
|
||||
creditcard: "Geben Sie bitte eine gültige Kreditkarten-Nummer ein."
|
||||
range: $.validator.format( "Gib bitte einen Wert zwischen {0} und {1} ein." ),
|
||||
max: $.validator.format( "Gib bitte einen Wert kleiner oder gleich {0} ein." ),
|
||||
min: $.validator.format( "Gib bitte einen Wert größer oder gleich {0} ein." ),
|
||||
creditcard: "Gib bitte eine gültige Kreditkarten-Nummer ein."
|
||||
});
|
||||
|
||||
// Set up validator
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
{!! Form::open(['url' => route('wizard_store_payment', [20]), 'class' => 'form-horizontal']) !!}
|
||||
<div class="table-responsive">
|
||||
<table class="table table- m-0">
|
||||
<table class="table table- m-0" id="membership_package_payment">
|
||||
<tbody class="switchers-stacked">
|
||||
@php($counter = 1)
|
||||
@foreach($products as $product)
|
||||
<tr>
|
||||
<td class="text-center align-middle px-0">
|
||||
<label class="switcher switcher-secondary">
|
||||
<input type="radio" class="switcher-input" value="{{$product->id}}" name="switchers-package-wizard" @if($counter == 2) checked @endif >
|
||||
<input type="radio" class="switcher-input" data-price="{{$product->price}}" value="{{$product->id}}" name="switchers-package-wizard" @if($counter == 2) checked @endif >
|
||||
<span class="switcher-indicator">
|
||||
<span class="switcher-yes"></span>
|
||||
<span class="switcher-no"></span>
|
||||
|
|
@ -35,6 +35,41 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@if($products_on_board)
|
||||
<div class="table-responsive">
|
||||
<table class="table table- m-0" id="membership_onboarding_package">
|
||||
<tbody class="">
|
||||
@foreach($products_on_board as $product)
|
||||
<tr>
|
||||
<td class="text-center align-middle px-0">
|
||||
<label class="switcher switcher-square switcher-secondary">
|
||||
<input type="checkbox" class="switcher-input" data-price="{{$product->price}}" name="products_on_board[]" value="{{$product->id}}">
|
||||
<span class="switcher-indicator">
|
||||
<span class="switcher-yes"></span>
|
||||
<span class="switcher-no"></span>
|
||||
</span>
|
||||
<span class="switcher-label"></span>
|
||||
</label>
|
||||
</td>
|
||||
<td class="p-4">
|
||||
<div class="media align-items-center">
|
||||
@if(count($product->images))
|
||||
<img src="{{ route('product_image', [$product->images->first()->slug]) }}" class="d-block ui-w-60 ui-bordered mr-4" alt="">
|
||||
@endif
|
||||
<div class="media-body">
|
||||
<h5 class="d-block text-dark">{{$product->name}}</h5>
|
||||
{!! $product->getLang('copy') !!}
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td class="text-right font-weight-semibold align-middle p-4">{{$product->getFormattedPrice()}} EUR / p.a.</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@endif
|
||||
<div class="text-left mt-3">
|
||||
<hr>
|
||||
<label class="custom-control custom-checkbox">
|
||||
|
|
@ -43,9 +78,38 @@
|
|||
<p class="text-muted">{{__('payment.status.auto_renewal_line_2')}}</p>
|
||||
</label>
|
||||
<hr>
|
||||
<div class="float-right">
|
||||
<strong>Gesamtsumme: <span id="card_total_price">0</span> €</strong>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-secondary">{{ __('wählen und weiter zur Kasse') }}</button>
|
||||
<br><br>
|
||||
<em class="small text-center"> <i class="fa fa-lock"></i> Du wirst auf unseren checkout Server weitergeletet, die Verbindung ist SSL verschlüsselt.</em>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
|
||||
<script>
|
||||
$( document ).ready(function() {
|
||||
function calculate_package_payment(){
|
||||
var price_total = 0;
|
||||
$('#membership_package_payment .switcher-input').each(function () {
|
||||
if($(this).prop('checked')){
|
||||
price_total += parseFloat($(this).data('price'));
|
||||
}
|
||||
});
|
||||
$('#membership_onboarding_package .switcher-input').each(function () {
|
||||
if($(this).prop('checked')){
|
||||
price_total += parseFloat($(this).data('price'));
|
||||
}
|
||||
});
|
||||
$('#card_total_price').text(price_total.toFixed(2).toString().replace(".", ","));
|
||||
|
||||
}
|
||||
$('#membership_package_payment .switcher-input').on('change', function () {
|
||||
calculate_package_payment();
|
||||
});
|
||||
$('#membership_onboarding_package .switcher-input').on('change', function () {
|
||||
calculate_package_payment();
|
||||
});
|
||||
calculate_package_payment();
|
||||
});
|
||||
</script>
|
||||
|
|
@ -102,9 +102,19 @@
|
|||
<div class="card-body">
|
||||
@if($userHistoryWizardPayment && $userHistoryWizardPayment->status > 2)
|
||||
<h6 class="alert badge-{{$userHistoryWizardPayment->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryWizardPayment->getStatusType())}}</h6>
|
||||
@endif
|
||||
<h5 class="card-header bg-light">
|
||||
<a href="#" class="" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
|
||||
<i class="fa fa-caret-expand"></i> {{ __('Zahlungsoptionen öffnen') }}
|
||||
</a>
|
||||
</h5>
|
||||
<div class="collapse" id="collapsePaymentForm">
|
||||
@include('user.wizard._payment')
|
||||
</div>
|
||||
|
||||
@else
|
||||
@include('user.wizard._payment')
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@
|
|||
<h5 class="card-header">
|
||||
{{ trans('register.wizard_business_license_hl') }}
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
<div class="card-body pb-0">
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<div class="mt-4">
|
||||
|
|
@ -191,10 +191,42 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-left mt-3">
|
||||
{!! Form::open(['url' => route('wizard_store_register', [3])]) !!}
|
||||
@php($business_license_choose = $user->account->getNotice('business_license'))
|
||||
<div class="card-body pt-0">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<label class="custom-control custom-radio">
|
||||
{{ Form::radio('business_license_choose', 'now' , (($business_license_choose === 'now' || !$business_license_choose) ? true : false), array('class'=>'custom-control-input')) }}
|
||||
<span class="custom-control-label">{{__('register.business_license_now')}}</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<hr>
|
||||
<label class="custom-control custom-radio">
|
||||
{{ Form::radio('business_license_choose', 'later' , (($business_license_choose === 'later') ? true : false), array('class'=>'custom-control-input')) }}
|
||||
<span class="custom-control-label">{{__('register.business_license_later')}}</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<hr>
|
||||
|
||||
<label class="custom-control custom-radio">
|
||||
{{ Form::radio('business_license_choose', 'non' , (($business_license_choose === 'non') ? true : false), array('class'=>'custom-control-input')) }}
|
||||
<span class="custom-control-label">{{__('register.business_license_non')}}</span>
|
||||
</label>
|
||||
<p>{{__('register.business_license_non_text')}}</p>
|
||||
{{ Form::textarea('non_business_license_reason', $user->account->getNotice('business_license_reason'), array('placeholder'=>__('Begründung'), 'class'=>'form-control', 'rows'=>' 2')) }}
|
||||
|
||||
</div>
|
||||
<div class="col-12 mt-2">
|
||||
<hr>
|
||||
<button type="submit" name="submit" value="do" class="btn btn-secondary">{{ __('speichern und weiter') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -236,15 +268,15 @@
|
|||
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',
|
||||
dictFallbackMessage: 'Dein Browser unterstützt Drag&Drop Dateiuploads nicht',
|
||||
dictFallbackText: 'Benutze das Formular um Deine 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',
|
||||
dictMaxFilesExceeded: 'Du kannst 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() {
|
||||
|
|
|
|||
|
|
@ -37,9 +37,18 @@
|
|||
<div class="card-body">
|
||||
@if($userHistoryWizardPayment && $userHistoryWizardPayment->status > 2)
|
||||
<h6 class="alert badge-{{$userHistoryWizardPayment->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryWizardPayment->getStatusType())}}</h6>
|
||||
@endif
|
||||
<h5 class="card-header bg-light">
|
||||
<a href="#" class="" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
|
||||
<i class="fa fa-caret-expand"></i> {{ __('Zahlungsoptionen öffnen') }}
|
||||
</a>
|
||||
</h5>
|
||||
<div class="collapse" id="collapsePaymentForm">
|
||||
@include('user.wizard._payment')
|
||||
</div>
|
||||
@else
|
||||
@include('user.wizard._payment')
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -48,6 +48,14 @@
|
|||
padding-left: 20px;
|
||||
}
|
||||
|
||||
a.shop-item-hl {
|
||||
color: #9aa983;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
.table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, .table-bordered > tfoot > tr > th, .table-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td {
|
||||
border: 1px solid #ddd !important;
|
||||
}
|
||||
|
||||
|
||||
@media only screen and (max-width: 1200px) {
|
||||
.cartContent .yard .product_name {
|
||||
|
|
@ -107,9 +115,6 @@
|
|||
</div>
|
||||
</div>-->
|
||||
<!-- /EMPTY CART -->
|
||||
|
||||
|
||||
|
||||
<!-- CART -->
|
||||
<div class="row">
|
||||
|
||||
|
|
@ -124,7 +129,63 @@
|
|||
|
||||
<!-- cart content -->
|
||||
<div id="cartContent">
|
||||
<div class="box-border-shadow">
|
||||
|
||||
<!-- Shopping cart table -->
|
||||
<div class="table-responsive">
|
||||
<table class="table table-bordered m-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<!-- Set columns width -->
|
||||
<th colspan="2" class="text-left py-3 px-4" style="min-width: 400px;">Produkt</th>
|
||||
<th class="text-right py-3 px-4" style="width: 120px;">Preis</th>
|
||||
<th class="text-center py-3 px-4" style="width: 60px;">Anzahl</th>
|
||||
<th class="text-right py-3 px-4" style="width: 100px;">Summe</th>
|
||||
<th class="text-center align-middle py-3 px-0" style="width: 40px;">#</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@foreach(Yard::instance('shopping')->content() as $row)
|
||||
@php($product = \App\Models\Product::find($row->id))
|
||||
<tr class="item yard">
|
||||
<td>
|
||||
@if($row->options->has('image'))
|
||||
<img src="{{ route('product_image', [$row->options->image]) }}" width="80" alt="">
|
||||
@else
|
||||
<img src="{{ asset('/assets/images/1x1.png') }}" width="80" alt="">
|
||||
@endif
|
||||
</td>
|
||||
<td class="p-4">
|
||||
<a href="{{ url('/produkte/alle-produkte/'.$row->options->slug) }}" class="shop-item-hl ">
|
||||
<span>{{ $row->name }}</span>
|
||||
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">Inhalt: {{ $product->contents }}</div>
|
||||
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">Art.-Nr.: {{ $product->number }}</div>
|
||||
<div style="font-size: 13px; color:#6e6e6e; font-weight: 400;"><em>Lieferzeit: 1-3 Werktage</em></div>
|
||||
</a>
|
||||
</td>
|
||||
|
||||
<td class="text-right font-weight-semibold align-middle p-2">
|
||||
<span>{{ $row->price() }} </span> €
|
||||
<div style="font-size: 11px; color:#1d1d1d; font-weight: 500;">{{$product->getBasePriceFormattedFull()}}</div>
|
||||
|
||||
</td>
|
||||
<td class="align-middle p-2">
|
||||
<input type="number" value="{{ $row->qty }}" name="quantity[{{$row->rowId}}]" maxlength="3" max="999" min="1" />
|
||||
</td>
|
||||
<td class="text-right font-weight-semibold align-middle p-2">
|
||||
<div class=""><strong>{{ $row->subtotal() }} €</strong></div>
|
||||
</td>
|
||||
<td class="text-left p-2">
|
||||
<a style="margin: 0" href="{{ url(Util::getPostRoute().'card/remove', $row->rowId) }}" class="remove_item"><i class="fa fa-times"></i></a></td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{{-- <div class="box-border-shadow">
|
||||
|
||||
|
||||
<!-- cart header -->
|
||||
<div class="item head clearfix">
|
||||
<span class="cart_img"></span>
|
||||
|
|
@ -136,7 +197,7 @@
|
|||
|
||||
|
||||
@foreach(Yard::instance('shopping')->content() as $row)
|
||||
|
||||
@php($product = \App\Models\Product::find($row->id))
|
||||
<div class="item yard">
|
||||
<div class="cart_img pull-left width-100 padding-10 text-left">
|
||||
@if($row->options->has('image'))
|
||||
|
|
@ -147,7 +208,10 @@
|
|||
</div>
|
||||
<a href="{{ url('/produkte/alle-produkte/'.$row->options->slug) }}" class="product_name">
|
||||
<span>{{ $row->name }}</span>
|
||||
<small>Lieferzeit: 1-3 Werktage</small>
|
||||
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{$product->getBasePriceFormattedFull()}}</div>
|
||||
<div style="font-size: 13px; color:#6e6e6e; font-weight: 400;"><em>Lieferzeit: 1-3 Werktage</em></div>
|
||||
|
||||
|
||||
</a>
|
||||
<a href="{{ url(Util::getPostRoute().'card/remove', $row->rowId) }}" class="remove_item"><i class="fa fa-times"></i></a>
|
||||
|
||||
|
|
@ -157,13 +221,11 @@
|
|||
</div>
|
||||
|
||||
@endforeach
|
||||
</div>
|
||||
</div>--}}
|
||||
<a href="{{url(Util::getPostRoute().'card/delete')}}" class="btn btn-default btn-sm margin-top-20 margin-right-10 pull-left"><i class="glyphicon glyphicon-remove"></i> Warenkorb löschen</a>
|
||||
<button type="submit" class="btn btn-sm btn-default margin-top-20 margin-left-0 pull-right pull-left-xs"><i class="glyphicon glyphicon-refresh"></i> Warenkorb aktualisieren</button>
|
||||
<div class="clearfix"></div>
|
||||
|
||||
</div>
|
||||
|
||||
{!! Form::close() !!}
|
||||
<!-- /CART -->
|
||||
@endif
|
||||
|
|
@ -240,7 +302,6 @@
|
|||
<hr>
|
||||
<p><em class="small" style="color: #828282">Alle Preise inkl. gesetzl. Mehrwertsteuer zzgl. Versandkosten, wenn nicht anders beschrieben</em></p>
|
||||
<!-- /CART -->
|
||||
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@
|
|||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="alert alert-danger">
|
||||
Bitte überprüfen Sie das Formular und vervollständigen alle Angaben.
|
||||
Bitte überprüfe das Formular und vervollständigen alle Angaben.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -681,7 +681,7 @@
|
|||
</div>
|
||||
|
||||
<button type="submit" class="btn btn-primary btn-lg btn-block size-18 btn-text-500 mt-4 faa-parent animated-hover"><i class="fa fa-mail-forward faa-horizontal"></i> Jetzt kaufen</button>
|
||||
<hr><p class="text-center" style="line-height: 1.2em;"><em class="small text-center"> <i class="fa fa-lock"></i> Sind alle Ihre Angaben vollsätndig ausgefüllt, klicken Sie auf "Jetzt kaufen" und Sie werden zu unserem Zahlungsanbieter weitergeleitet, die Verbindung wird ist SSL verschlüsselt.</em></p>
|
||||
<hr><p class="text-center" style="line-height: 1.2em;"><em class="small text-center"> <i class="fa fa-lock"></i> Sind alle Deine Angaben vollsätndig ausgefüllt, klicke auf "Jetzt kaufen" und Du wist zu unserem Zahlungsanbieter weitergeleitet, die Verbindung wird ist SSL verschlüsselt.</em></p>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@
|
|||
<div class="col-md-12">
|
||||
<div class="form-group">
|
||||
{!! Form::label('message', __('Nachricht*')) !!}
|
||||
{!! Form::textarea('message', null, ['class' => 'form-control '.($errors->has('message') ? 'error' : ''), 'placeholder'=>__('Ihre Nachticht'), 'required']) !!}
|
||||
{!! Form::textarea('message', null, ['class' => 'form-control '.($errors->has('message') ? 'error' : ''), 'placeholder'=>__('Deine Nachticht'), 'required']) !!}
|
||||
@if ($errors->has('message'))
|
||||
<label for="last_name" class="error text-danger small" style="display: block;">{{ $errors->first('message') }}</label>
|
||||
@endif
|
||||
|
|
@ -189,7 +189,7 @@
|
|||
{!! nl2br($user_shop->contact) !!}
|
||||
@endif
|
||||
<br>
|
||||
{{ $user_shop->getSubdomain() }}
|
||||
{{ $user_shop->getSubdomain(true) }}
|
||||
</p>
|
||||
|
||||
@if($user_shop->accessibility)
|
||||
|
|
|
|||
|
|
@ -48,10 +48,13 @@
|
|||
<div class="shop-item-price d-block text-danger mt-2">
|
||||
<del class="text-muted" style="font-size: 0.85em"> {{ $product->getFormattedPriceOld() }} €</del>
|
||||
{{ $product->getFormattedPrice() }} €
|
||||
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{$product->getBasePriceFormattedFull()}}</div>
|
||||
|
||||
</div>
|
||||
@else
|
||||
<div class="shop-item-price d-block mt-2 text-muted">
|
||||
{{ $product->getFormattedPrice() }} €
|
||||
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{$product->getBasePriceFormattedFull()}}</div>
|
||||
</div>
|
||||
@endif
|
||||
<!-- price -->
|
||||
|
|
|
|||
|
|
@ -25,6 +25,9 @@
|
|||
text-align: center;
|
||||
font-size: 16px;
|
||||
}
|
||||
div.shop-item-price > span {
|
||||
color: #6e6e6e;
|
||||
}
|
||||
</style>
|
||||
<section class="page-header page-header-xlg parallax parallax-3 hidden-xs"
|
||||
style="background-image:url('/assets/images/vision-min.jpg')">
|
||||
|
|
@ -97,34 +100,40 @@
|
|||
<del class="text-muted" style="font-size: 0.85em"> {{ $product->getFormattedPriceOld() }} €</del>
|
||||
{{ $product->getFormattedPrice() }} €
|
||||
@else
|
||||
<div class="shop-item-price text-right text-muted">
|
||||
<div class="shop-item-price text-right text-muted" style="line-height: 1.3em;">
|
||||
{{ $product->getFormattedPrice() }} €
|
||||
@endif<br>
|
||||
<span style="font-size: 0.7em; color:#999; font-weight: 400;"><em>inkl. 19% MwSt. zzgl. Versandkosten</em></span>
|
||||
<span style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{$product->getBasePriceFormattedFull()}}</span><br>
|
||||
<span style="font-size: 13px; color:#6e6e6e; font-weight: 500;"><em>inkl. 19% MwSt. zzgl. Versandkosten</em></span>
|
||||
|
||||
</div>
|
||||
<hr>
|
||||
<div class="shop-item-price text-right">
|
||||
<div class="shop-item-price text-right" style="line-height: 1.3em">
|
||||
{!! Form::open(['url' => url(Util::getPostRoute().'card/add/'.$product->id), 'class' => 'mb-0', 'id'=>'']) !!}
|
||||
<div class="qty float-left">
|
||||
<input type="number" value="1" name="quantity" maxlength="3" max="999" min="1"><br>
|
||||
</div>
|
||||
<button class="btn btn-primary btn-text-500 faa-parent animated-hover"><i class="fa fa-cart-plus faa-horizontal"></i> In den Warenkorb</button>
|
||||
<br>
|
||||
<span style="font-size: 0.7em; color:#999; font-weight: 400;"><em>Lieferzeit: 1-3 Werktage</em></span>
|
||||
<span style="font-size: 13px; color:#6e6e6e; font-weight: 400;"><em>Lieferzeit: 1-3 Werktage</em></span>
|
||||
{!! Form::close() !!}
|
||||
</div>
|
||||
<hr>
|
||||
@endif
|
||||
|
||||
|
||||
<div class="shop-item-price text-right">
|
||||
<span class="pull-left"><strong>Inhalt:</strong></span>
|
||||
<span style="font-size: 0.8em">{{ $product->contents }}</span>
|
||||
<span>{{ $product->contents }}</span>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="shop-item-price text-left">
|
||||
<span class=""><strong>Art.-Nr.:</strong> {{ $product->number }}</span>
|
||||
<div class="shop-item-price text-right">
|
||||
<span class="pull-left"><strong>Gewicht:</strong></span>
|
||||
<span>{{ $product->weight }} g</span>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="shop-item-price text-right">
|
||||
<span class="pull-left"><strong>Art.-Nr.:</strong></span>
|
||||
<span>{{ $product->number }}</span>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
|
|
|
|||
|
|
@ -88,6 +88,10 @@
|
|||
<div class="box-static box-transparent box-bordered padding-20">
|
||||
|
||||
{!! Form::open(['url' => '/registrierung']) !!}
|
||||
@if(isset($from_member_id))
|
||||
{!! Form::hidden('from_member_id', $from_member_id) !!}
|
||||
@endif
|
||||
|
||||
<div class="row contact-row">
|
||||
<div class="form-group col-md-12">
|
||||
{!! Form::label('first_name', __('Salutation').'*') !!}
|
||||
|
|
@ -223,7 +227,7 @@
|
|||
{!! nl2br($user_shop->contact) !!}
|
||||
@endif
|
||||
<br>
|
||||
{{ $user_shop->getSubdomain() }}
|
||||
{{ $user_shop->getSubdomain(true) }}
|
||||
</p>
|
||||
|
||||
@if($user_shop->accessibility)
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@
|
|||
{!! nl2br($user_shop->contact) !!}
|
||||
@endif
|
||||
<br>
|
||||
{{ $user_shop->getSubdomain() }}
|
||||
{{ $user_shop->getSubdomain(true) }}
|
||||
</p>
|
||||
|
||||
@if($user_shop->accessibility)
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
</li>
|
||||
@endif
|
||||
<li class="footer-sprite">
|
||||
{{ $user_shop->getSubdomain() }}
|
||||
{{ $user_shop->getSubdomain(true) }}
|
||||
</li>
|
||||
</ul>
|
||||
</address>
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@
|
|||
<i class="fa fa-chevron-down"></i>
|
||||
</div>
|
||||
|
||||
<h1>Sparen Sie mit Sets</h1>
|
||||
<h1>Spare mit Sets</h1>
|
||||
<ul class="shop-item-list row list-inline nomargin">
|
||||
@foreach($site->getProductSetModels() as $product)
|
||||
<!-- ITEM -->
|
||||
|
|
@ -165,7 +165,7 @@
|
|||
{!! nl2br($user_shop->contact) !!}
|
||||
@endif
|
||||
<br>
|
||||
{{ $user_shop->getSubdomain() }}
|
||||
{{ $user_shop->getSubdomain(true) }}
|
||||
</p>
|
||||
|
||||
@if($user_shop->accessibility)
|
||||
|
|
|
|||
|
|
@ -84,7 +84,10 @@ Route::domain(config('app.pre_url_main').config('app.domain').config('app.tld_ca
|
|||
Route::post('/kontakt', 'Web\ContactController@store')->name('contact_store');
|
||||
|
||||
Route::get('/registrierung', 'Web\RegisterController@index')->name('register_user');
|
||||
Route::get('/reg/{member_id?}', 'Web\RegisterController@member')->name('register_user_member');
|
||||
Route::post('/registrierung', 'Web\RegisterController@register')->name('register_user');
|
||||
Route::get('/registrierung/finish', 'Web\RegisterController@finish')->name('register_user_finish');
|
||||
|
||||
|
||||
Route::get('/', 'Web\SiteController@index')->name('/');
|
||||
|
||||
|
|
@ -214,6 +217,7 @@ Route::domain(config('app.pre_url_crm').config('app.domain').config('app.tld_car
|
|||
Route::get('/user/data/free', 'UserDataController@userDataFree')->name('user_data_free');
|
||||
Route::post('/user/data/free/form', 'UserDataController@userDataFreeForm')->name('user_data_free_form');
|
||||
|
||||
//user shop
|
||||
Route::get('/user/shop', 'UserShopController@index')->name('user_shop');
|
||||
Route::post('/user/shop/store', 'UserShopController@store')->name('user_shop_store');
|
||||
Route::post('/user/shop/register/form', 'UserShopController@userShopRegisterForm')->name('user_shop_register_form');
|
||||
|
|
@ -221,6 +225,15 @@ Route::domain(config('app.pre_url_crm').config('app.domain').config('app.tld_car
|
|||
Route::post('/user/shop/upload/image', 'UserShopController@uploadImage')->name('user_shop_upload_image');
|
||||
Route::get('/user/shop/delete/image', 'UserShopController@deleteImage')->name('user_shop_delete_image');
|
||||
|
||||
//user shop Sales
|
||||
Route::get('/user/shop/orders', 'User\ShopSalesController@orders')->name('user_shop_orders');
|
||||
Route::get('/user/shop/order/detail', 'User\ShopSalesController@orderDetail')->name('user_shop_order_detail');
|
||||
Route::get('/user/shop/orders/datatable', 'User\ShopSalesController@ordersDatatable')->name('user_shop_orders_datatable');
|
||||
|
||||
|
||||
//user team
|
||||
Route::get('/user/team/members', 'User\TeamController@members')->name('user_team_members');
|
||||
|
||||
//products images
|
||||
Route::post('/user/shop_on_site/upload/image', 'UserShopController@uploadOnSiteImage')->name('user_shop_on_site_upload_image');
|
||||
Route::get('/user/shop_on_site/{image_id}/{user_shop_id}', 'UserShopController@deleteOnSiteImage')->name('user_shop_on_site_delete_image');
|
||||
|
|
@ -387,10 +400,10 @@ $subDomainRouting = function (){
|
|||
Route::post('/kontakt', 'Web\ContactController@store')->name('contact_store');
|
||||
|
||||
Route::get('/registrierung', 'Web\RegisterController@index')->name('register_user');
|
||||
Route::get('/reg/{member_id?}', 'Web\RegisterController@member')->name('register_user_member');
|
||||
Route::post('/registrierung', 'Web\RegisterController@register')->name('register_user');
|
||||
Route::get('/registrierung/finish', 'Web\RegisterController@finish')->name('register_user_finish');
|
||||
|
||||
|
||||
Route::get('/', 'Web\SiteController@index')->name('');
|
||||
Route::get('/user/card/add/{id}/{quantity?}/{product_slug?}', 'Web\CardController@addToCardGet')->name('user.card_add_get');
|
||||
Route::post('/user/card/add/{id}', 'Web\CardController@addToCardPost')->name('user.card_add_post');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue