gitmedia/mein-sterntours
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

last from 01 2019

Browse source
This commit is contained in:
Kevin Adametz 2019-02-07 16:25:02 +01:00
parent f9fcaac838
commit ed80b25b85
19 changed files with 626 additions and 341 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.env
View file

@ -2,8 +2,8 @@ APP_NAME="STERN TOURS CRM"
APP_ENV=local
APP_KEY=base64:cxq+xNckU1xLwp8V9Bfj9+nOK5iZL6urcZ1EBO8usXg=
APP_DEBUG=true
APP_URL=http://crm-stern-tours.local
APP_OLD_URL = http://cms-stern-tours.local
APP_URL=http://mein.sterntours.local
APP_OLD_URL = http://mein.sterntours.local
#APP_URL_V2=https://v2.stern-tours.de
APP_URL_V2=http://v2-sterntours.local

2
.idea/.name generated
View file

@ -1 +1 @@
_crm
mein.sterntours

2
.idea/deployment.xml generated
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PublishConfigData" serverName="crm-stern-tours.local" />
<component name="PublishConfigData" serverName="mein.sterntours.local" />
</project>

0
.idea/_crm.iml → .idea/mein.sterntours.iml generated
View file

2
.idea/modules.xml generated
View file

@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/_crm.iml" filepath="$PROJECT_DIR$/.idea/_crm.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/mein.sterntours.iml" filepath="$PROJECT_DIR$/.idea/mein.sterntours.iml" />
</modules>
</component>
</project>

688
.idea/workspace.xml generated
View file

