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

Feedback / Draft + extra days

Browse source
This commit is contained in:
Kevin Adametz 2019-01-03 12:02:06 +01:00
parent 6e0c7e8706
commit f9fcaac838
13 changed files with 453 additions and 395 deletions
Download patch file Download diff file Expand all files Collapse all files

23
.env
View file

@ -13,18 +13,19 @@ APP_URL_STERN=http://sterntours.local
LOG_CHANNEL=stack
DB_CONNECTION=mysql
DB_HOST=localhost
DB_PORT=3306
DB_DATABASE=cmssso_db1
DB_USERNAME=root
DB_PASSWORD=KT32vQ7
# on neptune
#DB_HOST=192.168.1.7
#DB_CONNECTION=mysql
#DB_HOST=localhost
#DB_PORT=3306
#DB_DATABASE=cmssso_db1
#DB_USERNAME=cmssso_1
#DB_PASSWORD=ZXk8Udm8
#DB_USERNAME=root
#DB_PASSWORD=KT32vQ7
# on neptune
DB_CONNECTION=mysql
DB_HOST=192.168.1.7
DB_PORT=3306
DB_DATABASE=cmssso_db1
DB_USERNAME=cmssso_1
DB_PASSWORD=ZXk8Udm8
DB_CONNECTION_STERN=mysql
@ -48,7 +49,7 @@ REDIS_PORT=6379
#info@@mein.sterntours.de
#B7f8Ojt98v6tMz8W
MAIL_DRIVER=smtp
MAIL_HOST=smtp.kagado.de
MAIL_HOST=w00df904.kasserver.com
MAIL_PORT=587
MAIL_USERNAME=m0479305
MAIL_PASSWORD=m4CowydxoC4dY2DB

584
.idea/workspace.xml generated
View file

