Mails + Upload
This commit is contained in:
Kevin Adametz
parent
767e84e640
commit
a3bef8d1aa
19 changed files with 151 additions and 200 deletions
200
.idea/workspace.xml
generated
200
.idea/workspace.xml
generated
|
|
@ -2,29 +2,6 @@
|
|||
<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/CustomerFewoMailController.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Http/Controllers/ModalController.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Models/BookingCountryService.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Models/CustomerFewoFile.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Models/CustomerFewoMail.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Models/EmailTemplateDir.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Models/GeneralFile.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Models/TravelCountryService.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Models/TravelUserBookingFile.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Repositories/BookingFewoFileRepository.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Repositories/CustomerFewoFileRepository.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Repositories/CustomerFewoMailRepository.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Repositories/GeneralFileRepository.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Services/Booking.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Services/BookingFewo.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/config/booking.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/database/migrations/2020_04_23_144837_create_email_template_dirs_table.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/database/migrations/2020_05_15_111351_create_customer_fewo_mails_table.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/database/migrations/2020_05_15_111435_create_customer_fewo_files_table.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/database/migrations/2020_05_16_140222_create_travel_user_booking_files_table.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/database/migrations/2020_05_20_131909_create_general_files_table.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/database/migrations/2020_05_28_112257_create_travel_country_services_table.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/database/migrations/2020_05_28_112359_create_booking_country_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" />
|
||||
|
|
@ -48,103 +25,24 @@
|
|||
<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$/resources/views/admin/modal/country-service.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/admin/modal/upload.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/settings/emails/index.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/_detail_files.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/_detail_invoice.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/_detail_mails.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/_detail_sm_mails.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/mail/modal-new-booking-files.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/mail/modal-new-mail.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/mail/modal-show-mail-inner.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/mail/modal-show-mail.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/upload_modal.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/booking/files/2020/05/5ecfd762aa38a0.56412773_jackodurextrusionsstrang.jpg" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/booking/files/2020/05/5ecfd762e89a97.23023265_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ebfdb1ba22d59.38592238_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ebfdb5d952323.95463407_muscat-sultan-qaboos-moschee-h1_k.jpg" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5eb5345ca5de87.88438301_arb20190815.pdf" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5eb953a1c209a0.17939907_arb20190815.pdf" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5eb953a3eee0d4.85910050_sicherungsscheinnachsis651r.pdf" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5eb953a586abe9.14636744_gutschein2022585047591314.pdf" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5ebe7cafc91eb3.64758684_8.jpg" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5ebfc2a178f776.19101914_8.jpg" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5ec5300d90ac01.47787398_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5ec530720c7520.94997351_.html" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5ec530a06604b5.06762823_.html" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5ec530a2888c21.81994786_.html" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5ec530b0cd1b45.60705604_sicherungsscheinnachsis651.html" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5ec530bea69b42.94459338_sicherungsscheinnachsis651.html" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5ec530bf720f45.26590361_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5ec53165b27a66.41746967_sicherungsscheinnachsis651.html" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/fewo/infos/2020/Anreiseinfo-10848.pdf" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/fewo/invoices/2020/10848.pdf" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/general/2020/05/5ec51b17d1da21.32961364_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/general/2020/05/5ec51c02399ba4.58193608_the-easter-bunny-with-easter-eggs.jpg" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/general/2020/05/5ec51c643b2398.58669480_ust111.pdf" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/public/cms_files/2020/05/5eb5320e7d1990.10675631_arb20190815.pdf" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/public/cms_files/2020/05/5eb92c7f54cbc9.72843966_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/public/cms_files/2020/05/5eb935c79e7808.39271407_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/public/cms_files/2020/05/5eb950427e3795.55847896_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/public/cms_files/2020/05/5ebe665cd98ca1.76107546_8.jpg" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/travel_user/attachment/2020/05/5ebfc46e0ff3c0.14228313_8.jpg" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/travel_user/attachment/2020/05/5ebfc49a63c465.01874505_8.jpg" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/travel_user/attachment/2020/05/5ebfc6754af358.11706766_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/travel_user/attachment/2020/05/5ebfc6a83aaa03.48156108_8.jpg" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/travel_user/attachment/2020/05/5ebfdc2163c6f3.61031669_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/travel_user/attachment/2020/05/5ebfdc9a5508f1.82637218_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/travel_user/attachment/2020/05/5ebfdc9b61abc4.55465946_muscat-sultan-qaboos-moschee-h1_k.jpg" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/travel_user/attachment/2020/05/5ec53110cfd978.74599082_8.jpg" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/booking/files/2020/05/5ed104041c8f67.23753451_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/booking/files/2020/05/5ed104cd300220.63110550_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed1051bafc3b5.82676224_jackodurextrusionsstrang.jpg" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed1051bee26b3.70425691_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed105cc4be3e1.92100968_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed10756b16e44.33061945_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed1084db170d5.80879705_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed108c3096a09.95052646_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/booking_fewo/files/2020/05/5ed108e009c9f5.51348855_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5ed104e5ac4de8.29989312_jackodurextrusionsstrang.jpg" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/05/5ed104e5ee9389.49113198_jdatlastoollogo.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/general/2020/05/5ed0f462b82255.53122339_ust111.pdf" 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/Admin/ReportController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Admin/ReportController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/BookingController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/BookingController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/CMS/CMSContentController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CMS/CMSContentController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/CustomerMailController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CustomerMailController.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/FileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/FileController.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/EmailTemplateController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Settings/EmailsController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Settings/TravelCountryController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Settings/TravelCountryController.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/Airline.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Airline.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/Models/Booking.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Booking.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/BookingFile.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/BookingFile.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/CustomerFile.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/CustomerFile.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/CustomerMail.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/CustomerMail.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/EmailTemplate.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/EmailTemplate.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/Insurance.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Insurance.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/Sym/CmsContent.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Sym/CmsContent.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/Sym/TravelCountry.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Sym/TravelCountry.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/TravelCountry.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/TravelCountry.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/TravelUser.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/TravelUser.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$/app/Repositories/CMSFileRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Repositories/CMSFileRepository.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Repositories/CustomerFewoMailRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Repositories/CustomerFewoMailRepository.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Repositories/CustomerMailRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Repositories/CustomerMailRepository.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Repositories/FileRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Repositories/FileRepository.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Repositories/TravelUserBookingFewoRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Repositories/TravelUserBookingFewoRepository.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/HTMLHelper.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/HTMLHelper.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/Placeholder.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Placeholder.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/Util.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Util.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/helpers.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/helpers.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/bootstrap/cache/services.php" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/cache/services.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/app.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/app.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/filesystems.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/filesystems.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/2018_10_29_193339_create_travel_country_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2018_10_29_193339_create_travel_country_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2019_02_27_113516_create_c_m_s_contents_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_02_27_113516_create_c_m_s_contents_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2020_03_11_131408_create_customer_mails_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2020_03_11_131408_create_customer_mails_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2020_04_23_144838_create_email_templates_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2020_04_23_144838_create_email_templates_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/sym/0001_sym_travel_country_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/sym/0001_sym_travel_country_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/sym/0002_sym_salutation_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/sym/0002_sym_salutation_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" />
|
||||
|
|
@ -192,37 +90,12 @@
|
|||
<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$/public/css/application.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/application.css" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/css/stern_fewo_pdf.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/stern_fewo_pdf.css" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/js/custom.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/custom.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/booking/_detail_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_files.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/booking/_detail_files.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/booking/_detail_mails.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/booking/_detail_mails.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/booking/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/booking/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/cms/content/all/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/cms/content/all/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/cms/content/all/modal.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/cms/content/all/modal.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/cms/feedback/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/cms/feedback/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/customer/mail/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/customer/mail/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/customer/mail/modal-new-booking-files.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/customer/mail/modal-new-booking-files.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/customer/mail/modal-new-mail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/customer/mail/modal-new-mail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/customer/mail/modal-show-mail-inner.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/customer/mail/modal-show-mail-inner.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/customer/mail/modal-show-mail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/customer/mail/modal-show-mail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/drafts/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/drafts/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/layouts/application.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/application.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/pdf/layout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pdf/layout.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/email_template/index.blade.php" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/settings/email_template/modal.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/settings/emails/modal.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/settings/travel_agenda/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/settings/travel_agenda/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$/resources/views/settings/travel_country/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/settings/travel_country/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/travel/program/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/program/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/travel/user/booking/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/travel/user/booking/form.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/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/index.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/fewo/invoices/2019/12345.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/12345.pdf" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/modal/upload.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/modal/upload.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/report/bookings.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/report/bookings.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/report/service_providers.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/report/service_providers.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/booking/_detail_price.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/booking/_detail_price.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/booking/upload_modal.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/booking/upload_modal.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/travel/user/booking/upload_modal.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/upload_modal.blade.php" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -450,13 +323,6 @@
|
|||
<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/admin/modal" />
|
||||
<recent name="$PROJECT_DIR$/database/migrations" />
|
||||
<recent name="$PROJECT_DIR$/app/Repositories" />
|
||||
<recent name="$PROJECT_DIR$/app/Http/Controllers" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/travel/user/booking" />
|
||||
</key>
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/resources/views/settings" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/customer/mail" />
|
||||
|
|
@ -464,6 +330,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/admin/modal" />
|
||||
<recent name="$PROJECT_DIR$/database/migrations" />
|
||||
<recent name="$PROJECT_DIR$/app/Repositories" />
|
||||
<recent name="$PROJECT_DIR$/app/Http/Controllers" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/travel/user/booking" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunAnythingCache">
|
||||
<option name="myCommands">
|
||||
|
|
@ -861,6 +734,18 @@
|
|||
<workItem from="1589959162608" duration="2522000" />
|
||||
<workItem from="1589967486173" duration="10489000" />
|
||||
<workItem from="1590656843540" duration="18541000" />
|
||||
<workItem from="1590738781715" duration="2176000" />
|
||||
<workItem from="1590752007581" duration="1083000" />
|
||||
<workItem from="1590756282663" duration="1431000" />
|
||||
<workItem from="1590829849126" duration="19000" />
|
||||
<workItem from="1590829913404" duration="26000" />
|
||||
<workItem from="1591188765445" duration="64000" />
|
||||
<workItem from="1591363251226" duration="568000" />
|
||||
<workItem from="1591532626114" duration="5000" />
|
||||
<workItem from="1591532636876" duration="1000" />
|
||||
<workItem from="1591600294848" duration="3464000" />
|
||||
<workItem from="1591604539185" duration="2568000" />
|
||||
<workItem from="1591864148704" duration="3228000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
|
@ -926,9 +811,10 @@
|
|||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state width="2518" height="407" key="GridCell.Tab.0.right/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1587976409044" />
|
||||
<state x="815" y="370" key="SettingsEditor" timestamp="1587029998517">
|
||||
<state x="815" y="370" key="SettingsEditor" timestamp="1591607084280">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="815" y="370" key="SettingsEditor/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1591607084280" />
|
||||
<state x="815" y="370" key="SettingsEditor/2560.-493.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1585999076795" />
|
||||
<state x="815" y="370" key="SettingsEditor/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1587029998517" />
|
||||
<state x="1063" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1587128795225">
|
||||
|
|
@ -936,12 +822,12 @@
|
|||
</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="1585232936868" />
|
||||
<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="1590683778555">
|
||||
<state x="675" y="397" width="1487" height="939" key="find.popup" timestamp="1591602501931">
|
||||
<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="1590683778555" />
|
||||
<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="1591602501931" />
|
||||
<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="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" />
|
||||
|
|
|
|||
|
|
@ -143,7 +143,8 @@ class ReportController extends Controller
|
|||
})
|
||||
->orderColumn('id', 'id $1')
|
||||
->orderColumn('start_date', 'start_date $1')
|
||||
->orderColumn('start_date', 'start_date $1')
|
||||
->orderColumn('end_date', 'end_date $1')
|
||||
->orderColumn('booking_date', 'booking_date $1')
|
||||
->orderColumn('customer.fullName', 'customer.firstname $1')
|
||||
//->orderColumn('lead.status_id', 'lead.status_id $1')
|
||||
//->orderColumn('is_cleared', 'is_cleared $1')
|
||||
|
|
@ -153,9 +154,24 @@ class ReportController extends Controller
|
|||
|
||||
public function bookingsExport(){
|
||||
|
||||
$query = $this->prozessBookingSearch();
|
||||
$query->orderBy("id", 'ASC');
|
||||
|
||||
$query = $this->prozessBookingSearch();
|
||||
|
||||
$order = explode(",", Request::get('order'));
|
||||
$orderByNum = [
|
||||
0 => "id",
|
||||
2 => "merlin_order_number",
|
||||
3 => "price",
|
||||
4 => "price_total",
|
||||
7 => "start_date",
|
||||
8 => "end_date",
|
||||
9 => "booking_date",
|
||||
];
|
||||
if(isset($order[0])) {
|
||||
$column = isset($orderByNum[$order[0]]) ? $orderByNum[$order[0]] : "start_date";
|
||||
$direction = isset($order[1]) ? strtoupper($order[1]) : "ASC";
|
||||
$query->orderBy($column, $direction);
|
||||
}
|
||||
|
||||
$filename = "file-".date('Y-m-d-H-i-s');
|
||||
$exports = $query->get();
|
||||
|
|
@ -273,7 +289,9 @@ class ReportController extends Controller
|
|||
|
||||
private function prozessProvidersSearch(){
|
||||
|
||||
$query = ServiceProviderEntry::with('booking', 'service_provider', 'booking.customer')->select('service_provider_entry.*');
|
||||
$query = ServiceProviderEntry::with('booking', 'service_provider', 'booking.customer')->select('service_provider_entry.*')
|
||||
->join('booking', 'service_provider_entry.booking_id', '=', 'booking.id' );
|
||||
|
||||
if(Request::get('filter_is_cleared') != ""){
|
||||
$query->where('is_cleared', '=', Request::get('filter_is_cleared'));
|
||||
}
|
||||
|
|
@ -292,6 +310,7 @@ class ReportController extends Controller
|
|||
$q->where("start_date", '<=', $travel_date_to);
|
||||
});
|
||||
}
|
||||
|
||||
return $query;
|
||||
}
|
||||
|
||||
|
|
@ -385,9 +404,23 @@ class ReportController extends Controller
|
|||
{
|
||||
$query = $this->prozessProvidersSearch();
|
||||
|
||||
$query->whereHas('booking', function ($q) {
|
||||
$q->orderBy("lead_id", 'ASC');
|
||||
});
|
||||
$order = explode(",", Request::get('order'));
|
||||
$orderByNum = [
|
||||
0 => "id",
|
||||
1 => "booking.id", //booking
|
||||
3 => "booking.merlin_order_number",//booking
|
||||
4 => "booking.price",//booking
|
||||
5 => "booking.price_total",//booking
|
||||
8 => "booking.start_date",//booking
|
||||
9 => "booking.end_date",//booking
|
||||
10 => "is_cleared",
|
||||
];
|
||||
|
||||
if(isset($order[0])){
|
||||
$column = isset($orderByNum[$order[0]]) ? $orderByNum[$order[0]] : "start_date";
|
||||
$direction = isset($order[1]) ? strtoupper($order[1]) : "ASC";
|
||||
$query->orderBy($column, $direction);;
|
||||
}
|
||||
|
||||
$filename = "file-".date('Y-m-d-H-i-s');
|
||||
$exports = $query->get();
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ class ModalController extends Controller
|
|||
$generalFileRepo->_set('dir', '/'.date('Y/m').'/');
|
||||
$generalFileRepo->_set('identifier', 'travel_country');
|
||||
$generalFileRepo->_set('redirect', $data['back']);
|
||||
|
||||
return $generalFileRepo->uploadFile(Request::all());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -638,7 +638,7 @@ class Booking extends Model
|
|||
}
|
||||
|
||||
public function isCanceled(){
|
||||
return ($this->attributes['canceled'] > 0);
|
||||
return ($this->attributes['canceled'] !== null);
|
||||
}
|
||||
|
||||
//erlös #getRevenueFactor
|
||||
|
|
|
|||
|
|
@ -234,7 +234,6 @@ class CustomerFewoMailRepository extends BaseRepository {
|
|||
$value->show = 'single';
|
||||
$value->lead_title_id = " - (".$value->booking->invoice_number.")";
|
||||
|
||||
|
||||
$tmp = [];
|
||||
$tmp['email'] = $booking->travel_user ? $booking->travel_user->email : "";
|
||||
$tmp['name'] = $booking->travel_user ? $booking->travel_user->first_name . " " . $booking->travel_user->last_name . " | " : "- | ";
|
||||
|
|
@ -252,7 +251,7 @@ class CustomerFewoMailRepository extends BaseRepository {
|
|||
if($customer_mail->reply_id){
|
||||
$value->title = "E-Mail Antwort an Kunden senden";
|
||||
$value->subtitle = "Dem Kunden wird eine E-Mail zugesendet, die im System als Antwort gespeichert wird.";
|
||||
$value->customer_mail = $customer_mail;
|
||||
$value->customer_mail = $customer_mail->customer_mail;
|
||||
}
|
||||
$value->s_placeholder = "Betreff der E-Mail";
|
||||
$value->m_placeholder = "Nachricht der E-Mail";
|
||||
|
|
@ -261,7 +260,6 @@ class CustomerFewoMailRepository extends BaseRepository {
|
|||
$value->customer_mail_subdir = $customer_mail->subdir ? $customer_mail->subdir : 0;
|
||||
|
||||
return view("travel.user.booking.mail.modal-new-mail", compact('data', 'value'))->render();
|
||||
|
||||
}
|
||||
/* neue Mail */
|
||||
if ($data['action'] === "new-customer-mail") {
|
||||
|
|
|
|||
|
|
@ -257,7 +257,7 @@ class CustomerMailRepository extends BaseRepository {
|
|||
if($customer_mail->reply_id){
|
||||
$value->title = "E-Mail Antwort an Kunden senden";
|
||||
$value->subtitle = "Dem Kunden wird eine E-Mail zugesendet, die im System als Antwort gespeichert wird.";
|
||||
$value->customer_mail = $customer_mail;
|
||||
$value->customer_mail = $customer_mail->customer_mail;
|
||||
|
||||
}
|
||||
$value->s_placeholder = "Betreff der E-Mail";
|
||||
|
|
@ -265,9 +265,7 @@ class CustomerMailRepository extends BaseRepository {
|
|||
$value->url = $data['url'];
|
||||
$value->customer_mail_dir = $customer_mail->dir ? $customer_mail->dir : 0;
|
||||
$value->customer_mail_subdir = $customer_mail->subdir ? $customer_mail->subdir : 0;
|
||||
|
||||
return view("customer.mail.modal-new-mail", compact('data', 'value'))->render();
|
||||
|
||||
}
|
||||
/* neue Mail */
|
||||
if ($data['action'] === "new-customer-mail") {
|
||||
|
|
|
|||
|
|
@ -35,6 +35,14 @@
|
|||
|
||||
<script type="text/javascript">
|
||||
|
||||
var responseRedirect = undefined;
|
||||
$('#modals-load-content').on('hide.bs.modal', function (event) {
|
||||
$(this).off('hide.bs.modal');
|
||||
if(responseRedirect){
|
||||
window.location.href = responseRedirect;
|
||||
}
|
||||
});
|
||||
|
||||
$( document ).ready(function() {
|
||||
Dropzone.autoDiscover = false;
|
||||
$("#uploadModalFile").dropzone({
|
||||
|
|
@ -76,18 +84,21 @@
|
|||
message = response.message;
|
||||
var _ele = $('.alert-danger');
|
||||
_ele.fadeIn();
|
||||
console.log(message);
|
||||
$(file.previewElement).find('.dz-error-message').text(message);
|
||||
$(file.previewElement).addClass('dz-error');
|
||||
_ele.text(message);
|
||||
},
|
||||
success: function(file, response) {
|
||||
console.log(file);
|
||||
console.log(response);
|
||||
//console.log(file);
|
||||
//console.log(response);
|
||||
$(file.previewElement).addClass('dz-success');
|
||||
if(response.error === false){
|
||||
if(response.redirect){
|
||||
window.location.href = response.redirect
|
||||
responseRedirect = response.redirect;
|
||||
// window.location.href = response.redirect
|
||||
}else{
|
||||
//window.location.href = window.location.href; //This is a possibility
|
||||
window.location.reload(); //Another possiblity
|
||||
// window.location.reload(); //Another possiblity
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
</h4>
|
||||
<div class="card">
|
||||
{!! Form::open(['url' => route('admin_report_export_bookings'), 'class' => '']) !!}
|
||||
|
||||
{!! Form::hidden('order', '[[7, "asc"]]', ['id'=>'order_table']) !!}
|
||||
<div class="ui-bordered px-4 pt-3 mb-0">
|
||||
<div class="form-row align-items-center">
|
||||
|
||||
|
|
@ -114,14 +114,14 @@
|
|||
{ data: 'merlin_order_number', name: 'merlin_order_number' },
|
||||
{ data: 'price', name: 'price' },
|
||||
{ data: 'price_total', name: 'price_total' },
|
||||
{ data: 'proceeds', name: 'proceeds' },
|
||||
{ data: 'customer.fullName', name: 'customer.fullName' },
|
||||
{ data: 'proceeds', name: 'proceeds', orderable: false },
|
||||
{ data: 'customer.fullName', name: 'customer.fullName', orderable: false },
|
||||
{ data: 'start_date', name: 'start_date' },
|
||||
{ data: 'end_date', name: 'end_date' },
|
||||
{ data: 'booking_date', name: 'booking_date' },
|
||||
{ data: 'service_provider.names', name: 'service_provider.names' },
|
||||
{ data: 'service_provider.names', name: 'service_provider.names', orderable: false },
|
||||
],
|
||||
"order": [[ 0, "desc" ]],
|
||||
"order": [[ 7, "asc" ]],
|
||||
"orderSequence": ["desc", "asc"],
|
||||
"bLengthChange": false,
|
||||
"iDisplayLength": 100,
|
||||
|
|
@ -129,16 +129,17 @@
|
|||
"url": "/js/German.json"
|
||||
},
|
||||
drawCallback: function (settings) {
|
||||
$('#order_table').val(table.order());
|
||||
$('#price_total_sum').html(settings.json.price_total_sum);
|
||||
$('#price_total_total_sum').html(settings.json.price_total_total_sum);
|
||||
$('#proceed_total_sum').html(settings.json.proceed_total_sum);
|
||||
}
|
||||
});
|
||||
$('#filter_service_provider_id, #filter_is_cleared, #filter_sort_by').on('change', function(){
|
||||
table.order( [ 0, 'desc' ] ).draw();
|
||||
table.order( [ 7, 'asc' ] ).draw();
|
||||
});
|
||||
$('.datepicker-base').on('change', function(){
|
||||
table.order( [ 0, 'desc' ] ).draw();
|
||||
table.order( [ 7, 'asc' ] ).draw();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
</h4>
|
||||
<div class="card">
|
||||
{!! Form::open(['url' => route('admin_report_export_providers'), 'class' => '']) !!}
|
||||
|
||||
{!! Form::hidden('order', '[[8, "asc"]]', ['id'=>'order_table']) !!}
|
||||
<div class="ui-bordered px-4 pt-3 mb-0">
|
||||
<div class="form-row align-items-center">
|
||||
<div class="col-12 col-md-4 mb-4">
|
||||
|
|
@ -108,17 +108,17 @@
|
|||
"columns": [
|
||||
{ data: 'id', name: 'id' },
|
||||
{ data: 'booking.id', name: 'booking.id' },
|
||||
{ data: 'service_provider.name', name: 'service_provider.name' },
|
||||
{ data: 'service_provider.name', name: 'service_provider.name', orderable: false },
|
||||
{ data: 'booking.merlin_order_number', name: 'booking.merlin_order_number' },
|
||||
{ data: 'booking.price', name: 'booking.price' },
|
||||
{ data: 'booking.price_total', name: 'booking.price_total' },
|
||||
{ data: 'booking.proceeds', name: 'booking.proceeds' },
|
||||
{ data: 'booking.proceeds', name: 'booking.proceeds', orderable: false },
|
||||
{ data: 'booking.customer.fullName', name: 'booking.customer.fullName' },
|
||||
{ data: 'booking.start_date', name: 'booking.start_date' },
|
||||
{ data: 'booking.end_date', name: 'booking.end_date' },
|
||||
{ data: 'is_cleared', name: 'is_cleared' },
|
||||
],
|
||||
"order": [[ 0, "desc" ]],
|
||||
"order": [[ 8, "asc" ]],
|
||||
"orderSequence": ["desc", "asc"],
|
||||
"bLengthChange": false,
|
||||
"iDisplayLength": 100,
|
||||
|
|
@ -126,6 +126,7 @@
|
|||
"url": "/js/German.json"
|
||||
},
|
||||
drawCallback: function (settings) {
|
||||
$('#order_table').val(table.order());
|
||||
$('#price_total_sum').html(settings.json.price_total_sum);
|
||||
$('#price_total_total_sum').html(settings.json.price_total_total_sum);
|
||||
$('#proceed_total_sum').html(settings.json.proceed_total_sum);
|
||||
|
|
@ -133,11 +134,11 @@
|
|||
});
|
||||
|
||||
$('#filter_service_provider_id, #filter_is_cleared, #filter_sort_by').on('change', function(){
|
||||
table.order( [ 0, 'desc' ] ).draw();
|
||||
table.order( [ 8, 'asc' ] ).draw();
|
||||
});
|
||||
|
||||
$('.datepicker-base').on('change', function(){
|
||||
table.order( [ 0, 'desc' ] ).draw();
|
||||
table.order( [ 8, 'asc' ] ).draw();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
{{ Form::text('service_total', $booking->getServiceTotal(), array('placeholder'=>__('Gesamtpreis Vermittlung'), 'class'=>'form-control', 'id'=>'service_total', 'readonly')) }}
|
||||
</div>
|
||||
</div>
|
||||
@if($booking->isCanceled() > 0)
|
||||
@if($booking->isCanceled())
|
||||
<div class="form-group ">
|
||||
<label class="form-label" for="price_canceled">{{ __('Storno Betrag') }} <span class="text-muted">{{ __('(Forderung)') }}</span></label>
|
||||
<div class="input-group">
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
@if($booking->isCanceled() > 0)
|
||||
@if($booking->isCanceled())
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="canceled">{{ __('Storno in %') }}</label>
|
||||
<div class="input-group">
|
||||
|
|
|
|||
|
|
@ -34,6 +34,15 @@
|
|||
|
||||
<script type="text/javascript">
|
||||
|
||||
var responseReaload = false;
|
||||
$('#modals-load-content').on('hide.bs.modal', function (event) {
|
||||
$(this).off('hide.bs.modal');
|
||||
if(responseReaload){
|
||||
responseReaload = false;
|
||||
window.location.reload();
|
||||
}
|
||||
});
|
||||
|
||||
$( document ).ready(function() {
|
||||
Dropzone.autoDiscover = false;
|
||||
$("#uploadBookingFile").dropzone({
|
||||
|
|
@ -75,15 +84,18 @@
|
|||
message = response.message;
|
||||
var _ele = $('.alert-danger');
|
||||
_ele.fadeIn();
|
||||
console.log(message);
|
||||
$(file.previewElement).find('.dz-error-message').text(message);
|
||||
$(file.previewElement).addClass('dz-error');
|
||||
_ele.text(message);
|
||||
},
|
||||
success: function(file, response) {
|
||||
console.log(file);
|
||||
console.log(response);
|
||||
// console.log(file);
|
||||
// console.log(response);
|
||||
$(file.previewElement).addClass('dz-success');
|
||||
if(response.error === false){
|
||||
responseReaload = true;
|
||||
//window.location.href = window.location.href; //This is a possibility
|
||||
window.location.reload(); //Another possiblity
|
||||
// window.location.reload(); //Another possiblity
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -34,6 +34,15 @@
|
|||
|
||||
<script type="text/javascript">
|
||||
|
||||
var responseReaload = false;
|
||||
$('#modals-load-content').on('hide.bs.modal', function (event) {
|
||||
$(this).off('hide.bs.modal');
|
||||
if(responseReaload){
|
||||
responseReaload = false;
|
||||
window.location.reload();
|
||||
}
|
||||
});
|
||||
|
||||
$( document ).ready(function() {
|
||||
Dropzone.autoDiscover = false;
|
||||
$("#uploadBookingFile").dropzone({
|
||||
|
|
@ -75,15 +84,18 @@
|
|||
message = response.message;
|
||||
var _ele = $('.alert-danger');
|
||||
_ele.fadeIn();
|
||||
console.log(message);
|
||||
$(file.previewElement).find('.dz-error-message').text(message);
|
||||
$(file.previewElement).addClass('dz-error');
|
||||
_ele.text(message);
|
||||
},
|
||||
success: function(file, response) {
|
||||
console.log(file);
|
||||
console.log(response);
|
||||
// console.log(file);
|
||||
// console.log(response);
|
||||
$(file.previewElement).addClass('dz-success');
|
||||
if(response.error === false){
|
||||
responseReaload = true;
|
||||
//window.location.href = window.location.href; //This is a possibility
|
||||
window.location.reload(); //Another possiblity
|
||||
// window.location.reload(); //Another possiblity
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 5.2 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 9.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 9.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 9.3 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 9.3 KiB |
Loading…
Add table
Add a link
Reference in a new issue