@ -2,19 +2,25 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e1ac1cea-a1a5-4c16-b5f0-5908c7d368de" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/app/Http/Controllers/Settings/TravelCountryController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.name" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.name" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/_crm.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/mein.sterntours.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.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/API/DraftController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/API/DraftController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/BookingController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/BookingController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/CMSFeedbackController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CMSFeedbackController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/DraftController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/DraftController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/Feedback.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Feedback.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Services/HTMLHelper.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/HTMLHelper.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/BookingDraftItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/BookingDraftItem.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/DraftItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/DraftItem.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/DraftType.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/DraftType.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/migrations/2018_10_19_114521_create_draft_items_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2018_10_19_114521_create_draft_items_table.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/migrations/2018_10_29_193339_create_booking_draft_items_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2018_10_29_193339_create_booking_draft_items_table.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/js/custom.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/custom.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/booking/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/booking/detail.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/cms/feedback/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/cms/feedback/detail.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/cms/feedback/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/cms/feedback/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/drafts/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/drafts/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/travel/program/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/program/index.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$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/vendor/defuse/php-encryption/" />
<ignored path="$PROJECT_DIR$/vendor/doctrine/cache/" />
@ -41,15 +47,15 @@
<session id="1709161781">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="31" />
<entry key="project.open.time.0" value="9" />
<entry key="project.closed" value="34" />
<entry key="project.open.time.0" value="12" />
<entry key="project.open.time.1" value="3" />
<entry key="project.open.time.12" value="1" />
<entry key="project.open.time.2" value="4" />
<entry key="project.open.time.3" value="7" />
<entry key="project.open.time.4" value="4" />
<entry key="project.open.time.5" value="2" />
<entry key="project.opened" value="30" />
<entry key="project.opened" value="33" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
@ -57,19 +63,19 @@
<entry key="cms" value="1" />
<entry key="css" value="2" />
<entry key="env" value="8" />
<entry key="js" value="8" />
<entry key="json" value="1" />
<entry key="php" value="264" />
<entry key="js" value="11" />
<entry key="json" value="3" />
<entry key="php" value="293" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key=".env file" value="8" />
<entry key="Blade" value="61" />
<entry key="Blade" value="63" />
<entry key="CSS" value="2" />
<entry key="JSON" value="1" />
<entry key="JavaScript" value="8" />
<entry key="PHP" value="203" />
<entry key="JSON" value="3" />
<entry key="JavaScript" value="11" />
<entry key="PHP" value="230" />
<entry key="PLAIN_TEXT" value="1" />
</counts>
</usages-collector>
@ -77,104 +83,128 @@
<counts>
<entry key="dummy" value="13" />
<entry key="env" value="50" />
<entry key="js" value="38" />
<entry key="php" value="10822" />
<entry key="js" value="40" />
<entry key="php" value="11238" />
<entry key="txt" value="184" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key=".env file" value="50" />
<entry key="Blade" value="3411" />
<entry key="JavaScript" value="38" />
<entry key="PHP" value="7411" />
<entry key="Blade" value="3484" />
<entry key="JavaScript" value="40" />
<entry key="PHP" value="7754" />
<entry key="PLAIN_TEXT" value="197" />
</counts>
</usages-collector>
<usages-collector id="statistics.js.language.service.starts">
<counts>
<entry key="TypeScriptServerServiceImpl" value="1" />
</counts>
</usages-collector>
</session>
<session id="605484579">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="4" />
<entry key="project.open.time.0" value="2" />
<entry key="project.open.time.3" value="1" />
<entry key="project.open.time.4" value="1" />
<entry key="project.opened" value="4" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="env" value="2" />
<entry key="php" value="10" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key=".env file" value="2" />
<entry key="Blade" value="2" />
<entry key="PHP" value="8" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="env" value="8" />
<entry key="php" value="152" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key=".env file" value="8" />
<entry key="Blade" value="74" />
<entry key="PHP" value="78" />
</counts>
</usages-collector>
<usages-collector id="statistics.js.language.service.starts">
<counts>
<entry key="TypeScriptServerServiceImpl" value="1" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Models/Feedback.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/ResetPasswordController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1008">
<caret line="73" column="16" selection-start-line="73" selection-start-column="16" selection-end-line="73" selection-end-column="16" />
<state>
<folding>
<element signature="e#30#48#0#PHP" expanded="true" />
<element signature="e#45#81#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/DraftController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1050">
<caret line="78" column="33" selection-start-line="78" selection-start-column="33" selection-end-line="78" selection-end-column="33" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/BookingController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1596">
<caret line="117" column="33" selection-start-line="117" selection-start-column="33" selection-end-line="117" selection-end-column="33" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/API/DraftController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="924">
<caret line="172" column="54" selection-start-line="172" selection-start-column="54" selection-end-line="172" selection-end-column="54" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/travel/program/detail.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="546">
<caret line="39" column="29" selection-start-line="36" selection-start-column="18" selection-end-line="39" selection-end-column="29" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/booking/detail.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1064">
<caret line="76" column="26" selection-start-line="76" selection-start-column="26" selection-end-line="76" selection-end-column="26" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Repositories/BookingRepository.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="280">
<caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2086">
<caret line="158" column="3" selection-start-line="158" selection-start-column="3" selection-end-line="158" selection-end-column="3" />
<state relative-caret-position="465">
<caret line="169" column="95" selection-start-line="169" selection-start-column="95" selection-end-line="169" selection-end-column="95" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="602">
<caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/cms/feedback/detail.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="27" column="53" selection-start-line="27" selection-start-column="53" selection-end-line="27" selection-end-column="70" />
<state relative-caret-position="1232">
<caret line="88" column="90" selection-start-line="88" selection-start-column="78" selection-end-line="88" selection-end-column="90" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/ForgotPasswordController.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/Settings/TravelCountryController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="14">
<caret line="1" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/API/LoaderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="56">
<caret line="4" column="10" selection-start-line="4" selection-end-line="5" />
</state>
</provider>
</entry>
@ -189,6 +219,9 @@
<find>translations</find>
<find>draft</find>
<find>version</find>
<find>selectpicker</find>
<find>travel_pr</find>
<find>modi</find>
</findStrings>
</component>
<component name="FrameworkCommandLineHistory">
@ -205,15 +238,11 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/app/Models/TravelProgram.php" />
<option value="$PROJECT_DIR$/app/Models/TravelCountry.php" />
<option value="$PROJECT_DIR$/routes/api.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/API/LoaderController.php" />
<option value="$PROJECT_DIR$/database/migrations/2018_11_06_185812_create_bookings_table.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" />
<option value="$PROJECT_DIR$/app/Repositories/BookingRepository.php" />
<option value="$PROJECT_DIR$/app/Models/Booking.php" />
<option value="$PROJECT_DIR$/app/Models/BookingDraftItem.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/DataTableController.php" />
<option value="$PROJECT_DIR$/app/Mail/MailResetPassword.php" />
<option value="$PROJECT_DIR$/app/Mail/MailActivateUser.php" />
@ -232,14 +261,11 @@
<option value="$PROJECT_DIR$/resources/lang/de/_vorlagen.php" />
<option value="$PROJECT_DIR$/database/migrations/2018_10_19_114519_create_draft_types_table.php" />
<option value="$PROJECT_DIR$/resources/views/drafts/detail.blade.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" />
<option value="$PROJECT_DIR$/database/migrations/2018_12_22_171112_create_page_table.php" />
<option value="$PROJECT_DIR$/app/Models/Page.php" />
<option value="$PROJECT_DIR$/resources/views/booking/index.blade.php" />
<option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/app/helpers.php" />
<option value="$PROJECT_DIR$/resources/views/travel/program/detail.blade.php" />
<option value="$PROJECT_DIR$/public/js/custom.js" />
<option value="$PROJECT_DIR$/resources/views/layouts/application.blade.php" />
<option value="$PROJECT_DIR$/config/app.php" />
<option value="$PROJECT_DIR$/app/Services/HTMLHelper.php" />
@ -251,11 +277,18 @@
<option value="$PROJECT_DIR$/app/Http/Controllers/UserDataController.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/AdminUserController.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/CMSFeedbackController.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/DraftController.php" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/app/Http/Controllers/BookingController.php" />
<option value="$PROJECT_DIR$/app/Models/DraftItem.php" />
<option value="$PROJECT_DIR$/public/js/custom.js" />
<option value="$PROJECT_DIR$/resources/views/booking/detail.blade.php" />
<option value="$PROJECT_DIR$/app/Models/BookingDraftItem.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/BookingController.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/API/DraftController.php" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/DraftController.php" />
<option value="$PROJECT_DIR$/app/Models/DraftType.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/Settings/DraftController.php" />
<option value="$PROJECT_DIR$/routes/web.php" />
</list>
</option>
</component>
@ -383,10 +416,10 @@
</include_path>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="18" />
<option name="y" value="23" />
<option name="width" value="2542" />
<option name="height" value="1334" />
<option name="x" value="67" />
<option name="y" value="93" />
<option name="width" value="2493" />
<option name="height" value="1347" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@ -399,13 +432,8 @@
<subPane>
<expand>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="routes" type="462c0819:PsiDirectoryNode" />
<item name="mein.sterntours" type="b2602c69:ProjectViewProjectNode" />
<item name="mein.sterntours.local" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@ -418,11 +446,11 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/app/Http/Controllers/Settings" />
<recent name="$PROJECT_DIR$/resources/views/cms/feedback" />
<recent name="$PROJECT_DIR$/app/Models" />
<recent name="$PROJECT_DIR$/app/Http/Controllers" />
<recent name="$PROJECT_DIR$/resources/lang/de" />
<recent name="$PROJECT_DIR$/resources/views/translation" />
</key>
</component>
<component name="RunDashboard">
@ -502,17 +530,23 @@
<workItem from="1546436783290" duration="9665000" />
<workItem from="1546506304457" duration="557000" />
<workItem from="1546507505156" duration="25000" />
<workItem from="1547204326081" duration="1348000" />
<workItem from="1548166697729" duration="1006000" />
<workItem from="1548174377034" duration="3602000" />
<workItem from="1548245662709" duration="3116000" />
<workItem from="1548320403239" duration="302000" />
<workItem from="1549302291003" duration="73000" />
<workItem from="1549468148924" duration="619000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="76437000" />
<option name="totallyTimeSpent" value="86503000" />
</component>
<component name="ToolWindowManager">
<frame x="18" y="23" width="2542" height="1334" extended-state="0" />
<editor active="true" />
<frame x="67" y="93" width="2493" height="1347" extended-state="0" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2244" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22154222" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="npm" order="2" side_tool="true" />
<window_info id="Favorites" order="3" side_tool="true" />
@ -529,6 +563,7 @@
<window_info anchor="bottom" id="Command Line Tools Console" order="10" sideWeight="0.49720448" weight="0.32930756" />
<window_info anchor="bottom" id="Terminal" order="11" sideWeight="0.49920127" weight="0.32769728" />
<window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.5027955" side_tool="true" weight="0.32930756" />
<window_info anchor="bottom" id="TypeScript" order="13" />
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@ -553,188 +588,6 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/database/migrations/2018_10_19_114519_create_draft_types_table.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="29" column="7" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TravelProgramController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="504">
<caret line="40" column="17" lean-forward="true" selection-start-line="40" selection-start-column="17" selection-end-line="40" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="714">
<caret line="51" column="32" selection-start-line="51" selection-start-column="32" selection-end-line="51" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Controller.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/cms">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/API/LoaderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434">
<caret line="31" column="79" lean-forward="true" selection-start-line="31" selection-start-column="79" selection-end-line="31" selection-end-column="79" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Repositories/TravelProgramRepository.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/drafts/detail.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1610">
<caret line="115" column="30" selection-start-line="115" selection-start-column="30" selection-end-line="115" selection-end-column="59" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TranslationController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434">
<caret line="33" column="27" lean-forward="true" selection-start-line="33" selection-start-column="27" selection-end-line="33" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/database/migrations/2018_12_22_171112_create_page_table.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="182">
<caret line="15" column="19" lean-forward="true" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/booking/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="574">
<caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/TravelClass.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434">
<caret line="31" selection-start-line="31" selection-end-line="33" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/Account.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/TravelProgramDraft.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-108" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/TravelProgramCountry.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/Country.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/Draft.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="25" column="1" selection-start-line="25" selection-start-column="1" selection-end-line="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/DraftType.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/helpers.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="224">
<caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/custom.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="728">
<caret line="52" column="33" lean-forward="true" selection-start-line="52" selection-start-column="33" selection-end-line="52" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/vendor/libs/quill/typography.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/public/vendor/libs/quill/quill.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114">
<caret line="14" column="21728" selection-start-line="14" selection-start-column="21728" selection-end-line="14" selection-end-column="21728" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/vendor/libs/quill/editor.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="532">
<caret line="38" column="17" lean-forward="true" selection-start-line="38" selection-start-column="17" selection-end-line="38" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/_ide_helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="909">
<caret line="19870" column="10" selection-start-line="19870" selection-start-column="10" selection-end-line="19870" selection-end-column="10" />
</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="640">
<caret line="137" column="52" selection-start-line="137" selection-start-column="52" selection-end-line="137" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/app.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="662">
<caret line="64" column="6" selection-start-line="64" selection-start-column="6" selection-end-line="64" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/TravelProgram.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="845">
<caret line="144" column="5" lean-forward="true" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/DraftItem.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="531">
<caret line="67" column="5" selection-start-line="64" selection-start-column="4" selection-end-line="67" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/BookingDraftItem.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1069">
<caret line="127" column="5" selection-start-line="127" selection-start-column="5" selection-end-line="127" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/SfGuardUser.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/Booking.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/Page.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84">
<caret line="6" column="24" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/travel/program/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3">
@ -802,23 +655,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1008">
<caret line="73" column="16" selection-start-line="73" selection-start-column="16" selection-end-line="73" selection-end-column="16" />
<folding>
<element signature="e#30#48#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/DraftController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1050">
<caret line="78" column="33" selection-start-line="78" selection-start-column="33" selection-end-line="78" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/BookingController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1596">
<caret line="117" column="33" selection-start-line="117" selection-start-column="33" selection-end-line="117" selection-end-column="33" />
</state>
</provider>
</entry>
@ -829,13 +665,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/booking/detail.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1064">
<caret line="76" column="26" selection-start-line="76" selection-start-column="26" selection-end-line="76" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Repositories/BookingRepository.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="280">
@ -843,13 +672,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2086">
<caret line="158" column="3" selection-start-line="158" selection-start-column="3" selection-end-line="158" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/cms/feedback/detail.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
@ -857,17 +679,225 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<entry file="file://$PROJECT_DIR$/bootstrap/app.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="798">
<caret line="57" column="14" lean-forward="true" selection-start-line="57" selection-start-column="14" selection-end-line="57" selection-end-column="14" />
<state relative-caret-position="56">
<caret line="4" selection-start-line="4" selection-end-line="10" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/database/migrations/2018_09_29_145909_create_countries_table.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="476">
<caret line="36" column="5" lean-forward="true" selection-end-line="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/database/migrations/2018_09_29_145839_create_user_update_emails_table.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="27" column="7" lean-forward="true" selection-end-line="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/database/migrations/2014_10_12_100000_create_password_resets_table.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/database/migrations/2014_10_12_000000_create_users_table.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="19" column="39" lean-forward="true" selection-start-line="19" selection-start-column="39" selection-end-line="19" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Kernel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218">
<caret line="40" column="18" selection-start-line="40" selection-start-column="18" selection-end-line="40" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/app.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="520">
<caret line="237" column="67" lean-forward="true" selection-start-line="235" selection-start-column="7" selection-end-line="237" selection-end-column="67" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/datatables.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434">
<caret line="31" column="7" lean-forward="true" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Providers/AppServiceProvider.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="28" column="9" lean-forward="true" selection-start-line="26" selection-start-column="7" selection-end-line="28" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Providers/AuthServiceProvider.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Providers/BroadcastServiceProvider.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Providers/EventServiceProvider.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Providers/RouteServiceProvider.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/helpers.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="8" selection-end-line="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Services/Util.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/LoginController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="560">
<caret line="43" column="3" selection-start-line="43" selection-start-column="3" selection-end-line="52" 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="630">
<caret line="47" column="54" lean-forward="true" selection-start-line="47" selection-start-column="54" selection-end-line="47" selection-end-column="54" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/RegisterController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="532">
<caret line="43" column="2" selection-start-line="43" selection-start-column="2" selection-end-line="48" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/BookingController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="94" column="37" lean-forward="true" selection-start-line="94" selection-start-column="37" selection-end-line="94" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/BookingDraftItem.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="917">
<caret line="135" column="45" lean-forward="true" selection-start-line="135" selection-start-column="45" selection-end-line="135" selection-end-column="45" />
</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="1834">
<caret line="131" column="43" selection-start-line="131" selection-start-column="43" selection-end-line="131" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/DraftType.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="504">
<caret line="36" column="1" lean-forward="true" selection-start-line="36" selection-start-column="1" selection-end-line="36" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/DraftController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="419">
<caret line="137" column="67" lean-forward="true" selection-start-line="137" selection-start-column="67" selection-end-line="137" selection-end-column="67" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/booking/detail.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="889">
<caret line="140" selection-start-line="140" selection-end-line="140" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/DraftItem.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1007">
<caret line="72" column="5" selection-start-line="70" selection-start-column="2" selection-end-line="72" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/custom.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="423">
<caret line="60" column="29" selection-start-line="60" selection-start-column="29" selection-end-line="60" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/layout-1.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/API/DraftController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="924">
<caret line="172" column="54" selection-start-line="172" selection-start-column="54" selection-end-line="172" selection-end-column="54" />
<state relative-caret-position="138">
<caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Settings/DraftController.php" />
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/ResetPasswordController.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#45#81#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1232">
<caret line="88" column="90" selection-start-line="88" selection-start-column="78" selection-end-line="88" selection-end-column="90" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/ForgotPasswordController.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Settings/TravelCountryController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="14">
<caret line="1" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/API/LoaderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="56">
<caret line="4" column="10" selection-start-line="4" selection-end-line="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="465">
<caret line="169" column="95" selection-start-line="169" selection-start-column="95" selection-end-line="169" selection-end-column="95" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="602">
<caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
</state>
</provider>
</entry>