@ -2,23 +2,19 @@
<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/CMSFeedbackController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Models/Feedback.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/cms/feedback/detail.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/cms/feedback/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" 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/helpers.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/helpers.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/app.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/app.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/js/custom.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/custom.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/booking/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/booking/index.blade.php" 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/layouts/application.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/application.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/travel/program/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/program/detail.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.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" />
</list>
<ignored path="$PROJECT_DIR$/vendor/defuse/php-encryption/" />
<ignored path="$PROJECT_DIR$/vendor/doctrine/cache/" />
@ -45,53 +41,53 @@
<session id="1709161781">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="27" />
<entry key="project.open.time.0" value="8" />
<entry key="project.closed" value="31" />
<entry key="project.open.time.0" value="9" />
<entry key="project.open.time.1" value="3" />
<entry key="project.open.time.12" value="1" />
<entry key="project.open.time.2" value="3" />
<entry key="project.open.time.3" value="6" />
<entry key="project.open.time.4" value="3" />
<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="26" />
<entry key="project.opened" value="30" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="cms" value="1" />
<entry key="css" value="2" />
<entry key="env" value="6" />
<entry key="env" value="8" />
<entry key="js" value="8" />
<entry key="json" value="1" />
<entry key="php" value="244" />
<entry key="php" value="264" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key=".env file" value="6" />
<entry key="Blade" value="54" />
<entry key=".env file" value="8" />
<entry key="Blade" value="61" />
<entry key="CSS" value="2" />
<entry key="JSON" value="1" />
<entry key="JavaScript" value="8" />
<entry key="PHP" value="190" />
<entry key="PHP" value="203" />
<entry key="PLAIN_TEXT" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="dummy" value="13" />
<entry key="env" value="47" />
<entry key="env" value="50" />
<entry key="js" value="38" />
<entry key="php" value="9514" />
<entry key="php" value="10822" />
<entry key="txt" value="184" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key=".env file" value="47" />
<entry key="Blade" value="3212" />
<entry key=".env file" value="50" />
<entry key="Blade" value="3411" />
<entry key="JavaScript" value="38" />
<entry key="PHP" value="6302" />
<entry key="PHP" value="7411" />
<entry key="PLAIN_TEXT" value="197" />
</counts>
</usages-collector>
@ -102,8 +98,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Models/Feedback.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="18" column="44" selection-start-line="18" selection-start-column="44" selection-end-line="18" selection-end-column="44" />
<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>
@ -112,23 +108,73 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Models/Booking.php">
<provider selected="true" editor-type-id="text-editor" />
<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/Models/SfGuardUser.php">
<provider selected="true" editor-type-id="text-editor" />
<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/CMSFeedbackController.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/API/DraftController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="224">
<caret line="16" column="2" selection-start-line="16" selection-start-column="2" selection-end-line="16" selection-end-column="2" />
<folding>
<element signature="e#42#66#0#PHP" expanded="true" />
</folding>
<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>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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">
<caret line="27" column="53" selection-start-line="27" selection-start-column="53" selection-end-line="27" selection-end-column="70" />
</state>
</provider>
</entry>
@ -159,9 +205,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/database/migrations/2018_10_29_193339_create_travel_country_table.php" />
<option value="$PROJECT_DIR$/database/migrations/2018_10_29_193349_create_travel_program_country_table.php" />
<option value="$PROJECT_DIR$/app/Models/TravelProgramCountry.php" />
<option value="$PROJECT_DIR$/app/Models/TravelProgram.php" />
<option value="$PROJECT_DIR$/app/Models/TravelCountry.php" />
<option value="$PROJECT_DIR$/routes/api.php" />
@ -171,7 +214,6 @@
<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/BookingController.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" />
@ -190,26 +232,30 @@
<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$/app/Http/Controllers/API/DraftController.php" />
<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$/database/migrations/2018_12_22_171112_create_page_table.php" />
<option value="$PROJECT_DIR$/app/Models/Page.php" />
<option value="$PROJECT_DIR$/resources/views/drafts/index.blade.php" />
<option value="$PROJECT_DIR$/resources/views/booking/index.blade.php" />
<option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/resources/views/booking/detail.blade.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$/.env" />
<option value="$PROJECT_DIR$/resources/views/cms/feedback/index.blade.php" />
<option value="$PROJECT_DIR$/resources/views/cms/feedback/detail.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/CMSFeedbackController.php" />
<option value="$PROJECT_DIR$/app/Models/Feedback.php" />
<option value="$PROJECT_DIR$/app/Services/HTMLHelper.php" />
<option value="$PROJECT_DIR$/resources/views/drafts/index.blade.php" />
<option value="$PROJECT_DIR$/resources/views/travel/program/index.blade.php" />
<option value="$PROJECT_DIR$/resources/views/cms/feedback/detail.blade.php" />
<option value="$PROJECT_DIR$/app/Models/Feedback.php" />
<option value="$PROJECT_DIR$/resources/views/cms/feedback/index.blade.php" />
<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$/resources/views/booking/detail.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/API/DraftController.php" />
</list>
</option>
</component>
@ -337,8 +383,8 @@
</include_path>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="102" />
<option name="y" value="157" />
<option name="x" value="18" />
<option name="y" value="23" />
<option name="width" value="2542" />
<option name="height" value="1334" />
</component>
@ -356,170 +402,6 @@
<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="app" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="Http" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="Http" type="462c0819:PsiDirectoryNode" />
<item name="Controllers" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="Http" type="462c0819:PsiDirectoryNode" />
<item name="Controllers" type="462c0819:PsiDirectoryNode" />
<item name="API" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="Models" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="Repositories" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="Requests" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="Services" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="bootstrap" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="config" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="database" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="database" type="462c0819:PsiDirectoryNode" />
<item name="factories" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="database" type="462c0819:PsiDirectoryNode" />
<item name="migrations" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="vendor" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="vendor" type="462c0819:PsiDirectoryNode" />
<item name="libs" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="vendor" type="462c0819:PsiDirectoryNode" />
<item name="libs" type="462c0819:PsiDirectoryNode" />
<item name="quill" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="cms" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="cms" type="462c0819:PsiDirectoryNode" />
<item name="feedback" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="drafts" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="layouts" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="travel" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="travel" type="462c0819:PsiDirectoryNode" />
<item name="program" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="_crm" type="b2602c69:ProjectViewProjectNode" />
<item name="_crm" type="462c0819:PsiDirectoryNode" />
@ -616,17 +498,21 @@
<workItem from="1545486507571" duration="2261000" />
<workItem from="1545492507510" duration="13372000" />
<workItem from="1545567920905" duration="156000" />
<workItem from="1545941177162" duration="3647000" />
<workItem from="1546436783290" duration="9665000" />
<workItem from="1546506304457" duration="557000" />
<workItem from="1546507505156" duration="25000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="62543000" />
<option name="totallyTimeSpent" value="76437000" />
</component>
<component name="ToolWindowManager">
<frame x="102" y="157" width="2542" height="1334" extended-state="0" />
<frame x="18" y="23" width="2542" height="1334" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.218" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2244" />
<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" />
@ -642,7 +528,7 @@
<window_info anchor="bottom" id="Database Changes" order="9" sideWeight="0.49960065" weight="0.32955405" />
<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.32955405" />
<window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.5027955" side_tool="true" weight="0.32930756" />
<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" />
@ -667,20 +553,6 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/resources/lang/de/_vorlagen.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="98">
<caret line="7" column="2" lean-forward="true" selection-start-line="7" selection-start-column="2" selection-end-line="7" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/database/migrations/2018_10_19_114521_create_draft_items_table.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="20" column="67" selection-start-line="20" selection-start-column="59" selection-end-line="20" selection-end-column="67" />
</state>
</provider>
</entry>
<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">
@ -695,20 +567,6 @@
</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">
<caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/API/DraftController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="742">
<caret line="58" column="90" selection-start-line="58" selection-start-column="90" selection-end-line="58" selection-end-column="90" />
</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">
@ -739,20 +597,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="406">
<caret line="35" column="5" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="35" selection-end-column="5" />
</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="420">
<caret line="33" column="40" lean-forward="true" selection-start-line="33" selection-start-column="40" selection-end-line="33" selection-end-column="40" />
</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">
@ -767,13 +611,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/drafts/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="23" column="72" lean-forward="true" selection-start-line="23" selection-start-column="72" selection-end-line="23" selection-end-column="72" />
</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">
@ -812,20 +649,6 @@
<entry file="file://$PROJECT_DIR$/app/Models/DraftType.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/BookingController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="45" column="5" selection-start-line="29" selection-start-column="3" selection-end-line="45" selection-end-column="5" />
</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="971">
<caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/helpers.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="224">
@ -878,23 +701,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="280">
<caret line="20" column="19" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/travel/program/index.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<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" lean-forward="true" selection-start-line="36" selection-start-column="18" selection-end-line="39" selection-end-column="29" />
</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">
@ -902,27 +708,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/cms/feedback/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="430">
<caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="46" />
</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="848">
<caret line="114" column="5" lean-forward="true" selection-start-line="48" selection-start-column="4" selection-end-line="114" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="684">
<caret line="158" column="3" lean-forward="true" selection-start-line="158" selection-start-column="3" selection-end-line="158" selection-end-column="3" />
</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">
@ -937,12 +722,11 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Services/HTMLHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="571">
<caret line="214" column="52" lean-forward="true" selection-start-line="214" selection-start-column="52" selection-end-line="214" selection-end-column="52" />
</state>
</provider>
<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">
@ -951,39 +735,139 @@
</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">
<caret column="28" lean-forward="true" selection-start-column="28" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/drafts/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="727">
<caret line="52" column="44" selection-start-line="52" selection-start-column="44" selection-end-line="52" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/UserDeleteController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="882">
<caret line="68" column="69" lean-forward="true" selection-start-line="68" selection-end-line="69" />
</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="1055">
<caret line="91" column="46" lean-forward="true" selection-start-line="91" selection-end-line="92" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-261">
<caret line="35" column="5" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="35" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AdminUserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="882">
<caret line="69" column="46" lean-forward="true" selection-start-line="69" selection-start-column="46" selection-end-line="69" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/CMSFeedbackController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1087">
<caret line="128" column="40" selection-start-line="128" selection-start-column="40" selection-end-line="128" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Services/HTMLHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2856">
<caret line="211" column="13" selection-start-line="211" selection-start-column="13" selection-end-line="211" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/cms/feedback/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="644">
<caret line="46" column="32" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/Feedback.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="18" column="44" selection-start-line="18" selection-start-column="44" selection-end-line="18" selection-end-column="44" />
<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/Models/Booking.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/SfGuardUser.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/cms/feedback/detail.blade.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/DraftController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="640">
<caret line="46" column="48" selection-start-line="46" selection-start-column="48" selection-end-line="46" selection-end-column="115" />
<folding>
<element signature="e#3905#3911#0#HTML" expanded="true" />
</folding>
<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/CMSFeedbackController.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/BookingController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="224">
<caret line="16" column="2" selection-start-line="16" selection-start-column="2" selection-end-line="16" selection-end-column="2" />
<folding>
<element signature="e#42#66#0#PHP" expanded="true" />
</folding>
<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>
<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>
<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">
<caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
</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">
<caret line="27" column="53" selection-start-line="27" selection-start-column="53" selection-end-line="27" selection-end-column="70" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<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>
</provider>
</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>
</provider>
</entry>

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

