Upload Files Booking, Mails, Attachments,

This commit is contained in:
Kevin Adametz 2020-04-17 15:51:22 +02:00
parent 5daea268f7
commit 68b9d1ff88
92 changed files with 2837 additions and 1778 deletions

362
.idea/workspace.xml generated
View file

@ -2,24 +2,10 @@
<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/CustomerFileController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Http/Controllers/Settings/AirlineController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Libraries/CouponPDF.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Models/Airline.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Models/BookingApplication.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Models/BookingConfirmation.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Models/BookingInvoice.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Models/BookingStorno.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Models/BookingVoucher.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Models/TravelInsurance.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Services/CreateCouponPDF.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/fpdf.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/database/migrations/2020_03_27_095607_create_airlines_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/database/migrations/2020_04_08_094455_create_booking_application_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/database/migrations/2020_04_08_094456_create_booking_confirmation_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/database/migrations/2020_04_08_094503_create_booking_invoice_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/database/migrations/2020_04_08_094514_create_booking_voucher_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/database/migrations/2020_04_08_094528_create_travel_insurance_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Http/Controllers/FileController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Repositories/BookingFileRepository.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Repositories/CMSFileRepository.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/Repositories/FileRepository.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" />
@ -39,91 +25,71 @@
<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/128.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/pdf/coupon/fonts/arial.ttf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/pdf/coupon/fonts/arialbd.ttf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/pdf/coupon/images/coupon-background.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/pdf/coupon/images/coupon-background.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/pdf/coupon/images/coupon-background1.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/pdf/coupon/images/coupon-background1.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/admin/report/service_providers.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/settings/airline/index.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e8ca526256d3_wlogo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e8ca561244c3_jdatlastoollogo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e8cafd9cfa1a_jdatlastoollogo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e8cafeb5138a_jdatlastoollogo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e8cb00b8222e_wlogo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/jdatlastoollogo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.name" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.name" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/mein.sterntours.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/booking/_detail_booking.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/booking/_detail_drafs.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/booking/_detail_files.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/booking/_detail_info.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/booking/_detail_lead.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/booking/_detail_mails.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/booking/_detail_myjack.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/booking/_detail_price.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/booking/upload_modal.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/customer/mail/modal-new-booking-files.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/booking/files/2020/04/5e9873901e2bd_jdatlastoollogo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/booking/files/2020/04/5e997d7b4ecc2_ust111.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/booking/files/2020/04/5e99aaf396d750.47072403_muscat-sultan-qaboos-moschee-h1_k.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e972e144373d7.97972029_jdatlastoollogo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e972e27878222.09265384_jdatlastoollogo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e972e38af6043.03271213_jdatlastoollogo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e972fbe2ce954.66250128_jdatlastoollogo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e97302ed1c839.78339022_muscat-sultan-qaboos-moschee-h1.JPG" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99a72f1bfde9.86685319_ust111pd." afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99a752cba2a2.94746278_jdatlastoollogopn." afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99aa9cd041d8.89347563_reiseanme.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99aad1b1ba55.84697018_reiseanmel.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99aadc24e747.88797929_reisebestäti.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99aadce9a149.07769362_gutschein_202258804771.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99aadd9d8d66.71792306_sicherungsscheinnachsis651r.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99aadea97ec4.45183917_jdatlastoollogo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99aadf8228a7.04445821_ust111.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99ab01275620.11542311_muscat-sultan-qaboos-moschee-h1_k.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99accb7b29a6.14209159_reiseanmel.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99adcfe04075.56597947_reiseanmel.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99ae058f7ec3.92405331_reiseanmel.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99ae5570a9d2.76710677_reiseanmel.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99ae646eb0a1.78424093_jdatlastoollogo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99afbe21f9c2.01938887_reiseanmel.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99aff4c885b4.22939380_reiseanmel.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99b016467117.77860068_reiseanmel.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99b065104c37.78810324_reiseanmel.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99b0c59b2738.41424954_reiseanmel.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99b0cb639727.76108821_reisebestäti.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99b0cda4e229.01104704_reisebestäti.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99b1f2e2bc67.91448850_reiseanmel.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/5e99b1f532d420.57931412_muscat-sultan-qaboos-moschee-h1_k.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/asdas.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/04/test.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/cms_files/2020/04/5e98451b1ae7a_sicherungsscheinnachsis651r.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/CMSContentCountryController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CMS/CMSContentCountryController.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/CustomerFileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CustomerFileController.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/HomeController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/HomeController.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/BookingStatusController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Settings/BookingStatusController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Settings/KeywordController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Settings/KeywordController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/Arrangement.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Arrangement.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/ArrangementTemplate.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ArrangementTemplate.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/ArrangementType.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ArrangementType.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Mail/MailSendInfo.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailSendInfo.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/BookingDraftItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/BookingDraftItem.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/BookingServiceItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/BookingServiceItem.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/CMSAuthor.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/CMSAuthor.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/Coupon.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Coupon.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/CreditCardType.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/CreditCardType.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/Customer.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Customer.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/InitialContactType.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/InitialContactType.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/Inquiry.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Inquiry.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/InquiryTemplate.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/InquiryTemplate.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/InquiryType.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/InquiryType.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/InsuranceCertificate.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/InsuranceCertificate.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/Keyword.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Keyword.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/Lead.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Lead.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/LeadParticipant.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/LeadParticipant.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/Offer.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Offer.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/Participant.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Participant.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/Salutation.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Salutation.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/Searchengine.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Searchengine.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/Status.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Status.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/StatusHistory.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/StatusHistory.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/Sym/_Booking.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/TravelBooking.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/TravelBooking.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/TravelCategory.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/TravelCategory.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/Website.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Website.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Repositories/CustomerFileRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Repositories/CustomerFileRepository.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/DraftRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Repositories/DraftRepository.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Repositories/FileRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Repositories/CustomerFileRepository.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/CreateCouponPDF.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/CreateCouponPDF.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$/archiv.tar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/archiv.tar.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/models.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/models.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$/config/filesystems.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/filesystems.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/migrations/2018_10_29_202123_create_booking_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2018_10_29_202123_create_booking_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_03_19_152708_create_booking_storno_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2020_03_19_152708_create_booking_storno_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$/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" />
@ -173,149 +139,16 @@
<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/js/custom.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/custom.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/storage" beforeDir="false" afterPath="$PROJECT_DIR$/public/storage" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/report/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/report/bookings.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/country/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/cms/content/country/detail.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/cms/content/country/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/cms/content/country/index.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/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/emails/content.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/content.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/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/request/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/request/index.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$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e78e1ac59cc0_ust111.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e78e1ac59cc0_ust111.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e78e1ae88686_ustvadezember.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e78e1ae88686_ustvadezember.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e78e1ef84dc1_mcwebartworkqrg181130.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e78e1ef84dc1_mcwebartworkqrg181130.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e78e1f2d7c2e_payoneplatformtestdataen.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e78e1f2d7c2e_payoneplatformtestdataen.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e7b225b0ed62_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e7b225b0ed62_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e7b3644bf721_wlogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e7b3644bf721_wlogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e7b492402436_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e7b492402436_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e7b8ab17b3b5_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/attachment/2020/03/5e7b8ab17b3b5_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78c9ab01d68_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78c9ab01d68_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78ca461db73_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78ca461db73_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cabfcc631_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cabfcc631_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78caee86679_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78caee86679_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cb08e8fda_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cb08e8fda_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cb0c29487_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cb0c29487_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cb5297d99_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cb5297d99_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78ce73a0b51_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78ce73a0b51_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cec300ea9_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cec300ea9_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cef2a2811_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cef2a2811_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78ceff86c13_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78ceff86c13_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cf1d742c7_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cf1d742c7_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cf23670ae_ust111.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cf23670ae_ust111.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cfb1a7800_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cfb1a7800_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cfbd8ef63_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78cfbd8ef63_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d0037eca4_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d0037eca4_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d02050d7c_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d02050d7c_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d02498dfd_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d02498dfd_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d183c4f80_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d183c4f80_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d1c454e6f_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d1c454e6f_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d1cf536e8_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d1cf536e8_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d35b13cdf_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d35b13cdf_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d3faa91df_ust111.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d3faa91df_ust111.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d45fdbc3b_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d45fdbc3b_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d463478f2_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d463478f2_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d464c5ab1_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d464c5ab1_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d46a01b5d_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d46a01b5d_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d46a312bf_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d46a312bf_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d564d217f_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d564d217f_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d5ef6c709_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d5ef6c709_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d60335e7a_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d60335e7a_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d6341a8ab_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d6341a8ab_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d6470bf25_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d6470bf25_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d7038592f_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d7038592f_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d78baa10e_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d78baa10e_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d98658c62_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78d98658c62_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78db64e414c_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78db64e414c_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78dbc255921_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78dbc255921_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78dc789e5ec_ust111.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78dc789e5ec_ust111.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78dce263b11_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78dce263b11_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78dd3a57e2c_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78dd3a57e2c_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78ddbd11b14_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78ddbd11b14_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78de3e83a57_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78de3e83a57_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78de619eef4_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78de619eef4_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78dea62a197_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78dea62a197_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78dfdf5464a_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78dfdf5464a_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78e019450d8_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78e019450d8_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78e0416765e_jackodurextrusionsstrang.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78e0416765e_jackodurextrusionsstrang.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78e05dcf7c8_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78e05dcf7c8_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78e086b0a43_jdatlastoollogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/customer/tmp/attachment/5e78e086b0a43_jdatlastoollogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/fewo/infos/2019/Anreiseinfo-1231433.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/fewo/infos/2019/Anreiseinfo-1231433.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/fewo/infos/2019/Anreiseinfo-123431221321.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/fewo/infos/2019/Anreiseinfo-123431221321.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/fewo/infos/2019/Anreiseinfo-12345.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/fewo/infos/2019/Anreiseinfo-12345.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/fewo/infos/2019/Anreiseinfo-123455.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/fewo/infos/2019/Anreiseinfo-123455.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/fewo/infos/2019/Anreiseinfo-1243414.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/fewo/infos/2019/Anreiseinfo-1243414.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/1231433.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/1231433.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/123431221321.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/123431221321.pdf" 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$/storage/app/fewo/invoices/2019/123455.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/123455.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/1234556.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/1234556.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/1243414.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/1243414.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/1312.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/1312.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/9538.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/9538.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/fewo/travel/infos/2019/Anreiseinfo-123455.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/fewo/travel/infos/2019/Anreiseinfo-123455.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/invoices/fewo/2019/.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/invoices/fewo/2019/.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/invoices/fewo/2019/12345.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/invoices/fewo/2019/12345.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/invoices/fewo/2019/123455.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/invoices/fewo/2019/123455.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/invoices/fewo/2019/1243.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/invoices/fewo/2019/1243.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/invoices/fewo/2019/1243414.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/invoices/fewo/2019/1243414.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/Stern-Tours-Mietbedingungen.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/Stern-Tours-Mietbedingungen.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/5095742f201612038.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/5095742f201612038.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/Datenblatt-BFX2019-01-15.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/Datenblatt-BFX2019-01-15.xlsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-2.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-2.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-3.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-3.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/Muscat-Sultan-Qaboos-Moschee-h1-Kopie.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/Muscat-Sultan-Qaboos-Moschee-h1-Kopie.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/Muscat-Sultan-Qaboos-Moschee-h1.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/Muscat-Sultan-Qaboos-Moschee-h1.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/Muscat-Sultan-Qaboos-Moschee-h1_cropped_1582804461.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/Muscat-Sultan-Qaboos-Moschee-h1_cropped_1582804461.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/Tempel-Nefertari-und-Ramses-am-Nassersee-in-Abu-Simbel.youtube" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/Tempel-Nefertari-und-Ramses-am-Nassersee-in-Abu-Simbel.youtube" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/6.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/6.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/7.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/7.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/8.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/8.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/Bilder-in/Muscat-Sultan-Qaboos-Moschee-h1.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/Bilder-in/Muscat-Sultan-Qaboos-Moschee-h1.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/Bilder-in/thumbs/4_cropped_1574181421.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/Bilder-in/thumbs/4_cropped_1574181421.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/Bilder-in/thumbs/Muscat-Sultan-Qaboos-Moschee-h1.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/Bilder-in/thumbs/Muscat-Sultan-Qaboos-Moschee-h1.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-2.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-2.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-3.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-3.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/Muscat-Sultan-Qaboos-Moschee-h1-Kopie.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/Muscat-Sultan-Qaboos-Moschee-h1-Kopie.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/Muscat-Sultan-Qaboos-Moschee-h1.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/Muscat-Sultan-Qaboos-Moschee-h1.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/logo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/logo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/6.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/6.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/7.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/7.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/8.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/8.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-2.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-2.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-3.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-3.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/Muscat-Sultan-Qaboos-Moschee-h1-Kopie.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/Muscat-Sultan-Qaboos-Moschee-h1-Kopie.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/Muscat-Sultan-Qaboos-Moschee-h1.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/Muscat-Sultan-Qaboos-Moschee-h1.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/logo.png" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/logo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/formsextras.html" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/formsextras.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/youtube/5_cropped_1574182410.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/youtube/5_cropped_1574182410.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/youtube/thumbs/5_cropped_1574182410.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/youtube/thumbs/5_cropped_1574182410.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/youtube/youtube-in/Wir-STERN-TOURS.youtube" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/youtube/youtube-in/Wir-STERN-TOURS.youtube" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root/youtube/youtube-in/thumbs/Wir-STERN-TOURS.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/youtube/youtube-in/thumbs/Wir-STERN-TOURS.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root2/1Baustein-Q-Board-Zeus.xls" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root2/1Baustein-Q-Board-Zeus.xls" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root2/4cropped1574181421212.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root2/4cropped1574181421212.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/root2/thumbs/Wir-STERN-TOURS.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root2/thumbs/Wir-STERN-TOURS.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/test/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-2.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/test/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-2.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/test/Muscat-Sultan-Qaboos-Moschee-h1.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/test/Muscat-Sultan-Qaboos-Moschee-h1.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/test/thumbs/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-2.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/test/thumbs/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-2.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/test/thumbs/Muscat-Sultan-Qaboos-Moschee-h1.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/test/thumbs/Muscat-Sultan-Qaboos-Moschee-h1.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/128.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/128.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-2.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-2.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-3.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/Muscat-Sultan-Qaboos-Moschee-h1-Kopie-3.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/Muscat-Sultan-Qaboos-Moschee-h1-Kopie.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/Muscat-Sultan-Qaboos-Moschee-h1-Kopie.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/Muscat-Sultan-Qaboos-Moschee-h1.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/Muscat-Sultan-Qaboos-Moschee-h1.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/Muscat-Sultan-Qaboos-Moschee-h1_cropped_1582804461.JPG" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/Muscat-Sultan-Qaboos-Moschee-h1_cropped_1582804461.JPG" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/Tempel-Nefertari-und-Ramses-am-Nassersee-in-Abu-Simbel.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/Tempel-Nefertari-und-Ramses-am-Nassersee-in-Abu-Simbel.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/Wir-STERN-TOURS.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/Wir-STERN-TOURS.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/debugbar/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/storage/debugbar/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/oauth-private.key" beforeDir="false" afterPath="$PROJECT_DIR$/storage/oauth-private.key" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/oauth-public.key" beforeDir="false" afterPath="$PROJECT_DIR$/storage/oauth-public.key" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor.tar.gz" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/which" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -526,22 +359,29 @@
</component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showExcludedFiles" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="DatabaseDriversLRU" value="mysql" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<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$/app/Libraries" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/resources/views/customer/mail" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resources/views/customer/mail" />
<recent name="$PROJECT_DIR$/app/Repositories" />
<recent name="$PROJECT_DIR$/resources/views/booking" />
<recent name="$PROJECT_DIR$/app/Http/Controllers" />
<recent name="$PROJECT_DIR$/app/Libraries" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resources/views/customer/mail" />
<recent name="$PROJECT_DIR$/public/js" />
@ -549,13 +389,6 @@
<recent name="$PROJECT_DIR$/app/Models/Sym" />
<recent name="$PROJECT_DIR$/app/Models" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/app/Libraries" />
<recent name="$PROJECT_DIR$/app/Services" />
<recent name="$PROJECT_DIR$/app/Repositories" />
<recent name="$PROJECT_DIR$/app/Http/Controllers" />
<recent name="$PROJECT_DIR$/app/Http/Controllers/Settings" />
</key>
</component>
<component name="RunAnythingCache">
<option name="myCommands">
@ -564,17 +397,23 @@
</component>
<component name="RunManager">
<configuration default="true" type="ShConfigurationType">
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="$USER_HOME$/Documents/scripts/composer-post-update.sh" />
<option name="SCRIPT_OPTIONS" value="" />
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
<option name="SCRIPT_WORKING_DIRECTORY" value="" />
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="/bin/bash" />
<option name="INTERPRETER_OPTIONS" value="" />
<method v="2" />
</configuration>
<configuration name="composer-post-update.sh" type="ShConfigurationType">
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="$USER_HOME$/Documents/scripts/composer-post-update.sh" />
<option name="SCRIPT_OPTIONS" value="" />
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="/bin/bash" />
<option name="INTERPRETER_OPTIONS" value="" />
<method v="2" />
@ -585,18 +424,6 @@
<method v="2" />
</configuration>
</component>
<component name="ServiceViewManager">
<option name="viewStates">
<list>
<serviceView>
<treeState>
<expand />
<select />
</treeState>
</serviceView>
</list>
</option>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
@ -904,24 +731,35 @@
<workItem from="1586420844552" duration="3000" />
<workItem from="1586454358482" duration="377000" />
<workItem from="1586851166069" duration="20000" />
<workItem from="1586945582775" duration="9075000" />
<workItem from="1586962935729" duration="7042000" />
<workItem from="1587020739257" duration="3822000" />
<workItem from="1587029641027" duration="78000" />
<workItem from="1587029724618" duration="229000" />
<workItem from="1587029959326" duration="17750000" />
<workItem from="1587058311065" duration="153000" />
<workItem from="1587107509192" duration="17000" />
<workItem from="1587109018008" duration="34000" />
<workItem from="1587109633375" duration="34000" />
<workItem from="1587113061793" duration="13766000" />
<workItem from="1587131112608" duration="33000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
<option name="version" value="2" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="COLUMN_ORDER" />
</State>
<State />
</value>
</entry>
</map>
</option>
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
@ -930,11 +768,16 @@
</ignored-roots>
</component>
<component name="WindowStateProjectService">
<state x="873" y="395" key="#Notifications" timestamp="1586283483077">
<state x="1220" y="624" key="#Custom_Plugin_Repositories" timestamp="1587029807185">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="1220" y="624" key="#Custom_Plugin_Repositories/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1587029807185" />
<state x="873" y="395" key="#Notifications" timestamp="1587029730203">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="873" y="395" key="#Notifications/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1586283483077" />
<state x="873" y="395" key="#Notifications/2560.-493.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1585998077451" />
<state x="873" y="395" key="#Notifications/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1587029730203" />
<state x="-1399" y="392" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1581158769046">
<screen x="-2560" y="23" width="2560" height="1417" />
</state>
@ -950,10 +793,11 @@
</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="54" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1581351314829" />
<state x="1018" y="488" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1585128425251">
<state x="1018" y="488" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1587048507717">
<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="1585128425251" />
<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 x="1097" y="610" width="600" height="300" key="ComposerAddDependencyOutputPopupDimensionServiceKey" timestamp="1581350288912">
<screen x="0" y="23" width="2560" height="1417" />
</state>
@ -962,25 +806,29 @@
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="1020" y="544" width="527" height="375" key="PHPComposerAddDependencyDialogDimensionKey/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1581350432217" />
<state x="815" y="370" key="SettingsEditor" timestamp="1585999076795">
<state x="815" y="370" key="SettingsEditor" timestamp="1587029998517">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<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="1063" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1585232936868">
<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">
<screen x="0" y="23" width="2560" height="1417" />
</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="870" y="380" width="1487" height="939" key="find.popup" timestamp="1586367147094">
<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="870" y="380" width="1487" height="939" key="find.popup" timestamp="1587130944842">
<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="-1690" y="380" width="1487" height="939" key="find.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1585157716675" />
<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="946" y="348" width="670" height="676" key="search.everywhere.popup" timestamp="1586370499861">
<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="946" y="348" width="670" height="676" key="search.everywhere.popup" timestamp="1587036951215">
<screen x="0" y="23" width="2560" height="1417" />
</state>
<state x="946" y="348" width="670" height="676" key="search.everywhere.popup/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1586370499861" />
<state x="946" y="348" width="670" height="676" key="search.everywhere.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1585136385851" />
<state x="946" y="348" width="670" height="676" key="search.everywhere.popup/2560.-493.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1585834441242" />
<state x="946" y="348" width="670" height="676" key="search.everywhere.popup/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1587036951215" />
</component>
</project>

