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

Bug Netto in Card to Brutto

Browse source
This commit is contained in:
Kevin Adametz 2019-06-11 14:35:33 +02:00
parent ebac67b81f
commit 8cae2f92a4
7 changed files with 254 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

385
.idea/workspace.xml generated
View file

@ -3,13 +3,12 @@
<component name="ChangeListManager">
<list default="true" id="2fbaac5f-25ba-4502-a970-cc14728d7d55" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/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$/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/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$/app/Http/Controllers/AdminUserController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/AdminUserController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/DataTableController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/DataTableController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/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/user/layouts/includes/header.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/user/layouts/includes/header.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -17,62 +16,57 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ComposerSettings" doNotAsk="true" executionDataType="PHAR" phpInterpreterId="1b9e99f0-0fb5-45bb-9686-0d9b61bf499b" synchronizationState="SYNCHRONIZE">
<component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
<pharPath>/usr/local/bin/composer</pharPath>
<execution>
<phar pharPath="/usr/local/bin/composer" interpreterId="1b9e99f0-0fb5-45bb-9686-0d9b61bf499b" />
</execution>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/checkout-final.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/web/layouts/includes/header.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>
<state relative-caret-position="-38" />
</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://$PROJECT_DIR$/resources/views/web/user/layouts/layout.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php">
<entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/includes/header.blade.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 relative-caret-position="695">
<caret line="125" column="126" selection-start-line="125" selection-start-column="126" selection-end-line="125" selection-end-column="126" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/WizardController.php">
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/checkout.blade.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 relative-caret-position="906">
<caret line="591" column="77" selection-start-line="591" selection-start-column="77" selection-end-line="591" selection-end-column="77" />
<folding>
<element signature="e#35351#35373#0#HTML" expanded="true" />
<element signature="e#35682#35704#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/web/layouts/layout.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>logou</find>
<find>log</find>
<find>same_as_billing</find>
<find>select</find>
@ -102,6 +96,7 @@
<find>birthday</find>
<find>datepicker-birthday</find>
<find>datepicker</find>
<find>Mail::</find>
</findStrings>
<replaceStrings>
<replace />
@ -114,6 +109,7 @@
<dir>$PROJECT_DIR$/resources/views</dir>
<dir>$PROJECT_DIR$/resources</dir>
<dir>$PROJECT_DIR$/app</dir>
<dir>$PROJECT_DIR$/app/Http</dir>
</dirStrings>
</component>
<component name="FrameworkCommandLineHistory">
@ -151,10 +147,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<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" />
<option value="$PROJECT_DIR$/app/Http/Controllers/TranslationController.php" />
<option value="$PROJECT_DIR$/app/Requests/TranslationRequest.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/TranslationFileController.php" />
<option value="$PROJECT_DIR$/app/Mail/MailContact.php" />
@ -163,7 +155,6 @@
<option value="$PROJECT_DIR$/app/Services/Util.php" />
<option value="$PROJECT_DIR$/resources/views/web/layouts/includes/footer.blade.php" />
<option value="$PROJECT_DIR$/resources/views/web/templates/agb.blade.php" />
<option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/resources/views/legal/agb.blade.php" />
<option value="$PROJECT_DIR$/resources/views/legal/data_protected.blade.php" />
<option value="$PROJECT_DIR$/resources/views/legal/_imprint.blade.php" />
@ -198,10 +189,15 @@
<option value="$PROJECT_DIR$/app/Http/Controllers/HomeController.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" />
<option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/AdminUserController.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/DataTableController.php" />
<option value="$PROJECT_DIR$/resources/views/web/user/layouts/includes/header.blade.php" />
<option value="$PROJECT_DIR$/resources/views/web/templates/card.blade.php" />
<option value="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" />
</list>
</option>
</component>
@ -314,8 +310,9 @@
</include_path>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="323" />
<option name="y" value="23" />
<option name="width" value="2560" />
<option name="width" value="2022" />
<option name="height" value="1417" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@ -324,7 +321,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -358,12 +354,32 @@
<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="Http" type="462c0819:PsiDirectoryNode" />
<item name="Controllers" 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="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="app" type="462c0819:PsiDirectoryNode" />
<item name="Repositories" 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="Services" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
@ -386,6 +402,13 @@
<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="admin" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
@ -407,6 +430,23 @@
<item name="views" 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="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="web" type="462c0819:PsiDirectoryNode" />
<item name="layouts" 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="web" type="462c0819:PsiDirectoryNode" />
<item name="layouts" type="462c0819:PsiDirectoryNode" />
<item name="includes" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
@ -415,13 +455,47 @@
<item name="web" type="462c0819:PsiDirectoryNode" />
<item name="templates" 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="web" type="462c0819:PsiDirectoryNode" />
<item name="user" 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="web" type="462c0819:PsiDirectoryNode" />
<item name="user" type="462c0819:PsiDirectoryNode" />
<item name="layouts" 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="web" type="462c0819:PsiDirectoryNode" />
<item name="user" type="462c0819:PsiDirectoryNode" />
<item name="layouts" type="462c0819:PsiDirectoryNode" />
<item name="includes" 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" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
@ -535,11 +609,15 @@
<workItem from="1553694116510" duration="350000" />
<workItem from="1553694855934" duration="1157000" />
<workItem from="1553708521909" duration="492000" />
<workItem from="1555429292695" duration="630000" />
<workItem from="1555490678820" duration="3921000" />
<workItem from="1556891567027" duration="851000" />
<workItem from="1560255951776" duration="286000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="332938000" />
<option name="totallyTimeSpent" value="338626000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -551,12 +629,13 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="2560" height="1417" extended-state="0" />
<frame x="323" y="23" width="2022" 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.19618745" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49811035" visible="true" weight="0.1449495" />
<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 id="npm" order="3" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32981133" />
@ -581,76 +660,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<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">
<caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/legal/data_protect_de.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="662">
<caret line="191" column="45" selection-start-line="191" selection-start-column="45" selection-end-line="191" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/legal/imprint_de.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="574">
<caret line="41" column="6" lean-forward="true" selection-start-line="41" selection-start-column="6" selection-end-line="41" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/includes/layout-footer.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/web/layouts/includes/footer.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="684">
<caret line="65" column="68" selection-start-line="65" selection-start-column="68" selection-end-line="65" selection-end-column="68" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/auth/register.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1036">
<caret line="74" column="228" selection-start-line="74" selection-start-column="228" selection-end-line="74" selection-end-column="228" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/auth/login.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="938">
<caret line="67" column="228" selection-start-line="67" selection-start-column="228" selection-end-line="67" selection-end-column="228" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/emails/contact.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="872">
<caret line="212" column="48" lean-forward="true" selection-start-line="212" selection-start-column="48" selection-end-line="212" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/emails/_auth.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="802">
<caret line="216" column="72" lean-forward="true" selection-start-line="216" selection-start-column="72" selection-end-line="216" selection-end-column="72" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/emails/auth.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="824">
<caret line="212" column="79" lean-forward="true" selection-start-line="212" selection-start-column="79" selection-end-line="212" selection-end-column="79" />
</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">
@ -796,13 +805,6 @@
</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">
@ -833,18 +835,6 @@
<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">
@ -852,13 +842,6 @@
</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="1250">
@ -886,31 +869,129 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/web/index.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 relative-caret-position="14">
<caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php">
<entry file="file://$PROJECT_DIR$/app/User.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 relative-caret-position="984">
<caret line="140" lean-forward="true" selection-start-line="140" selection-end-line="140" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/emails/checkout_status.blade.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AdminUserController.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 relative-caret-position="1118">
<caret line="87" column="41" lean-forward="true" selection-start-line="87" selection-start-column="41" selection-end-line="87" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="769">
<caret line="241" lean-forward="true" selection-start-line="241" selection-end-line="241" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/DataTableController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="13" column="5" lean-forward="true" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
</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 relative-caret-position="1250">
<caret line="98" column="51" selection-start-line="98" selection-start-column="51" selection-end-line="98" selection-end-column="51" />
</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="14">
<caret line="80" column="9" selection-start-line="46" selection-start-column="7" selection-end-line="80" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/admin/users.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</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="507">
<caret line="49" selection-start-line="49" selection-end-line="49" />
</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="1250">
<caret line="118" column="36" selection-start-line="118" selection-start-column="36" selection-end-line="118" selection-end-column="36" />
<folding>
<element signature="e#45#81#0#PHP" expanded="true" />
</folding>
</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" />
<folding>
<element signature="e#45#81#0#PHP" expanded="true" />
</folding>
</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="1250">
<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/web/layouts/layout.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/web/layouts/includes/header.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-38" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/layout.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/includes/header.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="695">
<caret line="125" column="126" selection-start-line="125" selection-start-column="126" selection-end-line="125" selection-end-column="126" />
</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="979">
<caret line="226" column="39" lean-forward="true" selection-start-line="226" selection-start-column="39" selection-end-line="226" selection-end-column="39" />
<folding>
<element signature="e#9090#9112#0#HTML" expanded="true" />
<element signature="e#9438#9460#0#HTML" expanded="true" />
</folding>
</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="906">
<caret line="591" column="77" selection-start-line="591" selection-start-column="77" selection-end-line="591" selection-end-column="77" />
<folding>
<element signature="e#35351#35373#0#HTML" expanded="true" />
<element signature="e#35682#35704#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>