@ -61,6 +61,7 @@ class DraftController extends Controller
$start_date = Carbon::parse($data['startDateStr']);
$end_date = Carbon::parse($data['endDateStr']);
if($draft){
//------------------------------------------------------------------------------
@ -72,7 +73,9 @@ class DraftController extends Controller
$room_children = 0;
$room_price_adult = 0;
$room_price_children = 0;
$data['rooms'] = array_reverse($data['rooms']);
foreach ($data['rooms'] as $room){
$room_adult += $room['adult'];
@ -112,12 +115,82 @@ class DraftController extends Controller
];
}
$this->room_str = "";
foreach ($room_names as $name=>$count){
$this->room_str .= $count.' x '.$name.', ';
}
$this->room_str = rtrim($this->room_str, ', ');
//before & after days
$price_info_rooms_before = [];
$price_info_rooms_after = [];
if(isset($data['booking_before']) && is_array($data['booking_before'])){
foreach ($data['booking_before'] as $booking_before){
$start_date_before = clone $start_date;
if(isset($booking_before['days']) && $booking_before['days'] > 0){
$start_date_before->modify('-'.$booking_before['days'].' day');
}
$price_info_rooms_before[] = [
'booking_id' => $data['booking_id'],
'travel_program_id' => $data['travel_program_id'],
'travel_class_id' => null,
'draft_item_id' => null,
'draft_type_id' => 36,
'request_date' => $data['request_date'],
'days_start' => null,
'days_duration' => $booking_before['days'],
'start_date' => $start_date_before->format("Y-m-d"),
'end_date' => $data['startDateStr'],
'service' => $booking_before['name'],
'price_adult' => $booking_before['price'],
'adult' => $booking_before['adults'],
'price_children' => $booking_before['price_children'],
'children' => $booking_before['children'],
'pos' => 0,
'in_pdf' => true,
'comfort' => $data['comfort']
];
}
}
if(isset($data['booking_after']) && is_array($data['booking_after'])){
foreach ($data['booking_after'] as $booking_after){
$end_date_after = clone $end_date;
if(isset($booking_after['days']) && $booking_after['days'] > 0){
$end_date_after->modify('+'.$booking_after['days'].' day');
}
$price_info_rooms_after[] = [
'booking_id' => $data['booking_id'],
'travel_program_id' => $data['travel_program_id'],
'travel_class_id' => null,
'draft_item_id' => null,
'draft_type_id' => 37,
'request_date' => $data['request_date'],
'days_start' => null,
'days_duration' => $booking_after['days'],
'start_date' => $data['endDateStr'],
'end_date' => $end_date_after->format("Y-m-d"),
'service' => $booking_after['name'],
'price_adult' => $booking_after['price'],
'adult' => $booking_after['adults'],
'price_children' => $booking_after['price_children'],
'children' => $booking_after['children'],
'pos' => 0,
'in_pdf' => true,
'comfort' => $data['comfort']
];
}
}
//------------------------------------------------------------------------------
//prepare extra_charge
$price_info_extra_charge = [];
@ -307,6 +380,27 @@ class DraftController extends Controller
BookingDraftItem::create($price_info_room);
}
}
//set room prices before
if(count($price_info_rooms_before)){
foreach ($price_info_rooms_before as $price_info_room){
$last_post ++;
$price_info_room['pos'] = $last_post;
BookingDraftItem::create($price_info_room);
}
}
//set room prices after
if(count($price_info_rooms_after)){
foreach ($price_info_rooms_after as $price_info_room){
$last_post ++;
$price_info_room['pos'] = $last_post;
BookingDraftItem::create($price_info_room);
}
}
//set extra charge price
if(count($price_info_extra_charge)){
foreach ($price_info_extra_charge as $price_info_extra){
@ -397,6 +491,13 @@ class DraftController extends Controller
}
}
}
//found non get first
foreach ($travel_program->travel_program_drafts as $travel_program_draft) {
return $travel_program_draft->draft;
}
}
return null;
}

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