View file

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

View file

@ -3,7 +3,7 @@
/**
* A helper file for Laravel 5, to provide autocomplete information to your IDE
* Generated for Laravel 6.18.5 on 2020-04-08 15:47:00.
* Generated for Laravel 6.18.5 on 2020-04-16 17:05:52.
*
* This file should not be included in your code, only analyzed by your IDE!
*

View file

@ -450,6 +450,12 @@ namespace App\Models{
* @property-read int|null $booking_stornos_count
* @property-read int|null $booking_vouchers_count
* @property-read int|null $travel_insurances_count
* @property string|null $origin_start_date
* @property \Illuminate\Support\Carbon|null $lawyer_date
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Booking whereLawyerDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Booking whereOriginStartDate($value)
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\BookingFile[] $booking_files
* @property-read int|null $booking_files_count
*/
class Booking extends \Eloquent {}
}
@ -2095,6 +2101,8 @@ namespace App\Models{
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompany whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompany wherePercentage($value)
* @mixin \Eloquent
* @property int|null $active
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompany whereActive($value)
*/
class TravelCompany extends \Eloquent {}
}
@ -3233,6 +3241,41 @@ namespace App\Models{
class SfGuardUser extends \Eloquent {}
}
namespace App\Models{
/**
* Class BookingFile
*
* @property int $id
* @property int $booking_id
* @property string $identifier
* @property string $filename
* @property string $dir
* @property string $original_name
* @property string $ext
* @property string $mine
* @property int $size
* @property Carbon $created_at
* @property Carbon $updated_at
* @property Booking $booking
* @package App\Models
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile query()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereBookingId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereDir($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereExt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereFilename($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereIdentifier($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereMine($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereOriginalName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereSize($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereUpdatedAt($value)
*/
class BookingFile extends \Eloquent {}
}
namespace App\Models{
/**
* App\Models\Draft

View file

@ -4,7 +4,9 @@ namespace App\Http\Controllers;
use App\Models\Booking;
use App\Models\BookingDraftItem;
use App\Models\BookingFile;
use App\Models\Customer;
use App\Repositories\BookingFileRepository;
use App\Repositories\BookingRepository;
use App\Repositories\CustomerMailRepository;
use App\Repositories\DraftRepository;
@ -43,6 +45,7 @@ class BookingController extends Controller
$data = [
'booking' => $booking,
'id' => $id,
];
return view('booking.detail', $data);
@ -186,17 +189,35 @@ class BookingController extends Controller
public function loadModal(){
$data = Request::all();
$ret = "";
if(Request::ajax()){
$data['customers'] = [];
if($data['action'] === "new-customer-mail" && isset($data['booking_id']) && $booking = Booking::find($data['booking_id'])){
$tmp = [];
$tmp['email'] = $booking->customer ? $booking->customer->email : "";
$tmp['name'] = $booking->customer ? $booking->customer->firstname." ".$booking->customer->name." | " : "- | ";
$tmp['name'] .= $booking->travel_country_id ? $booking->travel_country->name." | " : "- | ";
$tmp['name'] .= $booking->travelagenda_id ? $booking->travel_agenda->name."" : "-";
$data['customers'][$booking->id] = $tmp;
if(Request::ajax()) {
if ($data['action'] === "new-customer-mail" || $data['action'] === "reply-customer-mail" || $data['action'] === "show-customer-mail" || $data['action'] === "edit-customer-mail"){
$data['customers'] = [];
if ($data['action'] === "new-customer-mail" && isset($data['booking_id']) && $booking = Booking::find($data['booking_id'])) {
$tmp = [];
$tmp['email'] = $booking->customer ? $booking->customer->email : "";
$tmp['name'] = $booking->customer ? $booking->customer->firstname . " " . $booking->customer->name . " | " : "- | ";
$tmp['name'] .= $booking->travel_country_id ? $booking->travel_country->name . " | " : "- | ";
$tmp['name'] .= $booking->travelagenda_id ? $booking->travel_agenda->name . "" : "-";
$data['customers'][$booking->id] = $tmp;
}
$ret = CustomerMailRepository::loadModal($data);
}
if($data['action'] === "modal-upload-booking-file") {
$ret = view("booking.upload_modal", compact('data'))->render();
}
if($data['action'] === "upload-booking-file"){
if($data['booking_id']){
$bookingFileRepo = new BookingFileRepository(new BookingFile());
$bookingFileRepo->_set('disk', 'booking');
$bookingFileRepo->_set('booking_id', $data['booking_id']);
$bookingFileRepo->_set('dir', '/files/'.date('Y/m').'/');
$bookingFileRepo->_set('identifier', 'booking');
return $bookingFileRepo->uploadFile(Request::all());
}
}
$ret = CustomerMailRepository::loadModal($data);
}
return response()->json(['response' => $data, 'html'=>$ret]);
}

View file

@ -5,20 +5,16 @@ namespace App\Http\Controllers\CMS;
use App\Http\Controllers\Controller;
use App\Models\CMSContent;
use App\Repositories\CMSFileRepository;
use Request;
use Validator;
class CMSContentController extends Controller
{
/*
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
}
@ -28,13 +24,25 @@ class CMSContentController extends Controller
'contents' => CMSContent::all()->sortByDesc('id')
];
return view('cms.content.all.index', $data);
}
public function store()
{
$data = Request::all();
if(Request::ajax()) {
//upload file
if($data['file']){
$cmsFileRepo = new CMSFileRepository(new CMSContent());
$cmsFileRepo->_set('disk', 'public');
$cmsFileRepo->_set('dir', '/cms_files/'.date('Y/m').'/');
$cmsFileRepo->_set('identifier', 'cms_file');
return $cmsFileRepo->uploadFile(Request::all());
}
return response()->json(['response' => $data, 'html'=>""]);
}
$rules = array(
'name' => 'required',
'field' => 'required',
@ -50,7 +58,6 @@ class CMSContentController extends Controller
//store in cms old Datebase
\App\Models\Sym\CmsContent::create($data);
}else{
$model = CMSContent::find($data['id']);
$model->fill($data);
$model->save();
@ -65,7 +72,7 @@ class CMSContentController extends Controller
}
public function loadModal()
public function loadModal()
{
if(Request::ajax()){
$data = Request::all();
@ -79,16 +86,19 @@ class CMSContentController extends Controller
}
$returnHTML = view("cms.content.all.modal", compact('data','value') )->render();
}
}
return response()->json(['response' => $data, 'html'=>$returnHTML]);
}
}
//public
public function delete($id){
$content = CMSContent::findOrFail($id);
if($content->isFile()){
$content->deleteFile();
}
$content->delete();
\Session()->flash('alert-success', __('Content gelöscht'));
return redirect(route('cms_content_all'));

View file

@ -25,7 +25,6 @@ class CustomerFileController extends Controller
public function __construct(CustomerFileRepository $customerFileRepo)
{
$this->middleware('admin');
$this->customerFileRepo = $customerFileRepo;
}

View file

@ -7,6 +7,7 @@ use App\Models\CustomerFile;
use App\Models\CustomerMail;
use App\Repositories\CustomerMailRepository;
use App\Repositories\CustomerFileRepository;
use App\Services\Util;
use Carbon;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Support\Facades\URL;
@ -53,14 +54,19 @@ class CustomerMailController extends Controller
}
public function store($id)
public function store($id, $action=false)
{
$data = Request::all();
$customer_mail = CustomerMail::findOrFail($id);
if($action === 'move-mail'){
$data['travel_country_id'] = isset($data['travel_country_id']) && $data['travel_country_id'] ? $data['travel_country_id'] : null;
$customer_mail->dir = $data['dir'];
$customer_mail->travel_country_id = $data['travel_country_id'];
$customer_mail->save();
}
return back();
/* $data = Request::all();
\Session()->flash('alert-save', '1');
return redirect(route('lead_detail', [$lead->id]));*/
}
public function delete($id){
@ -201,11 +207,36 @@ class CustomerMailController extends Controller
$status = false;
if(Request::ajax()){
if($data['action'] === 'toggle_important'){
$customer_mail = CustomerMail::find($data['id']);
$customer_mail = CustomerMail::find($data['id']);
$customer_mail->important = ($customer_mail->important ? false : true);
$customer_mail->save();
$status = 'success';
}
if($data['action'] === 'add_attachment'){
$arrContextOptions=array(
"ssl"=>array(
"verify_peer"=>false,
"verify_peer_name"=>false,
),
);
$contents = file_get_contents($data['target'], false, stream_context_create($arrContextOptions));
$mine = Util::getMimeFromHeader($http_response_header);
$extension = Util::getExtensionFromMime($mine);
$fileRepo = new CustomerFileRepository(new CustomerFile());
$fileRepo->_set('disk', 'customer');
$fileRepo->_set('dir', '/attachment/'.date('Y/m').'/');
$fileRepo->_set('customer_id', NULL);
$fileRepo->_set('customer_mail_id', NULL);
$fileRepo->_set('identifier', 'tmp');
$fileRepo->_set('originalName', $data['name']);
$fileRepo->_set('mine', $mine);
$fileRepo->_set('extension', $extension);
return $fileRepo->storeFile($contents);
}
}
return response()->json(['response' => $data, 'html'=>$ret, 'status'=>$status]);
}

View file

@ -0,0 +1,91 @@
<?php
namespace App\Http\Controllers;
use Response;
use Storage;
class FileController extends Controller
{
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
}
public function show($id = null, $disk = null, $do='file')
{
$path = "";
$filename = "";
if ($disk === 'customer'){
$file = \App\Models\CustomerFile::findOrFail($id);
$filename = $file->original_name;
$path = $file->getPath();
}
if ($disk === 'booking'){
$file = \App\Models\BookingFile::findOrFail($id);
$filename = $file->original_name;
$path = $file->getPath();
}
if ($disk === 'cms_file'){
$file = \App\Models\CMSContent::findOrFail($id);
$filename = $file->name;
$path = $file->getPath();
}
if (file_exists($path)) {
if($do === "download"){
return Response::download($path, $filename);
}
return Response::file($path);
}
}
public function showExpert($type = null, $class = null, $year = null, $file = null, $do = null) {
/*if ($type == 'xls') {
$path = storage_path("app/export/");
$filename = $file . '.xls';
}*/
$path = "";
$filename = "";
$headers = [];
if ($class === 'invoices' || $class === 'infos'){
$headers = [
'Content-Type: application/pdf',
'Pragma: no-cache',
'Cache-Control: no-store,no-cache, must-revalidate, post-check=0, pre-check=0'
];
$dir = $year."/";
$filename = $file;
if ($type === 'fewo') {
if(Storage::disk('fewo_invoices')->exists( $dir.$filename )){
$path = Storage::disk('fewo_invoices')->path($dir.$filename);
}
}
if ($type === 'fewo') {
if(Storage::disk('fewo_infos')->exists( $dir.$filename )){
$path = Storage::disk('fewo_infos')->path($dir.$filename);
}
}
}
if (file_exists($path)) {
if($do === "download"){
return Response::download($path, $filename, $headers);
}
if($do === "file"){
return Response::file($path, $headers);
}
}
}
}

View file

@ -8,6 +8,7 @@ use App\Models\CustomerMail;
use App\Models\Status;
use App\Models\Sym\TravelCountry;
use App\Models\TravelAgenda;
use App\Models\TravelCompany;
use App\Repositories\CustomerMailRepository;
use Carbon\Carbon;
use Request;
@ -26,9 +27,8 @@ class RequestController extends Controller
{
$travel_countries = Booking::join('travel_country', 'travel_country_id', '=', 'travel_country.id')->get()->pluck('name', 'travel_country_id')->unique()->toArray();
$filter_lead_status = Status::get()->pluck('name', 'id')->toArray();
$filter_travel_company = TravelCompany::get()->pluck('name', 'id')->toArray();
$filter_paying_out = Booking::$paying_out_types;
$filter_paying_out_status = Booking::$paying_out_status_types;
$filter_refund = Booking::$refund_types;
@ -43,6 +43,7 @@ class RequestController extends Controller
$data = [
'step' => $step,
'travel_countries' => $travel_countries,
'filter_travel_company' => $filter_travel_company,
'filter_lead_status' => $filter_lead_status,
'filter_paying_out' => $filter_paying_out,
'filter_paying_out_status' => $filter_paying_out_status,
@ -96,7 +97,9 @@ class RequestController extends Controller
if(Request::get('travel_option_agenda_id') != ""){
$query->where('travelagenda_id', '=', Request::get('travel_option_agenda_id'));
}
if(Request::get('travel_option_company_id') != ""){
$query->where('travel_company_id', '=', Request::get('travel_option_company_id'));
}
if(Request::get('travel_option_lead_status_id') != ""){
$query->whereHas('lead', function ($q) {
$q->where('status_id', '=', Request::get('travel_option_lead_status_id'));
@ -276,6 +279,9 @@ class RequestController extends Controller
->addColumn('travelagenda_id', function (Booking $booking) {
return '<span data-order="'.($booking->travelagenda_id ? $booking->travelagenda_id : 0).'">'.($booking->travelagenda_id ? $booking->travel_agenda->name : "-").'</span>';
})
->addColumn('travel_company_id', function (Booking $booking) {
return '<span data-order="'.($booking->travel_company_id ? $booking->travel_company_id : 0).'">'.($booking->travel_company ? $booking->travel_company->name : "-").'</span>';
})
->addColumn('start_date', function (Booking $booking) {
return $booking->getStartDateFormat();
})
@ -300,6 +306,13 @@ class RequestController extends Controller
if($booking->lead->status_id == 14 && !$booking->lead->is_rebook){
$icon = '<i class="fa fa-times-circle"></i> ';
}
if($booking->lead->status_id == 15){
$icon = '<i class="fa fa-balance-scale"></i> ';
if($booking->lawyer_date){
return '<span data-order="'.$booking->lead->status_id.'"><span class="badge badge-dark" style="background-color: '.$color.'">'.$icon.$booking->lawyer_date->format('d.m.Y').'</span></span>';
}
}
return '<span data-order="'.$booking->lead->status_id.'"><span class="badge badge-dark" style="background-color: '.$color.'">'.$icon.$booking->lead->status->name.'</span></span>';
}
return '<span data-order="0">-</span>';
@ -367,6 +380,7 @@ class RequestController extends Controller
->orderColumn('id', 'id $1')
->orderColumn('travel_country_id', 'travel_country_id $1')
->orderColumn('travelagenda_id', 'travelagenda_id $1')
->orderColumn('travel_company_id', 'travel_company_id $1')
->orderColumn('sf_guard_user_id', 'sf_guard_user_id $1')
->orderColumn('start_date', 'start_date $1')
->orderColumn('end_date', 'end_date $1')
@ -377,7 +391,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', 'sf_guard_user_id', 'lead.status_id', 'last_customer_email', 'id', 'travel_documents', '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', 'paying_out', 'paying_out_status', 'airline_id', 'refund', 'hold', 'xx_tkt'])
->make(true);
}
}

View file

@ -33,16 +33,12 @@ class MailSendInfo extends Mailable
'content' => $this->content,
'greetings' => __('Best regards'),
]);
/* foreach ($this->files as $file) {
foreach ($this->files as $file) {
$message->attach($file->getPath(),[
'as' => $file->original_name,
'mime' => $file->mine,
]); // attach each file
}*/
foreach ($this->files as $file) {
$message->attach((string) $file->getPath()); // attach each file
//$message->attach((string) $file->getPath()); // attach each file
}
return $message;

View file