10
app/Http/Controllers/AdminUserController.php
View file

@ -7,6 +7,7 @@ namespace App\Http\Controllers;
use App\Models\UserAccount;
use App\Repositories\UserRepository;
use App\User;
use Auth;
use Illuminate\Support\Facades\Mail;
use Input;
use Illuminate\Http\Request;
@ -82,4 +83,13 @@ class AdminUserController extends Controller
}
public function userLoginAs($userId){
if(Auth::user()->isSuperAdmin()){
$user = User::find($userId);
Auth::login($user);
return redirect('/home');
}
}
}

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

@ -79,7 +79,8 @@ class DataTableController extends Controller
return '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
})
->addColumn('action_delete', function (User $user) {
return '<a href="' . route('admin_user_delete', [$user->id]) . '" class="btn icon-btn btn-sm btn-danger" onclick="return confirm(\''.__('Really delete entry?').'\');"><span class="far fa-trash"></span></a>';
return '<a href="' . route('admin_user_delete', [$user->id]) . '" class="btn icon-btn btn-sm btn-danger" onclick="return confirm(\''.__('Really delete entry?').'\');"><span class="far fa-trash"></span></a>
<a href="' . route('admin_user_login_as', [$user->id]) . '" class="btn icon-btn btn-sm btn-warning" onclick="return confirm(\''.__('Login as User?').'\');"><span class="far fa-sign-in-alt"></span></a>';
})
->orderColumn('confirmed', 'confirmed $1')
->orderColumn('active', 'active $1')

