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

FeWo Mail, Booking Services

Browse source
This commit is contained in:
Kevin Adametz 2020-07-09 12:36:15 +02:00
parent 730832c8e1
commit e6cc042aee
62 changed files with 1766 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

127
.idea/workspace.xml generated
View file

@ -2,9 +2,14 @@
<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/CMS/CMSFeWoController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Services/CreatePDF.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/fewo.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Models/BookingCompanyService.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Models/BookingProviderService.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Models/ServiceProviderService.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Models/TravelCompanyService.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/database/migrations/2020_07_03_143033_create_travel_company_services_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/database/migrations/2020_07_03_143108_create_booking_company_services_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/database/migrations/2020_07_03_143147_create_service_provider_services_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/database/migrations/2020_07_03_143224_create_booking_provider_services_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations/2019_08_05_171716_create_i_q_content_folders_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations/2019_08_05_171717_create_i_q_content_files_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations/2019_08_05_171718_create_i_q_content_categories_table.php" afterDir="false" />
@ -28,24 +33,41 @@
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/colors.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/file.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/move-item.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/js/summernote-cleaner.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/wartung.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/cms/fewo/all/index.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/cms/fewo/content/detail.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/cms/fewo/content/index.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/pdf/fewo_instructions.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/pdf/layout-small.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/06/5ef9ab45db7800.71530766_ust111.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/mein.sterntours.test.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/mein.sterntours.test.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/admin/modal/company-service.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/admin/modal/provider-service.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/booking/_detail_company.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/booking/_detail_provider.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/booking/_detail_services.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/settings/service_provider/detail.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/settings/travel_company/detail.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.phpstorm.meta.php" beforeDir="false" afterPath="$PROJECT_DIR$/.phpstorm.meta.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/_ide_helper.php" beforeDir="false" afterPath="$PROJECT_DIR$/_ide_helper.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/_ide_helper_models.php" beforeDir="false" afterPath="$PROJECT_DIR$/_ide_helper_models.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/CMS/CMSFeWoController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CMS/CMSFeWoController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/CustomerFileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CustomerFileController.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/Http/Controllers/ModalController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/ModalController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/RequestController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/RequestController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Settings/ServiceProviderController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Settings/ServiceProviderController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Settings/TravelCompanyController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Settings/TravelCompanyController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/SyS/Tools/ContentLinkController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/SyS/Tools/ContentLinkController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/TravelUserBookingFewoController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TravelUserBookingFewoController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/CMSContent.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/CMSContent.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/Booking.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Booking.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/BookingCountryService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/BookingCountryService.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/CustomerFewoFile.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/CustomerFewoFile.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/CustomerFewoMail.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/CustomerFewoMail.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/FewoLodging.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/FewoLodging.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Services/BookingFewo.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/BookingFewo.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/permissions.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/permissions.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/migrations/2019_03_20_132556_create_fewo_lodging_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_03_20_132556_create_fewo_lodging_table.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/FewoReservation.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/FewoReservation.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/ServiceProvider.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ServiceProvider.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/ServiceProviderEntry.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ServiceProviderEntry.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/TravelCompany.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/TravelCompany.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/TravelUserBookingFewo.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/TravelUserBookingFewo.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Repositories/BookingRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Repositories/BookingRepository.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/migrations/2019_03_20_132600_create_fewo_reservation_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_03_20_132600_create_fewo_reservation_table.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/migrations/2020_05_15_111351_create_customer_fewo_mails_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2020_05_15_111351_create_customer_fewo_mails_table.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/migrations/2020_05_15_111435_create_customer_fewo_files_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2020_05_15_111435_create_customer_fewo_files_table.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/migrations/2020_05_28_112257_create_travel_country_services_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2020_05_28_112257_create_travel_country_services_table.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/migrations/2020_05_28_112359_create_booking_country_services_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2020_05_28_112359_create_booking_country_services_table.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/composer.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/public/css/cropper.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/public/css/cropper.min.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/public/js/cropper.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/public/js/cropper.min.js" afterDir="false" />
@ -93,14 +115,25 @@
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/move.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/move.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/resize.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/resize.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/drafts/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/drafts/detail.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/pdf/layout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pdf/layout.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/travel/user/booking/_detail_files.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/_detail_files.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/travel/user/booking/_detail_info.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/_detail_info.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/travel/user/booking/mail/modal-new-booking-files.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/mail/modal-new-booking-files.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/booking/_detail_booking.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/booking/_detail_booking.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/request/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/request/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/settings/service_provider/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/settings/service_provider/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/settings/travel_company/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/settings/travel_company/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/settings/travel_country/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/settings/travel_country/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$/storage/app/booking_fewo/files/2020/05/5ed1051bafc3b5.82676224_jackodurextrusionsstrang.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed1051bee26b3.70425691_jdatlastoollogo.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed105cc4be3e1.92100968_jdatlastoollogo.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed10756b16e44.33061945_jdatlastoollogo.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed1084db170d5.80879705_jdatlastoollogo.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed108c3096a09.95052646_jdatlastoollogo.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed108e009c9f5.51348855_jdatlastoollogo.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed10907ddc864.16746869_muscat-sultan-qaboos-moschee-h1_k.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed10944f20eb4.87453333_jdatlastoollogo.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed1098e66a8e6.33653098_jdatlastoollogo.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed109d6576903.25774360_jdatlastoollogo.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/06/5ef9ab45db7800.71530766_ust111.pdf" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -322,19 +355,12 @@
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="database.console.LAST_STATE" value="false" />
<property name="js.buildTools.grunt.grunt-cli.package" value="" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/resources/views/pdf" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/resources/views/booking" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="settings.editor.selected.configurable" value="web-ide.project.structure" />
<property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resources/views/pdf" />
<recent name="$PROJECT_DIR$/app/Services" />
<recent name="$PROJECT_DIR$/resources/views/cms/fewo/content" />
<recent name="$PROJECT_DIR$/resources/views/cms/fewo/all" />
<recent name="$PROJECT_DIR$/app/Http/Controllers/CMS" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resources/views/settings" />
<recent name="$PROJECT_DIR$/resources/views/customer/mail" />
@ -342,6 +368,13 @@
<recent name="$PROJECT_DIR$/database/migrations" />
<recent name="$PROJECT_DIR$/app/Models/Sym" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resources/views/booking" />
<recent name="$PROJECT_DIR$/resources/views/settings/service_provider" />
<recent name="$PROJECT_DIR$/resources/views/admin/modal" />
<recent name="$PROJECT_DIR$/resources/views/settings/travel_company" />
<recent name="$PROJECT_DIR$/resources/views/sys/tools" />
</key>
</component>
<component name="RunAnythingCache">
<option name="myCommands">
@ -757,6 +790,19 @@
<workItem from="1593084225915" duration="9683000" />
<workItem from="1593417309317" duration="4000" />
<workItem from="1593417320619" duration="6174000" />
<workItem from="1593440416367" duration="9000" />
<workItem from="1593455626783" duration="35000" />
<workItem from="1593526813197" duration="92000" />
<workItem from="1593527352490" duration="1068000" />
<workItem from="1593674529275" duration="6862000" />
<workItem from="1593690649072" duration="2000" />
<workItem from="1593691963599" duration="1711000" />
<workItem from="1593777026123" duration="5544000" />
<workItem from="1594048285099" duration="1000" />
<workItem from="1594200882470" duration="1705000" />
<workItem from="1594205908423" duration="27000" />
<workItem from="1594205937259" duration="6790000" />
<workItem from="1594290486070" duration="302000" />
</task>
<servers />
</component>
@ -796,19 +842,15 @@
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="962" y="536" key="#com.intellij.fileTypes.FileTypeChooser/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1593421255813" />
<state x="968" y="466" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1585396813007">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="968" y="466" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/2560.-493.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1585396813007" />
<state x="723" y="23" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1590658970755">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="723" y="23" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1586342353394" />
<state x="723" y="23" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1590658970755" />
<state x="1018" y="488" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1593421562418">
<state x="1018" y="488" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1593778349963">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="1018" y="488" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1593421562418" />
<state x="1018" y="488" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1593778349963" />
<state x="1018" y="488" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1587048507717" />
<state width="2518" height="407" key="GridCell.Tab.0.bottom" timestamp="1587976409045">
<screen x="0" y="23" width="2560" height="1417" />
@ -838,15 +880,16 @@
</state>
<state x="1063" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1593090629992" />
<state x="1063" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1587128795225" />
<state x="675" y="397" width="1487" height="939" key="find.popup" timestamp="1593421444006">
<state x="870" y="380" width="1487" height="939" key="find.popup" timestamp="1594208510158">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="870" y="380" width="1487" height="939" key="find.popup/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1586367147094" />
<state x="-1885" y="398" width="1487" height="939" key="find.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@-2560.23.2560.1417" timestamp="1588269655118" />
<state x="675" y="397" width="1487" height="939" key="find.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1593421444006" />
<state x="2940" y="143" width="837" height="1682" key="find.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@2560.-527.1440.2537" timestamp="1589874198139" />
<state x="675" y="397" width="1487" height="939" key="find.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1593692036451" />
<state x="2940" y="143" width="837" height="1682" key="find.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@2560.-527.1440.2537" timestamp="1593692693354" />
<state x="870" y="380" width="1487" height="939" key="find.popup/2560.-493.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1586172282780" />
<state x="870" y="380" width="1487" height="939" key="find.popup/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1587130944842" />
<state x="-1885" y="397" width="1487" height="939" key="find.popup/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@-2560.23.2560.1417" timestamp="1593528261486" />
<state x="870" y="380" width="1487" height="939" key="find.popup/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1594208510158" />
<state x="946" y="348" width="670" height="676" key="search.everywhere.popup" timestamp="1593417679041">
<screen x="0" y="23" width="2560" height="1417" />
</state>

2
.phpstorm.meta.php
View file