90
app/Http/Controllers/API/DraftController.php
View file

@ -50,6 +50,88 @@ class DraftController extends Controller
}
if ($action == "create_drafts_from_fewo") {
$data = \Input::all();
$start_date = Carbon::parse($data['startDateStr']);
$end_date = Carbon::parse($data['endDateStr']);
$pos = 0;
if(isset($data['priceResult']) && is_array($data['priceResult'])){
if(isset($data['priceResult']['season']) && is_array($data['priceResult']['season'])){
foreach ($data['priceResult']['season'] as $season => $values){
$service = '* Saison: '.$season."\n".
'* Mindestbelegung: '.$values['minimumStay'].' '.($values['minimumStay'] < 2 ? 'Nacht' : 'Nächte')."\n".
'* Preis: '.number_format($values['price'], 2, ',', '.').' € / '. $values['numberDays'].' '.($values['numberDays'] < 2 ? 'Nacht' : 'Nächte').' x '.number_format($values['perNight'], 2, ',', '.')." € \n";
$from_date = Carbon::parse($values['fromDay']);
$to_date = Carbon::parse($values['toDay']);
$to_date->modify('+1 day');
BookingDraftItem::create([
'booking_id' => $data['booking_id'],
'fewo_lodging_id' => $data['fewo_lodging_id'],
'draft_type_id' => 38,
'request_date' => $data['request_date'],
'days_duration' => $values['numberDays'],
'start_date' => $from_date->format("Y-m-d"),
'end_date' => $to_date->format("Y-m-d"),
'service' => $service,
'price' => $values['perNight'],
'pos' => $pos,
'in_pdf' => true,
]);
$pos++;
}
}
if(isset($data['priceResult']['flatPrice'])){
$service = '* Service-Gebühr: '.number_format($data['priceResult']['deposit'], 2, ',', '.');
BookingDraftItem::create([
'booking_id' => $data['booking_id'],
'fewo_lodging_id' => $data['fewo_lodging_id'],
'draft_type_id' => 39,
'request_date' => $data['request_date'],
'days_duration' => $data['priceResult']['days'],
'start_date' => $start_date->format("Y-m-d"),
'end_date' => $end_date->format("Y-m-d"),
'service' => $service,
'price' => $data['priceResult']['flatPrice'],
'pos' => $pos,
'in_pdf' => true,
]);
$pos++;
}
if(isset($data['priceResult']['deposit'])){
$service = '* Kaution: '.number_format($data['priceResult']['deposit'], 2, ',', '.');
BookingDraftItem::create([
'booking_id' => $data['booking_id'],
'fewo_lodging_id' => $data['fewo_lodging_id'],
'draft_type_id' => 40,
'request_date' => $data['request_date'],
'days_duration' => $data['priceResult']['days'],
'start_date' => $start_date->format("Y-m-d"),
'end_date' => $end_date->format("Y-m-d"),
'service' => $service,
'price' => $data['priceResult']['flatPrice'],
'pos' => $pos,
'in_pdf' => true,
]);
}
}
return response()->json(['success' => $data['booking_id']], $this->successStatus);
}
if ($action == "create_drafts_from_booking") {
$data = \Input::all();
$this->data = $data;
@ -96,6 +178,7 @@ class DraftController extends Controller
$price_info_rooms[] = [
'booking_id' => $data['booking_id'],
'travel_program_id' => $data['travel_program_id'],
'fewo_lodging_id' => null,
'travel_class_id' => null,
'draft_item_id' => null,
'draft_type_id' => 30,
@ -140,6 +223,7 @@ class DraftController extends Controller
$price_info_rooms_before[] = [
'booking_id' => $data['booking_id'],
'travel_program_id' => $data['travel_program_id'],
'fewo_lodging_id' => null,
'travel_class_id' => null,
'draft_item_id' => null,
'draft_type_id' => 36,
@ -170,6 +254,7 @@ class DraftController extends Controller
$price_info_rooms_after[] = [
'booking_id' => $data['booking_id'],
'travel_program_id' => $data['travel_program_id'],
'fewo_lodging_id' => null,
'travel_class_id' => null,
'draft_item_id' => null,
'draft_type_id' => 37,
@ -202,6 +287,7 @@ class DraftController extends Controller
$price_info_extra_charge[] = [
'booking_id' => $data['booking_id'],
'travel_program_id' => $data['travel_program_id'],
'fewo_lodging_id' => null,
'travel_class_id' => null,
'draft_item_id' => null,
'draft_type_id' => 33,
@ -233,6 +319,7 @@ class DraftController extends Controller
$price_info_class_options[] = [
'booking_id' => $data['booking_id'],
'travel_program_id' => $data['travel_program_id'],
'fewo_lodging_id' => null,
'travel_class_id' => null,
'draft_item_id' => null,
'draft_type_id' => 32,
@ -264,6 +351,7 @@ class DraftController extends Controller
$price_info_travel_options[] = [
'booking_id' => $data['booking_id'],
'travel_program_id' => $data['travel_program_id'],
'fewo_lodging_id' => null,
'travel_class_id' => null,
'draft_item_id' => null,
'draft_type_id' => 34,
@ -323,6 +411,7 @@ class DraftController extends Controller
$info_texts[] = [
'booking_id' => $data['booking_id'],
'travel_program_id' => $data['travel_program_id'],
'fewo_lodging_id' => null,
'travel_class_id' => null,
'draft_item_id' => $draft_item->id,
'draft_type_id' => $draft_item->draft_type->id,
@ -347,6 +436,7 @@ class DraftController extends Controller
BookingDraftItem::create([
'booking_id' => $data['booking_id'],
'travel_program_id' => $data['travel_program_id'],
'fewo_lodging_id' => null,
'travel_class_id' => null,
'draft_item_id' => $draft_item->id,
'draft_type_id' => $draft_item->draft_type->id,

7
app/Http/Controllers/BookingController.php
View file

@ -75,6 +75,7 @@ class BookingController extends Controller
$booking->booking_draft_items()->create([
'booking_id' => $booking->id,
'travel_program_id' => $travel_program_id,
'fewo_lodging_id' => null,
'travel_class_id' => null,
'draft_item_id' => null,
'draft_type_id' => null,
@ -88,6 +89,7 @@ class BookingController extends Controller
'adult' => null ,
'price_children' => 0,
'children' => 0,
'price' => 0,
'pos' => $i,
'in_pdf' => true,
'comfort' => $comfort
@ -106,6 +108,9 @@ class BookingController extends Controller
if(isset($draft_item['days_duration'])){
$di->days_duration = $draft_item['days_duration'];
}
if(isset($draft_item['price'])){
$di->price = $draft_item['price'];
}
$di->service = $draft_item['service'];
$di->in_pdf = isset($draft_item['in_pdf']) ? true : false;
$di->pos = $i++;
@ -126,6 +131,7 @@ class BookingController extends Controller
$booking->booking_draft_items()->create([
'booking_id' => $booking->id,
'travel_program_id' => $travel_program_id,
'fewo_lodging_id' => null,
'travel_class_id' => null,
'draft_item_id' => null,
'draft_type_id' => null,
@ -139,6 +145,7 @@ class BookingController extends Controller
'adult' => null ,
'price_children' => 0,
'children' => 0,
'price' => 0,
'pos' => $i,
'in_pdf' => true,
'comfort' => $comfort

1
app/Http/Controllers/DraftController.php
View file

@ -150,6 +150,7 @@ class DraftController extends Controller
$draft_type = DraftType::create([
'name' => $data['name'],
'active' => isset($data['active']) ? true : false,
'color' => $data['color'],
]);
}else{
$draft_type = DraftType::find($data['id']);

65
app/Http/Controllers/Settings/TravelCountryController.php Executable file
View file

@ -0,0 +1,65 @@
<?php
namespace App\Http\Controllers\Settings;
use App\Http\Controllers\Controller;
use Carbon\Carbon;
use HTMLHelper;
use Input;
class TravelCountryController extends Controller
{
public function __construct()
{
$this->middleware('admin');
}
public function index($step = false)
{
$data = [
'drafts' => Draft::all()->sortByDesc("id"),
'draft_types' => DraftType::all()->sortByDesc("id"),
'step' => $step
];
return view('drafts.index', $data);
}
public function store(){
$data = Input::all();
if($data['id'] == "new"){
$draft_type = DraftType::create([
'name' => $data['name'],
'active' => isset($data['active']) ? true : false,
'color' => $data['color'],
]);
}else{
$draft_type = DraftType::find($data['id']);
$draft_type->name = $data['name'];
$draft_type->active = isset($data['active']) ? true : false;
$draft_type->color = $data['color'];
$draft_type->save();
}
\Session()->flash('alert-save', '1');
return redirect(route('drafts', ['type']));
}
public function delete($id){
if(DraftItem::where('draft_type_id', $id)->count()){
\Session()->flash('alert-error', 'Eintrag wird verwendet');
return redirect(route('drafts'));
}
$draft_type = DraftType::findOrFail($id);
$draft_type->delete();
\Session()->flash('alert-success', 'Eintrag gelöscht');
return redirect(route('drafts', ['type']));
}
}

23
app/Models/BookingDraftItem.php
View file

@ -65,6 +65,7 @@ class BookingDraftItem extends Model
protected $fillable = [
'booking_id',
'travel_program_id',
'fewo_lodging_id',
'travel_class_id',
'draft_item_id',
'draft_type_id',
@ -78,6 +79,7 @@ class BookingDraftItem extends Model
'adult',
'price_children',
'children',
'price',
'pos',
'in_pdf',
'comfort',
@ -104,6 +106,10 @@ class BookingDraftItem extends Model
return $this->belongsTo('App\Models\DraftType', 'draft_type_id');
}
public function _format_number($value){
return preg_replace("/[^0-9,]/", "", $value);
}
public function getStartDateAttribute(){
return isset($this->attributes['start_date']) ? Carbon::parse($this->attributes['start_date'])->format("d.m.Y") : '';
}
@ -127,4 +133,21 @@ class BookingDraftItem extends Model
}
}
public function setPriceAttribute($value)
{
$value = $this->_format_number($value);
$this->attributes['price'] = floatval(str_replace(',', '.', $value));
}
public function getPriceAttribute()
{
// 2 = decimal places | '.' = decimal seperator | ',' = thousand seperator
return number_format(($this->attributes['price']), 2, ',', '.');
}
public function getPriceRaw()
{
return isset($this->attributes['price']) ? $this->attributes['price'] : 0;
}
}

17
app/Models/DraftItem.php
View file

@ -106,5 +106,22 @@ class DraftItem extends Model
return isset($this->attributes['price_children']) ? $this->attributes['price_children'] : 0;
}
public function setPriceAttribute($value)
{
$value = $this->_format_number($value);
$this->attributes['price'] = floatval(str_replace(',', '.', $value));
}
public function getPriceAttribute()
{
// 2 = decimal places | '.' = decimal seperator | ',' = thousand seperator
return number_format(($this->attributes['price']), 2, ',', '.');
}
public function getPriceRaw()
{
return isset($this->attributes['price']) ? $this->attributes['price'] : 0;
}
}

2
app/Models/DraftType.php
View file

@ -27,7 +27,7 @@ class DraftType extends Model
protected $table = 'draft_types';
protected $fillable = [
'name', 'active',
'name', 'active', 'color',
];
public function draft_items()

3
database/migrations/2018_10_19_114521_create_draft_items_table.php
View file

@ -27,6 +27,9 @@ class CreateDraftItemsTable extends Migration
$table->decimal('price_children', 8, 2)->nullable();
$table->tinyInteger('children')->unsigned()->nullable();
$table->decimal('price', 8, 2)->nullable();
$table->tinyInteger('pos')->unsigned()->nullable();
$table->boolean('in_pdf')->default(true);
$table->boolean('active')->default(true);

2
database/migrations/2018_10_29_193339_create_booking_draft_items_table.php
View file

@ -39,6 +39,8 @@ class CreateBookingDraftItemsTable extends Migration
$table->decimal('price_children', 8, 2)->nullable();
$table->tinyInteger('children')->unsigned()->nullable();
$table->decimal('price', 8, 2)->nullable();
$table->tinyInteger('pos')->unsigned()->nullable();
$table->boolean('in_pdf')->default(true);
$table->boolean('status')->default(false);

2
public/js/custom.js
View file

@ -53,7 +53,7 @@ $(function() {
orientation: 'auto left',
calendarWeeks: true,
todayBtn: 'linked',
daysOfWeekDisabled: '1',
// daysOfWeekDisabled: '1',
todayHighlight: true,
multidate: false,
daysOfWeekHighlighted: '0,6',

25
resources/views/booking/detail.blade.php
View file

@ -126,10 +126,31 @@
{{ Form::text('draft_item['.$booking_draft_item->id.'][price_children]', $booking_draft_item->price_children, array('placeholder'=>__('Preis in €'), 'class'=>'form-control', 'id'=>'draft_item_'.$booking_draft_item->id.'_price_children')) }}
</div>
</div>
@endif
@if(in_array($booking_draft_item->draft_type_id, [38, 39,40]))
<div class="form-group col-3">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">€ </span>
</div>
{{ Form::text('draft_item['.$booking_draft_item->id.'][price]', $booking_draft_item->price, array('placeholder'=>__('Preis in €'), 'class'=>'form-control', 'id'=>'draft_item_'.$booking_draft_item->id.'_price',)) }}
</div>
</div>
@if(in_array($booking_draft_item->draft_type_id, [38]))
<div class="form-group col-sm-3 col-3">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">A:</span>
</div>
{{ Form::text('draft_item['.$booking_draft_item->id.'][days_duration]', $booking_draft_item->days_duration, array('placeholder'=>__('Anzahl Tage'), 'class'=>'form-control', 'id'=>'draft_item_'.$booking_draft_item->id.'_days_duration',)) }}
</div>
</div>
@endif
@endif
</div>

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

@ -77,6 +77,26 @@
<li class="sidenav-divider mb-1"></li>
<li class="sidenav-header small font-weight-semibold">SUPERADMIN</li>
<li class="sidenav-item{{ Request::is('admin/settings/*') ? ' open' : '' }}">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-ios-settings"></i>
<div>Einstellungen</div>
</a>
<ul class="sidenav-menu">
<li class="sidenav-item{{ Request::is('admin/settings/travel/country/*') ? ' active' : '' }}">
<a href="{{ route('admin_settings_travel_country') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-globe"></i><div>{{ __('Reiseländer') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('admin/settings/travel/program/*') ? ' active' : '' }}">
<a href="{{ route('admin_settings_travel_program') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-airplane"></i><div>{{ __('Reiseprogramme') }}</div></a>
</li>
</ul>
</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>
</li>
@ -90,13 +110,10 @@
<ul class="sidenav-menu">
<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>{{ __('Vorlagen') }}</div></a>
</li>
<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>
</li>
</ul>
</li>

9
routes/web.php
View file

@ -179,6 +179,15 @@ Route::group(['middleware' => ['superadmin']], function() {
Route::get('/admin/translation/file/{file}/{language?}/{langsource?}/{show?}', 'TranslationFileController@edit')->name('admin_translate_file_edit');
Route::post('/admin/translation/file/{file}/{language?}/{langsource?}/{show?}', 'TranslationFileController@update')->name('admin_translate_file_update');
Route::get('/admin/settings/travel/country', 'DraftController@index')->name('admin_settings_travel_country');
Route::post('/admin/settings/travel/country/update', 'DraftController@update')->name('admin_settings_travel_country_update');
Route::get('/admin/settings/travel/country/delete/{id}', 'DraftController@delete')->name('admin_settings_travel_country_delete');
Route::get('/admin/settings/travel/program/{id?}', 'DraftController@index')->name('admin_settings_travel_program');
//
});