4
resources/views/web/templates/card.blade.php
View file

@ -211,12 +211,12 @@
<span class="pull-left small">Versandkosten:</span>
</div>
<hr class="mt-4 mb-4">
<div class="clearfix mb-2">
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small">{{ Yard::instance('shopping')->subtotalWithShipping() }} €</span>
<span class="pull-left small">Summe ohne MwSt:</span>
</div>
<div class="clearfix mb-2">
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small">{{ Yard::instance('shopping')->taxWithShipping() }} €</span>
<span class="pull-left small"> zzgl. {{ Yard::getTaxRate() }} % MwSt:</span>
</div>

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

@ -584,12 +584,12 @@
<hr class="mt-4 mb-4">
<div class="clearfix mb-2">
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small">{{ Yard::instance('shopping')->subtotalWithShipping() }} €</span>
<span class="pull-left small">Summe ohne MwSt:</span>
</div>
<div class="clearfix mb-2">
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small">{{ Yard::instance('shopping')->taxWithShipping() }} €</span>
<span class="pull-left small"> zzgl. {{ Yard::getTaxRate() }} % MwSt:</span>
</div>

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

@ -100,7 +100,7 @@
</span>
&nbsp;
@if(Yard::instance('shopping')->count())
<span class="">{{ \Yard::instance('shopping')->subtotal() }} € </span>
<span class="">{{ \Yard::instance('shopping')->total() }} € </span>
@endif
</a>
<div class="quick-cart-box" style="display: @if(Session::has('show-card-after-add')) block @else none @endif">
@ -123,7 +123,7 @@
<!-- quick cart footer -->
<div class="quick-cart-footer clearfix">
<div class="text-left">
<strong>Zwischensumme:</strong> <strong class="pull-right">{{ Yard::instance('shopping')->subtotal() }} €</strong>
<strong>Zwischensumme:</strong> <strong class="pull-right">{{ Yard::instance('shopping')->total() }} €</strong>
<br>
<em style="font-size: 0.9em">inkl. MwSt. zzgl. Versandkosten</em>
</div>

3
routes/web.php
View file

@ -238,6 +238,8 @@ Route::domain(config('app.pre_url_crm').config('app.domain'))->group(function ()
Route::get('/admin/user/edit/{user_id}', 'AdminUserController@edit')->name('admin_user_edit');
Route::post('/admin/user/store', 'AdminUserController@store')->name('admin_user_store');
Route::get('/admin/user/delete/{user_id}', 'AdminUserController@deleteUser')->name('admin_user_delete');
Route::get('/admin/user/login_as/{userId?}', 'AdminUserController@userLoginAs')->name('admin_user_login_as');
Route::get('/admin/shippings', 'ShippingController@index')->name('admin_shippings');
Route::get('/admin/shipping/edit/{shipping_id}', 'ShippingController@edit')->name('admin_shipping_edit');
@ -249,6 +251,7 @@ Route::domain(config('app.pre_url_crm').config('app.domain'))->group(function ()
Route::get('data_table', 'DataTableController@datatable')->name('data_table');
// Route::get('datatables/leads', 'DataTableController@getLeads')->name('datatables-leads');
Route::get('data/table/users', 'DataTableController@getUsers')->name('data_table_users');
});
});