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

last fix for first online

Browse source
This commit is contained in:
Kevin Adametz 2019-03-28 14:51:50 +01:00
parent 6db007fc82
commit ebac67b81f
8 changed files with 269 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

491
.idea/workspace.xml generated
View file

@ -2,58 +2,14 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="2fbaac5f-25ba-4502-a970-cc14728d7d55" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/public/download/mivita_widerruf_formular.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/legal/_agb.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/legal/_data_protected.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/legal/_imprint.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/legal/agb.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/legal/agb_de.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/web/templates/agb.blade.php" 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/Api/PayoneController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/PayoneController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/TranslationController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TranslationController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/TranslationFileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TranslationFileController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/UserShopController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/UserShopController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/ContactController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/ContactController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.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/MailActivateUser.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailActivateUser.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Mail/MailCheckout.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailCheckout.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Mail/MailContact.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailContact.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Mail/MailResetPassword.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailResetPassword.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Mail/MailVerifyAccount.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailVerifyAccount.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Mail/MailVerifyContact.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailVerifyContact.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Services/Util.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Util.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/profanity.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/profanity.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/lang/de.json" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/lang/de/email.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de/email.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/lang/de/validation.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de/validation.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/auth/login.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/auth/login.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/auth/passwords/email.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/auth/passwords/email.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/auth/passwords/reset.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/auth/passwords/reset.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/auth/register.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/auth/register.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/emails/checkout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/checkout.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/payments-assets/creditcard.png" beforeDir="false" afterPath="$PROJECT_DIR$/public/images/payments-assets/creditcard.png" 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/layouts/application.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/application.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/auth.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/auth.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/legal/data_protect_de.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/legal/data_protect_de.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/legal/data_protected.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/legal/data_protected.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/legal/imprint.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/legal/imprint.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/legal/imprint_de.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/legal/imprint_de.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/legal/shop_term_of_use_de.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/legal/shop_term_of_use_de.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/translation/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/translation/index.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/shop.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/shop.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/layouts/application.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/layouts/application.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/layouts/includes/footer.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/layouts/includes/footer.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/checkout-final.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/checkout-final.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/user/layouts/application.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/user/layouts/application.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/user/layouts/includes/footer.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/user/layouts/includes/footer.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -68,15 +24,46 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/user/components/user_shop_on_site.blade.php">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/checkout-final.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1694">
<caret line="121" column="26" selection-start-line="121" selection-start-column="26" selection-end-line="121" selection-end-column="26" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6174">
<caret line="441" column="48" selection-start-line="441" selection-start-column="48" selection-end-line="441" selection-end-column="48" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2240">
<caret line="176" column="16" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/emails/checkout_status.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="869">
<caret line="200" column="32" selection-start-line="200" selection-start-column="32" selection-end-line="200" selection-end-column="32" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/user/components/user_shop_edit.blade.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/WizardController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1059">
<caret line="94" column="74" lean-forward="true" selection-start-line="94" selection-start-column="74" selection-end-line="94" selection-end-column="74" />
<state relative-caret-position="868">
<caret line="98" column="51" lean-forward="true" selection-start-line="98" selection-start-column="51" selection-end-line="98" selection-end-column="51" />
</state>
</provider>
</entry>
@ -85,9 +72,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>update_p</find>
<find>_scrollTo</find>
<find>user_update_password_first</find>
<find>logou</find>
<find>log</find>
<find>same_as_billing</find>
@ -115,6 +99,9 @@
<find>data</find>
<find>data_prote</find>
<find>data_pro</find>
<find>birthday</find>
<find>datepicker-birthday</find>
<find>datepicker</find>
</findStrings>
<replaceStrings>
<replace />
@ -124,9 +111,9 @@
<dir>$PROJECT_DIR$/database/migrations</dir>
<dir>$PROJECT_DIR$/resources/views/user</dir>
<dir>$PROJECT_DIR$/resources/views/web</dir>
<dir>$PROJECT_DIR$/app</dir>
<dir>$PROJECT_DIR$/resources/views</dir>
<dir>$PROJECT_DIR$/resources</dir>
<dir>$PROJECT_DIR$/app</dir>
</dirStrings>
</component>
<component name="FrameworkCommandLineHistory">
@ -164,8 +151,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/resources/views/home.blade.php" />
<option value="$PROJECT_DIR$/app/Services/Yard.php" />
<option value="$PROJECT_DIR$/resources/lang/de.json" />
<option value="$PROJECT_DIR$/resources/lang/de/email.php" />
<option value="$PROJECT_DIR$/resources/views/translation/index.blade.php" />
@ -190,7 +175,6 @@
<option value="$PROJECT_DIR$/resources/views/legal/shop_term_of_use_de.blade.php" />
<option value="$PROJECT_DIR$/resources/views/legal/agb_de.blade.php" />
<option value="$PROJECT_DIR$/resources/views/legal/data_protect_de.blade.php" />
<option value="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" />
<option value="$PROJECT_DIR$/resources/views/auth/register.blade.php" />
<option value="$PROJECT_DIR$/resources/views/auth/login.blade.php" />
<option value="$PROJECT_DIR$/resources/views/auth/passwords/reset.blade.php" />
@ -200,7 +184,6 @@
<option value="$PROJECT_DIR$/resources/views/emails/_auth.blade.php" />
<option value="$PROJECT_DIR$/resources/views/emails/auth.blade.php" />
<option value="$PROJECT_DIR$/resources/views/emails/checkout.blade.php" />
<option value="$PROJECT_DIR$/resources/views/emails/checkout_status.blade.php" />
<option value="$PROJECT_DIR$/resources/views/web/layouts/application.blade.php" />
<option value="$PROJECT_DIR$/app/Mail/MailActivateUser.php" />
<option value="$PROJECT_DIR$/app/Mail/MailCheckout.php" />
@ -213,8 +196,12 @@
<option value="$PROJECT_DIR$/resources/views/user/components/user_shop_register.blade.php" />
<option value="$PROJECT_DIR$/resources/views/user/shop.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/WizardController.php" />
<option value="$PROJECT_DIR$/resources/views/user/components/user_shop_edit.blade.php" />
<option value="$PROJECT_DIR$/resources/views/web/templates/checkout-final.blade.php" />
<option value="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php" />
<option value="$PROJECT_DIR$/resources/views/emails/checkout_status.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/WizardController.php" />
</list>
</option>
</component>
@ -366,32 +353,46 @@
<path>
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
<item name="config" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="Http" type="462c0819:PsiDirectoryNode" />
<item name="Controllers" type="462c0819:PsiDirectoryNode" />
<item name="Pay" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="Mail" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="lang" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="lang" type="462c0819:PsiDirectoryNode" />
<item name="de" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="emails" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
@ -404,13 +405,15 @@
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="user" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" />
<item name="web" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
<item name="routes" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="web" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@ -522,11 +525,21 @@
<workItem from="1552481695438" duration="231000" />
<workItem from="1552482684973" duration="1481000" />
<workItem from="1552485686862" duration="497000" />
<workItem from="1553078315005" duration="42000" />
<workItem from="1553172339375" duration="754000" />
<workItem from="1553174858066" duration="22000" />
<workItem from="1553175700548" duration="116000" />
<workItem from="1553176149267" duration="34000" />
<workItem from="1553687920206" duration="395000" />
<workItem from="1553692408844" duration="6000" />
<workItem from="1553694116510" duration="350000" />
<workItem from="1553694855934" duration="1157000" />
<workItem from="1553708521909" duration="492000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="329570000" />
<option name="totallyTimeSpent" value="332938000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -541,7 +554,7 @@
<frame x="0" y="23" width="2560" height="1417" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49811035" visible="true" weight="0.13939634" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49811035" visible="true" weight="0.19618745" />
<window_info id="Structure" order="1" sideWeight="0.50188965" side_tool="true" weight="0.13921972" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
@ -568,127 +581,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/agb.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="9" selection-start-line="9" selection-end-line="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/web/start.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="70">
<caret line="5" column="4" selection-end-line="5" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/karrierechancen.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1774">
<caret line="15" column="13" lean-forward="true" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/home.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/legal/_data_protected.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="518">
<caret line="37" column="11" lean-forward="true" selection-start-line="37" selection-start-column="11" selection-end-line="37" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/legal/_imprint.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="490">
<caret line="35" column="11" lean-forward="true" selection-start-line="35" selection-start-column="11" selection-end-line="35" selection-end-column="11" />
<folding>
<element signature="e#479#512#0#HTML" expanded="true" />
<element signature="e#623#648#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/legal/shop_term_of_use.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="11" selection-start-line="11" selection-end-line="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/legal/imprint.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="196">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Web/SiteController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/card.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-800" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/legal/agb.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="13" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/legal/data_protected.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="13" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/includes/footer.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="354">
<caret line="67" column="48" lean-forward="true" selection-start-line="67" selection-start-column="48" selection-end-line="67" selection-end-column="48" />
<folding>
<element signature="e#3925#3931#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/application.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="644">
<caret line="47" column="17" lean-forward="true" selection-start-line="47" selection-start-column="17" selection-end-line="47" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/application.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="118">
<caret line="25" column="79" lean-forward="true" selection-start-line="25" selection-start-column="79" selection-end-line="25" selection-end-column="79" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/legal/shop_term_of_use_de.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="18" column="6" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/legal/_agb.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/legal/agb_de.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="98">
@ -759,20 +651,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/emails/checkout_status.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1026">
<caret line="402" column="33" lean-forward="true" selection-start-line="402" selection-start-column="33" selection-end-line="402" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434">
<caret line="31" column="9" lean-forward="true" selection-start-line="31" selection-start-column="9" selection-end-line="31" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/web/layouts/application.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="448">
@ -818,13 +696,6 @@
<entry file="file://$PROJECT_DIR$/app/Mail/MailContact.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Mail/MailCheckout.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="490">
<caret line="40" column="106" selection-start-line="40" selection-start-column="106" selection-end-line="40" selection-end-column="106" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Mail/MailActivateUser.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="504">
@ -832,13 +703,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/emails/checkout.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="713">
<caret line="351" column="48" lean-forward="true" selection-start-line="351" selection-start-column="48" selection-end-line="351" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Mail/MailVerifyContact.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
@ -877,13 +741,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/WizardController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1018">
<caret line="112" column="27" selection-start-line="112" selection-start-column="27" selection-end-line="112" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="915">
@ -891,13 +748,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="728">
<caret line="92" column="41" selection-start-line="92" selection-start-column="41" selection-end-line="92" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/user/shop.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="294">
@ -905,13 +755,162 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/user/components/user_shop_on_site.blade.php">
<entry file="file://$PROJECT_DIR$/database/migrations/2019_02_29_170559_create_user_accounts_table.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="490">
<caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/ShippingPrice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1087">
<caret line="95" column="5" lean-forward="true" selection-start-line="41" selection-end-line="95" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/application.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="476">
<caret line="34" column="8" lean-forward="true" selection-start-line="34" selection-start-column="8" selection-end-line="34" selection-end-column="8" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/forms_file-upload.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/public/js/custom.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="747">
<caret line="55" column="22" lean-forward="true" selection-start-line="55" selection-start-column="22" selection-end-line="55" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/application.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="786">
<caret line="128" lean-forward="true" selection-start-line="128" selection-end-line="128" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/UserDataController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1062">
<caret line="80" column="9" lean-forward="true" selection-start-line="46" selection-start-column="7" selection-end-line="80" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/UserAccount.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1174">
<caret line="94" selection-start-line="94" selection-end-line="94" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/user/form.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="718">
<caret line="224" column="215" selection-start-line="224" selection-start-column="196" selection-end-line="224" selection-end-column="215" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/ShoppingUser.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="742">
<caret line="53" column="1" selection-start-line="53" selection-start-column="1" selection-end-line="53" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/ShoppingPayment.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/ShoppingOrderItem.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/ShoppingOrder.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="726">
<caret line="274" column="124" lean-forward="true" selection-start-line="274" selection-start-column="124" selection-end-line="274" selection-end-column="124" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Api/PayoneController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-150" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Mail/MailCheckout.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="490">
<caret line="40" column="106" selection-start-line="40" selection-start-column="106" selection-end-line="40" selection-end-column="106" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Web/CheckoutController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1250">
<caret line="155" column="49" selection-start-line="155" selection-start-column="49" selection-end-line="155" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/user/components/user_shop_edit.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1059">
<caret line="94" column="74" lean-forward="true" selection-start-line="94" selection-start-column="74" selection-end-line="94" selection-end-column="74" />
<state relative-caret-position="1250">
<caret line="94" column="74" selection-start-line="94" selection-start-column="74" selection-end-line="94" selection-end-column="74" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/user/components/user_shop_on_site.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/ShippingCountry.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/emails/checkout.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="795">
<caret line="238" column="40" lean-forward="true" selection-start-line="238" selection-start-column="40" selection-end-line="238" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/checkout-final.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1694">
<caret line="121" column="26" selection-start-line="121" selection-start-column="26" selection-end-line="121" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6174">
<caret line="441" column="48" selection-start-line="441" selection-start-column="48" selection-end-line="441" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2240">
<caret line="176" column="16" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/emails/checkout_status.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="869">
<caret line="200" column="32" selection-start-line="200" selection-start-column="32" selection-end-line="200" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/WizardController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="868">
<caret line="98" column="51" lean-forward="true" selection-start-line="98" selection-start-column="51" selection-end-line="98" selection-end-column="51" />
</state>
</provider>
</entry>

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