@ -154,6 +154,12 @@ use Illuminate\Database\Eloquent\Model;
* @property-read int|null $booking_stornos_count
* @property-read int|null $booking_vouchers_count
* @property-read int|null $travel_insurances_count
* @property string|null $origin_start_date
* @property \Illuminate\Support\Carbon|null $lawyer_date
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Booking whereLawyerDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Booking whereOriginStartDate($value)
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\BookingFile[] $booking_files
* @property-read int|null $booking_files_count
*/
class Booking extends Model
{
@ -186,6 +192,8 @@ class Booking extends Model
'airline_id' => 'int',
'refund' => 'int',
'xx_tkt' => 'int',
'is_rail_fly' => 'bool',
];
@ -195,7 +203,10 @@ class Booking extends Model
'end_date',
'participant_birthdate',
'final_payment_date',
'refund_date'
'refund_date',
'lawyer_date',
'xx_tkt_date'
];
protected $fillable = [
@ -233,11 +244,15 @@ class Booking extends Model
'paying_out',
'paying_out_status',
'airline_id',
'hold',
'refund',
'refund_date',
'lawyer_date',
'hold',
'xx_tkt',
'xx_tkt_date',
'filekey',
'is_rail_fly',
'notice',
];
public static $paying_out_types = [
@ -478,6 +493,11 @@ class Booking extends Model
return $this->hasMany(TravelInsurance::class);
}
public function booking_files()
{
return $this->hasMany(BookingFile::class);
}
public function calculate_price_total()
{

103
app/Models/BookingFile.php Normal file
View file

@ -0,0 +1,103 @@
<?php
/**
* Created by Reliese Model.
*/
namespace App\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
/**
* Class BookingFile
*
* @property int $id
* @property int $booking_id
* @property string $identifier
* @property string $filename
* @property string $dir
* @property string $original_name
* @property string $ext
* @property string $mine
* @property int $size
* @property Carbon $created_at
* @property Carbon $updated_at
* @property Booking $booking
* @package App\Models
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile query()
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereBookingId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereDir($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereExt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereFilename($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereIdentifier($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereMine($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereOriginalName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereSize($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\BookingFile whereUpdatedAt($value)
* @mixin \Eloquent
*/
class BookingFile extends Model
{
protected $table = 'booking_files';
protected $casts = [
'booking_id' => 'int',
'size' => 'int'
];
public static $icon_ext = [
'default' => 'fa fa-file',
'pdf'=> 'fa fa-file-pdf',
'jpg'=> 'fa fa-file-image',
'png'=> 'fa fa-file-image',
];
protected $fillable = [
'booking_id',
'identifier',
'filename',
'dir',
'original_name',
'ext',
'mine',
'size'
];
public function booking()
{
return $this->belongsTo(Booking::class);
}
public function getIconExt(){
return isset(self::$icon_ext[$this->ext]) ? self::$icon_ext[$this->ext] : self::$icon_ext['default'];
}
public function getURL($do=false){
return route('storage_file', [$this->id, 'booking', $do]);
}
public function getPath(){
return \Storage::disk('booking')->path($this->dir.$this->filename);
}
public function formatBytes($precision = 2)
{
$size = $this->size;
if ($size > 0) {
$size = (int) $size;
$base = log($size) / log(1024);
$suffixes = array(' bytes', ' KB', ' MB', ' GB', ' TB');
return round(pow(1024, $base - floor($base)), $precision) . $suffixes[floor($base)];
} else {
return $size;
}
}
}

View file

@ -42,10 +42,19 @@ class CMSContent extends Model
protected static $fields = [
'text' => 'Text (190 Zeichen)',
'full_text' => 'Full Text (50K Zeichen)',
'file' => 'Datei (PDF/JPG/PNG)',
'integer' => 'Zahl (10 Stellen)',
'decimal' => 'Kommazahl (10,2 Stellen)',
];
public static $icon_ext = [
'default' => 'fa fa-file',
'pdf'=> 'fa fa-file-pdf',
'jpg'=> 'fa fa-file-image',
'png'=> 'fa fa-file-image',
];
protected $connection = 'mysql_stern';
protected $table = 'c_m_s_contents';
@ -78,13 +87,88 @@ class CMSContent extends Model
public function getPreviewContent(){
$content = $this->{$this->field};
if(strlen($content) > 40){
return substr($content, 0, 40)." ...";
if($this->isFile()){
$content = '<i class="'.$this->getIconExt().'"></i> <a href="'.$this->getURL().'" target="_blank">Vorschau | '.$this->formatBytes().'</a>';
}else{
$content = $this->{$this->field};
if(strlen($content) > 40){
return substr($content, 0, 40)." ...";
}
}
return $content;
}
public function getContent(){
switch ($this->field){
case 'text':
return $this->text;
break;
case 'full_text':
return $this->full_text;
break;
case 'file':
return \GuzzleHttp\json_decode($this->full_text);
break;
case 'integer':
return $this->integer;
break;
case 'decimal':
return $this->decimal;
break;
}
}
//FILE ------------------------
public function isFile(){
return $this->field === 'file' ? true : false;
}
/*'identifier', 'filename', 'dir', 'original_name', 'ext', 'mine', 'size'*/
public function getFileContent($key= false){
if($key && $this->isFile()){
$file = \GuzzleHttp\json_decode($this->full_text);
return isset($file->{$key}) ? $file->{$key} : false;
}
return false;
}
public function getIconExt(){
$ext = $this->getFileContent('ext');
return isset(self::$icon_ext[$ext]) ? self::$icon_ext[$ext] : self::$icon_ext['default'];
}
public function getURL($do = false){
return route('storage_file', [$this->id, 'cms_file', $do]);
}
public function getPath(){
$dir = $this->getFileContent('dir');
$filename = $this->getFileContent('filename');
return \Storage::disk('public')->path($dir.$filename);
}
public function formatBytes($precision = 2)
{
$size = $this->getFileContent('size');
if ($size > 0) {
$size = (int) $size;
$base = log($size) / log(1024);
$suffixes = array(' bytes', ' KB', ' MB', ' GB', ' TB');
return round(pow(1024, $base - floor($base)), $precision) . $suffixes[floor($base)];
}
return $size;
}
public function deleteFile(){
$dir = $this->getFileContent('dir');
$filename = $this->getFileContent('filename');
return \Storage::disk('public')->delete($dir.$filename);
}
//end FILE ------------------------
public function _format_number($value){
return preg_replace("/[^0-9,]/", "", $value);
@ -124,6 +208,9 @@ class CMSContent extends Model
case 'full_text':
return $CMSContent->full_text;
break;
case 'file':
return \GuzzleHttp\json_decode($CMSContent->full_text);
break;
case 'integer':
return $CMSContent->integer;
@ -131,10 +218,12 @@ class CMSContent extends Model
case 'decimal':
return $CMSContent->decimal;
break;
}
}
return false;
}
public static function getModelBySlug($slug){
return CMSContent::whereSlug(trim($slug))->first();
}
}

View file