@ -5,7 +5,7 @@ namespace PHPSTORM_META {
/**
* PhpStorm Meta file, to provide autocomplete information for PhpStorm
* Generated on 2020-05-28 13:03:00.
* Generated on 2020-07-03 15:08:29.
*
* @author Barry vd. Heuvel <barryvdh@gmail.com>
* @see https://github.com/barryvdh/laravel-ide-helper

2
_ide_helper.php
View file

@ -3,7 +3,7 @@
/**
* A helper file for Laravel, to provide autocomplete information to your IDE
* Generated for Laravel 6.18.13 on 2020-05-28 13:02:56.
* Generated for Laravel 6.18.13 on 2020-07-03 15:08:27.
*
* This file should not be included in your code, only analyzed by your IDE!
*

142
_ide_helper_models.php
View file

@ -367,6 +367,11 @@ namespace App\Models{
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\CustomerFewoFile[] $customer_files
* @property-read int|null $customer_files_count
* @property-read \App\Models\CustomerFewoMail|null $customer_mail
* @property \Illuminate\Support\Carbon|null $deleted_at
* @method static \Illuminate\Database\Query\Builder|\App\Models\CustomerFewoMail onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CustomerFewoMail whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\App\Models\CustomerFewoMail withTrashed()
* @method static \Illuminate\Database\Query\Builder|\App\Models\CustomerFewoMail withoutTrashed()
*/
class CustomerFewoMail extends \Eloquent {}
}
@ -542,6 +547,10 @@ namespace App\Models{
* @property-read int|null $booking_files_count
* @property float|null $price_balance
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Booking wherePriceBalance($value)
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\BookingCountryService[] $booking_country_services
* @property-read int|null $booking_country_services_count
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\BookingCountryService[] $booking_country_services_checked
* @property-read int|null $booking_country_services_checked_count
*/
class Booking extends \Eloquent {}
}
@ -734,6 +743,8 @@ namespace App\Models{
* @property-read int|null $fewo_reservations_count
* @property-read int|null $pages_count
* @property-read int|null $travel_user_booking_fewos_count
* @property string|null $pdf_name
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\FewoLodging wherePdfName($value)
*/
class FewoLodging extends \Eloquent {}
}
@ -1753,6 +1764,11 @@ namespace App\Models{
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CustomerFewoFile whereTravelUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CustomerFewoFile whereUpdatedAt($value)
* @mixin \Eloquent
* @property \Illuminate\Support\Carbon|null $deleted_at
* @method static \Illuminate\Database\Query\Builder|\App\Models\CustomerFewoFile onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CustomerFewoFile whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\App\Models\CustomerFewoFile withTrashed()
* @method static \Illuminate\Database\Query\Builder|\App\Models\CustomerFewoFile withoutTrashed()
*/
class CustomerFewoFile extends \Eloquent {}
}
@ -1826,6 +1842,33 @@ namespace App\Models{
class TravelCountry extends \Eloquent {}
}
namespace App\Models{
/**
* Class BookingProviderService
*
* @property int $id
* @property int $service_provider_service_id
* @property int $booking_id
* @property int $status
* @property Carbon $created_at
* @property Carbon $updated_at
* @property Booking $booking
* @property ServiceProviderService $service_provider_service
* @package App\Models
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService query()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService whereBookingId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService whereServiceProviderServiceId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService whereStatus($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService whereUpdatedAt($value)
* @mixin \Eloquent
*/
class BookingProviderService extends \Eloquent {}
}
namespace App\Models{
/**
* Class Salutation
@ -2399,6 +2442,8 @@ namespace App\Models{
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompany whereActive($value)
* @property array|null $contact_emails
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompany whereContactEmails($value)
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\TravelCompanyService[] $travel_company_services
* @property-read int|null $travel_company_services_count
*/
class TravelCompany extends \Eloquent {}
}
@ -2422,6 +2467,38 @@ namespace App\Models{
class CreditCardType extends \Eloquent {}
}
namespace App\Models{
/**
* Class TravelCompanyService
*
* @property int $id
* @property int $travel_company_id
* @property string $name
* @property string $description
* @property bool $active
* @property int $pos
* @property Carbon $created_at
* @property Carbon $updated_at
* @property TravelCompany $travel_company
* @property Collection|BookingCompanyService[] $booking_company_services
* @package App\Models
* @property-read int|null $booking_company_services_count
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService query()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService whereDescription($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService wherePos($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService whereTravelCompanyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService whereUpdatedAt($value)
* @mixin \Eloquent
*/
class TravelCompanyService extends \Eloquent {}
}
namespace App\Models{
/**
* App\Models\CMSContent
@ -2654,6 +2731,33 @@ namespace App\Models{
class Page extends \Eloquent {}
}
namespace App\Models{
/**
* Class BookingCompanyService
*
* @property int $id
* @property int $travel_company_service_id
* @property int $booking_id
* @property int $status
* @property Carbon $created_at
* @property Carbon $updated_at
* @property Booking $booking
* @property TravelCompanyService $travel_company_service
* @package App\Models
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService query()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService whereBookingId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService whereStatus($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService whereTravelCompanyServiceId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService whereUpdatedAt($value)
* @mixin \Eloquent
*/
class BookingCompanyService extends \Eloquent {}
}
namespace App\Models{
/**
* App\Models\TravelProgramCountry
@ -2783,6 +2887,8 @@ namespace App\Models{
* @property bool|null $active
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProvider whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProvider whereContactEmails($value)
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ServiceProviderService[] $service_provider_services
* @property-read int|null $service_provider_services_count
*/
class ServiceProvider extends \Eloquent {}
}
@ -2816,6 +2922,38 @@ namespace App\Models{
class TravelClass extends \Eloquent {}
}
namespace App\Models{
/**
* Class ServiceProviderService
*
* @property int $id
* @property int $service_provider_id
* @property string $name
* @property string $description
* @property bool $active
* @property int $pos
* @property Carbon $created_at
* @property Carbon $updated_at
* @property ServiceProvider $service_provider
* @property Collection|BookingProviderService[] $booking_provider_services
* @package App\Models
* @property-read int|null $booking_provider_services_count
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService query()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService whereDescription($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService wherePos($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService whereServiceProviderId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService whereUpdatedAt($value)
* @mixin \Eloquent
*/
class ServiceProviderService extends \Eloquent {}
}
namespace App\Models{
/**
* App\Models\DraftType
@ -3455,6 +3593,7 @@ namespace App\Models{
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountryService wherePos($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountryService whereTravelCountryId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountryService whereUpdatedAt($value)
* @mixin \Eloquent
*/
class TravelCountryService extends \Eloquent {}
}
@ -3557,6 +3696,9 @@ namespace App\Models{
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCountryService whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCountryService whereTravelCountryServiceId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCountryService whereUpdatedAt($value)
* @mixin \Eloquent
* @property int|null $status
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCountryService whereStatus($value)
*/
class BookingCountryService extends \Eloquent {}
}

4
app/Http/Controllers/CMS/CMSFeWoController.php
View file