@ -103,6 +103,9 @@ class BookingController extends Controller
$di->draft_type_id = $draft_item['draft_type_id'];
$di->start_date = $draft_item['start_date'];
$di->end_date = $draft_item['end_date'];
if(isset($draft_item['days_duration'])){
$di->days_duration = $draft_item['days_duration'];
}
$di->service = $draft_item['service'];
$di->in_pdf = isset($draft_item['in_pdf']) ? true : false;
$di->pos = $i++;
@ -174,7 +177,7 @@ class BookingController extends Controller
$boking_draft_item = BookingDraftItem::findOrFail($id);
$booking_id = $boking_draft_item->booking_id;
$boking_draft_item->delete();
\Session()->flash('alert-success', 'Eintrag gelöscht');
\Session()->flash('alert-success', __('Eintrag gelöscht'));
return redirect(route('booking_detail', [$booking_id]));
}

56
app/Http/Controllers/CMSFeedbackController.php
View file

@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use App\Models\Feedback;
use Carbon\Carbon;
use Input;
class CMSFeedbackController extends Controller
@ -38,6 +39,7 @@ class CMSFeedbackController extends Controller
if($id == "new") {
$feedback = new Feedback();
$id = 'new';
$feedback->status = 1;
}else{
$feedback = Feedback::findOrFail($id);
@ -56,7 +58,17 @@ class CMSFeedbackController extends Controller
{
$data = Input::all();
if($id == "new") {
if(!isset($data['feedback_parent']) && !$data['feedback_parent']) {
abort(404);
die();
}
$feedback = new Feedback();
$feedback->model = 'feedback';
$feedback->owner_second = 0;
$feedback->show_in_navi = 1;
$feedback->catalog_id = 1;
}else{
$feedback = Feedback::findOrFail($id);
}
@ -70,13 +82,53 @@ class CMSFeedbackController extends Controller
$feedback->pagetitle = $data['pagetitle'];
$feedback->keywords = $data['keywords'];
//parent
$feedback->save();
$feedback->order = (new Carbon($feedback->date))->format('Ymd')*-1;
//parent -- lvl
if(isset($data['feedback_parent']) && $data['feedback_parent']){
$feedback->lvl = 2;
if($feedback->parent_id != $data['feedback_parent']){
$feedback->owner = $data['feedback_parent'];
$feedback->parent_id = $data['feedback_parent'];
$parent_feedback = Feedback::findOrFail($data['feedback_parent']);
if($first_feedback = $parent_feedback->children->first()){
$feedback->lft = $first_feedback->lft;
$feedback->rgt = $first_feedback->rgt;
}
$feedback->tree_root = $parent_feedback->tree_root;
}
$feedback->parent_id = $data['feedback_parent'];
}else{
// $feedback->lvl = 1;
//TODO need real parent from Navi tree
// $feedback->parent_id = 0;
}
$feedback->save();
\Session()->flash('alert-save', '1');
return redirect(route('cms_feedback_detail', [$feedback->id]));
}
public function delete($id){
$feedback = Feedback::findOrFail($id);
//TODO
//check for delete, only delete lvl 2 .,...?
if ($feedback->lvl != 2){
abort(404);
die();
}
$feedback->delete();
\Session()->flash('alert-success', __('Feedback gelöscht'));
return redirect(route('cms_feedback'));
}
}

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