@ -63,7 +63,6 @@ class CustomerFile extends Model
'pdf'=> 'fa fa-file-pdf',
'jpg'=> 'fa fa-file-image',
'png'=> 'fa fa-file-image',
];
protected $fillable = [
'customer_id',
@ -96,12 +95,12 @@ class CustomerFile extends Model
return isset(self::$icon_ext[$this->ext]) ? self::$icon_ext[$this->ext] : self::$icon_ext['default'];
}
public function getURL(){
return route('storage_file', [$this->id, 'customer']);
public function getURL($do=false){
return route('storage_file', [$this->id, 'customer', $do]);
}
public function getPath(){
return \Storage::disk('customer')->path($this->dir."/".$this->filename);
return \Storage::disk('customer')->path($this->dir.$this->filename);
}

View file

@ -31,6 +31,8 @@ use Illuminate\Database\Eloquent\Model;
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompany whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompany wherePercentage($value)
* @mixin \Eloquent
* @property int|null $active
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCompany whereActive($value)
*/
class TravelCompany extends Model
{

View file

@ -0,0 +1,52 @@
<?php
namespace App\Repositories;
use App\Models\BookingFile;
use Response;
class BookingFileRepository extends FileRepository {
protected $booking_file;
protected $booking_id;
protected $identifier;
public function __construct(BookingFile $model){
parent::__construct();
$this->model = $model;
}
public function save(){
$this->booking_file = BookingFile::create([
'booking_id' => $this->booking_id,
'identifier' => $this->identifier,
'filename' => $this->allowed_filename,
'dir' => $this->dir,
'original_name' => $this->originalName,
'ext' => $this->extension,
'mine' => $this->mine,
'size' => $this->size
]);
}
public function response(){
return Response::json([
'error' => false,
'filename' => $this->allowed_filename,
'file_id' =>$this->booking_file->id,
'file_data' => $this->extension,
'file_icon' => $this->booking_file->getIconExt(),
'file_format_bytes' => $this->booking_file->formatBytes(),
'file_url' => $this->booking_file->getURL(),
'redirect' => '',
'code' => 200
], 200);
}
}

View file

@ -0,0 +1,53 @@
<?php
namespace App\Repositories;
use App\Models\CMSContent;
use Response;
class CMSFileRepository extends FileRepository {
protected $identifier;
public function __construct($model){
parent::__construct();
$this->model = $model;
}
public function save(){
$file_data = [
'identifier' => $this->identifier,
'filename' => $this->allowed_filename,
'dir' => $this->dir,
'original_name' => $this->originalName,
'ext' => $this->extension,
'mine' => $this->mine,
'size' => $this->size
];
$data = [
"name" => $this->originalName,
"field" => "file",
"full_text" => \GuzzleHttp\json_encode($file_data),
];
$this->model = CMSContent::create($data);
//store in cms old Datebase
\App\Models\Sym\CmsContent::create($data);
}
public function response(){
return Response::json([
'error' => false,
'filename' => $this->allowed_filename,
'file_id' => $this->model->id,
'file_data' => $this->extension,
'file_icon' => $this->model->getIconExt(),
'file_format_bytes' => $this->model->formatBytes(),
'file_url' => $this->model->getURL(),
'redirect' => '',
'code' => 200
], 200);
}
}

View file

@ -3,145 +3,53 @@
namespace App\Repositories;
use App\Models\CustomerFile;
use Request;
use Response;
use Storage;
use Util;
use Validator;
class CustomerFileRepository extends FileRepository {
class CustomerFileRepository extends BaseRepository {
protected $rules;
protected $messages;
protected $disk;
protected $dir;
protected $customer_file;
protected $customer_id;
protected $customer_mail_id;
protected $identifier;
public function __construct(CustomerFile $model){
parent::__construct();
$this->model = $model;
$this->rules = [
'file' => 'required|mimes:pdf,jpeg,png|max:32768'
];
$this->messages = [
'file.mimes' => 'Datei ist kein PDF/JPG/PNG Format',
'file.required' => 'PDF/JPG/PNG-Datei wird benötigt'
];
}
public function _set($name, $value){
$this->{$name} = $value;
}
/* public function load($id){
$this->model = $id;
}
*/
public function uploadFile( $form_data )
{
$validator = Validator::make($form_data, $this->rules, $this->messages);
if ($validator->fails()) {
return Response::json([
'error' => true,
'message' => $validator->messages()->first(),
'code' => 400
], 400);
}
$file = $form_data['file'];
$originalName = $file->getClientOriginalName();
$extension = $file->getClientOriginalExtension();
$mine = $file->getClientMimeType();
$size = $file->getClientSize();
$originalNameWithoutExt = substr($originalName, 0, strlen($originalName) - strlen($extension) - 1);
$filename = Util::sanitize($originalNameWithoutExt, true, false, true);
$allowed_filename = uniqid() . '_' . $filename.".".$extension;
//$dir = $this->model->getInvoiceStorageAttDir();
if(!Storage::disk($this->disk)->exists( $this->dir )){
Storage::disk($this->disk)->makeDirectory($this->dir); //creates directory
}
Storage::disk($this->disk)->put($this->dir.$allowed_filename, file_get_contents($file->getRealPath()));
$customer_file = CustomerFile::create([
public function save(){
$this->customer_file = CustomerFile::create([
'customer_id' => $this->customer_id,
'customer_mail_id' => $this->customer_mail_id,
'identifier' => $this->identifier,
'filename' => $allowed_filename,
'filename' => $this->allowed_filename,
'dir' => $this->dir,
'original_name' => $originalName,
'ext' => $extension,
'mine' => $mine,
'size' => $size
'original_name' => $this->originalName,
'ext' => $this->extension,
'mine' => $this->mine,
'size' => $this->size
]);
}
public function response(){
return Response::json([
'error' => false,
'filename' => $allowed_filename,
'file_id' =>$customer_file->id,
'file_data' => $extension,
'file_icon' => $customer_file->getIconExt(),
'file_format_bytes' => $customer_file->formatBytes(),
'file_url' => $customer_file->getURL(),
'original_name' => $this->originalName,
'filename' => $this->allowed_filename,
'file_id' =>$this->customer_file->id,
'file_data' => $this->extension,
'file_icon' => $this->customer_file->getIconExt(),
'file_format_bytes' => $this->customer_file->formatBytes(),
'file_url' => $this->customer_file->getURL(),
'redirect' => '',
'code' => 200
], 200);
}
/* public function createFile(Request $request)
{
$locale = \App::getLocale();
$data = [
'step' => 2,
'locale' => $locale,
];
$rules = array(
'network_name' => 'required|max:255',
'input_file_now' => 'required|mimes:png,pdf,jpg,jpeg|max:30000'
);
$validator = Validator::make(Input::all(), $rules);
if ($validator->fails()) {
// get the error messages from the validator
$messages = $validator->messages();
// redirect our user back to the form with the errors from the validator
return view('user.register_complete', $data)->withErrors($validator);
} else {
$user = \Auth::user();
if(!$user->account->network_name){
$file = request()->file('input_file_now');
//$ext = $file->guessClientExtension();
//$file->storeAs('user/' . $user->id .'/verification');
$data = $file->store('user/' . $user->id .'/verification');
$account = $user->account;
$account->network_name = Input::get('network_name');
$account->network_verification = basename($data);
$account->save();
$user->role_id = 2; //set as User by default!
$user->save();
}
return redirect('complete_register');
//return view('user.register_complete', $data);
}
}*/
}

View file

@ -6,6 +6,7 @@ namespace App\Repositories;
use App\Mail\MailSendInfo;
use App\Models\Airline;
use App\Models\Booking;
use App\Models\CMSContent;
use App\Models\CustomerFile;
use App\Models\CustomerMail;
use App\Services\Util;
@ -168,12 +169,12 @@ class CustomerMailRepository extends BaseRepository {
return true;
}
private function prepareContent($booking, $content){
$first_name = $booking->customer->firstname;
$last_name = $booking->customer->name;
$title = $booking->customer->title;
$country = $booking->travel_country_id ? $booking->travel_country->name : "-";
$program = $booking->travelagenda_id ? $booking->travel_agenda->name : "-";
$salutation = $booking->customer->salutation->name;
@ -183,8 +184,8 @@ class CustomerMailRepository extends BaseRepository {
$airline = $booking->airline ? $booking->airline->name_full : '-';
$dear = $booking->customer->salutation_id == 1 ? 'geehrter' : 'geehrte';
$search = ['#geehrte/r#', '#Anrede#', '#Vorname#', '#Nachname#', '#Reiseland#', '#Programm#', '#Anreisedatum#', '#Abreisedatum#', '#Buchungsdatum#', '#Airline#'];
$replace = [$dear, $salutation, $first_name, $last_name, $country, $program, $start_date, $end_date, $booking_date, $airline];
$search = ['#geehrte/r#', '#Anrede#', '#Titel#', '#Vorname#', '#Nachname#', '#Reiseland#', '#Programm#', '#Anreisedatum#', '#Abreisedatum#', '#Buchungsdatum#', '#Airline#'];
$replace = [$dear, $salutation, $title, $first_name, $last_name, $country, $program, $start_date, $end_date, $booking_date, $airline];
$content = str_replace($search, $replace, $content);
return $content;
@ -287,19 +288,22 @@ class CustomerMailRepository extends BaseRepository {
if ($data['action'] === "new-customer-mail") {
$value->id = "";
$value->draft = false;
$lead_id = "-";
//singel
if (isset($data['booking_id']) && $booking = Booking::find($data['booking_id'])) {
$value->id = $data['booking_id'];
$value->booking = $booking;
$value->show = 'single';
$value->draft = true;
$lead_id = " - (".$value->booking->lead_id.")";
}else{
//multi
$value->show = 'multi';
}
$value->customers = $data['customers'];
$value->subject = "";
$value->message = "<p>Sehr #geehrte/r# #Anrede# #Vorname# #Nachname#,</p><p>Text ...</p>";
$value->subject = $lead_id ;
$value->message = CMSContent::getContentBySlug('mailvorlage');
$value->s_placeholder = "Betreff der E-Mail";
$value->m_placeholder = "Nachricht der E-Mail";
if(isset($data['customer_mail_id']) && $customer_mail = CustomerMail::find($data['customer_mail_id'])){

View file

@ -0,0 +1,108 @@
<?php
namespace App\Repositories;
use Response;
use Storage;
use Util;
use Validator;
class FileRepository extends BaseRepository {
protected $rules;
protected $messages;
protected $disk;
protected $dir;
protected $filename;
protected $allowed_filename;
protected $originalName;
protected $extension;
protected $mine;
protected $size;
public function __construct(){
$this->rules = [
'file' => 'required|mimes:pdf,jpeg,png|max:32768'
];
$this->messages = [
'file.mimes' => 'Datei ist kein PDF/JPG/PNG Format',
'file.required' => 'PDF/JPG/PNG-Datei wird benötigt'
];
}
public function _set($name, $value){
$this->{$name} = $value;
}
public function uploadFile( $form_data )
{
$validator = Validator::make($form_data, $this->rules, $this->messages);
if ($validator->fails()) {
return Response::json([
'error' => true,
'message' => $validator->messages()->first(),
'code' => 400
], 400);
}
$file = $form_data['file'];
$this->originalName = $file->getClientOriginalName();
$this->extension = strtolower($file->getClientOriginalExtension());
$this->mine = $file->getClientMimeType();
$this->size = $file->getClientSize();
$this->makeFilename();
//$dir = $this->model->getInvoiceStorageAttDir();
$this->store(file_get_contents($file->getRealPath()));
$this->save();
return $this->response();
}
public function storeFile( $content )
{
$this->makeFilename();
$this->store($content);
$this->size = Storage::disk($this->disk)->size($this->dir.$this->allowed_filename);
$this->save();
return $this->response();
}
public function store($content){
if(!Storage::disk($this->disk)->exists( $this->dir )){
Storage::disk($this->disk)->makeDirectory($this->dir); //creates directory
}
Storage::disk($this->disk)->put($this->dir.$this->allowed_filename, $content);
}
public function save(){
}
public function response(){
return Response::json([
'error' => false,
'filename' => $this->allowed_filename,
'originalName' => $this->originalName,
'file_data' => $this->extension,
'mine' => $this->mine,
'size' => $this->size,
'redirect' => '',
'code' => 200
], 200);
}
private function makeFilename(){
$originalNameWithoutExt = substr($this->originalName, 0, strlen($this->originalName) - strlen($this->extension) - 1);
$this->filename = Util::sanitize($originalNameWithoutExt, true, false, true);
$this->allowed_filename = uniqid("", true) . '_' . $this->filename.".".$this->extension;
}
}

View file

@ -93,7 +93,7 @@ class CreateCouponPDF {
$pdf->SetFont('Helvetica', '', 10);
$customerName = ($this->coupon->customer && $this->coupon->customer->salutation ? $this->coupon->customer->salutation->name . ' ' : '' )
. ($this->coupon->customer->title ? $$this->coupon->customer->title . ' ' : '' )
. ($this->coupon->customer->title ? $this->coupon->customer->title . ' ' : '' )
. $this->coupon->customer->fullName();
$customerStreet = $this->coupon->customer ? $this->coupon->customer->street : '';
$customerRegion = $this->coupon->customer->zip ? $this->coupon->customer->zip." " : '';

View file

@ -93,7 +93,7 @@ class Util
$clean = ($anal) ? preg_replace("/[^a-zA-Z0-9]/", "", $clean) : $clean ;
if($substr){
$clean = (strlen($clean) > 33) ? substr($clean,-33) : $clean;
$clean = (strlen($clean) > 33) ? substr($clean,0,33) : $clean;
}
return ($force_lowercase) ?
@ -172,4 +172,31 @@ class Util
$charset = mb_detect_encoding($value, "UTF-8, ISO-8859-1, ISO-8859-15", true);
return mb_convert_encoding($value, "Windows-1252", $charset);
}
public static function getMimeFromHeader($http_response_header){
$pattern = "/^content-type\s*:\s*(.*)$/i";
if (($header = array_values(preg_grep($pattern, $http_response_header))) &&
(preg_match($pattern, $header[0], $match) !== false))
{
return $match[1];
}
return "";
}
public static function getExtensionFromMime($mine){
$mime_types = [
'application/pdf' => 'pdf',
'image/png' => 'png',
'image/jpg' => 'jpg',
'image/jpeg' => 'jpg',
'text/html; charset=UTF-8' => 'html',
'text/html' => 'html',
];
return isset($mime_types[$mine]) ? $mime_types[$mine] : "";
}
}

View file

@ -60,6 +60,12 @@ return [
'url' => env('APP_URL').'/storage/customer',
'visibility' => 'public',
],
'booking' => [
'driver' => 'local',
'root' => storage_path('app/booking'),
'url' => env('APP_URL').'/storage/booking',
'visibility' => 'public',
],
'fewo_invoices' => [
'driver' => 'local',
'root' => storage_path('app/fewo/invoices'),

View file

@ -58,9 +58,14 @@ class CreateBookingTable extends Migration
$table->unsignedBigInteger('airline_id')->nullable();
$table->tinyInteger('refund')->nullable()->default(0);
$table->date('refund_date')->nullable();
$table->date('lawyer_date')->nullable();
$table->tinyInteger('hold')->nullable()->default(0);
$table->tinyInteger('xx_tkt')->nullable()->default(0);
$table->date('xx_tkt_date')->nullable();
$table->string('filekey', 255)->nullable();
$table->tinyInteger('is_rail_fly')->nullable()->default(0);
$table->text('notice')->nullable();
$table->dateTime('updated_at');
$table->dateTime('created_at');

View file

@ -0,0 +1,46 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateBookingFilesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('booking_files', function (Blueprint $table) {
$table->bigIncrements('id');
$table->bigInteger('booking_id')->nullable();
$table->string('identifier')->index();
$table->string('filename');
$table->string('dir');
$table->string('original_name');
$table->string('ext');
$table->string('mine');
$table->unsignedInteger('size');
$table->timestamps();
$table->foreign('booking_id')
->references('id')
->on('booking');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('booking_files');
}
}

View file

@ -268,7 +268,7 @@
uploadMultiple: false,
parallelUploads: 5,
clickable: '#upload-button',
dictDefaultMessage: lfm_lang['message-drop'],
dictDefaultMessage: '<i class="ion ion-ios-cloud-upload "></i>'+lfm_lang['message-drop'],
init: function() {
var _this = this; // For the closure
this.on('success', function(file, response) {

View file

@ -341,362 +341,11 @@ figcaption {
margin: 0;
width: auto;
}
/*
.messages-wrapper {
position: relative;
display: -ms-flexbox;
display: flex;
overflow: hidden;
-ms-flex: 1 1 100%;
flex: 1 1 100%;
width: 100%
.modal-open .tooltip {
z-index: 2120;
}
.messages-card {
overflow: hidden
}
.messages-wrapper,
.messages-sidebox {
transition: all .2s
}
.messages-sidebox {
-ms-flex-preferred-size: 100%;
flex-basis: 100%;
-ms-flex-positive: 0;
flex-grow: 0
}
.messages-wrapper .messages-sidebox,
.messages-card .messages-sidebox {
position: fixed;
left: calc(-14rem - 1px);
z-index: 10;
-ms-flex-preferred-size: auto;
flex-basis: auto;
-ms-flex-positive: 1;
flex-grow: 1;
width: 14rem
}
[dir=rtl] .messages-wrapper .messages-sidebox,
[dir=rtl] .messages-card .messages-sidebox {
right: calc(-14rem - 1px);
left: auto
}
.layout-sidenav-100vh .messages-wrapper .messages-sidebox {
height: 100vh
}
.messages-card .messages-sidebox {
position: absolute;
bottom: 0
}
.messages-scroll {
position: absolute;
top: 0;
bottom: 0;
height: 100%
}
.messages-scroll.messages-content {
position: absolute;
right: 0;
left: 0;
width: 100%
}
.messages-list .list-group-item {
z-index: auto !important;
display: -ms-flexbox;
display: flex;
-ms-flex-align: center;
align-items: center;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
padding-top: .375rem;
padding-bottom: .375rem;
width: 100%;
border-right: 0;
border-left: 0;
border-radius: 0
}
.messages-list .list-group-item:first-child {
border-top: 0
}
.messages-list .list-group-item:last-child {
border-bottom: 0
}
.messages-list .list-group-item>* {
padding-top: .375rem;
padding-bottom: .375rem
}
.message-checkbox .custom-control {
display: block !important;
margin: 0;
margin-top: -1px
}
.message-sender {
min-width: 10rem
}
.message-subject {
width: 100%
}
.message-date {
white-space: nowrap
}
.message-attachment {
display: -ms-flexbox;
display: flex;
-ms-flex-align: center;
align-items: center;
width: 100%
}
.message-attachment>.media-body {
min-width: 0
}
.message-attachment-file,
.message-attachment-img {
display: block;
-ms-flex-positive: 0;
flex-grow: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
width: 4rem;
height: 4rem
}
.message-attachment-file {
display: inline-block;
text-align: center;
line-height: 4rem
}
.message-attachment-img {
background-color: transparent;
background-position: center center;
background-size: cover
}
.message-attachment-filename {
display: block;
overflow: hidden;
width: 100%;
text-overflow: ellipsis;
white-space: nowrap
}
.default-style .messages-wrapper .messages-sidebox {
z-index: 1081
}
.default-style .messages-sidebox-open .messages-sidebox {
left: 0
}
.default-style .messages-card .messages-sidebox {
background: #fff;
box-shadow: 0 0 0 1px rgba(24, 28, 33, 0.075)
}
@media (min-width: 576px) {
.default-style .messages-list .list-group-item {
-ms-flex-wrap: nowrap;
flex-wrap: nowrap
}
.default-style .message-subject {
width: auto
}
.default-style .message-date {
margin-left: auto
}
}
@media (min-width: 768px) {
.default-style .messages-sidebox {
-ms-flex-preferred-size: 14rem;
flex-basis: 14rem
}
.default-style .messages-wrapper .messages-sidebox {
-ms-flex-preferred-size: auto;
flex-basis: auto
}
}
@media (min-width: 992px) {
.default-style .messages-wrapper,
.default-style .messages-sidebox {
transition: none !important
}
.default-style .messages-wrapper {
padding-left: 14rem
}
.default-style .messages-sidebox {
z-index: auto !important
}
.default-style .messages-wrapper .messages-sidebox {
position: absolute;
left: 0;
z-index: auto
}
.default-style .messages-wrapper .messages-sidebox {
height: 100% !important
}
.default-style .messages-card .messages-sidebox {
position: static;
right: auto;
left: auto;
-ms-flex-positive: 0;
flex-grow: 0;
height: auto
}
}
.default-style[dir=rtl] .messages-sidebox-open .messages-sidebox {
right: 0;
left: auto
}
@media (min-width: 576px) {
.default-style[dir=rtl] .message-date {
margin-right: auto;
margin-left: 0
}
}
@media (min-width: 992px) {
.default-style[dir=rtl] .messages-wrapper {
padding-right: 14rem;
padding-left: 0
}
.default-style[dir=rtl] .messages-wrapper .messages-sidebox {
right: 0;
left: auto
}
}
.material-style .messages-wrapper .messages-sidebox {
z-index: 1081
}
.material-style .messages-sidebox-open .messages-sidebox {
left: 0
}
.material-style .messages-card .messages-sidebox {
background: #fff;
box-shadow: 0 0 0 1px rgba(24, 28, 33, 0.075)
}
@media (min-width: 576px) {
.material-style .messages-list .list-group-item {
-ms-flex-wrap: nowrap;
flex-wrap: nowrap
}
.material-style .message-subject {
width: auto
}
.material-style .message-date {
margin-left: auto
}
}
@media (min-width: 768px) {
.material-style .messages-sidebox {
-ms-flex-preferred-size: 14rem;
flex-basis: 14rem
}
.material-style .messages-wrapper .messages-sidebox {
-ms-flex-preferred-size: auto;
flex-basis: auto
}
}
@media (min-width: 992px) {
.material-style .messages-wrapper,
.material-style .messages-sidebox {
transition: none !important
}
.material-style .messages-wrapper {
padding-left: 14rem
}
.material-style .messages-sidebox {
z-index: auto !important
}
.material-style .messages-wrapper .messages-sidebox {
position: absolute;
left: 0;
z-index: auto
}
.material-style .messages-wrapper .messages-sidebox {
height: 100% !important
}
.material-style .messages-card .messages-sidebox {
position: static;
right: auto;
left: auto;
-ms-flex-positive: 0;
flex-grow: 0;
height: auto
}
}
.material-style[dir=rtl] .messages-sidebox-open .messages-sidebox {
right: 0;
left: auto
}
@media (min-width: 576px) {
.material-style[dir=rtl] .message-date {
margin-right: auto;
margin-left: 0
}
}
@media (min-width: 992px) {
.material-style[dir=rtl] .messages-wrapper {
padding-right: 14rem;
padding-left: 0
}
.material-style[dir=rtl] .messages-wrapper .messages-sidebox {
right: 0;
left: auto
}
}
*/
.btn-next {
border-color: rgba(0, 0, 0, 0);
background: #8897AA;
@ -780,4 +429,18 @@ figcaption {
}
.table th, .table td {
padding: 0.4rem;
}
}
.dz-message i {
font-size: 50px;
display: block;
margin-bottom: 16px;
opacity: 0.8;
}
div.dropzone {
border-style: dashed;
}
div.dropzone.dz-drag-hover {
border-style: dashed;
}

View file

@ -7,6 +7,29 @@ $('.iq-save-bar').closest('form').find(':input, select, textarea').keydown(funct
showIqSaveBar($(this).closest('form'));
});
CookiesAddJSONValue = function(name, value) {
var elements = [];
if(Cookies.get(name)){
elements = JSON.parse(Cookies.get(name));
}
if(elements.indexOf(value) === -1){
elements.push(value);
}
Cookies.set(name, JSON.stringify(elements), { expires:30 });
};
CookiesRemoveJSONValue = function(name, value) {
var elements = [];
if(Cookies.get(name)){
elements = JSON.parse(Cookies.get(name));
}
var index = elements.indexOf(value);
if(index > -1){
elements.splice(index, 1);
Cookies.set(name, JSON.stringify(elements), { expires:30 });
}
};
$(function () {
@ -117,7 +140,7 @@ $(function () {
$.each(button.data(), function(index, value){
data[index] = value;
});
console.log(data);
//console.log(data);
loadModalInner(this, data);
});
@ -130,13 +153,12 @@ $(function () {
$.each(button.data(), function(index, value){
data[index] = value;
});
console.log(data);
//console.log(data);
loadModalInner(this, data);
});
}
function loadModalInner(self, data){
var url = data.route,
contentType = 'application/x-www-form-urlencoded; charset=UTF-8';
$.ajax({
@ -151,9 +173,9 @@ $(function () {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
},
success: function(data) {
// console.log(data);
// console.log(data);
$(data.response.target).find('.modal-dialog').html(data.html);
$(data.response.target + '.selectpicker').selectpicker('refresh');
$(data.response.target).find('.selectpicker').selectpicker('refresh');
initModalInner();
},
error: function(xhr, status, errorThrown) {
@ -177,8 +199,8 @@ function ajax_object_action(event, object, callback) {
data[index] = value;
});
var url = data['url'];
/*console.log(data);
console.log(url);*/
//console.log(data);
//console.log(url);
$.ajax({
url: url,
data: data,
@ -228,7 +250,7 @@ function update_modal_data_show(e, $ele) {
},
success: function(data) {
// do what ever you want here. add content to <div> if it was not 1 .
console.log(data);
//console.log(data);
$('#update-modal-content').html(data);
$('.selectpicker').selectpicker(["refresh"]);
$('.input-daterange').datepicker({toggleActive: true,format: 'dd.mm.yyyy'});
@ -251,8 +273,8 @@ function update_modal_data_load(e, $ele) {
data = {data:ele.data('data'), target:ele.data('target')} ,
contentType = 'application/x-www-form-urlencoded; charset=UTF-8';
console.log(data);
console.log(url);
//console.log(data);
//console.log(url);
$.ajax({
url: url,
data: data,
@ -287,8 +309,8 @@ function iq_update_data_load(e, $ele) {
data = {action:ele.data('action'), target:ele.data('target'), data:ele.data('data')} ,
contentType = 'application/x-www-form-urlencoded; charset=UTF-8';
console.log(data);
console.log(url);
//console.log(data);
//console.log(url);
$.ajax({
url: url,
data: data,

View file

@ -0,0 +1,75 @@
<div class="card mb-2">
<h6 class="card-header bg-primary text-white py-2" data-toggle="collapse" data-target="#collapseBookingBooking" aria-expanded="false" aria-controls="collapseBookingBooking">
<strong style="line-height: 1.6em">Buchung</strong>
</h6>
<div class="collapse" id="collapseBookingBooking">
<div class="card-body row">
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="sf_guard_user_id">{{ __('Sachbearbeiter') }}</label>
{{ Form::text('sf_guard_user_id', $booking->sf_guard_user->first_name." ".$booking->sf_guard_user->last_name, array('placeholder'=>__('Sachbearbeiter'), 'class'=>'form-control', 'id'=>'sf_guard_user_id', 'readonly')) }}
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="booking_date">{{ __('Buchungsdatum') }}</label>
{{ Form::text('booking_date', _format_date($booking->booking_date), array('placeholder'=>__('Buchungsdatum'), 'class'=>'form-control', 'id'=>'booking_date', 'readonly')) }}
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="travel_country_id">{{ __('Reiseland') }}</label>
{{ Form::text('travel_country_id', $booking->travel_country ? $booking->travel_country->name : '', array('placeholder'=>__('Reiseland'), 'class'=>'form-control', 'id'=>'travel_country_id', 'readonly')) }}
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="travel_number">{{ __('Reisenummer') }}</label>
{{ Form::text('travel_number', $booking->travel_number, array('placeholder'=>__('Reisenummer'), 'class'=>'form-control', 'id'=>'travel_number', 'readonly')) }}
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="travelagenda_id">{{ __('Reiseprogramm') }}</label>
{{ Form::text('travelagenda_id', $booking->travel_agenda ? $booking->travel_agenda->name : '', array('placeholder'=>__('Reiseprogramm'), 'class'=>'form-control', 'id'=>'travelagenda_id', 'readonly')) }}
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="travel_category_id">{{ __('Reiseart') }}</label>
{{ Form::text('travel_category_id', $booking->travel_category ? $booking->travel_category->name : '', array('placeholder'=>__('Reiseart'), 'class'=>'form-control', 'id'=>'travel_category_id', 'readonly')) }}
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="start_date">{{ __('Aufenthalt vom') }}</label>
{{ Form::text('start_date', _format_date($booking->start_date), array('placeholder'=>__('Aufenthalt vom'), 'class'=>'form-control', 'id'=>'start_date', 'readonly')) }}
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="end_date">{{ __('Aufenthalt bis') }}</label>
{{ Form::text('end_date', _format_date($booking->end_date), array('placeholder'=>__('Aufenthalt bis'), 'class'=>'form-control', 'id'=>'end_date', 'readonly')) }}
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="title">{{ __('Reisetitel') }}</label>
{{ Form::text('title', $booking->title, array('placeholder'=>__('Reisetitel'), 'class'=>'form-control', 'id'=>'title', 'readonly')) }}
</div>
<div class="col-12">
<hr>
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="paying_out">{{ __('K-Wunsch') }}</label>
{{ Form::text('paying_out', $booking->getPayingOutType(), array('placeholder'=>__('K-Wunsch'), 'class'=>'form-control', 'id'=>'paying_out', 'readonly')) }}
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="paying_out_status">{{ __('KW-Status') }}</label>
{{ Form::text('paying_out_status', $booking->getPayingOutStatusType(), array('placeholder'=>__('KW-Status'), 'class'=>'form-control', 'id'=>'paying_out_status', 'readonly')) }}
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="refund">{{ __('Refund') }}</label>
{{ Form::text('refund', $booking->getRefundType(), array('placeholder'=>__('Refund'), 'class'=>'form-control', 'id'=>'refund', 'readonly')) }}
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="refund_date">{{ __('Refund Datum') }}</label>
{{ Form::text('refund_date', _format_date($booking->refund_date), array('placeholder'=>__('Refund Datum'), 'class'=>'form-control', 'id'=>'refund_date', 'readonly')) }}
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="xx_tkt">{{ __('XX TKT') }}</label>
{{ Form::text('xx_tkt', $booking->getXxTktType(), array('placeholder'=>__('XX TKT'), 'class'=>'form-control', 'id'=>'xx_tkt', 'readonly')) }}
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="xx_tkt_date">{{ __('XX TKT Datum') }}</label>
{{ Form::text('xx_tkt_date', _format_date($booking->xx_tkt_date), array('placeholder'=>__('XX TKT Datum'), 'class'=>'form-control', 'id'=>'xx_tkt_date', 'readonly')) }}
</div>
</div>
</div>
</div>

View file

@ -0,0 +1,137 @@
<div class="card mb-2">
<h6 class="card-header bg-primary text-white py-2" data-toggle="collapse" data-target="#collapseBookingOrganisation" aria-expanded="false" aria-controls="collapseBookingOrganisation">
<strong style="line-height: 1.6em">Organisation</strong>
</h6>
<div class="collapse" id="collapseBookingOrganisation">
<div class="card-body px-0">
@if($booking->new_drafts )
@php($i = 1)
<div class="text-right mb-2 pr-2">
<button type="submit" name="action" value="addItemUp" class="btn btn-sm btn-primary"><i class="fa fa-plus"></i> Neue Leistung hinzufügen <i class="fa fa-arrow-up"></i></button><br>
<button type="button" name="" class="btn btn-sm btn-info mt-2" data-toggle="modal" data-target="#modals-change-travel-dates"><i class="fa fa-sync"></i> Datum der Reise ändern </button>
</div>
<div class="table-responsive mb-4" style="overflow: visible">
<table class="table mb-0" id="table_dragula_tbody" style="min-width: 1080px">
<thead class="thead-dark">
<tr>
<th style="width: 1em"></th>
<th style="width: 1em">#</th>
<th>Leistung</th>
<th style="width: 9em">Datum von</th>
<th style="width: 9em">Datum bis</th>
<th style="width: 15em">Teilnehmer/EP</th>
<th style="width: 15em">Kinder/EP</th>
<th style="width: 8em">#</th>
</tr>
</thead>
@foreach($booking->booking_draft_items as $booking_draft_item)
<tbody class="draft_item_tbody">
<tr @if($booking_draft_item->draft_type) style="background-color: {{ $booking_draft_item->draft_type->color }}" @endif>
<td>
<span class="handle ion ion-ios-move d-inline-block bg-primary text-white p-1"></span>
</td>
<td><span class="item_pos_number">{{ $i++ }}</span></td>
<td>
<select class="selectpicker" data-style="btn-light" name="draft_item[{{$booking_draft_item->id}}][draft_type_id]" id="draft_item_{{$booking_draft_item->id }}_draft_type_id" data-live-search="true" required>
<option value="" disabled>Vorlagen-Typ*</option>
{!! HTMLHelper::getDraftTypes($booking_draft_item->draft_type_id) !!}
</select>
</td>
<td>
{{ Form::text('draft_item['.$booking_draft_item->id.'][start_date]', $booking_draft_item->start_date, array('placeholder'=>__('Start Datum'), 'class'=>'form-control datepicker-base', 'id'=>'draft_item_'.$booking_draft_item->id.'_start_dat')) }}
</td>
<td>
{{ Form::text('draft_item['.$booking_draft_item->id.'][end_date]', $booking_draft_item->end_date, array('placeholder'=>__('End Datum'), 'class'=>'form-control datepicker-base', 'id'=>'draft_item_'.$booking_draft_item->id.'_end_date')) }}
</td>
@if(in_array($booking_draft_item->draft_type_id, [24, 26, 30, 31, 32, 33, 34, 35, 36, 37, 41, 42]))
<td>
<div class="input-group">
<select class="custom-select" name="draft_item[{{$booking_draft_item->id}}][adult]" id="draft_item_{{$booking_draft_item->id }}_adult">
<option value="">0</option>
{!! HTMLHelper::getRangeOptions($booking_draft_item->adult, 10, '') !!}
</select>
{{ Form::text('draft_item['.$booking_draft_item->id.'][price_adult]', $booking_draft_item->price_adult, array('placeholder'=>__('Preis in €'), 'class'=>'form-control', 'id'=>'draft_item_'.$booking_draft_item->id.'_price_adult', 'maxlength'=>10)) }}
<span class="input-group-append">
<span class="input-group-text"></span>
</span>
</div>
</td>
<td>
<div class="input-group">
<select class="custom-select" name="draft_item[{{$booking_draft_item->id}}][children]" id="draft_item_{{$booking_draft_item->id}}_children">
<option value="">0</option>
{!! HTMLHelper::getRangeOptions($booking_draft_item->children, 10, '') !!}
</select>
{{ Form::text('draft_item['.$booking_draft_item->id.'][price_children]', $booking_draft_item->price_children, array('placeholder'=>__('Preis in €'), 'class'=>'form-control', 'id'=>'draft_item_'.$booking_draft_item->id.'_price_children')) }}
<span class="input-group-append">
<span class="input-group-text"></span>
</span>
</div>
</td>
@else
<td>-</td>
<td>-</td>
@endif
<td>
<button type="button" name="" value="up_{{$booking_draft_item->id}}" class="btn btn-xs btn-primary py-0 move-up-btn"><i class="fa fa-arrow-up"></i> </button>
<button type="button" name="" value="down_{{$booking_draft_item->id}}" class="btn btn-xs btn-primary mr-2 move-down-btn"><i class="fa fa-arrow-down"></i> </button>
<a class="text-danger" href="{{ route('booking_draft_item_delete', [$booking_draft_item->id]) }}" onclick="return confirm('{{__('Wirklich löschen?')}}');"><i class="fa fa-trash-alt"></i></a>
</td>
</tr>
<tr @if($booking_draft_item->draft_type) style="background-color: {{ $booking_draft_item->draft_type->color }}" @endif class="border-none">
@if(in_array($booking_draft_item->draft_type_id, [36, 37]))
<td colspan="3">
<select class="custom-select" name="draft_item[{{$booking_draft_item->id}}][days_duration]" id="draft_item_{{$booking_draft_item->id }}_days_duration">
<option value="">0 Tage</option>
{!! HTMLHelper::getRangeOptions($booking_draft_item->days_duration, 40, ' Tage') !!}
</select>
</td>
<td colspan="4">
@elseif(in_array($booking_draft_item->draft_type_id, [38, 39,40]))
<td colspan="3">
<div class="input-group">
@if(in_array($booking_draft_item->draft_type_id, [38]))
<select class="custom-select" name="draft_item[{{$booking_draft_item->id}}][days_duration]" id="draft_item_{{$booking_draft_item->id }}_days_duration">
<option value="">0 Tage</option>
{!! HTMLHelper::getRangeOptions($booking_draft_item->days_duration, 40, ' T.') !!}
</select>
@endif
{{ Form::text('draft_item['.$booking_draft_item->id.'][price]', $booking_draft_item->price, array('placeholder'=>__('Preis in €'), 'class'=>'form-control', 'id'=>'draft_item_'.$booking_draft_item->id.'_price',)) }}
<span class="input-group-append">
<span class="input-group-text"></span>
</span>
</div>
</td>
<td colspan="4">
@else
<td colspan="7">
@endif
{{ Form::textarea('draft_item['.$booking_draft_item->id.'][service]', $booking_draft_item->service, array('placeholder'=>__('Leistungen'), 'class'=>'form-control autoExpand', 'id'=>'draft_item_'.$booking_draft_item->id.'_service', 'rows'=>'1', 'data-min-rows'=>'1')) }}
</td>
<td>
<label class="custom-control custom-checkbox mt-2" style="margin-right: 20px;">
{!! Form::checkbox('draft_item['.$booking_draft_item->id.'][in_pdf]', 1, $booking_draft_item->in_pdf, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">{{__('in PDF')}}</span>
</label>
</td>
</tr>
</tbody>
@endforeach
</table>
</div>
<div class="float-right pr-2">
<button type="submit" name="action" value="addItemDown" class="btn btn-sm btn-primary"><i class="fa fa-plus"></i> Neue Leistung hinzufügen <i class="fa fa-arrow-down"></i></button>
</div>
<div class="text-left mt-3 pl-2">
<button type="submit" name="action" value="saveAll" class="btn btn-sm btn-secondary">{{ __('save changes') }}</button>&nbsp;
<a href="{{route('bookings')}}" class="btn btn-sm btn-default">{{ __('zur Übersicht') }}</a>
</div>
@endif
</div>
</div>
</div>

View file

@ -0,0 +1,245 @@
<!-- Files -->
<div class="card mb-2">
<h6 class="card-header bg-primary text-white py-2" data-toggle="collapse" data-target="#collapseBookingFiles" aria-expanded="false" aria-controls="collapseBookingFiles">
<strong style="line-height: 1.6em">PDF Dateien</strong>
</h6>
<div class="collapse" id="collapseBookingFiles">
@php($booking_files_count = 1)
<div class="card-body row">
<div class="table-responsive" id="booking_files_table">
<table class="table table-striped table-sm">
<thead>
<tr>
<th>#</th>
<th>Datei</th>
<th>Inhalt</th>
<th>Datum</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
@if($booking->booking_applications)
@foreach($booking->booking_applications as $booking_application)
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a href="{{ route('customer_file_show', ['booking_application', $booking_application->id]) }}" target="_blank" class="badge badge-md badge-primary">
<i class="fa fa-file-pdf mr-1"></i> Reiseanmeldung
</a>
</td>
<td>
Gesamtpreis: {{ \App\Services\Util::_number_format($booking_application->total)}} &euro;
</td>
<td>{{\App\Services\Util::_format_date($booking_application->updated_at, 'date')}}</td>
<td>
<a href="{{ route('customer_file_show', ['booking_application', $booking_application->id, true]) }}" class="btn btn-xs btn-default"
title="Download" data-placement="left" rel="tooltip">
<i class="fa fa-download"></i>
</a>
</td>
</tr>
@endforeach
@endif
@if($booking->booking_confirmations)
@foreach($booking->booking_confirmations as $booking_confirmation)
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a href="{{ route('customer_file_show', ['booking_confirmation', $booking_confirmation->id]) }}" target="_blank" class="badge badge-md badge-success">
<i class="fa fa-file-pdf mr-1"></i> Reisebestätigung
</a>
</td>
<td>
Gesamtpreis: {{ \App\Services\Util::_number_format($booking_confirmation->total)}} &euro; |
Anzahlung: {{ \App\Services\Util::_number_format($booking_confirmation->deposit)}} &euro; |
Restzahlung: {{ \App\Services\Util::_number_format($booking_confirmation->final_payment)}} &euro;
</td>
<td>{{\App\Services\Util::_format_date($booking_confirmation->updated_at, 'date')}}</td>
<td>
<a href="{{ route('customer_file_show', ['booking_confirmation', $booking_confirmation->id, true]) }}" class="btn btn-xs btn-default"
title="Download" data-placement="left" rel="tooltip">
<i class="fa fa-download"></i>
</a>
</td>
</tr>
@endforeach
@endif
@if($booking->booking_stornos)
@foreach($booking->booking_stornos as $booking_storno)
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a href="{{ route('customer_file_show', ['booking_storno', $booking_storno->id]) }}" target="_blank" class="badge badge-md badge-danger">
<i class="fa fa-file-pdf mr-1"></i> Stornobestätigung
</a>
</td>
<td>
Stornobetrag: {{ \App\Services\Util::_number_format($booking_storno->total)}} &euro;
</td>
<td>{{\App\Services\Util::_format_date($booking_storno->updated_at, 'date')}}</td>
<td>
<a href="{{ route('customer_file_show', ['booking_storno', $booking_storno->id, true]) }}" class="btn btn-xs btn-default"
title="Download" data-placement="left" rel="tooltip">
<i class="fa fa-download"></i>
</a>
</td>
</tr>
@endforeach
@endif
@if($booking->coupons)
@foreach($booking->coupons as $coupon)
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a href="{{ route('customer_file_show', ['coupon', $coupon->id]) }}" target="_blank" class="badge badge-md badge-warning">
<i class="fa fa-file-pdf mr-1"></i> Gutschein {{$coupon->number}}
</a>
</td>
<td>
Wert: {{ \App\Services\Util::_number_format($coupon->value)}} &euro; |
bis: {{\App\Services\Util::_format_date($coupon->valid_date, 'date')}} |
@if($coupon->is_redeemed) <i class="fa fa-check-circle text-success"></i> {{\App\Services\Util::_format_date($coupon->redeem_date, 'date')}} @else <i class="fa fa-times-circle text-danger"></i> @endif
</td>
<td>{{\App\Services\Util::_format_date($coupon->issue_date, 'date')}}</td>
<td>
<a href="{{ route('customer_file_show', ['coupon', $coupon->id, true]) }}" class="btn btn-xs btn-default"
title="Download" data-placement="left" rel="tooltip">
<i class="fa fa-download"></i>
</a>
</td>
</tr>
@endforeach
@endif
@if($booking->booking_vouchers)
@foreach($booking->booking_vouchers as $booking_voucher)
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a href="{{ route('customer_file_show', ['booking_voucher', $booking_voucher->id]) }}" target="_blank" class="badge badge-md badge-dark">
<i class="fa fa-file-pdf mr-1"></i> Voucher-ID {{$booking_voucher->id}}
</a>
</td>
<td>
&nbsp;
</td>
<td>{{\App\Services\Util::_format_date($booking_voucher->updated_at, 'date')}}</td>
<td>
<a href="{{ route('customer_file_show', ['booking_vouchers', $booking_voucher->id, true]) }}" class="btn btn-xs btn-default"
title="Download" data-placement="left" rel="tooltip">
<i class="fa fa-download"></i>
</a>
</td>
</tr>
@endforeach
@endif
@if($booking->insurance_certificates)
@foreach($booking->insurance_certificates as $insurance_certificate)
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a href="{{ route('customer_file_show', ['insurance_certificate', $insurance_certificate->id]) }}" target="_blank" class="badge badge-md badge-next">
<i class="fa fa-file-pdf mr-1"></i> Sicherungsschein Nr. {{$insurance_certificate->internal_id}}
</a>
</td>
<td>
&nbsp;
</td>
<td>{{\App\Services\Util::_format_date($insurance_certificate->updated_at, 'date')}}</td>
<td>
<a href="{{ route('customer_file_show', ['insurance_certificates', $insurance_certificate->id, true]) }}" class="btn btn-xs btn-default"
title="Download" data-placement="left" rel="tooltip">
<i class="fa fa-download"></i>
</a>
</td>
</tr>
@endforeach
@endif
@if($booking->travel_insurances)
@foreach($booking->travel_insurances as $travel_insurances)
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<i class="fa fa-info-circle mr-1"></i> Policennummer {{$travel_insurances->policy_number}}
</td>
<td>
Gesamtprämie: {{ \App\Services\Util::_number_format($travel_insurances->premium)}} &euro;
</td>
<td>{{\App\Services\Util::_format_date($travel_insurances->updated_at, 'date')}}</td>
<td>
&nbsp;
</td>
</tr>
@endforeach
@endif
@if($security_certificate = \App\Models\CMSContent::getModelBySlug('sicherungsschein-nach-sis651r-pdf'))
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a target="_blank" href="{{ $security_certificate->getURL() }}" class="badge badge-md badge-next">
<i class="fa fa-file-pdf mr-1"></i> {{$security_certificate->name}}
</a>
</td>
<td>
{{ $security_certificate->formatBytes() }}
</td>
<td>{{\App\Services\Util::_format_date($security_certificate->created_at, 'date')}}</td>
<td>
<a href="{{ $security_certificate->getURL('download') }}" class="btn btn-xs btn-default"
title="Download" data-placement="left" rel="tooltip">
<i class="fa fa-download"></i>
</a>
</td>
</tr>
@endif
@if($booking->booking_files)
@foreach($booking->booking_files as $booking_file)
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a target="_blank" href="{{ $booking_file->getURL() }}" class="badge badge-md badge-secondary">
<i class="{{$booking_file->getIconExt()}} mr-1"></i> {{$booking_file->original_name}}
</a>
</td>
<td>
{{ $booking_file->mine }} | {{ $booking_file->formatBytes() }}
</td>
<td>{{\App\Services\Util::_format_date($booking_file->created_at, 'date')}}</td>
<td>
<a href="{{ $booking_file->getURL('download') }}" class="btn btn-xs btn-default"
title="Download" data-placement="left" rel="tooltip">
<i class="fa fa-download"></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="{{ route('booking_modal_load') }}"><i class="ion ion-md-cloud-upload"></i>&nbsp;Datei hinzufügen</button>
</div>
</div>
</div>
</div>

View file

@ -0,0 +1,34 @@
<div class="card mb-2 border-primary">
<h6 class="card-header bg-primary text-white py-2" data-toggle="collapse" data-target="#collapseBookingInfo" aria-expanded="false" aria-controls="collapseBookingInfo">
<strong style="line-height: 1.6em">Kunde</strong>
</h6>
<div class="collapse" id="collapseBookingInfo">
<div class="card-body row">
@if($booking->customer->count())
<div class="form-group col-sm-6">
<label class="form-label" for="customer_id">{{ __('Kunden ID') }}</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">
<a class="text-primary" href="{{route('customer_detail', [$booking->customer->id])}}"><i class="fa fa-edit"></i></a></span>
</div>
{{ Form::text('customer[id]', $booking->customer->id, array('placeholder'=>__('Kunden ID'), 'class'=>'form-control', 'id'=>'customer_id', 'readonly')) }}
</div>
</div>
<div class="form-group col-sm-6">
<label class="form-label" for="customer_email">{{ __('E-Mail') }}</label>
{{ Form::text('customer[email]', $booking->customer->email, array('placeholder'=>__('E-Mail'), 'class'=>'form-control', 'id'=>'customer_email', 'readonly')) }}
</div>
<div class="form-group col-sm-6">
<label class="form-label" for="customer_firstname">{{ __('Vorname') }}</label>
{{ Form::text('customer[firstname]', $booking->customer->firstname, array('placeholder'=>__('Vorname'), 'class'=>'form-control', 'id'=>'customer_firstname', 'readonly')) }}
</div>
<div class="form-group col-sm-6">
<label class="form-label" for="customer_name">{{ __('Nachname') }}</label>
{{ Form::text('customer[name]', $booking->customer->name, array('placeholder'=>__('Nachname'), 'class'=>'form-control', 'id'=>'customer_name', 'readonly')) }}
</div>
@endif
</div>
</div>
</div>

View file

@ -0,0 +1,39 @@
<div class="card mb-2 border-primary">
<h6 class="card-header bg-primary text-white py-2" data-toggle="collapse" data-target="#collapseBookingLead" aria-expanded="false" aria-controls="collapseBookingLead">
<strong style="line-height: 1.6em">Anfrage</strong>
</h6>
<div class="collapse" id="collapseBookingLead">
<div class="card-body row">
@if($booking->lead->count())
<div class="form-group col-sm-6">
<label class="form-label" for="lead_id">{{ __('Anfrage ID') }}</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">
<a class="text-primary" href="{{route('lead_detail', [$booking->lead->id])}}"><i class="fa fa-edit"></i></a></span>
</div>
{{ Form::text('lead[id]', $booking->lead->id, array('placeholder'=>__('Anfrage ID'), 'class'=>'form-control', 'id'=>'lead_id', 'readonly')) }}
</div>
</div>
<div class="form-group col-sm-6">
<label class="form-label" for="lead_status_id">{{ __('Status') }}</label>
{{ Form::text('lead[status_id]', $booking->lead->status ? $booking->lead->status->name : '', array('placeholder'=>__('Status'), 'class'=>'form-control', 'id'=>'lead_status_id', 'readonly')) }}
</div>
<div class="form-group col-sm-6">
<label class="custom-control custom-checkbox mt-2">
{!! Form::checkbox('lead[is_rebook]', 1, $booking->lead->is_rebook, ['class'=>'custom-control-input', 'readonly']) !!}
<span class="custom-control-label">{{__('Umbuchung abgeschlossen')}}</span>
</label>
</div>
<div class="form-group col-sm-6">
<label class="custom-control custom-checkbox mt-2">
{!! Form::checkbox('lead[is_closed]', 1, $booking->lead->is_closed, ['class'=>'custom-control-input', 'readonly']) !!}
<span class="custom-control-label">{{__('Vorgang abgeschlossen')}}</span>
</label>
</div>
@endif
</div>
</div>
</div>

View file

@ -0,0 +1,137 @@
<div class="card mb-2">
<h6 class="card-header bg-primary text-white py-2" data-toggle="collapse" data-target="#collapseBookingMails" aria-expanded="false" aria-controls="collapseBookingMails">
<strong style="line-height: 1.6em">E-Mails</strong>
</h6>
<div class="collapse" id="collapseBookingMails">
<div class="container-fluid d-flex align-items-stretch flex-grow-1 p-0">
<!-- `.messages-wrapper` fills all available space of container -->
<div class="messages-wrapper">
<!-- Messages sidebox -->
<div class="messages-sidebox messages-scroll bg-body border-right">
<div class="py-3 px-4">
<div class="media align-items-center">
<div class="media-body text-center">
<button type="button" class="btn btn-sm btn-secondary mb-3 btn-compare-customer-mails" data-toggle="modal"
data-target="#modals-load-content"
data-id="new-send"
data-model="customerMail"
data-action="new-customer-mail"
data-url="{{route('customer_mail_send_mail')}}"
data-redirect="back"
data-booking_id="{{$booking->id}}"
data-customer_mail_dir="0"
data-customer_mail_country="0"
data-route="{{ route('booking_modal_load') }}"><i class="ion ion-md-mail-open"></i>&nbsp;E-Mail schreiben</button>
<button type="button" class="btn btn-sm btn-next btn-compare-customer-mails" data-toggle="modal"
data-target="#modals-load-content"
data-id="new-save"
data-model="customerMail"
data-action="reply-customer-mail"
data-url="{{route('customer_mail_reply_mail')}}"
data-redirect="back"
data-booking_id="{{$booking->id}}"
data-customer_mail_dir="0"
data-customer_mail_country="0"
data-route="{{ route('booking_modal_load') }}"><i class="ion ion-md-mail-unread"></i>&nbsp;Antwort speichern</button>
</div>
<a href="javascript:void(0)" class="messages-sidebox-toggler d-lg-none d-block text-muted text-large font-weight-light pl-4">&times;</a>
</div>
</div>
<hr class="border-light mx-4 mt-0 mb-4">
<style>
.sidebox-nav-item {
color: #a3a4a6 !important;
}
.sidebox-nav-item[href]:hover,
.sidebox-nav-item[href]:focus {
color: #8c8e90 !important;
}
.sidebox-nav-item.active .item {
color: #4E5155 !important;
font-weight: 700 !important;
}
</style>
<!-- Mail boxes -->
@foreach($booking::$customer_mail_dirs as $dir_id => $customer_mail_dir)
@php($badge = $dir_id === 0 ? "badge-primary" : "badge-outline-primary")
<a href="javascript:void(0)" class="d-flex justify-content-between align-items-center py-2 px-4 sidebox-nav-item @if($dir_id === 0) active @endif"
data-dir="{{$dir_id}}" data-country="0" data-icon="{{$customer_mail_dir['icon']}}" data-name="{{$customer_mail_dir['name']}}">
<div class="item">
<i class="ion {{$customer_mail_dir['icon']}}"></i> {{$customer_mail_dir['name']}}
</div>
<div class="badge {{$badge}}">{{$booking->countCustomerMailsBy($dir_id)}}</div>
</a>
@if($dir_id === 1 && $booking->travel_country)
@foreach($booking->travel_country->getCountryLands() as $id => $name)
<a href="javascript:void(0)" class="d-flex justify-content-between align-items-center py-2 px-4 sidebox-nav-item"
data-dir="{{$dir_id}}" data-country="{{$id}}" data-icon="{{$customer_mail_dir['icon']}}" data-name="{{$name}}">
<div class="item pl-2">
<i class="ion {{$customer_mail_dir['icon']}}"></i> {{$name}}
</div>
<div class="badge {{$badge}}">{{$booking->countCustomerMailsBy($dir_id, $id)}}</div>
</a>
@endforeach
@endif
@endforeach
<hr class="border-light m-4">
</div>
<!-- / Messages sidebox -->
<!-- Messages content wrapper -->
<div class="d-flex flex-column w-100">
<!-- Header -->
<div class="flex-grow-0">
<h4 class="media align-items-center font-weight-bold container-p-x py-3 py-lg-4 m-0">
<a href="javascript:void(0)" class="messages-sidebox-toggler d-lg-none d-block align-self-center text-muted px-3 mr-3"><i class="ion ion-md-more"></i></a>
<div class="media-body">&nbsp;
<i id="message-sidebox-title-icon" class="ion ion-ios-filing"></i> <span id="message-sidebox-title-name">Reisender</span>
</div>
<input type="text" class="form-control form-control-sm" placeholder="Suche ..." style="max-width: 10rem;" id="dataTableInputSearchField">
</h4>
<hr class="border-light m-0">
</div>
<!-- / Header -->
<style>
div.dataTables_info, div.dataTables_paginate {
padding: 10px;
}
</style>
<!-- Wrap `.messages-scroll` to properly position scroll area. Remove this wrapper if you don't need scroll -->
<div class="flex-grow-1 position-relative">
<!-- Remove `.messages-scroll` and add `.flex-grow-1` if you don't need scroll -->
<div class="messages-content flex-grow-1">
<div class="table-responsive" id="customer_mails_table">
<input type="hidden" name="booking_id" value="{{$booking->id}}">
<input type="hidden" name="customer_mail_dir" value="0">
<input type="hidden" name="customer_mail_country" value="">
<table id="datatables-customer-mails" class="table table-striped">
<thead>
<tr>
<th>&nbsp;</th>
{{-- <th>{{__('E-Mail')}}</th> --}}
<th>{{__('Betreff')}}</th>
<th>{{__('Datum')}}</th>
<th style="width: 100px">{{__('#')}}</th>
</tr>
</thead>
<tbody class="">
</tbody>
</table>
</div>
</div><!-- / .messages-content -->
</div>
</div>
</div><!-- / .messages-wrapper -->
</div>
</div>
</div>

View file

@ -0,0 +1,22 @@
<div class="card mb-2">
<h6 class="card-header bg-primary text-white py-2" data-toggle="collapse" data-target="#collapseBookingMyJack" aria-expanded="false" aria-controls="collapseBookingMyJack">
<strong style="line-height: 1.6em">MyJack</strong>
</h6>
<div class="collapse" id="collapseBookingMyJack">
<div class="card-body row">
<div class="form-group col-sm-4">
<label class="form-label" for="ev_number">{{ __('EV Nummer') }}</label>
{{ Form::text('ev_number', $booking->ev_number, array('placeholder'=>__('EV Nummer'), 'class'=>'form-control', 'id'=>'ev_number', 'readonly')) }}
</div>
<div class="form-group col-sm-4">
<label class="form-label" for="booking_konto">{{ __('Konto') }}</label>
{{ Form::text('booking_konto', 4011, array('placeholder'=>__('Konto'), 'class'=>'form-control', 'id'=>'booking_konto', 'readonly')) }}
</div>
<div class="form-group col-sm-4">
<label class="form-label" for="merlin_order_number">{{ __('MyJack Nr.') }}</label>
{{ Form::text('merlin_order_number', $booking->merlin_order_number, array('placeholder'=>__('MyJack Nr.'), 'class'=>'form-control', 'id'=>'merlin_order_number', 'readonly')) }}
</div>
</div>
</div>
</div>

View file

@ -0,0 +1,18 @@
<div class="card mb-2">
<h6 class="card-header bg-primary text-white py-2" data-toggle="collapse" data-target="#collapseBookingPrice" aria-expanded="false" aria-controls="collapseBookingPrice">
<strong style="line-height: 1.6em">Preis</strong>
</h6>
<div class="collapse" id="collapseBookingPrice">
<div class="card-body row">
<div class="form-group col-sm-6">
<label class="form-label" for="price">{{ __('Gesamtpreis Organisation') }}</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"></span>
</div>
{{ Form::text('price', $booking->price, array('placeholder'=>__('Gesamtpreis'), 'class'=>'form-control', 'id'=>'price', 'readonly')) }}
</div>
</div>
</div>
</div>
</div>

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,93 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">
{{ __('Datei') }}
<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-row show-content-file">
<div class="col-12">
<div class="alert alert-danger alert-dismissable" style="display:none;"></div>
</div>
<div class="col-12 mt-2 mb-4">
{!! Form::open([ 'url' => route('booking_modal_load'), 'method' => 'post', 'files' => true, 'enctype' => 'multipart/form-data', 'class' => 'dropzone', 'id' => 'uploadBookingFile' ]) !!}
<input type="hidden" name="booking_id" value="{{ $data['booking_id'] }}">
<input type="hidden" name="action" value="upload-booking-file">
<div class="fallback">
<input name="file" type="file" multiple>
</div>
{!! Form::close() !!}
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
</div>
</div>
<script type="text/javascript">
$( document ).ready(function() {
Dropzone.autoDiscover = false;
$("#uploadBookingFile").dropzone({
uploadMultiple: false,
parallelUploads: 1,
maxFilesize: 32,
addRemoveLinks: true,
dictDefaultMessage: '<i class="ion ion-ios-cloud-upload "></i>Hier klicken, oder Datei hier reinziehen (Drag&Drop)',
dictFallbackMessage: 'Ihr Browser unterstützt Drag&Drop Dateiuploads nicht',
dictFallbackText: 'Benutzen Sie das Formular um Ihre Dateien hochzuladen',
dictFileTooBig: "Die Datei ist zu groß. Die maximale Dateigröße beträgt 32 MB",
dictInvalidFileType: 'Eine Datei dieses Typs kann nicht hochgeladen werden',
dictResponseError: "Der Server hat ihre Anfrage mit Status error abgelehnt",
dictCancelUpload: 'Hochladen abbrechen',
dictCancelUploadConfirmation: null,
dictRemoveFile: 'Datei entfernen',
dictMaxFilesExceeded: 'Sie können keine weiteren Dateien mehr hochladen',
acceptedFiles: "image/jpeg,image/pjpeg,image/png,image/gif,application/pdf,text/plain",
// The setting up of the dropzone
headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
},
init:function() {
this.on("removedfile", function(file) {
var _ele = $('.alert-danger');
_ele.fadeOut();
});
this.on("addedfile", function (file) {
var _ele = $('.alert-danger');
_ele.fadeOut();
});
},
error: function(file, response) {
var message
if($.type(response) === "string")
message = response; //dropzone sends it's own error messages in string
else
message = response.message;
var _ele = $('.alert-danger');
_ele.fadeIn();
console.log(message);
_ele.text(message);
},
success: function(file, response) {
console.log(file);
console.log(response);
if(response.error === false){
//window.location.href = window.location.href; //This is a possibility
window.location.reload(); //Another possiblity
}
}
});
});
</script>

View file

@ -21,11 +21,13 @@
@endif
<div class="card">
<div class="card-datatable table-responsive py-2" data-route-modal="{{ route('cms_content_all_load_modal') }}" data-target-modal="#modals-load-content">
<div class="card-datatable table-responsive py-2" >
<div class="mr-4 mb-2 text-right">
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-load-content"
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal"
data-target="#modals-load-content"
data-id="new"
data-model="content"
data-route="{{ route('cms_content_all_load_modal') }}"
>Neuen Content anlegen</button>
</div>
@ -34,8 +36,10 @@
<tr>
<th style="max-width: 60px;">&nbsp;</th>
<th>{{__('Name')}}</th>
<th>{{__('Type')}}</th>
<th>{{__('Slug')}}</th>
<th>{{__('Inhalt')}}</th>
<th>{{__('Type')}}</th>
<th></th>
</tr>
</thead>
@ -45,13 +49,16 @@
<td class="not">
<button type="button" class="btn icon-btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-load-content"
data-id="{{ $value->id }}"
data-model="content">
data-model="content"
data-route="{{ route('cms_content_all_load_modal') }}">
<span class="fa fa-edit"></span>
</button>
</td>
<td>{{ $value->name }}</td>
<td>{{ $value->slug }}</td>
<td>@if($value->isFile()) {!! $value->getPreviewContent() !!} @else {{ $value->getPreviewContent() }} @endif</td>
<td>{{ $value->getFieldName() }}</td>
<td>{{ $value->getPreviewContent() }}</td>
<td><a class="text-danger" href="{{ route('cms_content_all_delete', [$value->id]) }}" onclick="return confirm('{{__('Wirklich löschen?')}}');"><i class="fa fa-trash-alt"></i></a></td>
</tr>
@ -62,6 +69,7 @@
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-load-content"
data-id="new"
data-model="content"
data-route="{{ route('cms_content_all_load_modal') }}"
>Neuen Content anlegen</button>
</div>
</div>
@ -70,52 +78,6 @@
<script>
$( document ).ready(function() {
function loadModalInner(self, data){
var url = data.route,
contentType = 'application/x-www-form-urlencoded; charset=UTF-8';
$.ajax({
url: url,
data: data,
type: "POST",
dataType: "json",
cache: false,
contentType: contentType,
encode: true,
headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
},
success: function(data) {
$(data.response.target).find('.modal-dialog').html(data.html);
$('.selectpicker').selectpicker('refresh');
//datepicker_birthday_init();
},
error: function(xhr, status, errorThrown) {
console.log(xhr);
console.log(xhr.responseText);
console.log(errorThrown);
console.log("Sorry, there was a problem!");
}
});
return false;
}
$('#modals-load-content').on('show.bs.modal', function (event) {
var button = $(event.relatedTarget);
if (!button.data('id')) {
return;
}
var data = {};
data.route = button.parents('.card').find('.card-datatable').data('route-modal');
data.target = button.parents('.card').find('.card-datatable').data('target-modal');
data.id = button.data('id');
data.model = button.data('model');
console.log(data);
loadModalInner(this, data);
});
$('.datatables-default').dataTable({
"bLengthChange": false,
"iDisplayLength": 50,

View file

@ -1,7 +1,7 @@
{!! Form::open(['url' => route('cms_content_all_store'), 'class' => 'modal-content']) !!}
{!! Form::open(['url' => route('cms_content_all_store'), 'class' => 'modal-content', 'enctype' => 'multipart/form-data']) !!}
<input type="hidden" name="id" id="id" value="@if($value->id>0){{$value->id}}@else new @endif">
<input type="hidden" name="id" id="id" value="{{ $value->id > 0 ? $value->id : 'new' }}">
<div class="modal-header">
@ -12,51 +12,81 @@
<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', $value->name, array('placeholder'=>__('Name'), 'class'=>'form-control', 'required')) }}
</div>
</div>
<div class="form-row">
<div class="form-group col">
<label for="field" class="form-label">{{ __('Country') }}*</label>
<label for="field" class="form-label">{{ __('Type') }}*</label>
<select class="selectpicker" name="field" data-style="btn-light" data-live-search="true" required>
{!! \App\Models\CMSContent::getFieldsOptions($value->field) !!}
</select>
</div>
</div>
<div class="form-row show-content-text" style="display: ;">
<div class="form-row show-field-name">
<div class="form-group col">
<label for="name" class="form-label">{{ __('Name') }}</label>
{{ Form::text('name', $value->name, array('placeholder'=>__('Name'), 'class'=>'form-control', 'required')) }}
</div>
</div>
<div class="form-row show-content-text" style="display:none ;">
<div class="form-group col">
<label for="text" class="form-label">{{ __('Text') }}</label>
{{ Form::text('text', $value->text, array('placeholder'=>__('Text'), 'class'=>'form-control')) }}
</div>
</div>
<div class="form-row show-content-full_text" style="display: ;">
<div class="form-row show-content-full_text" style="display:none ;">
<div class="form-group col">
<label for="text" class="form-label">{{ __('Full Text') }}</label>
{{ Form::textarea('full_text', $value->full_text, array('placeholder'=>__('Full Text'), 'class'=>'form-control', 'rows'=>20)) }}
</div>
</div>
<div class="form-row show-content-integer" style="display: ;">
<div class="form-row show-content-integer" style="display:none ;">
<div class="form-group col">
<label for="integer" class="form-label">{{ __('Zahl') }}</label>
{{ Form::text('integer', $value->integer, array('placeholder'=>__('Zahl'), 'class'=>'form-control')) }}
</div>
</div>
<div class="form-row show-content-decimal" style="display: ;">
<div class="form-row show-content-decimal" style="display:none ;">
<div class="form-group col">
<label for="decimal" class="form-label">{{ __('Kommazahl') }}</label>
{{ Form::text('decimal', $value->decimal, array('placeholder'=>__('Kommazahl'), 'class'=>'form-control')) }}
</div>
</div>
<div class="form-row">
<div class="form-row show-content-file" style="display:none ;">
@if($value->isFile())
<div class="col-12 " id="preview-mail-attachment">
<div class="message-attachment ui-bordered p-2 mr-3 mb-3">
<div class="message-attachment-file display-4"><i class="mail-att-icon {{$value->getIconExt()}}"></i></div>
<div class="media-body ml-3">
<strong class="message-attachment-filename">{{$value->filename}}</strong>
<div class="text-muted small mail-att-size">{{$value->formatBytes()}}</div>
<div>
<a href="{{$value->getURL()}}" target="_blank" class="mail-att-show">Vorschau</a> &nbsp;
{{-- <a href="javascript:void(0)" class="mail-att-delete">entfernen</a> --}}
</div>
</div>
</div>
</div>
@else
<div class="col-12">
<div class="alert alert-danger alert-dismissable" style="display:none;"></div>
</div>
<div class="col-12 mt-2 mb-4">
<!-- You can add extra form fields here -->
<div class="dropzone" id="fileUpload"></div>
</div>
@endif
</div>
<div class="form-row show-field-slug">
<div class="form-group col">
<label for="name" class="form-label">{{ __('Slug') }}</label>
{{ Form::text('slug', $value->slug, array('class'=>'form-control')) }}
@ -71,7 +101,10 @@
{!! Form::close() !!}
<script>
<script type="text/javascript">
$( document ).ready(function() {
$('div[class*="show-content"]').hide();
@ -80,6 +113,67 @@
$('select[name="field"]').on('change', function () {
$('div[class*="show-content"]').hide();
$('.show-content-'+$(this).val()).show();
if($(this).val() == 'file' && $('input[name="id"]').val() == 'new'){
$('.show-field-slug').hide();
$('.show-field-name').hide();
}else{
$('.show-field-slug').show();
$('.show-field-name').show();
}
});
Dropzone.autoDiscover = false;
$("#fileUpload").dropzone({
url: "{{route('cms_content_all_store')}}",
uploadMultiple: false,
parallelUploads: 1,
maxFilesize: 32,
addRemoveLinks: true,
dictDefaultMessage: '<i class="ion ion-ios-cloud-upload "></i>Hier klicken, oder Datei hier reinziehen (Drag&Drop)',
dictFallbackMessage: 'Ihr Browser unterstützt Drag&Drop Dateiuploads nicht',
dictFallbackText: 'Benutzen Sie das Formular um Ihre Dateien hochzuladen',
dictFileTooBig: "Die Datei ist zu groß. Die maximale Dateigröße beträgt 32 MB",
dictInvalidFileType: 'Eine Datei dieses Typs kann nicht hochgeladen werden',
dictResponseError: "Der Server hat ihre Anfrage mit Status error abgelehnt",
dictCancelUpload: 'Hochladen abbrechen',
dictCancelUploadConfirmation: null,
dictRemoveFile: 'Datei entfernen',
dictMaxFilesExceeded: 'Sie können keine weiteren Dateien mehr hochladen',
acceptedFiles: "image/jpeg,image/pjpeg,image/png,image/gif,application/pdf,text/plain",
// The setting up of the dropzone
headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
},
init:function() {
this.on("removedfile", function(file) {
var _ele = $('.alert-danger');
_ele.fadeOut();
});
this.on("addedfile", function (file) {
var _ele = $('.alert-danger');
_ele.fadeOut();
});
},
error: function(file, response) {
var message
if($.type(response) === "string")
message = response; //dropzone sends it's own error messages in string
else
message = response.message;
var _ele = $('.alert-danger');
_ele.fadeIn();
console.log(message);
_ele.text(message);
},
success: function(file, response) {
console.log(file);
console.log(response);
if(response.error === false){
//window.location.href = window.location.href; //This is a possibility
window.location.reload(); //Another possiblity
}
}
});
});

View file

@ -0,0 +1,218 @@
<div class="table-responsive border-bottom mb-2">
<table class="table table-striped table-sm" id="table-modal-booking-files">
<thead>
<tr>
<th>#</th>
<th>Datei</th>
<th>Inhalt</th>
<th>Datum</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
@php($booking_files_count = 1)
@if($booking->booking_applications)
@foreach($booking->booking_applications as $booking_application)
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a href="{{ route('customer_file_show', ['booking_application', $booking_application->id]) }}" target="_blank" class="badge badge-md badge-primary">
<i class="fa fa-file-pdf mr-1"></i> Reiseanmeldung
</a>
</td>
<td>
GB: {{ \App\Services\Util::_number_format($booking_application->total)}} &euro;
</td>
<td>{{\App\Services\Util::_format_date($booking_application->updated_at, 'date')}}</td>
<td>
<button data-target="{{ route('customer_file_show', ['booking_application', $booking_application->id, true]) }}" data-name="Reiseanmeldung" class="btn btn-xs btn-primary add-file-to-attachment add-file-to-attachment"
title="als Anhang hinzufügen" data-placement="left" rel="tooltip">
<i class="fa fa-cloud-download-alt"></i>
</button>
</td>
</tr>
@endforeach
@endif
@if($booking->booking_confirmations)
@foreach($booking->booking_confirmations as $booking_confirmation)
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a href="{{ route('customer_file_show', ['booking_confirmation', $booking_confirmation->id]) }}" target="_blank" class="badge badge-md badge-success">
<i class="fa fa-file-pdf mr-1"></i> Reisebestätigung
</a>
</td>
<td>
GP: {{ \App\Services\Util::_number_format($booking_confirmation->total)}} &euro; |
AZ: {{ \App\Services\Util::_number_format($booking_confirmation->deposit)}} &euro; |
RE: {{ \App\Services\Util::_number_format($booking_confirmation->final_payment)}} &euro;
</td>
<td>{{\App\Services\Util::_format_date($booking_confirmation->updated_at, 'date')}}</td>
<td>
<button data-target="{{ route('customer_file_show', ['booking_confirmation', $booking_confirmation->id]) }}" data-name="Reisebestätigung" class="btn btn-xs btn-primary add-file-to-attachment"
title="als Anhang hinzufügen" data-placement="left" rel="tooltip">
<i class="fa fa-cloud-download-alt"></i>
</button>
</td>
</tr>
@endforeach
@endif
@if($booking->booking_stornos)
@foreach($booking->booking_stornos as $booking_storno)
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a href="{{ route('customer_file_show', ['booking_storno', $booking_storno->id]) }}" target="_blank" class="badge badge-md badge-danger">
<i class="fa fa-file-pdf mr-1"></i> Stornobestätigung
</a>
</td>
<td>
Stornobetrag: {{ \App\Services\Util::_number_format($booking_storno->total)}} &euro;
</td>
<td>{{\App\Services\Util::_format_date($booking_storno->updated_at, 'date')}}</td>
<td>
<button data-target="{{ route('customer_file_show', ['booking_storno', $booking_storno->id]) }}" data-name="Stornobestätigung" class="btn btn-xs btn-primary add-file-to-attachment"
title="als Anhang hinzufügen" data-placement="left" rel="tooltip">
<i class="fa fa-cloud-download-alt"></i>
</button>
</td>
</tr>
@endforeach
@endif
@if($booking->coupons)
@foreach($booking->coupons as $coupon)
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a href="{{ route('customer_file_show', ['coupon', $coupon->id]) }}" target="_blank" class="badge badge-md badge-warning">
<i class="fa fa-file-pdf mr-1"></i> Gutschein {{$coupon->number}}
</a>
</td>
<td>
Wert: {{ \App\Services\Util::_number_format($coupon->value)}} &euro; |
bis: {{\App\Services\Util::_format_date($coupon->valid_date, 'date')}} |
@if($coupon->is_redeemed) <i class="fa fa-check-circle text-success"></i> {{\App\Services\Util::_format_date($coupon->redeem_date, 'date')}} @else <i class="fa fa-times-circle text-danger"></i> @endif
</td>
<td>{{\App\Services\Util::_format_date($coupon->issue_date, 'date')}}</td>
<td>
<button data-target="{{ route('customer_file_show', ['coupon', $coupon->id]) }}" data-name="Gutschein {{$coupon->number}}" class="btn btn-xs btn-primary add-file-to-attachment"
title="als Anhang hinzufügen" data-placement="left" rel="tooltip">
<i class="fa fa-cloud-download-alt"></i>
</button>
</td>
</tr>
@endforeach
@endif
@if($booking->booking_vouchers)
@foreach($booking->booking_vouchers as $booking_voucher)
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a href="{{ route('customer_file_show', ['booking_voucher', $booking_voucher->id]) }}" target="_blank" class="badge badge-md badge-dark">
<i class="fa fa-file-pdf mr-1"></i> Voucher-ID {{$booking_voucher->id}}
</a>
</td>
<td>
&nbsp;
</td>
<td>{{\App\Services\Util::_format_date($booking_voucher->updated_at, 'date')}}</td>
<td>
<button data-target="{{ route('customer_file_show', ['booking_vouchers', $booking_voucher->id]) }}" data-name="Voucher-ID {{$booking_voucher->id}}" class="btn btn-xs btn-primary add-file-to-attachment"
title="als Anhang hinzufügen" data-placement="left" rel="tooltip">
<i class="fa fa-cloud-download-alt"></i>
</button>
</td>
</tr>
@endforeach
@endif
@if($booking->insurance_certificates)
@foreach($booking->insurance_certificates as $insurance_certificate)
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a href="{{ route('customer_file_show', ['insurance_certificate', $insurance_certificate->id]) }}" target="_blank" class="badge badge-md badge-next">
<i class="fa fa-file-pdf mr-1"></i> Sicherungsschein Nr. {{$insurance_certificate->internal_id}}
</a>
</td>
<td>
&nbsp;
</td>
<td>{{\App\Services\Util::_format_date($insurance_certificate->updated_at, 'date')}}</td>
<td>
<button data-target="{{ route('customer_file_show', ['insurance_certificates', $insurance_certificate->id]) }}" data-name="Sicherungsschein Nr. {{$insurance_certificate->internal_id}}" class="btn btn-xs btn-primary add-file-to-attachment"
title="als Anhang hinzufügen" data-placement="left" rel="tooltip">
<i class="fa fa-cloud-download-alt"></i>
</button>
</td>
</tr>
@endforeach
@endif
@if($security_certificate = \App\Models\CMSContent::getModelBySlug('sicherungsschein-nach-sis651r-pdf'))
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a target="_blank" href="{{ $security_certificate->getURL() }}" class="badge badge-md badge-next">
<i class="fa fa-file-pdf mr-1"></i> {{$security_certificate->name}}
</a>
</td>
<td>
{{ $security_certificate->formatBytes() }}
</td>
<td>{{\App\Services\Util::_format_date($security_certificate->created_at, 'date')}}</td>
<td>
<button data-target="{{ $security_certificate->getURL() }}" data-name="{{ $security_certificate->name }}" class="btn btn-xs btn-primary add-file-to-attachment"
title="als Anhang hinzufügen" data-placement="left" rel="tooltip">
<i class="fa fa-cloud-download-alt"></i>
</button>
</td>
</tr>
@endif
@if($booking->booking_files)
@foreach($booking->booking_files as $booking_file)
<tr>
<th scope="row">{{$booking_files_count++}}</th>
<td>
<a target="_blank" href="{{ $booking_file->getURL() }}" class="badge badge-md badge-secondary">
<i class="{{$booking_file->getIconExt()}} mr-1"></i> {{ $booking_file->original_name }}
</a>
</td>
<td>
{{ $booking_file->mine }} | {{ $booking_file->formatBytes() }}
</td>
<td>{{\App\Services\Util::_format_date($booking_file->created_at, 'date')}}</td>
<td>
<button data-target="{{ $booking_file->getURL() }}" data-name="{{ $booking_file->original_name }}" class="btn btn-xs btn-primary add-file-to-attachment"
title="als Anhang hinzufügen" data-placement="left" rel="tooltip">
<i class="fa fa-cloud-download-alt"></i>
</button>
</td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
<script type="text/javascript">
$(document).ready(function() {
$('#table-modal-booking-files [rel="tooltip"]').tooltip({trigger: "hover"});
$('#table-modal-booking-files .add-file-to-attachment').on('click', function (event) {
var $elem = $('<div/>');
$elem.data('action', 'add_attachment');
$elem.data('id', 'new');
$elem.data('url', '{{route('customer_mail_ajax')}}');
$elem.data('target', $(this).data('target'));
$elem.data('name', $(this).data('name'));
ajax_object_action(event, $elem, callback_ajax_add_attachment);
});
});
</script>

View file

@ -20,21 +20,26 @@
@if($value->show === 'single' || $value->show === 'reply')
<div class="row">
@if(isset($value->booking))
<div class="col-sm-4">
<strong>Buchung: </strong><br>
{{ $value->booking->id }}
@if($value->booking->travel_country_id)
{{ " | ".$value->booking->travel_country->name }}
@endif
@if($value->booking->travelagenda_id)
{{ " | ".$value->booking->travel_agenda->name }}
@endif
({{ $value->booking->id }})
</div>
<div class="col-sm-4">
@if($value->booking->customer)
<strong>Kunde: </strong><br>{{ $value->booking->customer->salutation->name }} {{ $value->booking->customer->firstname }} {{ $value->booking->customer->name }}
<strong>Kunde: </strong><br>{{ $value->booking->customer->salutation->name }} {{ $value->booking->customer->title }} {{ $value->booking->customer->firstname }} {{ $value->booking->customer->name }}
@endif
@if($value->booking->lead)
({{$value->booking->lead->id}})
@endif
</div>
@endif
<div class="col-sm-4">
@if(isset($value->customer_mail))
<strong>Antwort auf: </strong><br>{{ $value->customer_mail->id }} || {{ $value->customer_mail->subject }}
@ -62,7 +67,7 @@
<button type="button" class="btn btn-sm btn-outline-primary mt-1 mb-2" data-toggle="collapse" data-target="#collapseModalNewMailRe" aria-expanded="false" aria-controls="collapseModalNewMailRe"><i class="fa fa-plus-circle"></i> Weitere Empfänger</button>
</div>
</div>
</span>
</span>
</label>
@endforeach
</div>
@ -123,9 +128,10 @@
<div class="form-group mb-1">
<label class="form-label" for="message">Nachricht</label>
@if($value->show === 'single' || $value->show === 'multi')
<div class="float-right small">Vorlage unter: <a href="{{route('cms_content_all')}}">CMS->Inhalte->Allgemein</a> Slug:mailvorlage</div>
@endif
<div id="message-editor-toolbar">
<span class="ql-formats">
<button class="ql-bold"></button>
<button class="ql-italic"></button>
@ -155,12 +161,12 @@
{{ Form::textarea('message', $value->message, array('placeholder'=>$value->m_placeholder, 'id'=>'message-editor-fallback', 'class'=>'form-control d-none', 'rows'=>15)) }}
</div>
@if(isset($value->customers))
<p>Platzhalter: #geehrte/r# #Anrede# #Vorname# #Nachname# #Reiseland# #Programm# #Anreisedatum# #Abreisedatum# #Buchungsdatum# #Airline#</p>
<p>Platzhalter: #geehrte/r# #Anrede# #Titel# #Vorname# #Nachname# #Reiseland# #Programm# #Anreisedatum# #Abreisedatum# #Buchungsdatum# #Airline#</p>
@endif
@if($value->show === 'single' || $value->show === 'reply')
<div class="form-row">
<div class="col-sm-6">
<label for="to" class="form-label">Ablegen unter:</label>
<label for="send_mail_dir" class="form-label">Ablegen unter:</label>
<select class="custom-select" name="dir" id="send_mail_dir">
@foreach($value->booking::$customer_mail_dirs as $dir_id=>$customer_mail_dirs)
@if($dir_id <= 10)
@ -183,15 +189,24 @@
</div>
@endif
@if(isset($value->customer_mail))
{{ Form::hidden('customer_mail_id', $value->customer_mail->id) }}
{{ Form::hidden('customer_mail_id', $value->customer_mail->id) }}
@endif
<hr>
{!! Form::close() !!}
<div class="row">
<div class="col-12">
@if($value->show === 'single' && isset($value->booking))
<button type="button" class="btn btn-sm btn-outline-primary mt-1 mb-2 float-right" data-toggle="collapse" data-target="#collapseModalBookingFiles" aria-expanded="false" aria-controls="collapseModalBookingFiles"><i class="fa fa-plus-circle"></i> Dateien aus Buchung</button>
@endif
<h5>Datei Anhänge</h5>
</div>
@if($value->show === 'single' && isset($value->booking))
<div class="collapse col-12" id="collapseModalBookingFiles">
@include('customer.mail.modal-new-booking-files', ['booking'=>$value->booking])
</div>
@endif
<div class="col-12">
<div class="alert alert-danger alert-dismissable" style="display:none;"></div>
</div>
@ -211,7 +226,6 @@
</div>
@endforeach
@endif
</div>
<div class="col-6">
{!! Form::open([ 'url' => route('customer_mail_upload_attachment', ['tmp']), 'method' => 'post', 'files' => true, 'enctype' => 'multipart/form-data', 'class' => 'dropzone', 'id' => 'uploadAttachmentFile' ]) !!}
@ -253,16 +267,21 @@
</div>
<script type="text/javascript">
function add_mail_attachment_preview(file, response){
function callback_ajax_add_attachment(response) {
if(response.error === false){
add_mail_attachment_preview(response);
}
}
function add_mail_attachment_preview(response){
console.log(response);
var template = $('#mail-attachment-template').clone()
.removeAttr('id').removeClass('d-none')
.attr('data-id', response.file_id);
template.find('.mail-att-icon').addClass(response.file_icon);
template.find('.message-attachment-filename').text(response.filename);
template.find('.message-attachment-filename').text(response.original_name);
template.find('.mail-att-size').text(response.file_format_bytes);
///'storage/file/{id}/{disk}
@ -337,7 +356,7 @@
parallelUploads: 1,
maxFilesize: 32,
addRemoveLinks: true,
dictDefaultMessage: 'Hier klicken, oder Datei hier reinziehen (Drag&Drop)',
dictDefaultMessage: '<i class="ion ion-ios-cloud-upload "></i>Hier klicken, oder Datei hier reinziehen (Drag&Drop)',
dictFallbackMessage: 'Ihr Browser unterstützt Drag&Drop Dateiuploads nicht',
dictFallbackText: 'Benutzen Sie das Formular um Ihre Dateien hochzuladen',
dictFileTooBig: "Die Datei ist zu groß. Die maximale Dateigröße beträgt 32 MB",
@ -375,7 +394,7 @@
// console.log(file);
// console.log(response);
if(response.error === false){
add_mail_attachment_preview(file, response);
add_mail_attachment_preview(response);
this.removeFile(file);
}
}

View file

@ -30,7 +30,7 @@
</div>
</div>
<hr class="border-light m-0">
<!-- / Header -->
<!-- / Header -->
{{-- <!-- Controls -->
<div class="media flex-wrap align-items-center p-2">
<div class="media-body d-flex flex-wrap flex-basis-100 flex-basis-sm-auto">
@ -59,19 +59,22 @@
<div class="px-4 pt-4 pb-2">
@if($customer_mail->customer)
<p><strong>Kunde: </strong>
{{ $customer_mail->customer->salutation->name }} {{ $customer_mail->customer->firstname }} {{ $customer_mail->customer->name }}
{{ $customer_mail->customer->salutation->name }} {{ $customer_mail->customer->title }} {{ $customer_mail->customer->firstname }} {{ $customer_mail->customer->name }}
@if($customer_mail->booking)
({{$customer_mail->booking->lead_id}})
@endif
</p>
@endif
@if($customer_mail->booking)
<p><strong>Buchung: </strong>
{{ $customer_mail->booking_id }}
@if($customer_mail->booking->travel_country_id)
{{ " | ".$customer_mail->booking->travel_country->name }}
@endif
@if($customer_mail->booking->travelagenda_id)
{{ " | ".$customer_mail->booking->travel_agenda->name }}
@endif
({{ $customer_mail->booking_id }})
</p>
@endif
@ -87,40 +90,54 @@
<!-- Message attachments -->
@if($customer_mail->customer_files)
<hr class="border-light m-0">
<div class="px-4 pt-4 pb-2">
<h6 class="small font-weight-semibold mb-4">Datei-Anhänge</h6>
<div class="row">
@foreach($customer_mail->customer_files as $file)
<div class="col-sm-6 col-lg-12 col-xl-4">
<div class="col-sm-12 col-md-6 col-xl-4">
<div class="message-attachment ui-bordered p-2 mr-3 mb-3">
<div class="message-attachment-file display-4"><i class="{{$file->getIconExt()}}"></i></div>
<div class="media-body ml-3">
<strong class="message-attachment-filename">{{$file->filename}}</strong>
<strong class="message-attachment-filename">{{$file->original_name}}</strong>
<div class="text-muted small">{{$file->formatBytes()}}</div>
<div>
<a href="{{$file->getURL()}}" target="_blank" class="mail-att-show">Vorschau</a> &nbsp;
</div>
</div>
</div>
</div>
@endforeach
</div>
</div>
@endif
{{--
<!-- Footer -->
<div class="text-right p-4">
<button type="button" class="btn btn-primary"><i class="ion ion-ios-undo"></i>&nbsp; Reply</button>
&nbsp;
<button type="button" class="btn btn-default">Forward &nbsp;<i class="ion ion-ios-redo"></i></button>
</div>
--}}
<!-- / Footer -->
</div>
<hr class="border-light m-0">
<div class="px-4 pt-4 pb-2">
{!! Form::open(['url' => route('customer_mail_detail', [$customer_mail->id, 'move-mail']), 'class' => 'move-mail-form']) !!}
<div class="form-row">
<div class="col-sm-6">
<label for="customer_mail_dir_{{$customer_mail->id}}" class="form-label">Ablegen unter:</label>
<select class="custom-select customer_mail_dir" name="dir" id="customer_mail_dir_{{$customer_mail->id}}">
@foreach($customer_mail->booking::$customer_mail_dirs as $dir_id=>$customer_mail_dirs)
@if($dir_id <= 10)
<option value="{{$dir_id}}" @if($customer_mail->dir == $dir_id) selected @endif>{{$customer_mail_dirs['name']}}</option>
@endif
@endforeach
</select>
</div>
<div class="col-sm-6">
<button type="submit" class="btn btn-xs btn-default float-right mt-1"><i class="ion ion-ios-redo"></i>&nbsp; verschieben</button>
<label for="customer_mail_country_{{$customer_mail->id}}" class="form-label">&nbsp;</label>
<select class="custom-select customer_mail_country" name="travel_country_id" id="customer_mail_country_{{$customer_mail->id}}">
@if($customer_mail->booking->travel_country)
@foreach($customer_mail->booking->travel_country->getCountryLands() as $country_id => $country_name)
<option value="0">Nur bei Agentur -> Land</option>
<option value="{{$country_id}}" @if($customer_mail->travel_country_id == $country_id) selected @endif>{{$country_name}}</option>
@endforeach
@endif
</select>
</div>
</div>
{!! Form::close() !!}
</div>
</div>

View file

@ -9,6 +9,7 @@
<div class="modal-body">
@include('customer.mail.modal-show-mail-inner', ['customer_mail' => $customer_mail])
@if($customer_mail->customer_mail)
@include('customer.mail.modal-show-mail-inner', ['customer_mail' => $customer_mail->customer_mail])
@endif
@ -20,6 +21,26 @@
</div>
<script type="text/javascript">
function change_dir_country_select(_form){
if(_form.find('.customer_mail_dir').val() == 1){
_form.find('.customer_mail_country').prop('disabled', false);
}else{
_form.find('.customer_mail_country').prop('disabled', true);
_form.find('.customer_mail_country').val(0);
}
}
$(document).ready(function() {
$('form.move-mail-form').each(function () {
var _form = $(this);
$(this).find('.customer_mail_dir').on('change', function () {
change_dir_country_select(_form);
_form.find('.btn-default').removeClass('btn-default').addClass('btn-primary');
});
$(this).find('.customer_mail_country').on('change', function () {
_form.find('.btn-default').removeClass('btn-default').addClass('btn-primary');
});
change_dir_country_select(_form);
});
});
</script>

View file

@ -68,7 +68,7 @@
@yield('styles')
<!-- Application stylesheets -->
<link rel="stylesheet" href="{{ mix('/css/application.css') }}?v=5{{ get_file_last_time('js/application.css') }}">
<link rel="stylesheet" href="{{ mix('/css/application.css') }}?v=6{{ get_file_last_time('js/application.css') }}">
<script src="{{ asset('/js/jquery.min.js') }}"></script>
<link rel="stylesheet" type="text/css" href="{{ asset('/css/cookieconsent.min.css') }}" />
@ -158,7 +158,7 @@
<!-- Application javascripts -->
<script src="{{ mix('/js/application.js') }}"></script>
<script src="{{ asset('/js/custom.js?v=6') }}{{ get_file_last_time('/js/custom.js') }}"></script>
<script src="{{ asset('/js/custom.js?v=7') }}{{ get_file_last_time('/js/custom.js') }}"></script>
@include('asset.js')
@ -182,7 +182,7 @@
uploadMultiple: false,
parallelUploads: 10,
clickable: '#upload-button',
//dictDefaultMessage: LFileManager.lfm_config['lfm_lang']['message-drop'],
dictDefaultMessage: '<i class="ion ion-ios-cloud-upload "></i>Hier klicken, oder Datei hier reinziehen (Drag&Drop)',
init: function () {
var _this = this; // For the closure
this.on('success', function (file, response) {

View file

@ -184,16 +184,16 @@
<a href="{{ route('cms_content_infos') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-business"></i><div>Infos</div></a>
</li>
@endif
@if(Auth::user()->isPermission('cms-cn-al'))
<li class="sidenav-item{{ Request::is('cms/content/all') ? ' active' : '' }}">
<a href="{{ route('cms_content_all') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-paper"></i><div>Allgemein</div></a>
</li>
@endif
@if(Auth::user()->isPermission('cms-cn-co'))
<li class="sidenav-item{{ Request::is('cms/content/country') ? ' active' : '' }} {{ Request::is('cms/content/country/*') ? ' active' : '' }}">
<a href="{{ route('cms_content_country') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-globe"></i><div>Reiseländer</div></a>
</li>
@endif
@if(Auth::user()->isPermission('cms-cn-al'))
<li class="sidenav-item{{ Request::is('cms/content/all') ? ' active' : '' }}">
<a href="{{ route('cms_content_all') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-paper"></i><div>Allgemein</div></a>
</li>
@endif
@if(Auth::user()->isPermission('cms-cn-au'))
<li class="sidenav-item{{ Request::is('cms/content/author') ? ' active' : '' }}">
<a href="{{ route('cms_content_author') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-finger-print"></i><div>Autoren</div></a>

View file

@ -75,19 +75,19 @@
</select>
</div>
<div class="col-md-3 mb-3">
<label class="form-label" for="travel_option_lead_status_id">Filter Status</label>
<select class="custom-select" name="travel_option_lead_status_id" id="travel_option_lead_status_id">
<label class="form-label" for="travel_option_company_id">Filter Reiseveranstalter</label>
<select class="custom-select" name="travel_option_company_id" id="travel_option_company_id">
<option value="">Filter aus</option>
@foreach($filter_lead_status as $id=>$name)
@foreach($filter_travel_company as $id=>$name)
<option value="{{$id}}">{{$name}}</option>
@endforeach
</select>
</div>
<div class="col-md-3 mb-3">
<label class="form-label" for="travel_option_airline_id">Filter Airline</label>
<select class="custom-select" name="travel_option_airline_id" id="travel_option_airline_id">
<label class="form-label" for="travel_option_lead_status_id">Filter Status</label>
<select class="custom-select" name="travel_option_lead_status_id" id="travel_option_lead_status_id">
<option value="">Filter aus</option>
@foreach($filter_airlines as $id=>$name)
@foreach($filter_lead_status as $id=>$name)
<option value="{{$id}}">{{$name}}</option>
@endforeach
</select>
@ -112,7 +112,7 @@
@endforeach
</select>
</div>
<div class="col-md-3 mb-3">
<div class="col-md-2 mb-3">
<label class="form-label" for="travel_option_refund">Filter Refund</label>
<select class="custom-select" name="travel_option_refund" id="travel_option_refund">
<option value="">Filter aus</option>
@ -121,7 +121,7 @@
@endforeach
</select>
</div>
<div class="col-md-3 mb-3">
<div class="col-md-2 mb-3">
<label class="form-label" for="travel_option_xx_tkt">Filter XX TKT</label>
<select class="custom-select" name="travel_option_xx_tkt" id="travel_option_xx_tkt">
<option value="">Filter aus</option>
@ -130,6 +130,15 @@
@endforeach
</select>
</div>
<div class="col-md-2 mb-3">
<label class="form-label" for="travel_option_airline_id">Filter Airline</label>
<select class="custom-select" name="travel_option_airline_id" id="travel_option_airline_id">
<option value="">Filter aus</option>
@foreach($filter_airlines as $id=>$name)
<option value="{{$id}}">{{$name}}</option>
@endforeach
</select>
</div>
</div>
<div class="form-row align-items-center">
<div class="col-5 col-sm-2 mb-2">
@ -175,6 +184,7 @@
<th>{{__('BuchungsID')}}</th>
<th>{{__('Reiseland')}}</th>
<th>{{__('Programm')}}</th>
<th>{{__('Reiseveranstalter')}}</th>
{{--<th>{{__('Kategorie')}}</th>--}}
<th>{{__('Anreise')}}</th>
<th>{{__('Abreise')}}</th>
@ -235,6 +245,7 @@
d.travel_option_search = $('select[name=travel_option_search]').val();
d.travel_option_country_id = $('select[name=travel_option_country_id]').val();
d.travel_option_agenda_id = $('select[name=travel_option_agenda_id]').val();
d.travel_option_company_id = $('select[name=travel_option_company_id]').val();
d.travel_option_lead_status_id = $('select[name=travel_option_lead_status_id]').val();
d.travel_option_airline_id = $('select[name=travel_option_airline_id]').val();
d.travel_option_paying_out = $('select[name=travel_option_paying_out]').val();
@ -252,6 +263,7 @@
{ data: 'id', name: 'id' },
{ data: 'travel_country_id', name: 'travel_country_id', orderable: false },
{ data: 'travelagenda_id', name: 'travelagenda_id', orderable: false },
{ data: 'travel_company_id', name: 'travel_company_id', orderable: true },
{ data: 'start_date', name: 'start_date' },
{ data: 'end_date', name: 'end_date' },
{ data: 'travel_documents', name: 'travel_documents', orderable: false },
@ -394,6 +406,9 @@
$('#travel_option_agenda_id').on('change', function(){
table.draw();
});
$('#travel_option_company_id').on('change', function(){
table.draw();
});
$('#travel_option_lead_status_id').on('change', function(){
table.draw();
});

View file

@ -57,66 +57,14 @@ Route::get('/', 'HomeController@index')->name('home');
Route::get('/check/login/{identify}/{token}/{show?}', 'HomeController@checkLogin')->name('check_login');
Route::get('/user/update_email_confirm/{token}', 'UserUpdateEmailController@activateMail')->name('user_update_email_confirm');
Route::get('/storage/file/{id}/{disk}', function($id = null, $disk = null)
{
$file = \App\Models\CustomerFile::findOrFail($id);
$path = Storage::disk($disk)->path($file->dir.$file->filename);
if (file_exists($path)) {
return Response::file($path);
}
})->name('storage_file');
Route::get('/storage/file/{id}/{disk}/{do?}', 'FileController@show')->name('storage_file');
Route::get('customer_file/show/{model}/{id}/{cd?}', 'CustomerFileController@show')->name('customer_file_show');
Route::group(['middleware' => ['auth']], function()
{
Route::get('storage/{type?}/{class?}/{year?}/{file?}/{do?}', function($type = null, $class = null, $year = null, $file = null, $do = null) {
/*if ($type == 'xls') {
$path = storage_path("app/export/");
$filename = $file . '.xls';
}*/
$path = "";
$filename = "";
$headers = [];
if ($class == 'invoices' || $class == 'infos'){
$headers = [
'Content-Type: application/pdf',
'Pragma: no-cache',
'Cache-Control: no-store,no-cache, must-revalidate, post-check=0, pre-check=0'
];
$dir = $year."/";
$filename = $file;
if ($type == 'fewo') {
if(Storage::disk('fewo_invoices')->exists( $dir.$filename )){
$path = Storage::disk('fewo_invoices')->path($dir.$filename);
}
}
if ($type == 'fewo') {
if(Storage::disk('fewo_infos')->exists( $dir.$filename )){
$path = Storage::disk('fewo_infos')->path($dir.$filename);
}
}
}
if (file_exists($path)) {
if($do == "download"){
return Response::download($path, $filename, $headers);
}
if($do == "file"){
return Response::file($path, $headers);
}
}
})->name('storage');
Route::get('storage/{type?}/{class?}/{year?}/{file?}/{do?}', 'FileController@showExpert')->name('storage');
Route::get('/home', 'HomeController@show')->name('home');
/* Route::get('/user/edit', 'UserController@userEdit')->name('user_edit');
*/
Route::group(['middleware' => ['auth.permission:my-dat']], function() {
Route::get('/user/edit', 'UserDataController@userEdit')->name('user_edit');
@ -160,7 +108,6 @@ Route::group(['middleware' => ['admin']], function()
Route::get('/customer_mail/delete/{id}', 'CustomerMailController@delete')->name('customer_mail_delete');
Route::post('customer_mail/ajax', 'CustomerMailController@ajax')->name('customer_mail_ajax');
Route::get('customer_file/show/{model}/{id}/{cd?}', 'CustomerFileController@show')->name('customer_file_show');
Route::group(['middleware' => ['auth.permission:cms-iq-assets']], function() {
//assets
@ -241,7 +188,7 @@ Route::group(['middleware' => ['admin']], function()
Route::get('data/table/customer_mails', 'CustomerMailController@getCustomerMails')->name('data_table_customer_mails');
Route::get('/customer_mails', 'CustomerMailController@index')->name('customer_mails');
Route::get('/customer_mail/detail/{id}', 'CustomerMailController@detail')->name('customer_mail_detail');
Route::post('/customer_mail/detail/{id}', 'CustomerMailController@store')->name('customer_mail_detail');
Route::post('/customer_mail/detail/{id}/{action?}', 'CustomerMailController@store')->name('customer_mail_detail');
Route::get('/customer_mail/delete/{id}', 'CustomerMailController@delete')->name('customer_mail_delete');
});

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

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.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

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: 5.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

File diff suppressed because one or more lines are too long