@ -230,9 +230,12 @@ class HomeController extends Controller
$ShoppingPayment = ShoppingPayment::where('reference', $reference)->first();
if($ShoppingPayment->status == 'success'){
$user = Auth::user();
if($user->wizard < 4){
$user->wizard = 4;
$user->save();
return redirect(route('wizard', [4]));
}
}else{
\Session()->flash('alert-error', "Es ist ein Fehler bei der Bestellung aufgetreten");
return redirect(route('wizard'));

2
app/Http/Controllers/Pay/PayoneController.php
View file

@ -182,7 +182,7 @@ class PayoneController extends Controller
"clearingtype" => "vor",
"wallettype" => "",
'onlinebanktransfertype' => "",
"request" => "preauthorization",
"request" => "authorization",
];
}
//CreditCard

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

@ -81,7 +81,9 @@ class WizardController extends Controller
$account->data_protection = now();
$account->save();
$user->agreement = now();
if($user->wizard < 1){
$user->wizard = 1;
}
$user->save();
return redirect(route('wizard', [1]));
@ -89,7 +91,9 @@ class WizardController extends Controller
if($step == 1){
if($user->isPasswort()){
if($user->wizard < 2){
$user->wizard = 2;
}
//has Passwort -> delete Code!
$user->confirmation_code = null;
$user->confirmation_code_to = null;
@ -111,7 +115,9 @@ class WizardController extends Controller
$user->fill([
'password' => Hash::make(Input::get('password'))
])->save();
if($user->wizard < 2){
$user->wizard = 2;
}
//has Passwort -> delete Code!
$user->confirmation_code = null;
$user->confirmation_code_to = null;
@ -151,7 +157,9 @@ class WizardController extends Controller
$data = Input::all();
$data['same_as_billing'] = Input::get('same_as_billing') == NULL ? 0 : 1;
$user->account->fill($data)->save();
if($user->wizard < 3){
$user->wizard = 3;
}
$user->active_date = now();
$user->active = 1;
$user->save();

BIN
public/images/payments-assets/creditcard.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

4
resources/views/emails/checkout_status.blade.php
View file

@ -171,13 +171,13 @@
<b>{{__('email.checkout_mail_pay_pre')}}</b><br>
{{__('email.checkout_mail_pay_pre_c1')}} {{ number_format( floatval($shopping_payment->amount/100), 2, ",", ".") }} {{__('email.checkout_mail_pay_pre_c2')}}<br>
<p>
@php($pay_trans = $shopping_payment->payment_transactions->where('request', 'preauthorization')->last())
@php($pay_trans = $shopping_payment->payment_transactions->where('request', 'authorization')->last())
<b>{{__('email.checkout_mail_bank_holder')}}</b> {{ $pay_trans->transmitted_data['clearing_bankaccountholder'] }} <br>
<b>{{__('email.checkout_mail_bank_iban')}}</b> {{ $pay_trans->transmitted_data['clearing_bankiban'] }} <br>
<b>{{__('email.checkout_mail_bank_bic')}}</b> {{ $pay_trans->transmitted_data['clearing_bankbic'] }} <br>
<b>{{__('email.checkout_mail_bank_name')}}</b> {{ $pay_trans->transmitted_data['clearing_bankname'] }} <br>
<b>{{__('email.checkout_mail_bank_total')}}</b> {{ number_format( floatval($pay_trans->shopping_payment->amount/100), 2, ",", ".") }} EUR<br>
<b>{{__('email.checkout_mail_bank_code')}}</b> {{ $pay_trans->transmitted_data['clearing_bankcode'] }}
<b>{{__('email.checkout_mail_bank_code')}}</b> {{ $pay_trans->transmitted_data['txid'] }}
</p>
<hr />
@else

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

@ -109,7 +109,7 @@
<strong>BIC:</strong> {{ $pay_trans->transmitted_data['clearing_bankbic'] }} <br>
<strong>Bank:</strong> {{ $pay_trans->transmitted_data['clearing_bankname'] }} <br>
<strong>Gesamtbetrag:</strong> {{ number_format( floatval($pay_trans->shopping_payment->amount/100), 2, ",", ".") }} EUR<br>
<strong>Verwendungszweck:</strong> {{ $pay_trans->transmitted_data['clearing_bankcode'] }}
<strong>Verwendungszweck:</strong> {{ $pay_trans->transmitted_data['txid'] }}
</p>
<hr />
@endif

3
resources/views/web/templates/checkout.blade.php
View file

@ -427,13 +427,14 @@
</label>
</div>
<div class="col-lg-12 nomargin clearfix">
<!-- <div class="col-lg-12 nomargin clearfix">
<label class="mt-4 fs-14 fw-400 radio pull-left nomargin-top" style="width: 100%">
{!! Form::radio('payment_method', 'cc', '') !!}
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> Kreditkarte</span>
<img class="float-right" width="90" src="{{asset('images/payments-assets/creditcard.png')}}" alt="Mastercard + Visa">
</label>
</div>
-->
{{-- <div class="col-lg-12 nomargin clearfix">
<label class="mt-0 fs-14 fw-400 radio pull-left" style="width: 100%">
<input name="payment_method" type="radio" value="sb#GPY" />