@ -98,7 +98,7 @@ class CMSFeWoController extends Controller
public function detail($id, $step = false)
{
$fewo = FewoLodging::findOrFail($id);
$identifier_fewo = $this->identifier_fewo.Util::sanitize($fewo->single_name); // //this->identifier_fewo = 'fewo-pdf-';
$identifier_fewo = $this->identifier_fewo.Util::sanitize($fewo->pdf_name); // //this->identifier_fewo = 'fewo-pdf-';
$data = [
'contents' => CMSContent::where('identifier', '=', $this->identifier_content)->get()->sortBy('pos'),
@ -114,7 +114,7 @@ class CMSFeWoController extends Controller
{
$data = Request::all();
$fewo = FewoLodging::findOrFail($id);
$identifier_fewo = $this->identifier_fewo.Util::sanitize($fewo->single_name);
$identifier_fewo = $this->identifier_fewo.Util::sanitize($fewo->pdf_name);
$i = 1;
$last_content_id = null;

2
app/Http/Controllers/CustomerFileController.php
View file

@ -97,7 +97,7 @@ class CustomerFileController extends Controller
$fewo = FewoLodging::findOrFail($id);
$identifier_content = config('fewo.identifier_content');
$identifier_fewo = config('fewo.identifier_fewo');
$identifier_fewo = $identifier_fewo.Util::sanitize($fewo->single_name);
$identifier_fewo = $identifier_fewo.Util::sanitize($fewo->pdf_name);
$pdf_name = \App\Services\BookingFewo::getFeWoInstructionPDFName($fewo);
$pdf_content = BookingFewo::getFeWoCMSContentForPDF($identifier_content, $identifier_fewo);
$pdf_file = new CreatePDF('pdf.fewo_instructions');

22
app/Http/Controllers/ModalController.php
View file

@ -3,6 +3,8 @@
namespace App\Http\Controllers;
use App\Models\GeneralFile;
use App\Models\ServiceProviderService;
use App\Models\TravelCompanyService;
use App\Models\TravelCountry;
use App\Models\TravelCountryService;
use App\Repositories\GeneralFileRepository;
@ -48,6 +50,26 @@ class ModalController extends Controller
$ret = view("admin.modal.country-service", compact('data', 'value'))->render();
}
if($data['action'] === 'modal-travel_company-services'){
if($data['id'] === 'new'){
$value = new TravelCompanyService();
$value->active = true;
}else{
$value = TravelCompanyService::find($data['id']);
}
$ret = view("admin.modal.company-service", compact('data', 'value'))->render();
}
if($data['action'] === 'modal-service_provider-services'){
if($data['id'] === 'new'){
$value = new ServiceProviderService();
$value->active = true;
}else{
$value = ServiceProviderService::find($data['id']);
}
$ret = view("admin.modal.provider-service", compact('data', 'value'))->render();
}
}
return response()->json(['response' => $data, 'html'=>$ret, 'status'=>$status]);

53
app/Http/Controllers/RequestController.php
View file

@ -233,14 +233,55 @@ class RequestController extends Controller
$booking = Booking::findOrFail($data['booking_id']);
$ret = "";
$count = false;
foreach($booking->travel_country->getContactLandsModels() as $TravelCountry){
if($TravelCountry->stern_travel_country){
$hl = $TravelCountry->stern_travel_country->name."<br>";
$tmp = "";
foreach($TravelCountry->stern_travel_country->travel_country_services as $travel_country_service){
$ret .= \App\Models\BookingCountryService::getStatus($travel_country_service->id, $booking->id) ?
$tmp .= \App\Models\BookingCountryService::getStatus($travel_country_service->id, $booking->id) ?
'<span class="badge badge-pill badge-success"><i class="fa fa-check"></i> '.$travel_country_service->name.'</span>' :
'<span class="badge badge-pill badge-danger""><i class="fa fa-times"></i> '.$travel_country_service->name.'</span>';
$ret .= '<br>';
$tmp .= '<br>';
}
if($tmp !== ""){
$ret .= $hl.$tmp;
}
}
}
if($booking->service_provider_entries->count()){
foreach($booking->service_provider_entries as $service_provider_entry){
if($service_provider_entry->service_provider->service_provider_services->count()){
$hl = $service_provider_entry->service_provider->name."<br>";
$tmp = "";
foreach($service_provider_entry->service_provider->service_provider_services as $service_provider_service){
$tmp .= \App\Models\BookingProviderService::getStatus($service_provider_service->id, $booking->id) ?
'<span class="badge badge-pill badge-success"><i class="fa fa-check"></i> '.$service_provider_service->name.'</span>' :
'<span class="badge badge-pill badge-danger""><i class="fa fa-times"></i> '.$service_provider_service->name.'</span>';
$tmp .= '<br>';
}
if($tmp !== ""){
$ret .= $hl.$tmp;
}
}
}
}
if($booking->booking_service_items->count()){
foreach($booking->booking_service_items as $booking_service_item){
if($booking_service_item->travel_company->travel_company_services->count()){
$hl = $booking_service_item->travel_company->name."<br>";
$tmp = "";
foreach($booking_service_item->travel_company->travel_company_services as $travel_company_service){
$tmp .= \App\Models\BookingCompanyService::getStatus($travel_company_service->id, $booking->id) ?
'<span class="badge badge-pill badge-success"><i class="fa fa-check"></i> '.$travel_company_service->name.'</span>' :
'<span class="badge badge-pill badge-danger""><i class="fa fa-times"></i> '.$travel_company_service->name.'</span>';
$tmp .= '<br>';
}
if($tmp !== ""){
$ret .= $hl.$tmp;
}
}
}
}
@ -317,9 +358,9 @@ class RequestController extends Controller
->addColumn('travel_documents', function (Booking $booking) {
return $booking->travel_documents ? '<span data-order="1" class="badge badge-pill badge-success" title="Reiseunterlagen" data-placement="top" rel="tooltip"><i class="fa fa-check"></i></span>' : '<span data-order="0" class="badge badge-pill badge-danger" title="Reiseunterlagen" data-placement="top" rel="tooltip"><i class="fa fa-times"></i></span>';
})
->addColumn('booking_country_services', function (Booking $booking) {
return $booking->hasBookingCountryServicesUnchecked() ? '<span data-order="1" class="badge badge-pill badge-success" data-booking_id="'.$booking->id.'" data-placement="top" data-toggle="popover" title="Reise-, Agenturleistungen"><i class="fa fa-check"></i></span>' :
'<span data-order="0" class="badge badge-pill badge-danger" data-booking_id="'.$booking->id.'" data-placement="top" data-toggle="popover" title="Reise-, Agenturleistungen"><i class="fa fa-times"></i></span>';
->addColumn('booking_services', function (Booking $booking) {
return $booking->hasBookingServicesUnchecked() ? '<span data-order="1" class="badge badge-pill badge-success" data-booking_id="'.$booking->id.'" data-placement="top" data-toggle="popover" title="ServiceLeistungen"><i class="fa fa-check"></i></span>' :
'<span data-order="0" class="badge badge-pill badge-danger" data-booking_id="'.$booking->id.'" data-placement="top" data-toggle="popover" title="ServiceLeistungen"><i class="fa fa-times"></i></span>';
})
->addColumn('sf_guard_user_id', function (Booking $booking) {
@ -421,7 +462,7 @@ class RequestController extends Controller
->orderColumn('hold', 'hold $1')
->orderColumn('xx_tkt', 'xx_tkt_date $1')
//->orderColumn('travel_documents', 'travel_documents $1')
->rawColumns(['action_lead_edit', 'lead_id', 'participant_firstname', 'participant_name', 'action_booking_edit', 'travel_country_id', 'travelagenda_id', 'travel_company_id', 'sf_guard_user_id', 'lead.status_id', 'last_customer_email', 'id', 'travel_documents', 'booking_country_services', 'paying_out', 'paying_out_status', 'airline_id', 'refund', 'hold', 'xx_tkt'])
->rawColumns(['action_lead_edit', 'lead_id', 'participant_firstname', 'participant_name', 'action_booking_edit', 'travel_country_id', 'travelagenda_id', 'travel_company_id', 'sf_guard_user_id', 'lead.status_id', 'last_customer_email', 'id', 'travel_documents', 'booking_services', 'paying_out', 'paying_out_status', 'airline_id', 'refund', 'hold', 'xx_tkt'])
->make(true);
}
}

81
app/Http/Controllers/Settings/ServiceProviderController.php
View file

@ -5,6 +5,7 @@ namespace App\Http\Controllers\Settings;
use App\Http\Controllers\Controller;
use App\Models\ServiceProvider;
use App\Models\ServiceProviderService;
use App\Services\Util;
use Request;
@ -24,31 +25,87 @@ class ServiceProviderController extends Controller
}
public function update(){
public function detail($id, $step = false)
{
if($id === "new") {
$model = new ServiceProvider();
$id = 'new';
$model->active = 1;
}else{
$model = ServiceProvider::findOrFail($id);
$id = $model->id;
}
$data = [
'model' => $model,
'id' => $id,
'step' => $step,
];
return view('settings.service_provider.detail', $data);
}
public function update($id){
$data = Request::all();
$data['contact_emails'] = isset($data['contact_emails']) ? Util::_explodeLines($data['contact_emails']) : null;
$data['active'] = isset($data['active']) ? true : false;
if($data['id'] === "new"){
if(isset($data['update-action'])){
if($data['update-action'] === 'save-service-provider-service'){
$data['active'] = true;//isset($data['active']) ? true : false;
$service_provider = ServiceProvider::findOrFail($id);
$data['service_provider_id'] = $service_provider->id;
if($data['service_provider_service_id'] === 'new'){
$model = ServiceProviderService::create($data);
}else{
$model = ServiceProviderService::find($data['service_provider_service_id']);
$model->fill($data);
$model->save();
}
\Session()->flash('alert-save', '1');
return redirect($data['back']);
}
}
$data['contact_emails'] = isset($data['contact_emails']) ? Util::_explodeLines($data['contact_emails']) : null;
if($id === "new"){
$model = ServiceProvider::create($data);
}else{
$model = ServiceProvider::find($data['id']);
$model = ServiceProvider::find($id);
$model->fill($data);
$model->save();
}
\Session()->flash('alert-save', '1');
return redirect(route('admin_settings_service_provider'));
return redirect(route('admin_settings_service_provider_detail', [$model->id, $data['action']]));
}
public function delete($id){
public function delete($id, $del="service_provider"){
abort(404, 'Noch keine Funktion');
$model = ServiceProvider::findOrFail($id);
$model->delete();
\Session()->flash('alert-success', 'Eintrag gelöscht');
return redirect()->back();
if($del === 'service_provider') {
abort(404, 'Noch keine Funktion');
$model = ServiceProvider::findOrFail($id);
$model->delete();
\Session()->flash('alert-success', 'Eintrag gelöscht');
return redirect()->back();
}
if($del === 'provider_service'){
$service = ServiceProviderService::findOrFail($id);
$service_provider = $service->service_provider;
//check as entry
if($service->booking_provider_services->count() > 0){
\Session()->flash('alert-error', 'Die Leistung kann nicht gelöscht werden, diese hat Einträge bei den Buchungen');
return redirect(route('admin_settings_service_provider_detail', [$service_provider->id, 'services']));
}
$service->delete();
\Session()->flash('alert-success', 'Eintrag gelöscht');
return redirect(route('admin_settings_service_provider_detail', [$service_provider->id, 'services']));
}
}

79
app/Http/Controllers/Settings/TravelCompanyController.php
View file

@ -5,6 +5,7 @@ namespace App\Http\Controllers\Settings;
use App\Http\Controllers\Controller;
use App\Models\TravelCompany;
use App\Models\TravelCompanyService;
use App\Services\Util;
use Request;
@ -24,33 +25,85 @@ class TravelCompanyController extends Controller
}
public function update(){
public function detail($id, $step = false)
{
if($id === "new") {
$model = new TravelCompany();
$id = 'new';
$model->active = 1;
}else{
$model = TravelCompany::findOrFail($id);
$id = $model->id;
}
$data = [
'model' => $model,
'id' => $id,
'step' => $step,
];
return view('settings.travel_company.detail', $data);
}
public function update($id){
$data = Request::all();
if(isset($data['update-action'])){
if($data['update-action'] === 'save-travel-company-service'){
$data['active'] = true;//isset($data['active']) ? true : false;
$travel_company = TravelCompany::findOrFail($id);
$data['travel_company_id'] = $travel_company->id;
if($data['travel_company_service_id'] === 'new'){
$model = TravelCompanyService::create($data);
}else{
$model = TravelCompanyService::find($data['travel_company_service_id']);
$model->fill($data);
$model->save();
}
\Session()->flash('alert-save', '1');
return redirect($data['back']);
}
}
$data['contact_emails'] = isset($data['contact_emails']) ? Util::_explodeLines($data['contact_emails']) : null;
$data['active'] = isset($data['active']) ? true : false;
$data['is_allowed_edit_commission'] = isset($data['is_allowed_edit_commission']) ? true : false;
$data['is_inhouse'] = isset($data['is_inhouse']) ? true : false;
if($data['id'] === "new"){
if($id === "new"){
$model = TravelCompany::create($data);
}else{
$model = TravelCompany::find($data['id']);
$model = TravelCompany::find($id);
$model->fill($data);
$model->save();
}
\Session()->flash('alert-save', '1');
return redirect(route('admin_settings_travel_company'));
return redirect(route('admin_settings_travel_company_detail', [$model->id, $data['action']]));
}
public function delete($id){
public function delete($id, $del="travel_company"){
abort(404, 'Noch keine Funktion');
$model = TravelCompany::findOrFail($id);
$model->delete();
\Session()->flash('alert-success', 'Eintrag gelöscht');
return redirect()->back();
if($del === 'travel_country') {
abort(404, 'Noch keine Funktion');
$model = TravelCompany::findOrFail($id);
$model->delete();
\Session()->flash('alert-success', 'Eintrag gelöscht');
return redirect()->back();
}
if($del === 'company_service'){
$service = TravelCompanyService::findOrFail($id);
$travel_company = $service->travel_company;
//check as entry
if($service->booking_company_services->count() > 0){
\Session()->flash('alert-error', 'Die Leistung kann nicht gelöscht werden, diese hat Einträge bei den Buchungen');
return redirect(route('admin_settings_travel_company_detail', [$travel_company->id, 'services']));
}
$service->delete();
\Session()->flash('alert-success', 'Eintrag gelöscht');
return redirect(route('admin_settings_travel_company_detail', [$travel_company->id, 'services']));
}
}
}

3
app/Http/Controllers/SyS/Tools/ContentLinkController.php
View file

@ -140,9 +140,6 @@ class ContentLinkController extends Controller
return redirect()->back();
}
public function h1ToTitleTravelGuide()
{
$TravelGuides = TravelGuide::all();

16
app/Http/Controllers/TravelUserBookingFewoController.php
View file

@ -61,7 +61,7 @@ class TravelUserBookingFewoController extends Controller
/* if($travel_user_booking_fewo->fewo_lodging){
$this->identifier_fewo = $this->identifier_fewo.Util::sanitize($travel_user_booking_fewo->fewo_lodging->single_name);
$this->identifier_fewo = $this->identifier_fewo.Util::sanitize($travel_user_booking_fewo->fewo_lodging->pdf_name);
}*/
}
if(!$travel_user_booking_fewo->info_mail_text) {
@ -187,13 +187,27 @@ class TravelUserBookingFewoController extends Controller
if($del === 'travel_user_booking_fewo') {
$model = TravelUserBookingFewo::findOrFail($id);
//Reservations
$FewoReservations = FewoReservation::where('lodging_id', $model->fewo_lodging_id)->where('from_date', $model->getFromDateRaw())->where('to_date', $model->getToDateRaw())->get();
foreach ($FewoReservations as $FewoReservation) {
$FewoReservation->delete();
}
//Files
$FewoFiles = TravelUserBookingFile::where('travel_user_booking_fewo_id', $model->id)->get();
foreach ($FewoFiles as $file) {
$fileRepo = new BookingFewoFileRepository($file);
$fileRepo->_set('disk', 'booking_fewo');
$fileRepo->delete();
$file->delete();
}
//Mails
//CASCADE
$model->delete();
\Session()->flash('alert-success', __('Buchung gelöscht sowie die Reservierung im Sterntrous Kalender'));
}
if($del === 'booking_fewo_files'){
$booking_fewo_file = TravelUserBookingFile::findOrFail($id);
$travel_user_booking_fewo = $booking_fewo_file->travel_user_booking_fewo;

47
app/Models/Booking.php
View file

@ -163,6 +163,10 @@ use Illuminate\Database\Eloquent\Model;
* @property-read int|null $booking_files_count
* @property float|null $price_balance
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Booking wherePriceBalance($value)
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\BookingCountryService[] $booking_country_services
* @property-read int|null $booking_country_services_count
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\BookingCountryService[] $booking_country_services_checked
* @property-read int|null $booking_country_services_checked_count
*/
class Booking extends Model
{
@ -484,12 +488,45 @@ class Booking extends Model
return $this->hasMany(BookingCountryService::class, 'booking_id')->where('status', '=', 0);
}
public function hasBookingCountryServicesUnchecked(){
public function booking_company_services()
{
return $this->hasMany(BookingCompanyService::class, 'booking_id');
}
public function booking_company_services_checked()
{
return $this->hasMany(BookingCompanyService::class, 'booking_id')->where('status', '=', 0);
}
public function booking_provider_services()
{
return $this->hasMany(BookingProviderService::class, 'booking_id');
}
public function booking_provider_services_checked()
{
return $this->hasMany(BookingProviderService::class, 'booking_id')->where('status', '=', 0);
}
public function hasBookingServicesUnchecked(){
$country_services = true;
$provider_services = true;
$company_services = true;
if(!$this->booking_country_services->count() || $this->booking_country_services_checked->count() ||
($this->booking_country_services->count() !== TravelCountryService::where('crm_travel_country_id', '=', $this->travel_country_id)->count())){
return false;
$country_services = false;
}
return true;
if(!$this->booking_provider_services->count() || $this->booking_provider_services_checked->count()){
$provider_services = false;
}
if(!$this->booking_company_services->count() || $this->booking_company_services_checked->count()){
$company_services = false;
}
if($country_services && $provider_services && $provider_services){
return true;
}
return false;
}
public function calculate_price_total()
@ -662,7 +699,7 @@ class Booking extends Model
{
$total = 0;
foreach ($this->service_provider_entries as $entry){
$total += $entry->amount / $entry->factor;
$total += $entry->getAmountRaw() / $entry->factor;
}
return $raw ? $total : Util::_number_format($total);
}
@ -671,7 +708,7 @@ class Booking extends Model
{
$total = 0;
foreach ($this->service_provider_entries as $entry){
$total += $entry->amount;
$total += $entry->getAmountRaw();
}
return $raw ? $total : Util::_number_format($total);
}

77
app/Models/BookingCompanyService.php Normal file
View file

@ -0,0 +1,77 @@
<?php
/**
* Created by Reliese Model.
*/
namespace App\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
/**
* Class BookingCompanyService
*
* @property int $id
* @property int $travel_company_service_id
* @property int $booking_id
* @property int $status
* @property Carbon $created_at
* @property Carbon $updated_at
* @property Booking $booking
* @property TravelCompanyService $travel_company_service
* @package App\Models
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService query()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService whereBookingId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService whereStatus($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService whereTravelCompanyServiceId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCompanyService whereUpdatedAt($value)
* @mixin \Eloquent
*/
class BookingCompanyService extends Model
{
protected $connection = 'mysql';
protected $table = 'booking_company_services';
protected $casts = [
'travel_company_service_id' => 'int',
'booking_id' => 'int',
'status' => 'int'
];
protected $fillable = [
'travel_company_service_id',
'booking_id',
'status'
];
protected $status_type = [
0 => 'offen',
1 => 'erledigt',
];
public function booking()
{
return $this->belongsTo(Booking::class);
}
public function travel_company_service()
{
return $this->belongsTo(TravelCompanyService::class);
}
public static function getStatus($travel_company_service_id, $booking_id){
$service = BookingCompanyService::where('travel_company_service_id', '=', $travel_company_service_id)
->where('booking_id', '=', $booking_id)->first();
if($service){
return $service->status;
}
return 0;
}
}

8
app/Models/BookingCountryService.php
View file

@ -29,6 +29,8 @@ use Illuminate\Database\Eloquent\Model;
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCountryService whereTravelCountryServiceId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCountryService whereUpdatedAt($value)
* @mixin \Eloquent
* @property int|null $status
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingCountryService whereStatus($value)
*/
class BookingCountryService extends Model
{
@ -64,11 +66,11 @@ class BookingCountryService extends Model
}
public static function getStatus($travel_country_service_id, $booking_id){
$booking_country_service = BookingCountryService::where('travel_country_service_id', '=', $travel_country_service_id)
$service = BookingCountryService::where('travel_country_service_id', '=', $travel_country_service_id)
->where('booking_id', '=', $booking_id)->first();
if($booking_country_service){
return $booking_country_service->status;
if($service){
return $service->status;
}
return 0;
}

77
app/Models/BookingProviderService.php Normal file
View file

@ -0,0 +1,77 @@
<?php
/**
* Created by Reliese Model.
*/
namespace App\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
/**
* Class BookingProviderService
*
* @property int $id
* @property int $service_provider_service_id
* @property int $booking_id
* @property int $status
* @property Carbon $created_at
* @property Carbon $updated_at
* @property Booking $booking
* @property ServiceProviderService $service_provider_service
* @package App\Models
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService query()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService whereBookingId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService whereServiceProviderServiceId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService whereStatus($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingProviderService whereUpdatedAt($value)
* @mixin \Eloquent
*/
class BookingProviderService extends Model
{
protected $connection = 'mysql';
protected $table = 'booking_provider_services';
protected $casts = [
'service_provider_service_id' => 'int',
'booking_id' => 'int',
'status' => 'int'
];
protected $fillable = [
'service_provider_service_id',
'booking_id',
'status'
];
protected $status_type = [
0 => 'offen',
1 => 'erledigt',
];
public function booking()
{
return $this->belongsTo(Booking::class);
}
public function service_provider_service()
{
return $this->belongsTo(ServiceProviderService::class);
}
public static function getStatus($service_provider_service_id, $booking_id){
$service = BookingProviderService::where('service_provider_service_id', '=', $service_provider_service_id)
->where('booking_id', '=', $booking_id)->first();
if($service){
return $service->status;
}
return 0;
}
}

9
app/Models/CustomerFewoFile.php
View file

@ -43,9 +43,16 @@ use Illuminate\Database\Eloquent\Model;
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CustomerFewoFile whereTravelUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CustomerFewoFile whereUpdatedAt($value)
* @mixin \Eloquent
* @property \Illuminate\Support\Carbon|null $deleted_at
* @method static \Illuminate\Database\Query\Builder|\App\Models\CustomerFewoFile onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CustomerFewoFile whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\App\Models\CustomerFewoFile withTrashed()
* @method static \Illuminate\Database\Query\Builder|\App\Models\CustomerFewoFile withoutTrashed()
*/
class CustomerFewoFile extends Model
{
use \Illuminate\Database\Eloquent\SoftDeletes;
protected $connection = 'mysql_stern';
protected $table = 'customer_fewo_files';
@ -56,6 +63,8 @@ class CustomerFewoFile extends Model
'size' => 'int'
];
protected $dates = ['deleted_at'];
protected $fillable = [
'travel_user_id',
'customer_fewo_mail_id',

20
app/Models/CustomerFewoMail.php
View file

@ -76,9 +76,16 @@ use Illuminate\Database\Eloquent\Model;
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\CustomerFewoFile[] $customer_files
* @property-read int|null $customer_files_count
* @property-read \App\Models\CustomerFewoMail|null $customer_mail
* @property \Illuminate\Support\Carbon|null $deleted_at
* @method static \Illuminate\Database\Query\Builder|\App\Models\CustomerFewoMail onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CustomerFewoMail whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\App\Models\CustomerFewoMail withTrashed()
* @method static \Illuminate\Database\Query\Builder|\App\Models\CustomerFewoMail withoutTrashed()
*/
class CustomerFewoMail extends Model
{
use \Illuminate\Database\Eloquent\SoftDeletes;
protected $connection = 'mysql_stern';
protected $table = 'customer_fewo_mails';
@ -102,7 +109,8 @@ class CustomerFewoMail extends Model
protected $dates = [
'sent_at',
'scheduled_at',
'delivered_at'
'delivered_at',
'deleted_at'
];
protected $fillable = [
@ -128,6 +136,16 @@ class CustomerFewoMail extends Model
'delivered_at'
];
protected static function boot() {
parent::boot();
static::deleting(function($model) {
foreach ($model->customer_fewo_files as $relation)
{
$relation->delete();
}
});
}
public function customer_fewo_mail()
{
return $this->belongsTo(CustomerFewoMail::class, 'reply_id');

2
app/Models/FewoLodging.php
View file

@ -63,6 +63,8 @@ use Reliese\Database\Eloquent\Model as Eloquent;
* @property-read int|null $fewo_reservations_count
* @property-read int|null $pages_count
* @property-read int|null $travel_user_booking_fewos_count
* @property string|null $pdf_name
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\FewoLodging wherePdfName($value)
*/
class FewoLodging extends Model
{

1
app/Models/FewoReservation.php
View file

@ -61,4 +61,5 @@ class FewoReservation extends Model
{
return $this->belongsTo(\App\Models\FewoLodging::class, 'lodging_id');
}
}

7
app/Models/ServiceProvider.php
View file

@ -31,6 +31,8 @@ use Illuminate\Database\Eloquent\Model;
* @property bool|null $active
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProvider whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProvider whereContactEmails($value)
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ServiceProviderService[] $service_provider_services
* @property-read int|null $service_provider_services_count
*/
class ServiceProvider extends Model
{
@ -60,4 +62,9 @@ class ServiceProvider extends Model
{
return $this->hasMany(ServiceProviderEntry::class);
}
public function service_provider_services()
{
return $this->hasMany(ServiceProviderService::class, 'service_provider_id', 'id')->orderBy('pos', 'DESC');
}
}

32
app/Models/ServiceProviderEntry.php
View file

@ -6,6 +6,7 @@
namespace App\Models;
use App\Services\Util;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
@ -96,19 +97,38 @@ class ServiceProviderEntry extends Model
}
}
public function getAmountAttribute()
{
return Util::_number_format($this->attributes['amount']);
}
public function getAmountRaw()
{
return $this->attributes['amount'];
}
public function getAmountEurAttribute()
{
return Util::_number_format($this->attributes['amount_eur']);
}
public function getAmountEurRaw()
{
return $this->attributes['amount_eur'];
}
public function getAmountFinalEur(){
$ret = $this->amount;
if($this->amount_eur && $this->amount_eur > 0){
$ret = $this->amount_eur;
$ret = $this->attributes['amount'];
if($this->attributes['amount_eur'] && $this->attributes['amount_eur'] > 0){
$ret = $this->attributes['amount_eur'];
}
return number_format($ret, 2, ',', '.');
}
public function getAmountFinalEurRaw(){
if($this->amount_eur && $this->amount_eur > 0){
return $this->amount_eur;
if($this->attributes['amount_eur'] && $this->attributes['amount_eur'] > 0){
return $this->attributes['amount_eur'];
}
return $this->amount;
return $this->attributes['amount'];
}
public function getPaymentDateFormat(){

76
app/Models/ServiceProviderService.php Normal file
View file

@ -0,0 +1,76 @@
<?php
/**
* Created by Reliese Model.
*/
namespace App\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model;
/**
* Class ServiceProviderService
*
* @property int $id
* @property int $service_provider_id
* @property string $name
* @property string $description
* @property bool $active
* @property int $pos
* @property Carbon $created_at
* @property Carbon $updated_at
* @property ServiceProvider $service_provider
* @property Collection|BookingProviderService[] $booking_provider_services
* @package App\Models
* @property-read int|null $booking_provider_services_count
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService query()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService whereDescription($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService wherePos($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService whereServiceProviderId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ServiceProviderService whereUpdatedAt($value)
* @mixin \Eloquent
*/
class ServiceProviderService extends Model
{
protected $connection = 'mysql';
protected $table = 'service_provider_services';
protected $casts = [
'service_provider_id' => 'int',
'active' => 'bool',
'pos' => 'int'
];
protected $fillable = [
'service_provider_id',
'name',
'description',
'active',
'pos'
];
protected $status_type = [
0 => 'offen',
1 => 'erledigt',
];
public function service_provider()
{
return $this->belongsTo(ServiceProvider::class);
}
public function booking_provider_services()
{
return $this->hasMany(BookingProviderService::class);
}
}

6
app/Models/TravelCompany.php
View file

@ -36,6 +36,8 @@ use Illuminate\Database\Eloquent\Model;
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompany whereActive($value)
* @property array|null $contact_emails
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompany whereContactEmails($value)
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\TravelCompanyService[] $travel_company_services
* @property-read int|null $travel_company_services_count
*/
class TravelCompany extends Model
{
@ -70,6 +72,10 @@ class TravelCompany extends Model
{
return $this->hasMany(BookingServiceItem::class);
}
public function travel_company_services()
{
return $this->hasMany(TravelCompanyService::class, 'travel_company_id', 'id')->orderBy('pos', 'DESC');
}
public function setPercentageAttribute($value)
{

75
app/Models/TravelCompanyService.php Normal file
View file

@ -0,0 +1,75 @@
<?php
/**
* Created by Reliese Model.
*/
namespace App\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model;
/**
* Class TravelCompanyService
*
* @property int $id
* @property int $travel_company_id
* @property string $name
* @property string $description
* @property bool $active
* @property int $pos
* @property Carbon $created_at
* @property Carbon $updated_at
* @property TravelCompany $travel_company
* @property Collection|BookingCompanyService[] $booking_company_services
* @package App\Models
* @property-read int|null $booking_company_services_count
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService query()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService whereDescription($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService wherePos($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService whereTravelCompanyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompanyService whereUpdatedAt($value)
* @mixin \Eloquent
*/
class TravelCompanyService extends Model
{
protected $connection = 'mysql';
protected $table = 'travel_company_services';
protected $casts = [
'travel_company_id' => 'int',
'active' => 'bool',
'pos' => 'int'
];
protected $fillable = [
'travel_company_id',
'name',
'description',
'active',
'pos'
];
protected $status_type = [
0 => 'offen',
1 => 'erledigt',
];
public function travel_company()
{
return $this->belongsTo(TravelCompany::class);
}
public function booking_company_services()
{
return $this->hasMany(BookingCompanyService::class);
}
}

13
app/Models/TravelUserBookingFewo.php
View file

@ -159,7 +159,8 @@ class TravelUserBookingFewo extends Model
protected $dates = [
'booking_date',
'from_date',
'to_date'
'to_date',
'deleted_at'
];
protected $fillable = [
@ -190,6 +191,16 @@ class TravelUserBookingFewo extends Model
'status_text'
];
protected static function boot() {
parent::boot();
static::deleting(function($model) {
foreach ($model->customer_fewo_mails as $relation)
{
$relation->delete();
}
});
}
public static $customer_mail_dirs = [
11 => ['name' => 'Entwürfe', 'icon'=>'ion-md-create'],
12 => ['name' => 'Papierkorb', 'icon'=>'ion-md-trash'],

54
app/Repositories/BookingRepository.php
View file

@ -4,7 +4,9 @@ namespace App\Repositories;
use App\Models\Booking;
use App\Models\BookingCompanyService;
use App\Models\BookingCountryService;
use App\Models\BookingProviderService;
class BookingRepository extends BaseRepository {
@ -45,17 +47,24 @@ class BookingRepository extends BaseRepository {
$this->updateCountryService($data['country_service']);
}
if(isset($data['provider_service'])){
$this->updateProviderService($data['provider_service']);
}
if(isset($data['company_service'])){
$this->updateCompanyService($data['company_service']);
}
return $this->model;
}
public function updateCountryService($country_services){
foreach ($country_services as $country_service_id=>$val){
$booking_country_service = BookingCountryService::where('travel_country_service_id', '=', $country_service_id)
->where('booking_id', '=', $this->model->id)->first();
->where('booking_id', '=', $this->model->id)->first();
if(!$booking_country_service){
$booking_country_service = BookingCountryService::create([
BookingCountryService::create([
'travel_country_service_id' => $country_service_id,
'booking_id' => $this->model->id,
'status' => $val
@ -67,7 +76,46 @@ class BookingRepository extends BaseRepository {
$booking_country_service->save();
}
}
}
public function updateProviderService($provider_service){
foreach ($provider_service as $provider_service_id=>$val){
$booking_provider_service = BookingProviderService::where('service_provider_service_id', '=', $provider_service_id)
->where('booking_id', '=', $this->model->id)->first();
if(!$booking_provider_service){
BookingProviderService::create([
'service_provider_service_id' => $provider_service_id,
'booking_id' => $this->model->id,
'status' => $val
]);
}else{
$booking_provider_service->fill([
'status' => $val
]);
$booking_provider_service->save();
}
}
}
public function updateCompanyService($company_service){
foreach ($company_service as $company_service_id=>$val){
$booking_company_service = BookingCompanyService::where('travel_company_service_id', '=', $company_service_id)
->where('booking_id', '=', $this->model->id)->first();
if(!$booking_company_service){
BookingCompanyService::create([
'travel_company_service_id' => $company_service_id,
'booking_id' => $this->model->id,
'status' => $val
]);
}else{
$booking_company_service->fill([
'status' => $val
]);
$booking_company_service->save();
}
}
}
}

1
database/migrations/2019_03_20_132600_create_fewo_reservation_table.php
View file

@ -20,6 +20,7 @@ class CreateFewoReservationTable extends Migration
Schema::connection('mysql_stern')->create('fewo_reservation', function (Blueprint $table) {
$table->increments('id');
$table->integer('lodging_id')->nullable();
$table->date('from_date');
$table->date('to_date');
$table->integer('status');

6
database/migrations/2020_05_15_111351_create_customer_fewo_mails_table.php
View file

@ -47,9 +47,13 @@ class CreateCustomerFewoMailsTable extends Migration
$table->timestamps();
$table->softDeletes();
$table->foreign('travel_user_booking_fewo_id')
->references('id')
->on('travel_user_booking_fewos');
->on('travel_user_booking_fewos')
->onDelete('CASCADE');
$table->foreign('travel_user_id')
->references('id')

5
database/migrations/2020_05_15_111435_create_customer_fewo_files_table.php
View file

@ -28,13 +28,16 @@ class CreateCustomerFewoFilesTable extends Migration
$table->unsignedInteger('size');
$table->timestamps();
$table->softDeletes();
$table->foreign('travel_user_id')
->references('id')
->on('travel_users');
$table->foreign('customer_fewo_mail_id')
->references('id')
->on('customer_fewo_mails');
->on('customer_fewo_mails')
->onDelete('CASCADE');
});
}

5
database/migrations/2020_05_28_112257_create_travel_country_services_table.php
View file

@ -22,10 +22,13 @@ class CreateTravelCountryServicesTable extends Migration
$table->string('name')->nullable()->index();
$table->text('description')->nullable();
$table->boolean('active')->default(true);
$table->unsignedTinyInteger('pos')->default(0);
$table->unsignedTinyInteger('pos')->nullable()->default(0);
$table->timestamps();
$table->foreign('crm_travel_country_id')
->references('id')
->on('travel_country');
});
}

2
database/migrations/2020_05_28_112359_create_booking_country_services_table.php
View file

@ -19,7 +19,7 @@ class CreateBookingCountryServicesTable extends Migration
$table->unsignedInteger('travel_country_service_id')->index();
$table->bigInteger('booking_id')->index();
$table->unsignedTinyInteger('status')->default(0);
$table->unsignedTinyInteger('status')->nullable()->default(0);
$table->timestamps();

43
database/migrations/2020_07_03_143033_create_travel_company_services_table.php Normal file
View file

@ -0,0 +1,43 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateTravelCompanyServicesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('travel_company_services', function (Blueprint $table) {
$table->increments('id');
$table->bigInteger('travel_company_id')->index();
$table->string('name')->nullable()->index();
$table->text('description')->nullable();
$table->boolean('active')->default(true);
$table->unsignedTinyInteger('pos')->nullable()->default(0);
$table->timestamps();
$table->foreign('travel_company_id')
->references('id')
->on('travel_company');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('travel_company_services');
}
}

45
database/migrations/2020_07_03_143108_create_booking_company_services_table.php Normal file
View file

@ -0,0 +1,45 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateBookingCompanyServicesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('booking_company_services', function (Blueprint $table) {
$table->bigIncrements('id');
$table->unsignedInteger('travel_company_service_id')->index();
$table->bigInteger('booking_id')->index();
$table->unsignedTinyInteger('status')->nullable()->default(0);
$table->timestamps();
$table->foreign('travel_company_service_id')
->references('id')
->on('travel_company_services');
$table->foreign('booking_id')
->references('id')
->on('booking');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('booking_company_services');
}
}

42
database/migrations/2020_07_03_143147_create_service_provider_services_table.php Normal file
View file

@ -0,0 +1,42 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateServiceProviderServicesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('service_provider_services', function (Blueprint $table) {
$table->increments('id');
$table->bigInteger('service_provider_id')->index();
$table->string('name')->nullable()->index();
$table->text('description')->nullable();
$table->boolean('active')->default(true);
$table->unsignedTinyInteger('pos')->nullable()->default(0);
$table->timestamps();
$table->foreign('service_provider_id')
->references('id')
->on('service_provider');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('service_provider_services');
}
}

45
database/migrations/2020_07_03_143224_create_booking_provider_services_table.php Normal file
View file

@ -0,0 +1,45 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateBookingProviderServicesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('booking_provider_services', function (Blueprint $table) {
$table->bigIncrements('id');
$table->unsignedInteger('service_provider_service_id')->index();
$table->bigInteger('booking_id')->index();
$table->unsignedTinyInteger('status')->nullable()->default(0);
$table->timestamps();
$table->foreign('service_provider_service_id')
->references('id')
->on('service_provider_services');
$table->foreign('booking_id')
->references('id')
->on('booking');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('booking_provider_services');
}
}

36
resources/views/admin/modal/company-service.blade.php Executable file
View file

@ -0,0 +1,36 @@
<div class="modal-content">
{!! Form::open(['url' => $data['url'], 'class' => '', 'enctype' => 'multipart/form-data']) !!}
{{ Form::hidden('travel_company_service_id', $data['id']) }}
{{ Form::hidden('back', $data['back']) }}
<div class="modal-header">
<h5 class="modal-title">
Reiseveranstalter Leistungen
<span class="font-weight-light">hinzufügen</span>
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<div class="form-group">
<label for="name" class="form-label">{{ __('Name') }}</label>
{{ Form::text('name', $value->name, array('placeholder'=>__('Name'), 'class'=>'form-control', 'required')) }}
</div>
<div class="form-group ">
<label for="full_text" class="form-label">{{ __('Beschreibung') }}</label>
{{ Form::textarea('description', $value->description, array('Beschreibung'=>__('Beschreibung'), 'class'=>'form-control', 'rows'=>2)) }}
</div>
<div class="form-group">
<label for="pos" class="form-label">{{ __('Position') }}</label>
{{ Form::text('pos', $value->pos, array('class'=>'form-control')) }}
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="submit" class="btn btn-primary" name="update-action" value="save-travel-company-service">speichern</button>
</div>
{!! Form::close() !!}
</div>
<script type="text/javascript">
</script>

36
resources/views/admin/modal/provider-service.blade.php Executable file
View file

@ -0,0 +1,36 @@
<div class="modal-content">
{!! Form::open(['url' => $data['url'], 'class' => '', 'enctype' => 'multipart/form-data']) !!}
{{ Form::hidden('service_provider_service_id', $data['id']) }}
{{ Form::hidden('back', $data['back']) }}
<div class="modal-header">
<h5 class="modal-title">
Leistungsträger Leistungen
<span class="font-weight-light">hinzufügen</span>
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<div class="form-group">
<label for="name" class="form-label">{{ __('Name') }}</label>
{{ Form::text('name', $value->name, array('placeholder'=>__('Name'), 'class'=>'form-control', 'required')) }}
</div>
<div class="form-group ">
<label for="full_text" class="form-label">{{ __('Beschreibung') }}</label>
{{ Form::textarea('description', $value->description, array('Beschreibung'=>__('Beschreibung'), 'class'=>'form-control', 'rows'=>2)) }}
</div>
<div class="form-group">
<label for="pos" class="form-label">{{ __('Position') }}</label>
{{ Form::text('pos', $value->pos, array('class'=>'form-control')) }}
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="submit" class="btn btn-primary" name="update-action" value="save-service-provider-service">speichern</button>
</div>
{!! Form::close() !!}
</div>
<script type="text/javascript">
</script>

23
resources/views/booking/_detail_booking.blade.php
View file

@ -99,29 +99,6 @@
{{ Form::text('notice', $booking->notice, array('placeholder'=>__('Bemerkung'), 'class'=>'form-control', 'id'=>'notice')) }}
</div>
<div class="col-12">
<h5 class="card-title mt-3 mb-1">Leistungen</h5>
<hr class="mt-0">
</div>
@foreach($booking->travel_country->getContactLandsModels() as $TravelCountry)
@if($TravelCountry->stern_travel_country)
@foreach($TravelCountry->stern_travel_country->travel_country_services as $travel_country_service)
<div class="col-sm-6 col-md-4">
<label class="switcher switcher-on-off">
{{ Form::hidden('country_service['.$travel_country_service->id.']', 0) }}
{{ Form::checkbox('country_service['.$travel_country_service->id.']', 1, \App\Models\BookingCountryService::getStatus($travel_country_service->id, $booking->id), array('class'=>'switcher-input')) }}
<span class="switcher-indicator">
<span class="switcher-yes"><span class="ion ion-md-checkmark"></span></span>
<span class="switcher-no"><span class="ion ion-md-close"></span></span>
</span>
<span class="switcher-label">{{ $travel_country_service->name }}</span>
</label>
</div>
@endforeach
@endif
@endforeach
<div class="col-12">
<hr>
<div class="text-left mt-3">

70
resources/views/booking/_detail_company.blade.php Executable file
View file

@ -0,0 +1,70 @@
<div class="card mb-2">
<h6 class="card-header bg-primary text-white py-2" data-toggle="collapse" data-target="#collapseBookingCompany" aria-expanded="false" aria-controls="collapseBookingCompany">
<strong style="line-height: 1.6em">Reiseveranstalter</strong>
</h6>
<div class="collapse" id="collapseBookingCompany">
<div class="card-body row">
<div class="table-responsive" id="booking_files_table">
<table class="table table-striped table-sm">
<thead>
<tr>
<th>Veranstalter</th>
<th>Bezeichnung</th>
<th>Abreisedatum</th>
<th>Reisepreis inkl. MwSt</th>
<th>Rabatt</th>
<th>Erzielte Provision</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
@if($booking->booking_service_items)
@foreach($booking->booking_service_items as $item)
<tr>
<th scope="row">
{{$item->travel_company->name}}
<!--<a href="#" target="_blank" class="badge badge-md badge-primary">
</a>-->
</th>
<td>{{$item->name}}</td>
<td>{{\App\Services\Util::_format_date($item->travel_data, 'date')}}</td>
<td>{{$item->service_price}}</td>
<td>{{$item->commission}}</td>
<td>{{$item->service_price_refund}}</td>
<td>
<label class="custom-control custom-checkbox mt-2">
{!! Form::checkbox('booking_service_item['.$item->id.']', 1, $item->is_commission_locked, ['class'=>'custom-control-input', 'disabled']) !!}
<span class="custom-control-label"></span>
</label>
</td>
<td>
<i class="fa fa-trash-alt"></i>
{{--<a class="btn text-danger" href="#" onclick="return confirm('{{__('Wirklich löschen?')}}');"><i class="fa fa-trash-alt"></i></a> --}}
</td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
{{--
<div class="text-right d-block w-100">
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal"
data-target="#modals-load-content"
data-id="new-file"
data-model="bookingFile"
data-action="modal-upload-booking-file"
data-url=""
data-redirect="back"
data-booking_id="{{$booking->id}}"
data-route="#"><i class="ion ion-md-cloud-upload"></i>&nbsp;Datei hinzufügen</button>
</div>
--}}
</div>
</div>
</div>

68
resources/views/booking/_detail_provider.blade.php Executable file
View file

@ -0,0 +1,68 @@
<div class="card mb-2">
<h6 class="card-header bg-primary text-white py-2" data-toggle="collapse" data-target="#collapseBookingProvider" aria-expanded="false" aria-controls="collapseBookingProvider">
<strong style="line-height: 1.6em">Leistungsträger</strong>
</h6>
<div class="collapse" id="collapseBookingProvider">
<div class="card-body row">
<div class="table-responsive" id="booking_files_table">
<table class="table table-striped table-sm">
<thead>
<tr>
<th>Leistungsträger</th>
<th>Betrag</th>
<th>Faktor</th>
<th>Betrag €</th>
<th>Zahlungsdatum</th>
<th>Re.Nr.</th>
<th>bezahlt</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
@if($booking->service_provider_entries)
@foreach($booking->service_provider_entries as $item)
<tr>
<th scope="row">
{{$item->service_provider->name}}
<!--<a href="#" target="_blank" class="badge badge-md badge-primary">
</a>-->
</th>
<td>{{$item->amount}}</td>
<td>{{$item->factor}}</td>
<td>{{$item->amount_eur}}</td>
<td>{{\App\Services\Util::_format_date($item->payment_date, 'date')}}</td>
<td>{{$item->invoice_number}}</td>
<td>
<label class="custom-control custom-checkbox mt-2">
{!! Form::checkbox('service_provider_entry['.$item->id.']', 1, $item->is_cleared, ['class'=>'custom-control-input', 'disabled']) !!}
<span class="custom-control-label"></span>
</label>
</td>
<td>
<i class="fa fa-trash-alt"></i>
{{--<a class="btn text-danger" href="#" onclick="return confirm('{{__('Wirklich löschen?')}}');"><i class="fa fa-trash-alt"></i></a> --}} </td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
{{--
<div class="text-right d-block w-100">
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal"
data-target="#modals-load-content"
data-id="new-file"
data-model="bookingFile"
data-action="modal-upload-booking-file"
data-url=""
data-redirect="back"
data-booking_id="{{$booking->id}}"
data-route="#"><i class="ion ion-md-cloud-upload"></i>&nbsp;Datei hinzufügen</button>
</div>
--}}
</div>
</div>
</div>

90
resources/views/booking/_detail_services.blade.php Executable file
View file

@ -0,0 +1,90 @@
<div class="card mb-2">
<h6 class="card-header bg-primary text-white py-2" data-toggle="collapse" data-target="#collapseBookingServices" aria-expanded="false" aria-controls="collapseBookingServices">
<strong style="line-height: 1.6em">Leistungen</strong>
</h6>
<div class="collapse" id="collapseBookingServices">
<div class="card-body row">
<div class="col-md-4 col-sm-12">
<h5 class="card-title mt-3 mb-1">Agentur</h5>
<hr class="mt-0 mb-0">
@foreach($booking->travel_country->getContactLandsModels() as $TravelCountry)
@if($TravelCountry->stern_travel_country->count())
<h6 class="pt-2 pb-2 mb-0">{{$TravelCountry->stern_travel_country->name}}</h6>
@foreach($TravelCountry->stern_travel_country->travel_country_services as $travel_country_service)
<div class="pb-3">
<label class="switcher switcher-on-off">
{{ Form::hidden('country_service['.$travel_country_service->id.']', 0) }}
{{ Form::checkbox('country_service['.$travel_country_service->id.']', 1, \App\Models\BookingCountryService::getStatus($travel_country_service->id, $booking->id), array('class'=>'switcher-input')) }}
<span class="switcher-indicator">
<span class="switcher-yes"><span class="ion ion-md-checkmark"></span></span>
<span class="switcher-no"><span class="ion ion-md-close"></span></span>
</span>
<span class="switcher-label">{{ $travel_country_service->name }}</span>
</label>
</div>
@endforeach
@endif
@endforeach
</div>
<div class="col-md-4 col-sm-12">
<h5 class="card-title mt-3 mb-1">Leistungsträger</h5>
<hr class="mt-0 mb-0">
@if($booking->service_provider_entries->count())
@foreach($booking->service_provider_entries as $service_provider_entry)
@if($service_provider_entry->service_provider->service_provider_services->count())
<h6 class="pt-2 pb-2 mb-0">{{$service_provider_entry->service_provider->name}}</h6>
@foreach($service_provider_entry->service_provider->service_provider_services as $service_provider_service)
<div class="pb-3">
<label class="switcher switcher-on-off">
{{ Form::hidden('provider_service['.$service_provider_service->id.']', 0) }}
{{ Form::checkbox('provider_service['.$service_provider_service->id.']', 1, \App\Models\BookingProviderService::getStatus($service_provider_service->id, $booking->id), array('class'=>'switcher-input')) }}
<span class="switcher-indicator">
<span class="switcher-yes"><span class="ion ion-md-checkmark"></span></span>
<span class="switcher-no"><span class="ion ion-md-close"></span></span>
</span>
<span class="switcher-label">{{ $service_provider_service->name }}</span>
</label>
</div>
@endforeach
@endif
@endforeach
@endif
</div>
<div class="col-md-4 col-sm-12">
<h5 class="card-title mt-3 mb-1">Reiseveranstalter</h5>
<hr class="mt-0 mb-0">
@if($booking->booking_service_items->count())
@foreach($booking->booking_service_items as $booking_service_item)
@if($booking_service_item->travel_company->travel_company_services->count())
<h6 class="pt-2 pb-2 mb-0">{{$booking_service_item->travel_company->name}}</h6>
@foreach($booking_service_item->travel_company->travel_company_services as $travel_company_service)
<div class="pb-3">
<label class="switcher switcher-on-off">
{{ Form::hidden('company_service['.$travel_company_service->id.']', 0) }}
{{ Form::checkbox('company_service['.$travel_company_service->id.']', 1, \App\Models\BookingCompanyService::getStatus($travel_company_service->id, $booking->id), array('class'=>'switcher-input')) }}
<span class="switcher-indicator">
<span class="switcher-yes"><span class="ion ion-md-checkmark"></span></span>
<span class="switcher-no"><span class="ion ion-md-close"></span></span>
</span>
<span class="switcher-label">{{ $travel_company_service->name }}</span>
</label>
</div>
@endforeach
@endif
@endforeach
@endif
</div>
<div class="col-12">
<hr>
<div class="text-left mt-3">
<button type="submit" name="action" value="update_booking" class="btn btn-sm btn-secondary">{{ __('save changes') }}</button>&nbsp;
<a href="{{route('bookings')}}" class="btn btn-sm btn-default">{{ __('zur Übersicht') }}</a>
</div>
</div>
</div>
</div>
</div>

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

@ -54,6 +54,11 @@
Buchung
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="javascript:void(0)" data-collapse="#collapseBookingServices">
Leistungen
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="javascript:void(0)" data-collapse="#collapseBookingMyJack">
MyJack
@ -69,6 +74,16 @@
Organisation
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="javascript:void(0)" data-collapse="#collapseBookingCompany">
Veranstalter
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="javascript:void(0)" data-collapse="#collapseBookingProvider">
Leistungsträger
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="javascript:void(0)" data-collapse="#collapseBookingMails">
E-Mails
@ -98,6 +113,9 @@
<!-- Buchung -->
@include('booking._detail_booking')
<!-- Leistungen -->
@include('booking._detail_services')
<!-- MyJack -->
@include('booking._detail_myjack')
@ -107,6 +125,12 @@
<!-- Organisation -->
@include('booking._detail_drafs')
<!-- Veranstalter -->
@include('booking._detail_company')
<!-- Leistungsträger -->
@include('booking._detail_provider')
{!! Form::close() !!}
@include('booking._detail_mails')

2
resources/views/request/index.blade.php
View file

@ -267,7 +267,7 @@
{ data: 'start_date', name: 'start_date' },
{ data: 'end_date', name: 'end_date' },
{ data: 'travel_documents', name: 'travel_documents', orderable: false },
{ data: 'booking_country_services', name: 'booking_country_services', orderable: false },
{ data: 'booking_services', name: 'booking_services', orderable: false },
{ data: 'sf_guard_user_id', name: 'sf_guard_user_id', orderable: false },
{ data: 'lead.status_id', name: 'lead.status_id', orderable: false },
{ data: 'last_customer_email', name: 'last_customer_email', orderable: true },

132
resources/views/settings/service_provider/detail.blade.php Executable file
View file

@ -0,0 +1,132 @@
@extends('layouts.layout-2')
@section('content')
{!! Form::open(['url' => route('admin_settings_service_provider_update', [$id]), 'class' => 'form-horizontal']) !!}
<h4 class="font-weight-bold py-3 mb-1">
Leistungsträger Inhalte {{ $model->name }}
<div class="float-right">
<a href="{{route('admin_settings_service_provider')}}" class="btn btn-default btn-sm">{{ __('back') }}</a>
</div>
</h4>
<div class="nav-tabs-top mb-4">
<ul class="nav nav-tabs">
<li class="nav-item">
<a class="nav-link @if($step == false) active show @endif" data-toggle="tab" href="#navs-site">Allgemein</a>
</li>
<li class="nav-item">
<a class="nav-link @if($step === 'services') active show @endif" data-toggle="tab" href="#navs-services">Leistungen</a>
</li>
</ul>
<div class="tab-content">
<div class="tab-pane fade @if($step == false) active show @endif" id="navs-site">
<div class="card">
<div class="card-body">
<h4>Allgemein</h4>
<div class="form-row">
<div class="form-group col-sm-12">
<label class="form-label" for="name">{{ __('Name') }} *</label>
{{ Form::text('name', $model->name, array('placeholder'=>__('Name'), 'class'=>'form-control', 'id'=>'name', 'required'=>true)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-sm-12">
<label for="percentage" class="form-label">Type</label>
{{ Form::select('type', \App\Models\ServiceProvider::$types , $model->type, array('class'=>'custom-select', 'required'=>true)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-sm-12">
<label class="form-label" for="contact_emails">Für interene Mails <span class="text-muted">(jede E-Mail in eine extra Zeile)</span></label>
{{ Form::textarea('contact_emails', \App\Services\Util::_implodeLines($model->contact_emails), array('class'=>'form-control', 'rows'=>4)) }}
</div>
</div>
<div class="form-row">
<div class="col-12 py-2">
<label class="switcher switcher-on-off">
{{ Form::hidden('active', 0) }}
{{ Form::checkbox('active', 1, $model->active, array('class'=>'switcher-input')) }}
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">sichtbar</span>
</label>
</div>
</div>
<br>
<button type="submit" name="action" value="" class="btn btn-submit">{{ __('save changes') }}</button>&nbsp;
</div>
</div>
</div>
<div class="tab-pane fade @if($step === 'services') active show @endif" id="navs-services">
<div class="card">
<div class="card-body">
<br>
<h4>Leistungen <span class="text-muted">für diesen Leistungsträger</span></h4>
<div class="table-responsive" id="booking_files_table">
<table class="table table-striped table-sm">
<thead>
<tr>
<th style="width: 2%;">&nbsp;</th>
<th style="width: 6%;">{{__('POS')}}</th>
<th>Leistung</th>
<th>Beschreibung</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
@if($model->service_provider_services)
@foreach($model->service_provider_services as $service_provider_service)
<tr>
<td class="not">
<button type="button" class="btn icon-btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-load-content"
data-id="{{$service_provider_service->id}}"
data-model="TravelCompanyService"
data-action="modal-service_provider-services"
data-back="{{route('admin_settings_service_provider_detail', [$model->id, 'services'])}}"
data-url="{{ route('admin_settings_service_provider_update', [$model->id]) }}"
data-route="{{ route('modal_load') }}"><span class="fa fa-edit"></span></button>
</td>
<td>{{$service_provider_service->pos }}</td>
<td>{{$service_provider_service->name}}</td>
<td>{{$service_provider_service->description}}</td>
<td>
<a class="ml-2 btn btn-xs btn-danger" href="{{ route('admin_settings_service_provider_delete', [$service_provider_service->id, 'provider_service']) }}" onclick="return confirm('{{__('Wirklich löschen?')}}');"><i class="fa fa-trash-alt"></i></a>
</td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
<div class="text-right d-block w-100">
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-load-content"
data-id="new"
data-model="TravelCompanyService"
data-action="modal-service_provider-services"
data-back="{{route('admin_settings_service_provider_detail', [$model->id, 'services'])}}"
data-url="{{ route('admin_settings_service_provider_update', [$model->id]) }}"
data-route="{{ route('modal_load') }}"><i class="ion ion-md-add-circle"></i>&nbsp;Leistung hinzufügen</button>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="text-left mt-3">
<a href="{{route('admin_settings_service_provider')}}" class="btn btn-default">{{ __('back') }}</a>
</div>
{!! Form::close() !!}
@endsection

68
resources/views/settings/service_provider/index.blade.php
View file

@ -23,14 +23,9 @@
@foreach($service_provider as $value)
<tr>
<td data-sort="{{ $value->id }}">
<button type="button" class="btn icon-btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-default"
data-id="{{ $value->id }}"
data-name="{{ $value->name }}"
data-type="{{ $value->type }}"
data-contact_emails="{{\App\Services\Util::_implodeLines($value->contact_emails)}}"
data-active="{{ $value->active }}">
<a href="{{ route('admin_settings_service_provider_detail', [$value->id]) }}" class="btn icon-btn btn-sm btn-primary">
<span class="fa fa-edit"></span>
</button>
</a>
</td>
<td>{{ $value->name }}</td>
<td>{!! \App\Services\Util::_implodeLines($value->contact_emails, "<br>") !!}</td>
@ -42,70 +37,13 @@
</tbody>
</table>
<div class="mt-4 col">
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-default"
data-id="new"
data-name=""
data-type=""
data-contact_emails=""
data-active="1"
>Neuen Leistungsträger anlegen</button>
<a href="{{ route('admin_settings_service_provider_detail', ['new']) }}" class="btn btn-sm btn-primary">Neuen Leistungsträger anlegen</a>
</div>
</div>
<div class="modal fade" id="modals-default">
<div class="modal-dialog">
{!! Form::open([ 'url' => route('admin_settings_service_provider_update'), 'method' => 'post', 'class' => 'modal-content' ]) !!}
{{ Form::hidden('id', '') }}
<div class="modal-header">
<h5 class="modal-title">Leistungsträger <span class="font-weight-light">anlegen/bearbeiten</span></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<div class="form-row">
<div class="form-group col">
<label for="name" class="form-label">Name*</label>
{{ Form::text('name', '', array('placeholder'=>__('Description'), 'class'=>'form-control', 'required'=>true)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col">
<label class="form-label" for="type">Type</label>
{{ Form::select('type', \App\Models\ServiceProvider::$types , '', array('class'=>'custom-select', 'required'=>true)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col">
<label class="form-label" for="contact_emails">Für interene Mails <span class="text-muted">(jede E-Mail in eine extra Zeile)</span></label>
{{ Form::textarea('contact_emails', '', array('class'=>'form-control', 'rows'=>4)) }}
</div>
</div>
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
{{ Form::checkbox('active', 1, '', array('class'=>'custom-control-input')) }}
<span class="custom-control-label">{{__('sichtbar')}}</span>
</label>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
<button type="submit" class="btn btn-primary">{{__('save')}}</button>
</div>
{!! Form::close() !!}
</div>
</div>
<script>
$( document ).ready(function() {
$('#modals-default').on('show.bs.modal', function (event) {
var button = $(event.relatedTarget);
$(this).find(".modal-content input[name='id']").val(button.data('id'));
$(this).find(".modal-body input[name='name']").val(button.data('name'));
$(this).find(".modal-body select[name='type']").val(button.data('type'));
$(this).find(".modal-body textarea[name='contact_emails']").val(button.data('contact_emails'));
$(this).find(".modal-body input[name='active']").prop( "checked", button.data('active'));
});
$('.datatables-default').dataTable({
"bLengthChange": false,
"iDisplayLength": 50,

156
resources/views/settings/travel_company/detail.blade.php Executable file
View file

@ -0,0 +1,156 @@
@extends('layouts.layout-2')
@section('content')
{!! Form::open(['url' => route('admin_settings_travel_company_update', [$id]), 'class' => 'form-horizontal']) !!}
<h4 class="font-weight-bold py-3 mb-1">
Reiseveranstalter Inhalte {{ $model->name }}
<div class="float-right">
<a href="{{route('admin_settings_travel_company')}}" class="btn btn-default btn-sm">{{ __('back') }}</a>
</div>
</h4>
<div class="nav-tabs-top mb-4">
<ul class="nav nav-tabs">
<li class="nav-item">
<a class="nav-link @if($step == false) active show @endif" data-toggle="tab" href="#navs-site">Allgemein</a>
</li>
<li class="nav-item">
<a class="nav-link @if($step === 'services') active show @endif" data-toggle="tab" href="#navs-services">Leistungen</a>
</li>
</ul>
<div class="tab-content">
<div class="tab-pane fade @if($step == false) active show @endif" id="navs-site">
<div class="card">
<div class="card-body">
<h4>Allgemein</h4>
<div class="form-row">
<div class="form-group col-sm-12">
<label class="form-label" for="name">{{ __('Name') }} *</label>
{{ Form::text('name', $model->name, array('placeholder'=>__('Name'), 'class'=>'form-control', 'id'=>'name', 'required'=>true)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-sm-12">
<label for="percentage" class="form-label">Prozentsatz für Provision*</label>
{{ Form::text('percentage', $model->percentage, array('placeholder'=>__('%'), 'class'=>'form-control', 'required'=>true)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-sm-12">
<label class="form-label" for="contact_emails">Für interene Mails <span class="text-muted">(jede E-Mail in eine extra Zeile)</span></label>
{{ Form::textarea('contact_emails', \App\Services\Util::_implodeLines($model->contact_emails), array('class'=>'form-control', 'rows'=>4)) }}
</div>
</div>
<div class="form-row">
<div class="col-12 py-2">
<label class="switcher switcher-on-off">
{{ Form::hidden('is_allowed_edit_commission', 0) }}
{{ Form::checkbox('is_allowed_edit_commission', 1, $model->is_allowed_edit_commission, array('class'=>'switcher-input')) }}
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">Provision änderbar</span>
</label>
</div>
<div class="col-12 py-2">
<label class="switcher switcher-on-off">
{{ Form::hidden('is_inhouse', 0) }}
{{ Form::checkbox('is_inhouse', 1, $model->is_inhouse, array('class'=>'switcher-input')) }}
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">In-House</span>
</label>
</div>
<div class="col-12 py-2">
<label class="switcher switcher-on-off">
{{ Form::hidden('active', 0) }}
{{ Form::checkbox('active', 1, $model->active, array('class'=>'switcher-input')) }}
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">sichtbar</span>
</label>
</div>
</div>
<br>
<button type="submit" name="action" value="" class="btn btn-submit">{{ __('save changes') }}</button>&nbsp;
</div>
</div>
</div>
<div class="tab-pane fade @if($step === 'services') active show @endif" id="navs-services">
<div class="card">
<div class="card-body">
<br>
<h4>Leistungen <span class="text-muted">für dieses Reiseveranstalter</span></h4>
<div class="table-responsive" id="booking_files_table">
<table class="table table-striped table-sm">
<thead>
<tr>
<th style="width: 2%;">&nbsp;</th>
<th style="width: 6%;">{{__('POS')}}</th>
<th>Leistung</th>
<th>Beschreibung</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
@if($model->travel_company_services)
@foreach($model->travel_company_services as $travel_company_service)
<tr>
<td class="not">
<button type="button" class="btn icon-btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-load-content"
data-id="{{$travel_company_service->id}}"
data-model="TravelCompanyService"
data-action="modal-travel_company-services"
data-back="{{route('admin_settings_travel_company_detail', [$model->id, 'services'])}}"
data-url="{{ route('admin_settings_travel_company_update', [$model->id]) }}"
data-route="{{ route('modal_load') }}"><span class="fa fa-edit"></span></button>
</td>
<td>{{$travel_company_service->pos }}</td>
<td>{{$travel_company_service->name}}</td>
<td>{{$travel_company_service->description}}</td>
<td>
<a class="ml-2 btn btn-xs btn-danger" href="{{ route('admin_settings_travel_company_delete', [$travel_company_service->id, 'company_service']) }}" onclick="return confirm('{{__('Wirklich löschen?')}}');"><i class="fa fa-trash-alt"></i></a>
</td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
<div class="text-right d-block w-100">
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-load-content"
data-id="new"
data-model="TravelCompanyService"
data-action="modal-travel_company-services"
data-back="{{route('admin_settings_travel_company_detail', [$model->id, 'services'])}}"
data-url="{{ route('admin_settings_travel_company_update', [$model->id]) }}"
data-route="{{ route('modal_load') }}"><i class="ion ion-md-add-circle"></i>&nbsp;Leistung hinzufügen</button>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="text-left mt-3">
<a href="{{route('admin_settings_travel_company')}}" class="btn btn-default">{{ __('back') }}</a>
</div>
{!! Form::close() !!}
@endsection

86
resources/views/settings/travel_company/index.blade.php
View file

@ -25,16 +25,9 @@
@foreach($travel_company as $value)
<tr>
<td data-sort="{{ $value->id }}">
<button type="button" class="btn icon-btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-default"
data-id="{{ $value->id }}"
data-name="{{ $value->name }}"
data-percentage="{{ $value->percentage }}"
data-is_allowed_edit_commission="{{ $value->is_allowed_edit_commission }}"
data-is_inhouse="{{ $value->is_inhouse }}"
data-contact_emails="{{\App\Services\Util::_implodeLines($value->contact_emails)}}"
data-active="{{ $value->active }}">
<a href="{{ route('admin_settings_travel_company_detail', [$value->id]) }}" class="btn icon-btn btn-sm btn-primary">
<span class="fa fa-edit"></span>
</button>
</a>
</td>
<td>{{ $value->name }}</td>
<td>{!! \App\Services\Util::_implodeLines($value->contact_emails, "<br>") !!}</td>
@ -49,85 +42,12 @@
</tbody>
</table>
<div class="mt-4 col">
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-default"
data-id="new"
data-name=""
data-percentage=""
data-is_allowed_edit_commission=""
data-contact_emails=""
data-active="1"
>Neuen Reiseveranstalter anlegen</button>
</div>
</div>
<div class="modal fade" id="modals-default">
<div class="modal-dialog">
{!! Form::open([ 'url' => route('admin_settings_travel_company_update'), 'method' => 'post', 'class' => 'modal-content' ]) !!}
{{ Form::hidden('id', '') }}
<div class="modal-header">
<h5 class="modal-title">Reiseveranstalter <span class="font-weight-light">anlegen/bearbeiten</span></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<div class="form-row">
<div class="form-group col">
<label for="name" class="form-label">Name*</label>
{{ Form::text('name', '', array('placeholder'=>__('Description'), 'class'=>'form-control', 'required'=>true)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col">
<label for="percentage" class="form-label">Prozentsatz für Provision*</label>
{{ Form::text('percentage', '', array('placeholder'=>__('%'), 'class'=>'form-control', 'required'=>true)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col">
<label class="form-label" for="contact_emails">Für interene Mails <span class="text-muted">(jede E-Mail in eine extra Zeile)</span></label>
{{ Form::textarea('contact_emails', '', array('class'=>'form-control', 'rows'=>4)) }}
</div>
</div>
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
{{ Form::checkbox('is_allowed_edit_commission', 1, '', array('class'=>'custom-control-input')) }}
<span class="custom-control-label">{{__('Provision änderbar')}}</span>
</label>
</div>
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
{{ Form::checkbox('is_inhouse', 1, '', array('class'=>'custom-control-input')) }}
<span class="custom-control-label">{{__('In-House')}}</span>
</label>
</div>
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
{{ Form::checkbox('active', 1, '', array('class'=>'custom-control-input')) }}
<span class="custom-control-label">{{__('sichtbar')}}</span>
</label>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
<button type="submit" class="btn btn-primary">{{__('save')}}</button>
</div>
{!! Form::close() !!}
<a href="{{ route('admin_settings_travel_company_detail', ['new']) }}" class="btn btn-sm btn-primary">Neuen Reiseveranstalter anlegen</a>
</div>
</div>
<script>
$( document ).ready(function() {
$('#modals-default').on('show.bs.modal', function (event) {
var button = $(event.relatedTarget);
$(this).find(".modal-content input[name='id']").val(button.data('id'));
$(this).find(".modal-body input[name='name']").val(button.data('name'));
$(this).find(".modal-body input[name='percentage']").val(button.data('percentage'));
$(this).find(".modal-body input[name='is_allowed_edit_commission']").prop( "checked", button.data('is_allowed_edit_commission'));
$(this).find(".modal-body input[name='is_inhouse']").prop( "checked", button.data('is_inhouse'));
$(this).find(".modal-body textarea[name='contact_emails']").val(button.data('contact_emails'));
$(this).find(".modal-body input[name='active']").prop( "checked", button.data('active'));
});
$('.datatables-default').dataTable({
"bLengthChange": false,
"iDisplayLength": 50,

17
resources/views/settings/travel_country/detail.blade.php
View file

@ -38,6 +38,7 @@
<div class="tab-content">
<div class="tab-pane fade @if($step == false) active show @endif" id="navs-site">
<div class="card">
<div class="card-body">
<div class="form-row">
<div class="form-group col-sm-12">
@ -95,9 +96,11 @@
<button type="submit" name="action" value="" class="btn btn-submit">{{ __('save changes') }}</button>&nbsp;
</div>
</div>
</div>
<div class="tab-pane fade @if($step === 'form') active show @endif" id="navs-form">
<div class="card">
<div class="card-body">
<br>
<h4>Inhalte für Formular</h4>
@ -112,11 +115,12 @@
</div>
</div>
<button type="submit" name="action" value="form" class="btn btn-submit">{{ __('save changes') }}</button>&nbsp;
</div>
</div>
</div>
<div class="tab-pane fade @if($step === 'contact') active show @endif" id="navs-contact">
<div class="card">
<div class="card-body">
<h4>Land/Länder für Kontaktdaten definieren</h4>
<div class="form-row">
@ -169,9 +173,11 @@
<button type="submit" name="action" value="contact" class="btn btn-submit">{{ __('save changes') }}</button>&nbsp;
</div>
</div>
</div>
<div class="tab-pane fade @if($step === 'emails') active show @endif" id="navs-emails">
<div class="card">
<div class="card-body">
<div class="form-row">
<div class="form-group col-sm-12">
@ -212,9 +218,11 @@
@endforeach
<button type="submit" name="action" value="emails" class="btn btn-submit">{{ __('save changes') }}</button>&nbsp;
</div>
</div>
</div>
<div class="tab-pane fade @if($step === 'data') active show @endif" id="navs-data">
<div class="card">
<div class="card-body">
<br>
<h4>PDF-Dateien <span class="text-muted">für dieses Reiseland</span></h4>
@ -268,10 +276,11 @@
data-route="{{ route('modal_load') }}"><i class="ion ion-md-cloud-upload"></i>&nbsp;Datei hinzufügen</button>
</div>
</div>
</div>
</div>
<div class="tab-pane fade @if($step === 'services') active show @endif" id="navs-services">
<div class="card">
<div class="card-body">
<br>
<h4>Länderleistungen/Agenturleistungen <span class="text-muted">für dieses Reiseland</span></h4>
@ -322,10 +331,11 @@
data-route="{{ route('modal_load') }}"><i class="ion ion-md-add-circle"></i>&nbsp;Leistung hinzufügen</button>
</div>
</div>
</div>
</div>
<div class="tab-pane fade @if($step === 'travel') active show @endif" id="navs-travel">
<div class="card">
<div class="card-body">
<br>
<h4>Einreisebestimmungen</h4>
@ -339,6 +349,7 @@
@endforeach
<button type="submit" name="action" value="travel" class="btn btn-submit">{{ __('save changes') }}</button>&nbsp;
</div>
</div>
</div>
</div>
</div>

11
routes/web.php
View file

@ -317,8 +317,9 @@ Route::group(['middleware' => ['superadmin']], function() {
Route::group(['middleware' => ['auth.permission:sua-st-sp']], function() {
//SUPERADMIN > Einstellungen > Leistungsträger
Route::get('/admin/settings/service_provider', 'Settings\ServiceProviderController@index')->name('admin_settings_service_provider');
Route::post('/admin/settings/service_provider/update', 'Settings\ServiceProviderController@update')->name('admin_settings_service_provider_update');
Route::get('/admin/settings/service_provider/delete/{id}', 'Settings\ServiceProviderController@delete')->name('admin_settings_service_provider_delete');
Route::get('/admin/settings/service_provider/detail/{id}/{step?}', 'Settings\ServiceProviderController@detail')->name('admin_settings_service_provider_detail');
Route::post('/admin/settings/service_provider/update/{id}', 'Settings\ServiceProviderController@update')->name('admin_settings_service_provider_update');
Route::get('/admin/settings/service_provider/delete/{id}/{del?}', 'Settings\ServiceProviderController@delete')->name('admin_settings_service_provider_delete');
});
Route::group(['middleware' => ['auth.permission:sua-st-tn']], function() {
//SUPERADMIN > Einstellungen > Nationalitäten
@ -348,8 +349,9 @@ Route::group(['middleware' => ['superadmin']], function() {
Route::group(['middleware' => ['auth.permission:sua-st-bs']], function() {
//SUPERADMIN > Einstellungen > Veranstalter
Route::get('/admin/settings/travel_company', 'Settings\TravelCompanyController@index')->name('admin_settings_travel_company');
Route::post('/admin/settings/travel_company/update', 'Settings\TravelCompanyController@update')->name('admin_settings_travel_company_update');
Route::get('/admin/settings/travel_company/delete/{id}', 'Settings\TravelCompanyController@delete')->name('admin_settings_travel_company_delete');
Route::get('/admin/settings/travel_company/detail/{id}/{step?}', 'Settings\TravelCompanyController@detail')->name('admin_settings_travel_company_detail');
Route::post('/admin/settings/travel_company/update/{id}', 'Settings\TravelCompanyController@update')->name('admin_settings_travel_company_update');
Route::get('/admin/settings/travel_company/delete/{id}/{del?}', 'Settings\TravelCompanyController@delete')->name('admin_settings_travel_company_delete');
});
Route::group(['middleware' => ['auth.permission:sua-st-bs']], function() {
//SUPERADMIN > Einstellungen > Versicherungen
@ -397,6 +399,7 @@ Route::group(['middleware' => ['sysadmin']], function() {
Route::get('/sysadmin/tools/tree_title', 'SyS\Tools\ContentLinkController@treeTitle')->name('sysadmin_tools_tree_title');
Route::post('/sysadmin/tools/tree_title', 'SyS\Tools\ContentLinkController@treeTitleStore')->name('sysadmin_tools_tree_title');
});

BIN
storage/app/booking_fewo/files/2020/05/5ed1051bafc3b5.82676224_jackodurextrusionsstrang.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 98 KiB

BIN
storage/app/booking_fewo/files/2020/05/5ed1051bee26b3.70425691_jdatlastoollogo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.3 KiB

BIN
storage/app/booking_fewo/files/2020/05/5ed105cc4be3e1.92100968_jdatlastoollogo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.3 KiB

BIN
storage/app/booking_fewo/files/2020/05/5ed10756b16e44.33061945_jdatlastoollogo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.3 KiB

BIN
storage/app/booking_fewo/files/2020/05/5ed1084db170d5.80879705_jdatlastoollogo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.3 KiB

BIN
storage/app/booking_fewo/files/2020/05/5ed108c3096a09.95052646_jdatlastoollogo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.3 KiB

BIN
storage/app/booking_fewo/files/2020/05/5ed108e009c9f5.51348855_jdatlastoollogo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.3 KiB

BIN
storage/app/booking_fewo/files/2020/05/5ed10907ddc864.16746869_muscat-sultan-qaboos-moschee-h1_k.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.2 MiB

BIN
storage/app/booking_fewo/files/2020/05/5ed10944f20eb4.87453333_jdatlastoollogo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.3 KiB

BIN
storage/app/booking_fewo/files/2020/05/5ed1098e66a8e6.33653098_jdatlastoollogo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.3 KiB

BIN
storage/app/booking_fewo/files/2020/05/5ed109d6576903.25774360_jdatlastoollogo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.3 KiB

BIN
storage/app/booking_fewo/files/2020/06/5ef9ab45db7800.71530766_ust111.pdf
View file

Binary file not shown.