@ -127,17 +127,15 @@ class DraftController extends Controller
$draft->delete();
\Session()->flash('alert-save', '1');
\Session()->flash('alert-success', __('Vorlage gelöscht'));
return redirect(route('drafts'));
}
public function itemDelete($id){
$draft_item = DraftItem::findOrFail($id);
$draft_id = $draft_item->draft_id;
$draft_item->delete();
\Session()->flash('alert-success', 'Eintrag gelöscht');
\Session()->flash('alert-success', __('Eintrag gelöscht'));
return redirect(route('draft_detail', [$draft_id]));
}

7
app/Models/Feedback.php
View file

@ -23,7 +23,7 @@ class Feedback extends Page
public function parent()
{
return $this->belongsTo('App\Models\Feedback', 'owner');
return $this->belongsTo('App\Models\Feedback', 'parent_id');
}
public function getParent()
@ -34,6 +34,11 @@ class Feedback extends Page
return false;
}
public function children()
{
return $this->hasMany('App\Models\Feedback', 'parent_id');
}
public function setContentAttribute($value)
{

4
app/Services/HTMLHelper.php
View file

@ -180,7 +180,7 @@ class HTMLHelper
$setId = $obj->id;
}
if($empty){
$ret .= '<option value="">Non-Parent</option>\n';
// $ret .= '<option value="">Main (No-Parent)</option>\n';
}
foreach ($options as $id => $name){
$attr = ($id === $setId) ? 'selected="selected"' : '';
@ -196,7 +196,6 @@ class HTMLHelper
//@$dom->loadHTML();
@$dom->loadHTML( mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
if(isset($arg['src'])){
if(in_array('addHost', $arg['src'])){
@ -232,7 +231,6 @@ class HTMLHelper
return mb_convert_encoding($html, "UTF-8", "HTML-ENTITIES");
}
return $html;
}

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

@ -66,9 +66,21 @@
<button type="submit" name="action" value="down_{{$booking_draft_item->id}}" class="btn btn-xs btn-default mr-2"><i class="fa fa-arrow-down"></i> </button>
</div>
@if(in_array($booking_draft_item->draft_type_id, [36, 37]))
<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>
<div class="form-group col-sm-10 col-8">
{{ Form::textarea('draft_item['.$booking_draft_item->id.'][service]', $booking_draft_item->service, array('placeholder'=>__('Leistungen'), 'class'=>'form-control autoExpand', 'id'=>'draft_item_'.$booking_draft_item->id.'_service', 'rows'=>'1', 'data-min-rows'=>'1')) }}
<div class="form-group col-sm-7 col-5">
@else
<div class="form-group col-sm-10 col-8">
@endif
{{ Form::textarea('draft_item['.$booking_draft_item->id.'][service]', $booking_draft_item->service, array('placeholder'=>__('Leistungen'), 'class'=>'form-control autoExpand', 'id'=>'draft_item_'.$booking_draft_item->id.'_service', 'rows'=>'1', 'data-min-rows'=>'1')) }}
</div>
<div class="form-group col-sm-2 col-4">
@ -81,7 +93,7 @@
</label>
</div>
@if(in_array($booking_draft_item->draft_type_id, [24, 26, 30, 31, 32, 33, 34, 35]))
@if(in_array($booking_draft_item->draft_type_id, [24, 26, 30, 31, 32, 33, 34, 35, 36, 37]))
<div class="form-group col-3">
<select class="selectpicker" data-style="btn-light" name="draft_item[{{$booking_draft_item->id}}][adult]" id="draft_item_{{$booking_draft_item->id }}_adult">
<option value="">Teilnehmer</option>
@ -114,6 +126,8 @@
{{ 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

14
resources/views/cms/feedback/detail.blade.php
View file

@ -22,10 +22,16 @@
{!! Form::checkbox('status', 1, $feedback->status, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">{{__('aktiv')}}</span>
</label>
<label for="feedback_title" class="form-label">{{__('Parent')}}*</label>
<select class="selectpicker" data-style="btn-default" name="feedback_title" required>
@if($feedback->lvl != 1)
<label for="feedback_parent" class="form-label">{{__('Parent')}}*</label>
<select class="selectpicker" data-style="btn-default" name="feedback_parent" required>
{!! HTMLHelper::getParentBy($feedback->parent, $feedback->getParentsArray()) !!}
</select>
@else
<label for="feedback_parent" class="form-label">{{__('Parent')}}</label>
<div>NON</div>
@endif
</div>
</div>
<div class="form-row">
@ -35,8 +41,8 @@
{{ Form::text('slug', $feedback->slug, array('placeholder'=>__('slug'), 'class'=>'form-control', 'id'=>'feedback_slug', 'required'=>true)) }}
</div>
<div class="form-group col-sm-4">
<label class="form-label" for="feedback_date">{{ __('Reisezeitraum') }}</label>
{{ Form::text('date', $feedback->date, array('placeholder'=>__('Reisezeitraum'), 'class'=>'form-control datepicker-base', 'id'=>'feedback_date')) }}
<label class="form-label" for="feedback_date">{{ __('Reisezeitraum') }}*</label>
{{ Form::text('date', $feedback->date, array('placeholder'=>__('Reisezeitraum'), 'class'=>'form-control datepicker-base', 'id'=>'feedback_date', 'required'=>true)) }}
</div>
</div>

19
resources/views/cms/feedback/index.blade.php
View file

@ -30,7 +30,7 @@
</a>
</td>
<td><a href="{{ route('cms_feedback_detail', [$value->id]) }}">{{ $value->title }}</a></td>
<td>@if($value->parent) {{ $value->parent->title }} @endif</td>
<td>@if($value->parent) {{ $value->parent->title }} @else - Main No-Parent - @endif</td>
<td data-sort="{{ $value->getDateRow() }}">{{ $value->date }}</td>
<td data-sort="{{ $value->status }}">
@ -40,18 +40,19 @@
<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>
@endif
</td>
{{--
<td>
<td>
@if($value->parent)
<a class="text-danger" href="{{ route('cms_feedback_delete', [$value->id]) }}" onclick="return confirm('{{__('Wirklich löschen?')}}');"><i class="far fa-trash-alt"></i></a>
@else
-
@endif
</td>
--}}
</tr>
@endforeach
</tbody>
</table>
<div class="mt-4">
<!-- <a href="{{ route('draft_detail', ['new']) }}" class="btn btn-sm btn-primary">Neue Vorlage anlegen</a> -->
<div class="mt-4 col">
<a href="{{ route('cms_feedback_detail', ['new']) }}" class="btn btn-sm btn-primary">Neues Feedback anlegen</a>
</div>
</div>
<script>
@ -87,12 +88,8 @@
} );
$('.selectpicker').selectpicker();
}
});

4
resources/views/drafts/index.blade.php
View file

@ -16,7 +16,7 @@
<div class="tab-content">
<div class="tab-pane fade @if($step == false) active show @endif" id="navs-top-drafts">
<div class="card-body">
<div class="card">
<div class="card-datatable table-responsive">
<table class="datatables-drafts table table-striped table-bordered">
<thead>
@ -50,7 +50,7 @@
@endforeach
</tbody>
</table>
<div class="mt-4">
<div class="mt-4 col">
<a href="{{ route('draft_detail', ['new']) }}" class="btn btn-sm btn-primary">Neue Vorlage anlegen</a>
<a href="{{ route('draft_load_old') }}" class="btn btn-sm btn-default float-right">aus alter Vorlage laden</a><br>
<a href="{{ route('draft_load_new') }}" class="btn btn-sm btn-default float-right mt-2">aus Vorlage duplizieren</a>

5
resources/views/travel/program/index.blade.php
View file

@ -19,8 +19,7 @@
<div class="tab-content">
<div class="tab-pane fade @if($step == false) active show @endif" id="navs-top-drafts">
<div class="card-body">
<div class="card">
<div class="card-datatable table-responsive">
<table class="datatables-programms table table-striped table-bordered">
<thead>
@ -54,7 +53,7 @@
@endforeach
</tbody>
</table>
<div class="mt-4">
<div class="mt-4 col">
</div>
</div>