Fewo Mail MA, optimation Fewo, view User Fewos
This commit is contained in:
Kevin Adametz
parent
e537e47a82
commit
346a7427a5
30 changed files with 915 additions and 963 deletions
6
.env
6
.env
|
|
@ -49,8 +49,10 @@ REDIS_PASSWORD=null
|
|||
REDIS_PORT=6379
|
||||
|
||||
|
||||
MAIL_BBC=info@adametz.media
|
||||
#MAIL_BBC=info@sterntours.de
|
||||
MAIL_BBC=kevin@adametz.media
|
||||
MAIL_FEWO_EMPLOYEE=kevin@adametz.media
|
||||
#MAIL_FEWO_EMPLOYEE=katrin.nikolai@stern-tours.de,gerda.fritsch@stern-tours.de
|
||||
#MAIL_BBC=kontakt@stern-tours.de,thomas.stern@stern-tours.de
|
||||
MAIL_DRIVER=smtp
|
||||
MAIL_HOST=mail.your-server.de
|
||||
MAIL_PORT=587
|
||||
|
|
|
|||
7
.idea/dictionaries/kevinadametz.xml
generated
Normal file
7
.idea/dictionaries/kevinadametz.xml
generated
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<component name="ProjectDictionaryState">
|
||||
<dictionary name="kevinadametz">
|
||||
<words>
|
||||
<w>fewo</w>
|
||||
</words>
|
||||
</dictionary>
|
||||
</component>
|
||||
709
.idea/workspace.xml
generated
709
.idea/workspace.xml
generated
|
|
@ -2,41 +2,32 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="e1ac1cea-a1a5-4c16-b5f0-5908c7d368de" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/app/Mail/MailSendFeWoInfo.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Mail/MailSendFeWoInvoice.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Mail/MailSendFeWoService.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/emails/content.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/emails/info.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/emails/invoice.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/dictionaries/kevinadametz.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/public/css/stern_fewo_pdf.css" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/pdf/layout.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/API/FewoController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/API/FewoController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/TravelUserBookingFewoController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TravelUserBookingFewoController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Mail/MailVerifyAccount.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/MailVerifyAccount.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/Http/Controllers/TravelUserController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TravelUserController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/FewoLodging.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/FewoLodging.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/TravelUserBookingFewo.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/TravelUserBookingFewo.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Repositories/TravelUserBookingFewoRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Repositories/TravelUserBookingFewoRepository.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/Util.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Util.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/filesystems.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/filesystems.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/mail.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/mail.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2019_03_20_132556_create_fewo_lodging_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_03_20_132556_create_fewo_lodging_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2019_03_21_123748_create_travel_user_booking_fewos_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_03_21_123748_create_travel_user_booking_fewos_table.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$/resources/views/admin/user_edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/user_edit.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/cms/content/modal.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/cms/content/modal.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/cms/feedback/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/cms/feedback/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/cms/sidebar/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/cms/sidebar/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/cms/travel_magazine/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/cms/travel_magazine/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/drafts/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/drafts/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/emails/auth.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/auth.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/public/css/incoice_fewo_pdf.css" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/lang/de/validation.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de/validation.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/emails/invoice.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/invoice.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/home.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/home.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/pdf/invoice_fewo.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pdf/invoice_fewo.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/settings/travel_country/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/settings/travel_country/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/travel/program/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/program/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/travel/user/booking/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/pdf/travel_info_fewo.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pdf/travel_info_fewo.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/travel/user/booking/form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/form.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/travel/user/booking/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/travel/user/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/user/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/edit.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/travel/user/form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/user/form.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/invoices/fewo/2019/1243.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/invoices/fewo/2019/1243.pdf" afterDir="false" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/vendor/defuse/php-encryption/" />
|
||||
<ignored path="$PROJECT_DIR$/vendor/doctrine/cache/" />
|
||||
|
|
@ -84,69 +75,10 @@
|
|||
<select />
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/app/Services/Util.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="420">
|
||||
<caret line="30" selection-start-line="30" selection-end-line="30" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TravelUserBookingFewoController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="476">
|
||||
<caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
|
||||
<folding>
|
||||
<element signature="e#41#74#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/app/Mail/MailSendFeWoInfo.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="518">
|
||||
<caret line="42" column="38" selection-start-line="42" selection-start-column="38" selection-end-line="42" selection-end-column="38" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/app/Repositories/TravelUserBookingFewoRepository.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="308">
|
||||
<caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
|
||||
<folding>
|
||||
<element signature="e#38#63#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/travel/user/booking/form.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="747">
|
||||
<caret line="249" column="29" selection-start-line="249" selection-start-column="29" selection-end-line="249" selection-end-column="29" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
</leaf>
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
|
||||
</component>
|
||||
<component name="FindInProjectRecents">
|
||||
<findStrings>
|
||||
<find>modal</find>
|
||||
<find>selec</find>
|
||||
<find>sele</find>
|
||||
<find>Arrangement</find>
|
||||
<find>Validator</find>
|
||||
<find>live</find>
|
||||
<find>last_data</find>
|
||||
<find>array</find>
|
||||
<find>extends Eloquent</find>
|
||||
<find>travel_booking_fewo_channel_id</find>
|
||||
|
|
@ -164,12 +96,19 @@
|
|||
<find>unique</find>
|
||||
<find>confirm</find>
|
||||
<find>Mail::</find>
|
||||
<find>confo</find>
|
||||
<find>getInvoiceLastModified</find>
|
||||
<find>invoices_fewo</find>
|
||||
<find>invoices_fewo</find>
|
||||
<find>stora</find>
|
||||
<find>invoices</find>
|
||||
<find>miet</find>
|
||||
<find>getPriceTotalFirstPay</find>
|
||||
<find>mail</find>
|
||||
<find>bal</find>
|
||||
<find>onch</find>
|
||||
<find>rechnungsn</find>
|
||||
<find>dienst</find>
|
||||
<find>confo</find>
|
||||
<find>daily_prices</find>
|
||||
</findStrings>
|
||||
<replaceStrings>
|
||||
<replace />
|
||||
|
|
@ -201,25 +140,13 @@
|
|||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/resources/views/admin/index.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/admin/change_email.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Mail/MailVerifyContact.php" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/status/status_active.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/status/status_verify.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/lang/de.json" />
|
||||
<option value="$PROJECT_DIR$/resources/views/status/not_found.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/home.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/admin/user_form.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/user/form.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Controllers/AdminUserController.php" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Controllers/UserDataController.php" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Controllers/UserUpdateEmailController.php" />
|
||||
<option value="$PROJECT_DIR$/app/Repositories/UserRepository.php" />
|
||||
<option value="$PROJECT_DIR$/config/dompdf.php" />
|
||||
<option value="$PROJECT_DIR$/public/css/incoice_fewo_pdf.css" />
|
||||
<option value="$PROJECT_DIR$/resources/views/user/edit.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/travel/user/detail.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/travel/user/booking/detail.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/travel/program/detail.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/drafts/detail.blade.php" />
|
||||
|
|
@ -230,28 +157,40 @@
|
|||
<option value="$PROJECT_DIR$/resources/views/admin/user_edit.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Mail/MailVerifyAccount.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/emails/auth.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/emails/invoice.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Mail/MailSendFeWoService.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/emails/content.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/travel/user/booking/index.blade.php" />
|
||||
<option value="$PROJECT_DIR$/config/mail.php" />
|
||||
<option value="$PROJECT_DIR$/.env" />
|
||||
<option value="$PROJECT_DIR$/resources/views/cms/content/modal.blade.php" />
|
||||
<option value="$PROJECT_DIR$/public/css/application.css" />
|
||||
<option value="$PROJECT_DIR$/app/Models/CMSContent.php" />
|
||||
<option value="$PROJECT_DIR$/app/Services/Util.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/pdf/invoice_fewo.blade.php" />
|
||||
<option value="$PROJECT_DIR$/routes/web.php" />
|
||||
<option value="$PROJECT_DIR$/config/filesystems.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/pdf/travel_info_fewo.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Models/TravelUserBookingFewo.php" />
|
||||
<option value="$PROJECT_DIR$/database/migrations/2019_03_21_123748_create_travel_user_booking_fewos_table.php" />
|
||||
<option value="$PROJECT_DIR$/app/Repositories/TravelUserBookingFewoRepository.php" />
|
||||
<option value="$PROJECT_DIR$/app/Mail/MailSendFeWoInvoice.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/travel/user/booking/form.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Mail/MailSendFeWoInfo.php" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Controllers/TravelUserBookingFewoController.php" />
|
||||
<option value="$PROJECT_DIR$/public/css/incoice_fewo_pdf.css" />
|
||||
<option value="$PROJECT_DIR$/public/css/stern_fewo_pdf.css" />
|
||||
<option value="$PROJECT_DIR$/resources/views/pdf/index.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/home.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/pdf/layout.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/pdf/travel_info_fewo.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/travel/user/form.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Controllers/TravelUserController.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/travel/user/detail.blade.php" />
|
||||
<option value="$PROJECT_DIR$/routes/web.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/pdf/invoice_fewo.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/emails/invoice.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Repositories/TravelUserBookingFewoRepository.php" />
|
||||
<option value="$PROJECT_DIR$/resources/lang/de/validation.php" />
|
||||
<option value="$PROJECT_DIR$/public/css/application.css" />
|
||||
<option value="$PROJECT_DIR$/database/migrations/2019_03_21_123748_create_travel_user_booking_fewos_table.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/emails/content.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/emails/info.blade.php" />
|
||||
<option value="$PROJECT_DIR$/database/migrations/2019_03_20_132556_create_fewo_lodging_table.php" />
|
||||
<option value="$PROJECT_DIR$/app/Models/FewoLodging.php" />
|
||||
<option value="$PROJECT_DIR$/app/Models/TravelUserBookingFewo.php" />
|
||||
<option value="$PROJECT_DIR$/config/mail.php" />
|
||||
<option value="$PROJECT_DIR$/.env" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Controllers/API/FewoController.php" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Controllers/TravelUserBookingFewoController.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/travel/user/booking/form.blade.php" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
|
@ -372,8 +311,8 @@
|
|||
</include_path>
|
||||
</component>
|
||||
<component name="ProjectFrameBounds">
|
||||
<option name="x" value="-8" />
|
||||
<option name="y" value="720" />
|
||||
<option name="x" value="8" />
|
||||
<option name="y" value="650" />
|
||||
<option name="width" value="2552" />
|
||||
<option name="height" value="1402" />
|
||||
</component>
|
||||
|
|
@ -414,7 +353,7 @@
|
|||
<item name="app" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="Http" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="Controllers" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="CMS" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="API" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="mein.sterntours" type="b2602c69:ProjectViewProjectNode" />
|
||||
|
|
@ -431,8 +370,7 @@
|
|||
<path>
|
||||
<item name="mein.sterntours" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="mein.sterntours.local" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="app" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="Services" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="bootstrap" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="mein.sterntours" type="b2602c69:ProjectViewProjectNode" />
|
||||
|
|
@ -453,13 +391,18 @@
|
|||
<path>
|
||||
<item name="mein.sterntours" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="mein.sterntours.local" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="resources" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="public" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="mein.sterntours" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="mein.sterntours.local" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="public" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="css" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="mein.sterntours" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="mein.sterntours.local" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="resources" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="assets" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="mein.sterntours" type="b2602c69:ProjectViewProjectNode" />
|
||||
|
|
@ -467,28 +410,6 @@
|
|||
<item name="resources" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="views" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="mein.sterntours" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="mein.sterntours.local" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="resources" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="views" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="booking" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="mein.sterntours" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="mein.sterntours.local" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="resources" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="views" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="cms" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="mein.sterntours" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="mein.sterntours.local" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="resources" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="views" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="cms" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="content" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="mein.sterntours" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="mein.sterntours.local" type="462c0819:PsiDirectoryNode" />
|
||||
|
|
@ -535,13 +456,6 @@
|
|||
<item name="user" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="booking" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="mein.sterntours" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="mein.sterntours.local" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="resources" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="views" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="vendor" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="mein.sterntours" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="mein.sterntours.local" type="462c0819:PsiDirectoryNode" />
|
||||
|
|
@ -559,22 +473,22 @@
|
|||
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="database.console.LAST_STATE" value="false" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/resources/views/emails" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/public/css" />
|
||||
<property name="settings.editor.selected.configurable" value="web-ide.project.structure" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/public/css" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/emails" />
|
||||
<recent name="$PROJECT_DIR$/app/Mail" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/pdf" />
|
||||
<recent name="$PROJECT_DIR$/app/Repositories" />
|
||||
</key>
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/resources/views/travel/user" />
|
||||
<recent name="$PROJECT_DIR$/database/migrations" />
|
||||
<recent name="$PROJECT_DIR$/app/Http/Controllers/CMS" />
|
||||
</key>
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/resources/views/emails" />
|
||||
<recent name="$PROJECT_DIR$/app/Mail" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/pdf" />
|
||||
<recent name="$PROJECT_DIR$/public/css" />
|
||||
<recent name="$PROJECT_DIR$/app/Repositories" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunDashboard">
|
||||
<option name="ruleStates">
|
||||
|
|
@ -709,17 +623,22 @@
|
|||
<workItem from="1556963795602" duration="287000" />
|
||||
<workItem from="1557145026070" duration="9917000" />
|
||||
<workItem from="1557164032181" duration="1887000" />
|
||||
<workItem from="1557217932375" duration="306000" />
|
||||
<workItem from="1557219781701" duration="8274000" />
|
||||
<workItem from="1557232140957" duration="678000" />
|
||||
<workItem from="1557302033238" duration="3208000" />
|
||||
<workItem from="1557311602116" duration="2859000" />
|
||||
<workItem from="1557315192136" duration="1527000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="262166000" />
|
||||
<option name="totallyTimeSpent" value="279018000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="-8" y="720" width="2552" height="1402" extended-state="0" />
|
||||
<editor active="true" />
|
||||
<frame x="8" y="650" width="2552" height="1402" extended-state="0" />
|
||||
<layout>
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22031872" />
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22988048" />
|
||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||
<window_info id="npm" order="2" side_tool="true" />
|
||||
<window_info id="Favorites" order="3" side_tool="true" />
|
||||
|
|
@ -772,121 +691,6 @@
|
|||
<option name="version" value="1" />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/travel/program/detail.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="756">
|
||||
<caret line="54" column="32" lean-forward="true" selection-start-line="54" selection-start-column="32" selection-end-line="54" selection-end-column="32" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/travel/user/detail.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="266">
|
||||
<caret line="19" selection-start-line="19" selection-end-line="19" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AdminUserController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="325">
|
||||
<caret line="77" column="9" lean-forward="true" selection-start-line="77" selection-start-column="9" selection-end-line="77" selection-end-column="9" />
|
||||
<folding>
|
||||
<element signature="e#42#73#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/UserUpdateEmailController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="768">
|
||||
<caret line="153" column="5" lean-forward="true" selection-start-line="153" selection-start-column="5" selection-end-line="153" selection-end-column="5" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Mail/MailActivateUser.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="644">
|
||||
<caret line="50" column="46" lean-forward="true" selection-start-line="50" selection-start-column="46" selection-end-line="50" selection-end-column="46" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Mail/MailResetPassword.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TravelUserController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="676">
|
||||
<caret line="77" selection-start-line="77" selection-end-line="77" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Mail/Mailable.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="433">
|
||||
<caret line="681" column="20" selection-start-line="681" selection-start-column="20" selection-end-line="681" selection-end-column="20" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/emails/content.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="676">
|
||||
<caret line="145" column="49" lean-forward="true" selection-start-line="145" selection-start-column="49" selection-end-line="145" selection-end-column="49" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config/app.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-2127" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config/ide-helper.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="98">
|
||||
<caret line="103" column="48" lean-forward="true" selection-start-line="103" selection-start-column="48" selection-end-line="103" selection-end-column="48" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/assets/vendor/sass/theme-corporate.scss">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="448">
|
||||
<caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/assets/vendor/sass/appwork.scss">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="434">
|
||||
<caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/assets/vendor/sass/colors.scss">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/travel/user/booking/index.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="175">
|
||||
<caret line="13" column="23" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/assets/vendor/sass/theme-corporate-material.scss">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Models/UserUpdateEmail.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="378">
|
||||
<caret line="27" selection-start-line="27" selection-end-line="27" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/emails/auth.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1221">
|
||||
<caret line="200" column="52" selection-start-line="200" selection-start-column="52" selection-end-line="200" selection-end-column="52" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Mail/MailVerifyAccount.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="644">
|
||||
|
|
@ -917,13 +721,6 @@
|
|||
<entry file="file://$PROJECT_DIR$/config/services.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/.env">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="210">
|
||||
<caret line="15" selection-start-line="15" selection-end-line="15" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/cms/content/modal.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="658">
|
||||
|
|
@ -951,13 +748,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/_ide_helper.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="423">
|
||||
<caret line="11529" column="31" selection-start-line="11529" selection-start-column="31" selection-end-line="11529" selection-end-column="31" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/CMS/CMSContentController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="703">
|
||||
|
|
@ -972,34 +762,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config/mail.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="726">
|
||||
<caret line="80" column="26" selection-start-line="80" selection-start-column="26" selection-end-line="80" selection-end-column="26" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/public/css/incoice_fewo_pdf.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="448">
|
||||
<caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/pdf/invoice_fewo.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="173">
|
||||
<caret line="179" column="105" lean-forward="true" selection-start-line="179" selection-start-column="105" selection-end-line="179" selection-end-column="105" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/public/css/application.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="512">
|
||||
<caret line="44" column="1" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/User.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="428">
|
||||
|
|
@ -1021,61 +783,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Services/Util.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="420">
|
||||
<caret line="30" selection-start-line="30" selection-end-line="30" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Mail/MailSendFeWoService.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="476">
|
||||
<caret line="34" column="1" lean-forward="true" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
|
||||
<folding>
|
||||
<element signature="e#27#64#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/database/migrations/2019_03_21_123748_create_travel_user_booking_fewos_table.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="826">
|
||||
<caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Models/TravelUserBookingFewo.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="650">
|
||||
<caret line="110" column="19" lean-forward="true" selection-start-line="110" selection-start-column="19" selection-end-line="110" selection-end-column="19" />
|
||||
<folding>
|
||||
<element signature="e#110#121#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/pdf/travel_info_fewo.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="661">
|
||||
<caret line="169" column="52" lean-forward="true" selection-start-line="169" selection-start-column="52" selection-end-line="169" selection-end-column="52" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/travel/user/booking/form.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="747">
|
||||
<caret line="249" column="29" selection-start-line="249" selection-start-column="29" selection-end-line="249" selection-end-column="29" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/emails/invoice.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="343">
|
||||
<caret line="106" column="20" selection-start-line="106" selection-start-column="20" selection-end-line="106" selection-end-column="20" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Mail/MailSendFeWoInvoice.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="406">
|
||||
|
|
@ -1086,53 +793,279 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Mail/MailSendFeWoInfo.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="112">
|
||||
<caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Services/Util.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="420">
|
||||
<caret line="30" selection-start-line="30" selection-end-line="30" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Mail/PendingMail.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="306">
|
||||
<caret line="22" column="7" lean-forward="true" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/_ide_helper.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1117">
|
||||
<caret line="20039" column="44" selection-start-line="20039" selection-start-column="44" selection-end-line="20039" selection-end-column="44" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/public/css/incoice_fewo_pdf.css" />
|
||||
<entry file="file://$PROJECT_DIR$/public/css/stern_fewo_pdf.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="448">
|
||||
<caret line="32" column="26" lean-forward="true" selection-start-line="32" selection-start-column="26" selection-end-line="32" selection-end-column="26" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/layouts/layout-2.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="266">
|
||||
<caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="966">
|
||||
<caret line="69" column="22" lean-forward="true" selection-start-line="69" selection-start-column="22" selection-end-line="69" selection-end-column="22" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/layouts/application.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="406">
|
||||
<caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/home.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1151">
|
||||
<caret line="291" lean-forward="true" selection-start-line="291" selection-end-line="291" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Models/TravelUser.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="969">
|
||||
<caret line="95" column="5" lean-forward="true" selection-start-line="95" selection-start-column="5" selection-end-line="95" selection-end-column="5" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/travel/user/form.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="459">
|
||||
<caret line="33" column="49" selection-start-line="33" selection-start-column="37" selection-end-line="33" selection-end-column="49" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/travel/user/booking/index.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="375">
|
||||
<caret line="36" column="40" lean-forward="true" selection-start-line="36" selection-start-column="40" selection-end-line="36" selection-end-column="40" />
|
||||
<folding>
|
||||
<element signature="e#582#606#0#HTML" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/travel/user/index.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="294">
|
||||
<caret line="21" column="21" lean-forward="true" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TravelUserController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="420">
|
||||
<caret line="32" column="55" lean-forward="true" selection-start-line="32" selection-start-column="55" selection-end-line="32" selection-end-column="55" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/routes/web.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="687">
|
||||
<caret line="90" column="53" selection-start-line="90" selection-start-column="43" selection-end-line="90" selection-end-column="53" />
|
||||
<state relative-caret-position="883">
|
||||
<caret line="95" column="34" lean-forward="true" selection-start-line="95" selection-start-column="34" selection-end-line="95" selection-end-column="34" />
|
||||
<folding>
|
||||
<element signature="e#7#389#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TravelUserBookingFewoController.php">
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/travel/user/detail.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="476">
|
||||
<caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
|
||||
<state relative-caret-position="675">
|
||||
<caret line="54" column="49" selection-start-line="54" selection-start-column="49" selection-end-line="54" selection-end-column="49" />
|
||||
<folding>
|
||||
<element signature="e#41#74#0#PHP" expanded="true" />
|
||||
<element signature="e#1446#1470#0#HTML" expanded="true" />
|
||||
<element signature="e#1511#1529#0#HTML" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Mail/MailSendFeWoInfo.php">
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/emails/invoice.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="518">
|
||||
<caret line="42" column="38" selection-start-line="42" selection-start-column="38" selection-end-line="42" selection-end-column="38" />
|
||||
<state relative-caret-position="1034">
|
||||
<caret line="234" column="49" selection-start-line="234" selection-start-column="49" selection-end-line="234" selection-end-column="49" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/emails/info.blade.php">
|
||||
<entry file="file://$PROJECT_DIR$/resources/lang/de/validation.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="829">
|
||||
<caret line="153" column="123" lean-forward="true" selection-start-line="153" selection-start-column="123" selection-end-line="153" selection-end-column="123" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#p#0;n#td#0;n#tr#0;n#table#0;n#td#0;n#tr#0;n#table#1;n#td#0;n#tr#0;n#table#0;n#center#0;n#td#0;n#tr#0;n#table#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
||||
<element signature="n#style#0;n#table#2;n#td#0;n#tr#0;n#table#0;n#center#0;n#td#0;n#tr#0;n#table#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
<state relative-caret-position="1156">
|
||||
<caret line="174" column="50" selection-start-line="174" selection-start-column="50" selection-end-line="174" selection-end-column="50" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Repositories/TravelUserBookingFewoRepository.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="308">
|
||||
<caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
|
||||
<state relative-caret-position="527">
|
||||
<caret line="144" column="33" lean-forward="true" selection-start-line="144" selection-start-column="33" selection-end-line="144" selection-end-column="33" />
|
||||
<folding>
|
||||
<element signature="e#38#63#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/public/css/application.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="451">
|
||||
<caret line="46" column="102" lean-forward="true" selection-start-line="46" selection-start-column="102" selection-end-line="46" selection-end-column="102" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/database/migrations/2019_03_21_123748_create_travel_user_booking_fewos_table.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="896">
|
||||
<caret line="66" column="34" lean-forward="true" selection-start-line="66" selection-start-column="34" selection-end-line="66" selection-end-column="34" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/emails/info.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="81">
|
||||
<caret line="98" lean-forward="true" selection-start-line="98" selection-end-line="98" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#p#0;n#td#0;n#tr#0;n#table#0;n#td#0;n#tr#0;n#table#1;n#td#0;n#tr#0;n#table#0;n#center#0;n#td#0;n#tr#0;n#table#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/database/migrations/2019_03_20_132556_create_fewo_lodging_table.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="532">
|
||||
<caret line="40" column="54" selection-start-line="40" selection-start-column="54" selection-end-line="40" selection-end-column="54" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/pdf/travel_info_fewo.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="294">
|
||||
<caret line="21" column="11" lean-forward="true" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="11" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/pdf/layout.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="672">
|
||||
<caret line="48" column="7" lean-forward="true" selection-start-line="48" selection-start-column="7" selection-end-line="48" selection-end-column="7" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/pdf/invoice_fewo.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="588">
|
||||
<caret line="42" column="17" lean-forward="true" selection-start-line="42" selection-start-column="17" selection-end-line="42" selection-end-column="17" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Mail/MailSendFeWoService.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="406">
|
||||
<caret line="29" column="38" selection-start-line="29" selection-start-column="38" selection-end-line="29" selection-end-column="38" />
|
||||
<folding>
|
||||
<element signature="e#27#64#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/emails/content.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="662">
|
||||
<caret line="144" selection-start-line="144" selection-end-line="144" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Models/FewoLodging.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="712">
|
||||
<caret line="63" column="15" selection-start-line="63" selection-start-column="15" selection-end-line="63" selection-end-column="15" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/.env">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="840">
|
||||
<caret line="60" column="19" lean-forward="true" selection-start-line="60" selection-start-column="19" selection-end-line="60" selection-end-column="19" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config/mail.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="256">
|
||||
<caret line="48" column="27" lean-forward="true" selection-start-line="48" selection-start-column="27" selection-end-line="48" selection-end-column="27" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/API/FewoController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="374">
|
||||
<caret line="54" column="33" lean-forward="true" selection-start-line="54" selection-start-column="33" selection-end-line="54" selection-end-column="33" />
|
||||
<folding>
|
||||
<element signature="e#44#80#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Models/TravelUserBookingFewo.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="3598">
|
||||
<caret line="506" column="48" selection-start-line="506" selection-start-column="48" selection-end-line="506" selection-end-column="48" />
|
||||
<folding>
|
||||
<element signature="e#110#121#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TravelUserBookingFewoController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="426">
|
||||
<caret line="52" column="103" selection-start-line="52" selection-start-column="103" selection-end-line="52" selection-end-column="103" />
|
||||
<folding>
|
||||
<element signature="e#41#74#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/travel/user/booking/form.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="878">
|
||||
<caret line="87" column="33" lean-forward="true" selection-start-line="87" selection-start-column="33" selection-end-line="87" selection-end-column="33" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -3,10 +3,11 @@
|
|||
namespace App\Http\Controllers\API;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\BookingDraftItem;
|
||||
use App\Mail\MailSendFeWoService;
|
||||
use App\Models\TravelUser;
|
||||
use App\Models\TravelUserBookingFewo;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Input;
|
||||
use Validator;
|
||||
|
||||
class FewoController extends Controller
|
||||
|
|
@ -92,9 +93,22 @@ class FewoController extends Controller
|
|||
return response()->json($validator->messages(), $this->errorStatus);
|
||||
|
||||
}
|
||||
|
||||
$travel_user_booking_fewo = TravelUserBookingFewo::create($data['travel_user_booking_fewo']);
|
||||
|
||||
//mail
|
||||
if($travel_user_booking_fewo){
|
||||
$MailEmployee = explode(",", config('mail.mail_fewo_employee'));
|
||||
$EmployeeMailSubject = $travel_user_booking_fewo->getEmployeeMailSubject();
|
||||
$EmployeeMailContent = $travel_user_booking_fewo->getEmployeeMailContent();
|
||||
Mail::to($MailEmployee)->send(new MailSendFeWoService($travel_user_booking_fewo, $EmployeeMailSubject, $EmployeeMailContent));
|
||||
$send_employee_mail = $travel_user_booking_fewo->send_employee_mail;
|
||||
$send_employee_mail[] = ['d' => date('H:i d.m.Y'),
|
||||
'm'=>$MailEmployee,
|
||||
's'=>$EmployeeMailSubject,
|
||||
'c'=>$EmployeeMailContent];
|
||||
$travel_user_booking_fewo->send_employee_mail = $send_employee_mail;
|
||||
$travel_user_booking_fewo->save();
|
||||
}
|
||||
return response()->json(['success' => ['travel_user_booking_fewo_id' => $travel_user_booking_fewo->id, 'crm_url' => route('travel_user_booking_fewo_detail', [$travel_user_booking_fewo->id])]], $this->successStatus);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ class TravelUserBookingFewoController extends Controller
|
|||
$replace_info_text['fewo_user_anrede'] = $travel_user_booking_fewo->getUserSalutation();
|
||||
$replace_info_text['fewo_adresse'] = $travel_user_booking_fewo->getNameAddressLocation(", ");
|
||||
}
|
||||
|
||||
if(!$travel_user_booking_fewo->info_mail_text) {
|
||||
$travel_user_booking_fewo->info_mail_text = CMSContent::getContentBySlug('pdf-vorlage-anreiseinfo-fewo');
|
||||
$travel_user_booking_fewo->info_mail_text = Util::replacePlaceholders($travel_user_booking_fewo->info_mail_text, $replace_info_text);
|
||||
|
|
@ -60,6 +59,7 @@ class TravelUserBookingFewoController extends Controller
|
|||
|
||||
$data = [
|
||||
'travel_user_booking_fewo' => $travel_user_booking_fewo,
|
||||
'send_mail_employee_mail' => config('mail.mail_fewo_employee'),
|
||||
'max_adults' => $max_adults,
|
||||
'max_children' => $max_children,
|
||||
'id' => $id,
|
||||
|
|
@ -112,13 +112,12 @@ class TravelUserBookingFewoController extends Controller
|
|||
$mail_bbc = config('mail.mail_bbc');
|
||||
Mail::to($travel_user_booking_fewo->travel_user->email)->bcc($mail_bbc)->send(new MailSendFeWoInvoice($travel_user_booking_fewo, Input::get('send_mail_user_notice')));
|
||||
$send_user_mail = $travel_user_booking_fewo->send_user_mail;
|
||||
$send_user_mail[] = [date('H:i d.m.Y') => Input::get('send_mail_user_notice')];
|
||||
$send_user_mail[] = [date('H:i d.m.Y') => $travel_user_booking_fewo->travel_user->email." ".Input::get('send_mail_user_notice')];
|
||||
$travel_user_booking_fewo->send_user_mail = $send_user_mail;
|
||||
$travel_user_booking_fewo->save();
|
||||
\Session()->flash('alert-success', __('E-mail wurde an den Mieter versendet.'));
|
||||
\Session()->flash('alert-success', __('E-Mail wurde an den Mieter versendet.'));
|
||||
return redirect(route('travel_user_booking_fewo_detail', [$travel_user_booking_fewo->id]));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if($data['action'] == 'sendInfosMailtoUser') {
|
||||
|
|
@ -127,13 +126,12 @@ class TravelUserBookingFewoController extends Controller
|
|||
$mail_bbc = config('mail.mail_bbc');
|
||||
Mail::to($travel_user_booking_fewo->travel_user->email)->bcc($mail_bbc)->send(new MailSendFeWoInfo($travel_user_booking_fewo));
|
||||
$send_info_mail = $travel_user_booking_fewo->send_info_mail;
|
||||
$send_info_mail[] = [date('H:i d.m.Y') => ''];
|
||||
$send_info_mail[] = [date('H:i d.m.Y') => $travel_user_booking_fewo->travel_user->email];
|
||||
$travel_user_booking_fewo->send_info_mail = $send_info_mail;
|
||||
$travel_user_booking_fewo->save();
|
||||
\Session()->flash('alert-success', __('E-mail wurde an den Mieter versendet.'));
|
||||
\Session()->flash('alert-success', __('E-Mail wurde an den Mieter versendet.'));
|
||||
return redirect(route('travel_user_booking_fewo_detail', [$travel_user_booking_fewo->id]));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if($data['action'] == 'sendMailtoService') {
|
||||
|
|
@ -149,14 +147,28 @@ class TravelUserBookingFewoController extends Controller
|
|||
$travel_user_booking_fewo->send_service_mail = $send_service_mail;
|
||||
$travel_user_booking_fewo->save();
|
||||
|
||||
\Session()->flash('alert-success', __('E-mail wurde an den Dienstleister versendet.'));
|
||||
\Session()->flash('alert-success', __('E-Mail wurde an den Dienstleister versendet.'));
|
||||
return redirect(route('travel_user_booking_fewo_detail', [$travel_user_booking_fewo->id]));
|
||||
}
|
||||
}
|
||||
|
||||
if($data['action'] == 'sendMailtoEmployee') {
|
||||
$travel_user_booking_fewo = TravelUserBookingFewo::findOrFail($id);
|
||||
if($travel_user_booking_fewo){
|
||||
$mails = explode(",", Input::get('send_mail_employee_mail'));
|
||||
Mail::to($mails)->send(new MailSendFeWoService($travel_user_booking_fewo, Input::get('send_mail_employee_subject'), Input::get('send_mail_employee_content')));
|
||||
$send_employee_mail = $travel_user_booking_fewo->send_employee_mail;
|
||||
$send_employee_mail[] = ['d' => date('H:i d.m.Y'),
|
||||
'm'=>Input::get('send_mail_employee_mail'),
|
||||
's'=>Input::get('send_mail_employee_subject'),
|
||||
'c'=>Input::get('send_mail_employee_content')];
|
||||
$travel_user_booking_fewo->send_employee_mail = $send_employee_mail;
|
||||
$travel_user_booking_fewo->save();
|
||||
|
||||
|
||||
|
||||
\Session()->flash('alert-success', __('E-Mail wurde an die Mitarbeiter versendet.'));
|
||||
return redirect(route('travel_user_booking_fewo_detail', [$travel_user_booking_fewo->id]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public function delete($id){
|
||||
|
|
@ -188,7 +200,6 @@ class TravelUserBookingFewoController extends Controller
|
|||
return '<a href="' . route('travel_user_detail', [$travel_user_booking_fewo->travel_user_id]) . '">'.$travel_user_booking_fewo->travel_user->first_name.' '.$travel_user_booking_fewo->travel_user->last_name.'</a>';
|
||||
})
|
||||
->addColumn('is_calendar', function (TravelUserBookingFewo $travel_user_booking_fewo) {
|
||||
|
||||
$back = "";
|
||||
$back .= $travel_user_booking_fewo->is_calendar_fewo_direct ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : ' <span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
|
||||
$back .= $travel_user_booking_fewo->is_calendar_hrs ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : ' <span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
|
||||
|
|
@ -198,7 +209,6 @@ class TravelUserBookingFewoController extends Controller
|
|||
->addColumn('status_name', function (TravelUserBookingFewo $travel_user_booking_fewo) {
|
||||
return $travel_user_booking_fewo->getStatuesName();
|
||||
})
|
||||
|
||||
->addColumn('action_delete', function (TravelUserBookingFewo $travel_user_booking_fewo) {
|
||||
return '<a href="' . route('travel_user_booking_fewo_delete', [$travel_user_booking_fewo->id]) . '" class="btn icon-btn btn-sm btn-danger" onclick="return confirm(\''.__('Really delete entry?').'\');"><span class="far fa-trash"></span></a>';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@ class TravelUserController extends Controller
|
|||
'step' => $step
|
||||
];
|
||||
return view('travel.user.index', $data);
|
||||
|
||||
|
||||
}
|
||||
|
||||
public function detail($id)
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ class FewoLodging extends Model
|
|||
'group_id',
|
||||
'type_id',
|
||||
'name',
|
||||
'single_name',
|
||||
'description',
|
||||
'equipment',
|
||||
'adress1',
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@ class TravelUserBookingFewo extends Model
|
|||
'price_deposit' => 'float',
|
||||
'price_service' => 'float',
|
||||
'price_balance' => 'float',
|
||||
'price_extra' => 'float',
|
||||
'price_total' => 'float',
|
||||
'travel_booking_fewo_channel_id' => 'int',
|
||||
'is_calendar_fewo_direct' => 'bool',
|
||||
|
|
@ -94,6 +95,7 @@ class TravelUserBookingFewo extends Model
|
|||
'send_user_mail' => 'array',
|
||||
'send_service_mail' => 'array',
|
||||
'send_info_mail' => 'array',
|
||||
'send_employee_mail' => 'array',
|
||||
];
|
||||
|
||||
protected $dates = [
|
||||
|
|
@ -115,9 +117,11 @@ class TravelUserBookingFewo extends Model
|
|||
'to_date',
|
||||
'daily_prices',
|
||||
'price_travel',
|
||||
'price_balance',
|
||||
'price_extra',
|
||||
'price_travel_total',
|
||||
'price_deposit',
|
||||
'price_service',
|
||||
'price_balance',
|
||||
'price_total',
|
||||
'travel_booking_fewo_channel_id',
|
||||
'notice',
|
||||
|
|
@ -155,6 +159,14 @@ class TravelUserBookingFewo extends Model
|
|||
return "";
|
||||
}
|
||||
|
||||
public function getCheckedBadgeCalendar(){
|
||||
$back = "";
|
||||
$back .= $this->is_calendar_fewo_direct ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : ' <span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
|
||||
$back .= $this->is_calendar_hrs ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : ' <span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
|
||||
$back .= $this->is_calendar_stern_tours ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : ' <span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
|
||||
return $back;
|
||||
}
|
||||
|
||||
|
||||
public function getPersonsAttribute($value)
|
||||
{
|
||||
|
|
@ -259,6 +271,61 @@ class TravelUserBookingFewo extends Model
|
|||
return isset($this->attributes['price_travel']) ? $this->attributes['price_travel'] : 0;
|
||||
}
|
||||
|
||||
//price_extra
|
||||
public function setPriceExtraAttribute($value)
|
||||
{
|
||||
$value = Util::_format_number($value);
|
||||
$this->attributes['price_extra'] = floatval(str_replace(',', '.', $value));
|
||||
}
|
||||
public function getPriceExtraAttribute($value)
|
||||
{
|
||||
if(!$value){ return 0; }
|
||||
return number_format(($this->attributes['price_extra']), 2, ',', '.');
|
||||
}
|
||||
public function getPriceExtraRaw()
|
||||
{
|
||||
return isset($this->attributes['price_extra']) ? $this->attributes['price_extra'] : 0;
|
||||
}
|
||||
|
||||
|
||||
//price_balance
|
||||
public function setPriceBalanceAttribute($value)
|
||||
{
|
||||
$value = Util::_format_number($value);
|
||||
$this->attributes['price_balance'] = floatval(str_replace(',', '.', $value));
|
||||
}
|
||||
public function getPriceBalanceAttribute($value)
|
||||
{
|
||||
if(!$value){ return 0; }
|
||||
return number_format(($this->attributes['price_balance']), 2, ',', '.');
|
||||
}
|
||||
public function getPriceBalanceRaw()
|
||||
{
|
||||
return isset($this->attributes['price_balance']) ? $this->attributes['price_balance'] : 0;
|
||||
}
|
||||
|
||||
|
||||
//price_travel_total
|
||||
public function setPriceTravelTotalAttribute($value)
|
||||
{
|
||||
$value = Util::_format_number($value);
|
||||
$this->attributes['price_travel_total'] = floatval(str_replace(',', '.', $value));
|
||||
}
|
||||
public function getPriceTravelTotalAttribute($value)
|
||||
{
|
||||
if(!$value){
|
||||
$this->attributes['price_travel_total'] = $this->getPriceTravelRaw() + $this->getPriceBalanceRaw() + $this->getPriceExtraRaw();
|
||||
}
|
||||
return number_format(($this->attributes['price_travel_total']), 2, ',', '.');
|
||||
}
|
||||
public function getPriceTravelTotalRaw()
|
||||
{
|
||||
if(!isset($this->attributes['price_travel_total']) || $this->attributes['price_travel_total'] == 0){
|
||||
$this->attributes['price_travel_total'] = $this->getPriceTravelRaw() + $this->getPriceBalanceRaw() + $this->getPriceExtraRaw();
|
||||
}
|
||||
return isset($this->attributes['price_travel_total']) ? $this->attributes['price_travel_total'] : 0;
|
||||
}
|
||||
|
||||
//price_deposit
|
||||
public function setPriceDepositAttribute($value)
|
||||
{
|
||||
|
|
@ -295,21 +362,6 @@ class TravelUserBookingFewo extends Model
|
|||
return isset($this->attributes['price_service']) ? $this->attributes['price_service'] : 0;
|
||||
}
|
||||
|
||||
//price_balance
|
||||
public function setPriceBalanceAttribute($value)
|
||||
{
|
||||
$value = Util::_format_number($value);
|
||||
$this->attributes['price_balance'] = floatval(str_replace(',', '.', $value));
|
||||
}
|
||||
public function getPriceBalanceAttribute($value)
|
||||
{
|
||||
if(!$value){ return 0; }
|
||||
return number_format(($this->attributes['price_balance']), 2, ',', '.');
|
||||
}
|
||||
public function getPriceBalanceRaw()
|
||||
{
|
||||
return isset($this->attributes['price_balance']) ? $this->attributes['price_balance'] : 0;
|
||||
}
|
||||
|
||||
//price_total
|
||||
public function setPriceTotalAttribute($value)
|
||||
|
|
@ -329,35 +381,23 @@ class TravelUserBookingFewo extends Model
|
|||
return isset($this->attributes['price_total']) ? $this->attributes['price_total'] : 0;
|
||||
}
|
||||
|
||||
public function getPriceTotalFirstPay(){
|
||||
if($this->attributes['price_total'] == 0){
|
||||
return 0;
|
||||
}
|
||||
$first_pay = $this->attributes['price_total']/2;
|
||||
return number_format(($first_pay), 2, ',', '.');
|
||||
}
|
||||
public function getPriceTotalSecondPay(){
|
||||
if($this->attributes['price_total'] == 0){
|
||||
return 0;
|
||||
}
|
||||
$first_pay = $this->attributes['price_total']/2;
|
||||
return number_format(($this->attributes['price_total'] - $first_pay), 2, ',', '.');
|
||||
}
|
||||
public function getPriceTravelFirstPay(){
|
||||
public function getPriceTravelTotalFirstPay(){
|
||||
if($this->attributes['price_travel'] == 0){
|
||||
return 0;
|
||||
}
|
||||
$first_pay = $this->attributes['price_travel']/2;
|
||||
$first_pay = ($this->getPriceTravelTotalRaw() + $this->getPriceServiceRaw()) / 2;
|
||||
return number_format(($first_pay), 2, ',', '.');
|
||||
}
|
||||
public function getPriceTravelSecondPay(){
|
||||
public function getPriceTravelTotalSecondPay(){
|
||||
if($this->attributes['price_travel'] == 0){
|
||||
return 0;
|
||||
}
|
||||
$first_pay = $this->attributes['price_travel']/2;
|
||||
return number_format(($this->attributes['price_travel'] - $first_pay + $this->attributes['price_deposit']), 2, ',', '.');
|
||||
$total_pay = ($this->getPriceTravelTotalRaw() + $this->getPriceServiceRaw());
|
||||
$first_pay = $total_pay/2;
|
||||
return number_format(($total_pay - $first_pay + $this->getPriceDepositRaw()), 2, ',', '.');
|
||||
}
|
||||
|
||||
|
||||
public function getBookingDateYear(){
|
||||
return Carbon::parse($this->booking_date)->format('Y');
|
||||
}
|
||||
|
|
@ -487,7 +527,12 @@ class TravelUserBookingFewo extends Model
|
|||
}
|
||||
public function getNameAddressLocation($sep = "\n"){
|
||||
if($this->fewo_lodging){
|
||||
return $this->fewo_lodging->name.$sep.$this->fewo_lodging->adress1." ".$this->fewo_lodging->adress2.", ".$this->fewo_lodging->zip_code." ".$this->fewo_lodging->city;
|
||||
|
||||
$name = trim($this->fewo_lodging->single_name).$sep;
|
||||
$address = trim($this->fewo_lodging->adress1);
|
||||
$address .= $this->fewo_lodging->adress2 ? " ".$this->fewo_lodging->adress2.$sep : ", ";
|
||||
$city = trim($this->fewo_lodging->zip_code)." ".trim($this->fewo_lodging->city);
|
||||
return $name.$address.$city;
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
|
@ -517,7 +562,17 @@ class TravelUserBookingFewo extends Model
|
|||
$this->from_date." - ".$this->to_date." ".$this->travel_user->first_name." ".$this->travel_user->last_name;
|
||||
}
|
||||
|
||||
public function getEmployeeMailSubject(){
|
||||
if($this->fewo_lodging){
|
||||
return "CRM Fewo Buchung: ".$this->fewo_lodging->name." | Anreise ".$this->from_date;
|
||||
}
|
||||
return "CRM Fewo Buchung | Anreise ".$this->from_date;
|
||||
}
|
||||
|
||||
|
||||
public function getEmployeeMailContent(){
|
||||
return ($this->travel_user_id ? "Kunde: ".route('travel_user_detail', [$this->travel_user_id])."\n" : "").
|
||||
"Buchung: ".route('travel_user_booking_fewo_detail', [$this->id])."\n".
|
||||
$this->travel_user->first_name." ".$this->travel_user->last_name." | ".$this->from_date." - ".$this->to_date." | ".$this->adults." + ".$this->children." (Erwachsene + Kinder)";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -143,6 +143,7 @@ class TravelUserBookingFewoRepository extends BaseRepository {
|
|||
//check for data
|
||||
$check_for_reservation = true;
|
||||
$fewo_reservation_id = 0;
|
||||
$model = false;
|
||||
if($id > 0) {
|
||||
$model = TravelUserBookingFewo::findOrFail($id);
|
||||
if($data['from_date'] == $model->from_date && $data['to_date'] == $model->to_date){
|
||||
|
|
@ -178,13 +179,12 @@ class TravelUserBookingFewoRepository extends BaseRepository {
|
|||
'status' => 'required'
|
||||
);
|
||||
|
||||
if($fewo_reservation_id > 0 && $model && Input::get('invoice_number')){
|
||||
$rules['invoice_number'] = 'required|unique:mysql_stern.travel_user_booking_fewos,invoice_number,'.$model->id;
|
||||
}
|
||||
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
|
||||
/* $message = 'my custom validation rule message' . $data['from_date'];
|
||||
Validator::extend('my_custom_validation_rule', function ($attribute, $value, $parameters) {
|
||||
//
|
||||
}, $message);
|
||||
*/
|
||||
if ($validator->fails()) {
|
||||
return back()->withInput(Input::all())->withErrors($validator);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,10 +59,8 @@ return [
|
|||
'address' => env('MAIL_FROM_ADDRESS', 'info@mein.sterntours.de'),
|
||||
'name' => env('MAIL_FROM_NAME', 'Mein Stern-Tours'),
|
||||
],
|
||||
'mail_bbc' => env('MAIL_BBC', 'info@sterntours.de'),
|
||||
|
||||
|
||||
|
||||
'mail_bbc' => explode(',', env('MAIL_BBC', 'kontakt@stern-tours.de')),
|
||||
'mail_fewo_employee' => env('MAIL_FEWO_EMPLOYEE', 'kontakt@stern-tours.de'),
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| E-Mail Encryption Protocol
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ class CreateFewoLodgingTable extends Migration
|
|||
$table->integer('group_id')->nullable();
|
||||
$table->integer('type_id')->nullable();
|
||||
$table->string('name', 255);
|
||||
$table->string('single_name', 255);
|
||||
$table->longText('description');
|
||||
$table->longText('equipment');
|
||||
$table->string('adress1', 255);
|
||||
|
|
|
|||
|
|
@ -33,9 +33,11 @@ class CreateTravelUserBookingFewosTable extends Migration
|
|||
|
||||
$table->text('daily_prices')->nullable();
|
||||
$table->decimal('price_travel', 13, 2)->nullable();
|
||||
$table->decimal('price_balance', 13, 2)->nullable();
|
||||
$table->decimal('price_extra', 13, 2)->nullable();
|
||||
$table->decimal('price_travel_total', 13, 2)->nullable();
|
||||
$table->decimal('price_deposit', 8, 2)->nullable();
|
||||
$table->decimal('price_service', 8, 2)->nullable();
|
||||
$table->decimal('price_balance', 8, 2)->nullable();
|
||||
$table->decimal('price_total', 13, 2)->nullable();
|
||||
|
||||
|
||||
|
|
@ -53,8 +55,9 @@ class CreateTravelUserBookingFewosTable extends Migration
|
|||
|
||||
$table->text('send_user_mail')->nullable();
|
||||
$table->text('send_service_mail')->nullable();
|
||||
$table->text('info_mail_text')->nullable();
|
||||
$table->text('send_employee_mail')->nullable();
|
||||
$table->text('send_info_mail')->nullable();
|
||||
$table->text('info_mail_text')->nullable();
|
||||
|
||||
$table->timestamps();
|
||||
$table->softDeletes();
|
||||
|
|
|
|||
|
|
@ -93,6 +93,8 @@
|
|||
border-color: rgba(100, 136, 89, 0.4);
|
||||
}
|
||||
|
||||
|
||||
.alert ul {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
|
||||
html {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
body {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
margin: 0 auto;
|
||||
padding: 0;
|
||||
color: #000;
|
||||
background: #fff;
|
||||
font-family: 'DejaVu Sans', sans-serif;
|
||||
font-size: 9pt;
|
||||
line-height: 1.3em;
|
||||
font-weight: 400 ;
|
||||
}
|
||||
table {
|
||||
border: none;
|
||||
}
|
||||
|
||||
strong {
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
@page {
|
||||
margin: 0px;
|
||||
}
|
||||
@page {
|
||||
margin-top: 0px;
|
||||
}
|
||||
166
public/css/stern_fewo_pdf.css
Normal file
166
public/css/stern_fewo_pdf.css
Normal file
|
|
@ -0,0 +1,166 @@
|
|||
html {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
body {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
margin: 0 auto;
|
||||
padding: 0;
|
||||
color: #000;
|
||||
background: #fff;
|
||||
font-size: 10pt;
|
||||
line-height: 1.2em;
|
||||
}
|
||||
table {
|
||||
border: none;
|
||||
}
|
||||
|
||||
strong {
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
@page {
|
||||
margin: 0px;
|
||||
}
|
||||
@page {
|
||||
margin-top: 0px;
|
||||
}
|
||||
|
||||
|
||||
@page {
|
||||
margin: 90mm 0 30mm 0;
|
||||
color:#000;
|
||||
}
|
||||
|
||||
.font-weight-bold {
|
||||
font-weight: 600;
|
||||
}
|
||||
#logo_box {
|
||||
position: absolute;
|
||||
top:-80mm;
|
||||
left: 25mm;
|
||||
right: 25mm;
|
||||
height: 25mm;
|
||||
z-index: 1;
|
||||
font-size: 10pt;
|
||||
text-align: center;
|
||||
}
|
||||
#logo_box img {
|
||||
width: 65mm;
|
||||
}
|
||||
#address_box {
|
||||
position: absolute;
|
||||
top:-40mm;
|
||||
left: 25mm;
|
||||
width: 100mm;
|
||||
height: 45mm;
|
||||
z-index: 1;
|
||||
font-size: 11pt;
|
||||
color:#000;
|
||||
}
|
||||
#address_box #address_back{
|
||||
font-size: 7pt;
|
||||
text-decoration: underline;
|
||||
margin-bottom: 2mm;
|
||||
color:#000;
|
||||
}
|
||||
|
||||
#date_box {
|
||||
position: absolute;
|
||||
top:-10mm;
|
||||
right: 15mm;
|
||||
width: 70mm;
|
||||
height: 10mm;
|
||||
z-index: 1;
|
||||
font-size: 10pt;
|
||||
line-height: 12pt;
|
||||
text-align: right;
|
||||
color:#000;
|
||||
}
|
||||
|
||||
#title_box {
|
||||
position: absolute;
|
||||
top:0mm;
|
||||
left: 25mm;
|
||||
width: 160mm;
|
||||
height: 10mm;
|
||||
z-index: 2;
|
||||
font-weight: bold;
|
||||
color:#000;
|
||||
}
|
||||
#title_box .title {
|
||||
font-size: 16pt;
|
||||
line-height: 12pt;
|
||||
color:#000;
|
||||
}
|
||||
#title_box .subtitle {
|
||||
font-size: 9pt;
|
||||
line-height: 9pt;
|
||||
color:#000;
|
||||
}
|
||||
|
||||
#detail_box {
|
||||
position: absolute;
|
||||
top:15mm;
|
||||
left: 25mm;
|
||||
right: 15mm;
|
||||
z-index: 3;
|
||||
font-size: 9pt;
|
||||
color:#000;
|
||||
}
|
||||
|
||||
|
||||
#detail_box table {
|
||||
width: 100%;
|
||||
line-height: 9pt;
|
||||
border-collapse: collapse;
|
||||
color:#000;
|
||||
}
|
||||
#detail_box table td {
|
||||
border: 0.5pt solid #8c8c8c;
|
||||
padding: 1mm;
|
||||
color:#000;
|
||||
}
|
||||
|
||||
#detail_box table td.left {
|
||||
text-align: right;
|
||||
width: 50mm;
|
||||
color:#000;
|
||||
}
|
||||
|
||||
#detail_box table td.right {
|
||||
text-align: left;
|
||||
color:#000;
|
||||
|
||||
}
|
||||
.singel-line-top {
|
||||
border-top: 1pt solid #1a1a18;
|
||||
}
|
||||
.double-line {
|
||||
border-bottom: 2.5pt double #1a1a18;
|
||||
}
|
||||
.dotted-line {
|
||||
border-bottom: 0.8pt dotted #1a1a18;
|
||||
}
|
||||
|
||||
#footer_box {
|
||||
position: absolute;
|
||||
bottom:-25mm;
|
||||
left: 25mm;
|
||||
right: 15mm;
|
||||
height: 30mm;
|
||||
z-index: 6;
|
||||
font-size: 7pt;
|
||||
line-height: 8pt;
|
||||
}
|
||||
|
||||
#footer_box table {
|
||||
margin-top: 2mm;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#footer_box table td {
|
||||
vertical-align: top;
|
||||
}
|
||||
|
|
@ -172,5 +172,6 @@ return [
|
|||
'time' => 'Uhrzeit',
|
||||
'available' => 'verfügbar',
|
||||
'size' => 'Größe',
|
||||
'invoice_number' => 'Rechnungnummer',
|
||||
],
|
||||
];
|
||||
|
|
|
|||
|
|
@ -139,9 +139,9 @@
|
|||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="90%">
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left">
|
||||
<br>
|
||||
<p>
|
||||
{!! nl2br($content) !!}
|
||||
<br>
|
||||
</p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@
|
|||
{{ __('Mietpreis:') }}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top; border-top:1px solid #E4E4E4;">
|
||||
<strong>{{ $model->price_travel }} €</strong>
|
||||
<strong>{{ $model->price_travel_total }} €</strong>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -218,13 +218,15 @@
|
|||
<p>Mietbedingungen und Mietbestätigung / Rechnung finden Sie als PDF im Anhang.</p>
|
||||
<p>Mit dieser Buchungsbestätigung ist der Mietvertrag für <strong>Sie und uns verbindlich.</strong></p>
|
||||
<ul>
|
||||
<li>eine sofort zahlungsfällige Anzahlung von 50% Mietpreis = <strong>{{ $model->getPriceTravelFirstPay() }} €</strong></li>
|
||||
<li>sowie eine Restzahlung von <strong>{{ $model->getPriceTravelSecondPay() }} €</strong> bis spätestens 4 Wochen vor Belegungsbeginn inkl. der oben genannten Kaution.</li>
|
||||
<li>eine sofort zahlungsfällige Anzahlung von 50% Mietpreis = <strong>{{ $model->getPriceTravelTotalFirstPay() }} €</strong></li>
|
||||
<li>sowie eine Restzahlung von <strong>{{ $model->getPriceTravelTotalSecondPay() }} €</strong> bis spätestens 4 Wochen vor Belegungsbeginn inkl. der oben genannten Kaution.</li>
|
||||
</ul>
|
||||
<p>auf folgendes Bankkonto:<br>
|
||||
<strong>STERN TOURS GmbH<br>
|
||||
IBAN: DE83100208900018857111<br>
|
||||
BIC: HYVEDEMM488</strong>
|
||||
BIC: HYVEDEMM488<br>
|
||||
<u>Verwendungszweck: {{$model->invoice_number}}</u>
|
||||
</strong>
|
||||
</p>
|
||||
<p>Mit freundlichen Grüßen<br>
|
||||
Ihr Team von STERN TOURS</p>
|
||||
|
|
|
|||
|
|
@ -281,13 +281,13 @@
|
|||
{{ __('Logout') }}</a>
|
||||
</div>
|
||||
|
||||
{{--
|
||||
<div class="card-body" style="background: #fff; border: 1px solid rgba(24, 28, 33, 0.06);">
|
||||
<h4>{{__('Delete') }}</h4>
|
||||
<p>{{__('If you no longer want to use our offer, you can delete your account here.')}}</p>
|
||||
<a href="{{route('user_delete_account')}}" class="btn btn-default">{{__('Delete Account')}}</a>
|
||||
</div>
|
||||
--}}
|
||||
{{--
|
||||
<div class="card-body" style="background: #fff; border: 1px solid rgba(24, 28, 33, 0.06);">
|
||||
<h4>{{__('Delete') }}</h4>
|
||||
<p>{{__('If you no longer want to use our offer, you can delete your account here.')}}</p>
|
||||
<a href="{{route('user_delete_account')}}" class="btn btn-default">{{__('Delete Account')}}</a>
|
||||
</div>
|
||||
--}}
|
||||
|
||||
|
||||
@endsection
|
||||
|
|
|
|||
|
|
@ -1,157 +1,6 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<title></title>
|
||||
|
||||
{!! Html::style('css/invoice_fewo_pdf.css') !!}
|
||||
<style>
|
||||
@page {
|
||||
margin: 90mm 0 30mm 0;
|
||||
}
|
||||
|
||||
.font-weight-bold {
|
||||
font-weight: 600;
|
||||
}
|
||||
#logo_box {
|
||||
position: absolute;
|
||||
top:-80mm;
|
||||
left: 25mm;
|
||||
right: 25mm;
|
||||
height: 25mm;
|
||||
z-index: 1;
|
||||
font-size: 10pt;
|
||||
text-align: center;
|
||||
}
|
||||
#logo_box img {
|
||||
width: 65mm;
|
||||
}
|
||||
#address_box {
|
||||
position: absolute;
|
||||
top:-40mm;
|
||||
left: 25mm;
|
||||
width: 100mm;
|
||||
height: 45mm;
|
||||
z-index: 1;
|
||||
font-size: 11pt;
|
||||
|
||||
}
|
||||
#address_box #address_back{
|
||||
font-size: 7pt;
|
||||
text-decoration: underline;
|
||||
margin-bottom: 2mm;
|
||||
}
|
||||
|
||||
#date_box {
|
||||
position: absolute;
|
||||
top:-10mm;
|
||||
right: 15mm;
|
||||
width: 70mm;
|
||||
height: 10mm;
|
||||
z-index: 1;
|
||||
font-size: 10pt;
|
||||
line-height: 12pt;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
#title_box {
|
||||
position: absolute;
|
||||
top:0mm;
|
||||
left: 25mm;
|
||||
width: 160mm;
|
||||
height: 10mm;
|
||||
z-index: 2;
|
||||
font-weight: bold;
|
||||
|
||||
}
|
||||
#title_box .title {
|
||||
font-size: 16pt;
|
||||
line-height: 12pt;
|
||||
}
|
||||
#title_box .subtitle {
|
||||
font-size: 9pt;
|
||||
line-height: 9pt;
|
||||
}
|
||||
|
||||
#detail_box {
|
||||
position: absolute;
|
||||
top:15mm;
|
||||
left: 25mm;
|
||||
right: 15mm;
|
||||
z-index: 3;
|
||||
font-size: 9pt;
|
||||
}
|
||||
|
||||
|
||||
#detail_box table {
|
||||
width: 100%;
|
||||
line-height: 9pt;
|
||||
border-collapse: collapse;
|
||||
|
||||
}
|
||||
|
||||
#detail_box table td {
|
||||
border: 0.5pt solid #8c8c8c;
|
||||
padding: 1mm;
|
||||
|
||||
|
||||
}
|
||||
|
||||
#detail_box table td.left {
|
||||
text-align: right;
|
||||
width: 50mm;
|
||||
}
|
||||
|
||||
#detail_box table td.right {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
.singel-line-top {
|
||||
border-top: 1pt solid #1a1a18;
|
||||
}
|
||||
.double-line {
|
||||
border-bottom: 2.5pt double #1a1a18;
|
||||
}
|
||||
.dotted-line {
|
||||
border-bottom: 0.8pt dotted #1a1a18;
|
||||
}
|
||||
|
||||
#footer_box {
|
||||
position: absolute;
|
||||
bottom:-25mm;
|
||||
left: 25mm;
|
||||
right: 15mm;
|
||||
height: 30mm;
|
||||
z-index: 6;
|
||||
font-size: 7pt;
|
||||
line-height: 8pt;
|
||||
}
|
||||
|
||||
#footer_box table {
|
||||
margin-top: 2mm;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#footer_box table td {
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
{{--
|
||||
<div id="brand_paper_background">
|
||||
<img src="{{ base_path()}}/storage/app/pdf/inno-plan-bg.png" height="100%" width="100%">
|
||||
</div>
|
||||
--}}
|
||||
<div id="logo_box">
|
||||
<img src="{{asset('images/stern-tours-logo.png')}}">
|
||||
</div>
|
||||
@extends('pdf.layout')
|
||||
|
||||
@section('content')
|
||||
<div id="address_box">
|
||||
<div id="address_back">STERN TOURS GmbH • Emser Str. 3 • 10719 Berlin</div>
|
||||
{!! nl2br($model->getBookingUserAddress()) !!}
|
||||
|
|
@ -161,15 +10,14 @@
|
|||
Berlin, den {!! date("d.m.Y") !!}
|
||||
</div>
|
||||
|
||||
<div id="title_box">
|
||||
Mietbestätigung / Rechnung Nr. {{$model->invoice_number}}
|
||||
</div>
|
||||
|
||||
<div id="title_box">
|
||||
Mietbestätigung / Rechnung Nr. {{$model->invoice_number}}
|
||||
</div>
|
||||
|
||||
<div id="detail_box">
|
||||
<p>{{$model->getUserSalutation()}},<br>
|
||||
<br>
|
||||
herzlichen Dank für Ihre Online-Buchung vom {{$model->booking_date}} :</p>
|
||||
herzlichen Dank für Ihre Online-Buchung vom {{$model->booking_date}}.</p>
|
||||
<p>Auf Grundlage der Beschreibung der gebuchten Unterkunft und unserer im Rahmen des Onlinebuchungsprozesses vertraglich einbezogenen Mietbedingungen
|
||||
(die Sie auch nochmals beigefügt erhalten ) freuen wir uns, Ihre Anmietung wie folgt verbindlich bestätigen zu können:</p>
|
||||
|
||||
|
|
@ -190,11 +38,11 @@
|
|||
<tr>
|
||||
<td class="left">{{ __('Mietpreis:') }}</td>
|
||||
<td class="right">
|
||||
<div class="font-weight-bold">{{ $model->price_travel }} €</div>
|
||||
<div class="font-weight-bold">{{ $model->price_travel_total }} €</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="left">{{ __('Service-Gebühr:') }}??</td>
|
||||
<td class="left">{{ __('Service-Gebühr:') }}</td>
|
||||
<td class="right">
|
||||
<div class="font-weight-bold">{{ $model->price_service }} €</div>
|
||||
</td>
|
||||
|
|
@ -218,13 +66,14 @@
|
|||
<p>Mit dieser Buchungsbestätigung ist der Mietvertrag für <strong>Sie und uns verbindlich.</strong></p>
|
||||
<p>Entsprechend der Regelungen unter Ziffer 3.1. und 3.2. unserer Mietbedingungen überweisen Sie uns bitte</p>
|
||||
<ul>
|
||||
<li>eine sofort zahlungsfällige Anzahlung von 50% Mietpreis = <strong>{{ $model->getPriceTravelFirstPay() }} €</strong></li>
|
||||
<li>sowie eine Restzahlung von <strong>{{ $model->getPriceTravelSecondPay() }} €</strong> bis spätestens 4 Wochen vor Belegungsbeginn inkl. der oben genannten Kaution.</li>
|
||||
<li>eine sofort zahlungsfällige Anzahlung von 50% Mietpreis = <strong>{{ $model->getPriceTravelTotalFirstPay() }} €</strong></li>
|
||||
<li>sowie eine Restzahlung von <strong>{{ $model->getPriceTravelTotalSecondPay() }} €</strong> bis spätestens 4 Wochen vor Belegungsbeginn inkl. der oben genannten Kaution.</li>
|
||||
</ul>
|
||||
<p>auf folgendes Bankkonto:<br>
|
||||
<strong>STERN TOURS GmbH<br>
|
||||
IBAN: DE83100208900018857111<br>
|
||||
BIC: HYVEDEMM488</strong>
|
||||
BIC: HYVEDEMM488<br>
|
||||
<u>Verwendungszweck: {{$model->invoice_number}}</u></strong>
|
||||
</p>
|
||||
|
||||
<p>Beachten Sie bitte, dass eine Nichtzahlung des Unterkunftspreises zu den genannten Fälligkeitsdaten keine Aufhebung des
|
||||
|
|
@ -233,42 +82,4 @@
|
|||
<p>Mit freundlichen Grüßen<br>
|
||||
Ihr Team von STERN TOURS</p>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div id="footer_box">
|
||||
<strong>P.S.: Wir empfehlen dringend, den Abschluss einer Reiserücktrittskostenversicherung.</strong>
|
||||
<table>
|
||||
<tr>
|
||||
<td style="width: 20%">
|
||||
<strong>STERN TOURS GmbH</strong><br>
|
||||
Emser Str. 3<br>
|
||||
10719 Berlin<br>
|
||||
</td>
|
||||
<td>
|
||||
<strong>Fon:</strong> 030 | 88 0 313 0<br>
|
||||
<strong>Fax:</strong> 030 | 88 0 313 44<br>
|
||||
<strong>E-Mail:</strong> kontakt@sterntours.de<br>
|
||||
<strong>Web:</strong> www.sterntours.de
|
||||
</td>
|
||||
<td>
|
||||
<strong>Bankverbindung:</strong><br>
|
||||
STERN TOURS<br>
|
||||
Hypo Vereinsbank<br>
|
||||
IBAN: DE83100208900018857111<br>
|
||||
BIC-/SWIFT-Code: HYVEDEMM488
|
||||
</td>
|
||||
<td>
|
||||
<strong>Öffnungszeiten:</strong><br>
|
||||
Mo-Do: 09.00-18.00 Uhr<br>
|
||||
FR: 09.00-16.00 Uhr<br><br>
|
||||
UStId: DE192609253<br>
|
||||
Registernr.: HRB 67111<br>
|
||||
Amtsgericht Charlottenburg<br>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@endsection
|
||||
49
resources/views/pdf/layout.blade.php
Normal file
49
resources/views/pdf/layout.blade.php
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<title></title>
|
||||
{!! Html::style('css/stern_fewo_pdf.css') !!}
|
||||
</head>
|
||||
<body>
|
||||
<div id="logo_box">
|
||||
<img src="{{asset('images/stern-tours-logo.png')}}">
|
||||
</div>
|
||||
|
||||
@yield('content')
|
||||
|
||||
<div id="footer_box">
|
||||
<strong>P.S.: Wir empfehlen dringend, den Abschluss einer Reiserücktrittskostenversicherung.</strong>
|
||||
<table>
|
||||
<tr>
|
||||
<td style="width: 20%">
|
||||
<strong>STERN TOURS GmbH</strong><br>
|
||||
Emser Str. 3<br>
|
||||
10719 Berlin<br>
|
||||
</td>
|
||||
<td>
|
||||
<strong>Fon:</strong> 030 | 88 0 313 0<br>
|
||||
<strong>Fax:</strong> 030 | 88 0 313 44<br>
|
||||
<strong>E-Mail:</strong> kontakt@sterntours.de<br>
|
||||
<strong>Web:</strong> www.sterntours.de
|
||||
</td>
|
||||
<td>
|
||||
<strong>Bankverbindung:</strong><br>
|
||||
STERN TOURS<br>
|
||||
Hypo Vereinsbank<br>
|
||||
IBAN: DE83100208900018857111<br>
|
||||
BIC-/SWIFT-Code: HYVEDEMM488
|
||||
</td>
|
||||
<td>
|
||||
<strong>Öffnungszeiten:</strong><br>
|
||||
Mo-Do: 09.00-18.00 Uhr<br>
|
||||
FR: 09.00-16.00 Uhr<br><br>
|
||||
UStId: DE192609253<br>
|
||||
Registernr.: HRB 67111<br>
|
||||
Amtsgericht Charlottenburg<br>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,156 +1,6 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<title></title>
|
||||
@extends('pdf.layout')
|
||||
|
||||
{!! Html::style('css/invoice_fewo_pdf.css') !!}
|
||||
<style>
|
||||
@page {
|
||||
margin: 90mm 0 30mm 0;
|
||||
}
|
||||
|
||||
.font-weight-bold {
|
||||
font-weight: 600;
|
||||
}
|
||||
#logo_box {
|
||||
position: absolute;
|
||||
top:-80mm;
|
||||
left: 25mm;
|
||||
right: 25mm;
|
||||
height: 25mm;
|
||||
z-index: 1;
|
||||
font-size: 10pt;
|
||||
text-align: center;
|
||||
}
|
||||
#logo_box img {
|
||||
width: 65mm;
|
||||
}
|
||||
#address_box {
|
||||
position: absolute;
|
||||
top:-40mm;
|
||||
left: 25mm;
|
||||
width: 100mm;
|
||||
height: 45mm;
|
||||
z-index: 1;
|
||||
font-size: 11pt;
|
||||
|
||||
}
|
||||
#address_box #address_back{
|
||||
font-size: 7pt;
|
||||
text-decoration: underline;
|
||||
margin-bottom: 2mm;
|
||||
}
|
||||
|
||||
#date_box {
|
||||
position: absolute;
|
||||
top:-10mm;
|
||||
right: 15mm;
|
||||
width: 70mm;
|
||||
height: 10mm;
|
||||
z-index: 1;
|
||||
font-size: 10pt;
|
||||
line-height: 12pt;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
#title_box {
|
||||
position: absolute;
|
||||
top:0mm;
|
||||
left: 25mm;
|
||||
width: 160mm;
|
||||
height: 10mm;
|
||||
z-index: 2;
|
||||
font-weight: bold;
|
||||
|
||||
}
|
||||
#title_box .title {
|
||||
font-size: 16pt;
|
||||
line-height: 12pt;
|
||||
}
|
||||
#title_box .subtitle {
|
||||
font-size: 9pt;
|
||||
line-height: 9pt;
|
||||
}
|
||||
|
||||
#detail_box {
|
||||
position: absolute;
|
||||
top:15mm;
|
||||
left: 25mm;
|
||||
right: 15mm;
|
||||
z-index: 3;
|
||||
font-size: 9pt;
|
||||
}
|
||||
|
||||
|
||||
#detail_box table {
|
||||
width: 100%;
|
||||
line-height: 9pt;
|
||||
border-collapse: collapse;
|
||||
|
||||
}
|
||||
|
||||
#detail_box table td {
|
||||
border: 0.5pt solid #8c8c8c;
|
||||
padding: 1mm;
|
||||
|
||||
|
||||
}
|
||||
|
||||
#detail_box table td.left {
|
||||
text-align: right;
|
||||
width: 50mm;
|
||||
}
|
||||
|
||||
#detail_box table td.right {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
.singel-line-top {
|
||||
border-top: 1pt solid #1a1a18;
|
||||
}
|
||||
.double-line {
|
||||
border-bottom: 2.5pt double #1a1a18;
|
||||
}
|
||||
.dotted-line {
|
||||
border-bottom: 0.8pt dotted #1a1a18;
|
||||
}
|
||||
|
||||
#footer_box {
|
||||
position: absolute;
|
||||
bottom:-25mm;
|
||||
left: 25mm;
|
||||
right: 15mm;
|
||||
height: 30mm;
|
||||
z-index: 6;
|
||||
font-size: 7pt;
|
||||
line-height: 8pt;
|
||||
}
|
||||
|
||||
#footer_box table {
|
||||
margin-top: 2mm;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#footer_box table td {
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
{{--
|
||||
<div id="brand_paper_background">
|
||||
<img src="{{ base_path()}}/storage/app/pdf/inno-plan-bg.png" height="100%" width="100%">
|
||||
</div>
|
||||
--}}
|
||||
<div id="logo_box">
|
||||
<img src="{{asset('images/stern-tours-logo.png')}}">
|
||||
</div>
|
||||
@section('content')
|
||||
|
||||
<div id="address_box">
|
||||
<div id="address_back">STERN TOURS GmbH • Emser Str. 3 • 10719 Berlin</div>
|
||||
|
|
@ -161,47 +11,12 @@
|
|||
Berlin, den {!! date("d.m.Y") !!}
|
||||
</div>
|
||||
|
||||
<div id="title_box">
|
||||
Anreiseinfo Nr. {{$model->invoice_number}}
|
||||
</div>
|
||||
<div id="title_box">
|
||||
Anreiseinfo Nr. {{$model->invoice_number}}
|
||||
</div>
|
||||
|
||||
|
||||
<div id="detail_box">
|
||||
<p>{!! nl2br($travel_info_user_text) !!}</p>
|
||||
</div>
|
||||
|
||||
<div id="footer_box">
|
||||
<strong>P.S.: Wir empfehlen dringend, den Abschluss einer Reiserücktrittskostenversicherung.</strong>
|
||||
<table>
|
||||
<tr>
|
||||
<td style="width: 20%">
|
||||
<strong>STERN TOURS GmbH</strong><br>
|
||||
Emser Str. 3<br>
|
||||
10719 Berlin<br>
|
||||
</td>
|
||||
<td>
|
||||
<strong>Fon:</strong> 030 | 88 0 313 0<br>
|
||||
<strong>Fax:</strong> 030 | 88 0 313 44<br>
|
||||
<strong>E-Mail:</strong> kontakt@sterntours.de<br>
|
||||
<strong>Web:</strong> www.sterntours.de
|
||||
</td>
|
||||
<td>
|
||||
<strong>Bankverbindung:</strong><br>
|
||||
STERN TOURS<br>
|
||||
Hypo Vereinsbank<br>
|
||||
IBAN: DE83100208900018857111<br>
|
||||
BIC-/SWIFT-Code: HYVEDEMM488
|
||||
</td>
|
||||
<td>
|
||||
<strong>Öffnungszeiten:</strong><br>
|
||||
Mo-Do: 09.00-18.00 Uhr<br>
|
||||
FR: 09.00-16.00 Uhr<br><br>
|
||||
UStId: DE192609253<br>
|
||||
Registernr.: HRB 67111<br>
|
||||
Amtsgericht Charlottenburg<br>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@endsection
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-6">
|
||||
<label class="form-label" for="invoice_number">{{ __('Rechnungsnummer') }}</label>
|
||||
<label class="form-label" for="invoice_number">{{ __('Rechnungsnummer') }} (unique)</label>@if($travel_user_booking_fewo->isInvoice()) <em class="small">Rechnungsnummer ist PDF-Name der Mietbestätigung</em> @endif
|
||||
{{ Form::text('invoice_number', $travel_user_booking_fewo->invoice_number, array('placeholder'=>__('Rechnungsnummer'), 'class'=>'form-control')) }}
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
|
|
@ -68,6 +68,10 @@
|
|||
<label class="form-label" for="to_date">{{ __('Datum bis') }}*</label>
|
||||
{{ Form::text('to_date', $travel_user_booking_fewo->to_date, array('placeholder'=>__('Datum bis'), 'class'=>'form-control datepicker-base', 'required'=>true)) }}
|
||||
</div>
|
||||
<div class="col-sm-12">
|
||||
<em><small>Bei Datumsänderungen wird die Verfügbarkeit gerüft sowie die Berechnung der Preise neu ausgeführt.</small></em>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
|
|
@ -75,34 +79,50 @@
|
|||
@if(isset($travel_user_booking_fewo->daily_prices))
|
||||
@foreach($travel_user_booking_fewo->daily_prices as $s => $d)
|
||||
<div class="form-group col-sm-12">
|
||||
{{$s}} | {{$d['fromDay']}} - {{$d['toDay']}} | {{$d['numberDays']}} Tage x {{$d['perNight']}} € / pro Nacht | <strong>{{$d['price']}} € Gesamt</strong>
|
||||
{{$s}} | {{$d['fromDay']}} - {!! Carbon::parse($d['toDay'])->modify('+1 day')->format("d.m.Y") !!} | {{$d['numberDays']}} Nächte x {{$d['perNight']}} € / pro Nacht | <strong>{{$d['price']}} € Gesamt</strong>
|
||||
</div>
|
||||
@endforeach
|
||||
@endif
|
||||
<div class="form-group col-sm-4 col-md-2">
|
||||
<label class="form-label" for="price_travel">{{ __('Mitpreis alle Tage') }}</label>
|
||||
{{ Form::text('price_travel', $travel_user_booking_fewo->price_travel, array('placeholder'=>__('Preis Übernachtungen'), 'class'=>'form-control input-auto-calc')) }}
|
||||
<div class="form-group col-sm-4 col-md-4 col-lg-3">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<label class="form-label" for="price_travel">{{ __('Mietpreis alle Tage') }}</label>
|
||||
|
||||
{{ Form::text('price_travel', $travel_user_booking_fewo->price_travel, array('placeholder'=>__('Preis Übernachtungen'), 'class'=>'form-control input-auto-calc')) }}
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<label class="form-label" for="price_travel">{{ __('Mietp. zus. P.') }}</label>
|
||||
{{ Form::text('price_extra', $travel_user_booking_fewo->price_extra, array('placeholder'=>__('zusätzliche Personen'), 'class'=>'form-control input-auto-calc')) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-sm-4 col-md-2">
|
||||
<label class="form-label" for="price_service">{{ __('Preis Service-Gebühr') }}</label>
|
||||
|
||||
<div class="form-group col-sm-8 col-md-8 col-lg-3">
|
||||
<label class="form-label" for="price_balance">{{ __('Provisionsausgleich durch Vertriebskanal') }}</label>
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
{{ Form::text('price_balance', $travel_user_booking_fewo->price_balance, array('placeholder'=>__(' Provisionsausgleich durch Vertriebskanal'), 'class'=>'form-control input-auto-calc')) }}
|
||||
</div>
|
||||
<div class="col-6">
|
||||
{{ Form::text('price_travel_total', $travel_user_booking_fewo->price_travel_total, array('placeholder'=>__('Gesamt'), 'class'=>'form-control', 'readonly')) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-6 col-sm-4 col-md-4 col-lg-2">
|
||||
<label class="form-label" for="price_service">{{ __('Service-Gebühr') }}</label>
|
||||
{{ Form::text('price_service', $travel_user_booking_fewo->price_service, array('placeholder'=>__('Preis Service-Gebühr'), 'class'=>'form-control input-auto-calc')) }}
|
||||
</div>
|
||||
<div class="form-group col-sm-4 col-md-2">
|
||||
<label class="form-label" for="price_deposit">{{ __('Preis Kaution') }}</label>
|
||||
<div class="form-group col-6 col-sm-4 col-md-4 col-lg-2">
|
||||
<label class="form-label" for="price_deposit">{{ __('Kaution') }}</label>
|
||||
{{ Form::text('price_deposit', $travel_user_booking_fewo->price_deposit, array('placeholder'=>__('Preis Kaution'), 'class'=>'form-control input-auto-calc')) }}
|
||||
</div>
|
||||
|
||||
<div class="form-group col-sm-6 col-md-3">
|
||||
<label class="form-label" for="price_balance">{{ __('Provisionsausgleich durch Vertriebskanal') }}</label>
|
||||
{{ Form::text('price_balance', $travel_user_booking_fewo->price_balance, array('placeholder'=>__(' Provisionsausgleich durch Vertriebskanal'), 'class'=>'form-control input-auto-calc')) }}
|
||||
</div>
|
||||
|
||||
<div class="form-group col-sm-6 col-md-3">
|
||||
<div class="form-group col-sm-4 col-md-4 col-lg-2">
|
||||
<label class="form-label" for="price_total">{{ __('Preis Gesamt') }}*</label>
|
||||
{{ Form::text('price_total', $travel_user_booking_fewo->price_total, array('placeholder'=>__('Preis Gesamt'), 'class'=>'form-control')) }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
<div class="form-row">
|
||||
<div class="col-sm-12">
|
||||
|
|
@ -154,8 +174,6 @@
|
|||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-12">
|
||||
<label class="form-label" for="notice">{{ __('Bemerkung Kunde') }}</label>
|
||||
|
|
@ -169,9 +187,9 @@
|
|||
<div class="card mb-2">
|
||||
<div class="card-body">
|
||||
@if($travel_user_booking_fewo->isInvoice())
|
||||
<h4>Mietbestätigung / Rechnung
|
||||
<h4>Mietbestätigung / Rechnung <em style="font-size:60%">bei Preis-/Änderungen überschreiben</em>
|
||||
<div class="text-right float-right">
|
||||
<button type="submit" name="action" value="createInvoice" class="btn btn-primary btn-sm" onclick="return confirm('{{__('Rechnung überschreiben?')}}');">{{ __('Mietbestätigung / Rechnung PDF erstellen') }}</button>
|
||||
<button type="submit" name="action" value="createInvoice" class="btn btn-primary btn-sm" onclick="return confirm('{{__('Rechnung überschreiben?')}}');">{{ __('Mietbestätigung / Rechnung PDF überschreiben') }}</button>
|
||||
</div>
|
||||
</h4>
|
||||
<a class="btn btn-secondary btn-sm" target="_blank" href="{{$travel_user_booking_fewo->getInvoiceUrlFile()}}/file"><i class="fa fa-file-pdf"></i> Mietbestätigung / Rechnung: {{$travel_user_booking_fewo->getInvoiceFileName()}}</a>
|
||||
|
|
@ -197,26 +215,24 @@
|
|||
</table>
|
||||
@endif
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-12">
|
||||
<label class="form-label" for="send_mail_user_notice">{{ __('Wichtige Hinweise in E-Mail ') }}</label>
|
||||
{{ Form::textarea('send_mail_user_notice', '', ['class' => 'form-control autoExpand', 'rows'=>1]) }}
|
||||
<div class="form-group col-sm-12 mt-2">
|
||||
{{ Form::textarea('send_mail_user_notice', '', ['placeholder'=>'Wichtige Hinweise in E-Mail, werden nur in die aktuelle E-Mail übernommen', 'class' => 'form-control autoExpand', 'rows'=>1]) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-right mt-2">
|
||||
<button type="submit" name="action" value="sendMailtoUser" class="btn btn-primary btn-sm" onclick="return confirm('{{__('Mail an Mieter versenden?')}}');">{{ __('E-Mail mit Mietbestätigung / Rechnung und Mietbedingungen an Kunden versenden') }}</button>
|
||||
<div class="text-right mt-0">
|
||||
<button type="submit" name="action" value="sendMailtoUser" class="btn btn-primary btn-sm" onclick="return confirm('{{__('E-Mail Mietbestätigung an Mieter versenden?')}}');">{{ __('E-Mail mit Mietbestätigung / Rechnung und Mietbedingungen an Kunden versenden') }}</button>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if($travel_user_booking_fewo->isInvoice())
|
||||
|
||||
<div class="card mb-2">
|
||||
<div class="card-body">
|
||||
@if($travel_user_booking_fewo->isTravelInfo())
|
||||
<h4>Anreiseinfo
|
||||
<h4>Anreiseinfo <em style="font-size:60%">bei Änderungen überschreiben</em>
|
||||
<div class="text-right float-right">
|
||||
<button type="submit" name="action" value="createTravelInfo" class="btn btn-primary btn-sm" onclick="return confirm('{{__('Anreiseinfo überschreiben?')}}');">{{ __('Anreiseinfo speichern und PDF erstellen') }}</button>
|
||||
<button type="submit" name="action" value="createTravelInfo" class="btn btn-primary btn-sm" onclick="return confirm('{{__('Anreiseinfo überschreiben?')}}');">{{ __('Anreiseinfo speichern und PDF überschreiben') }}</button>
|
||||
</div>
|
||||
</h4>
|
||||
<p><a class="btn btn-secondary btn-sm" target="_blank" href="{{$travel_user_booking_fewo->getTravelInfoUrlFile()}}/file"><i class="fa fa-file-pdf"></i> {{$travel_user_booking_fewo->getTravelInfoFileName()}}</a>
|
||||
|
|
@ -236,6 +252,8 @@
|
|||
<div class="collapse mt-2" id="collapseTravelInfo">
|
||||
{{ Form::textarea('info_mail_text', $travel_user_booking_fewo->info_mail_text, ['class' => 'form-control autoExpand', 'rows'=>1, 'id'=>'travel_info_user_text']) }}
|
||||
<em>Grundtext in ADMIN CMS > <a href="{{route('cms_content')}}">Inhalte</a> > PDF Vorlage Anreiseinfo FeWo</em>
|
||||
<em class="small">(Änderungen werden hier gespeichert.)</em>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -253,7 +271,7 @@
|
|||
</table>
|
||||
@endif
|
||||
|
||||
<div class="text-right mt-2">
|
||||
<div class="text-right mt-0">
|
||||
<button type="submit" name="action" value="sendInfosMailtoUser" class="btn btn-primary btn-sm" onclick="return confirm('{{__('Mail an Mieter versenden?')}}');">{{ __('E-Mail mit Anreiseinfo an Kunden versenden') }}</button>
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -279,17 +297,18 @@
|
|||
</table>
|
||||
@endif
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6">
|
||||
<label class="form-label" for="send_mail_service_subject">{{ __('Betreff E-Mail ') }}</label>
|
||||
{{ Form::text('send_mail_service_subject', $travel_user_booking_fewo->getServiceMailSubject(), ['class' => 'form-control']) }}
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
<label class="form-label" for="send_mail_service_mail">{{ __('E-Mail Adresse Dienstleister') }}</label>
|
||||
{{ Form::text('send_mail_service_mail', 'langosch.birgit@web.de', array('class'=>'form-control')) }}
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
<label class="form-label" for="send_mail_service_subject">{{ __('Betreff E-Mail ') }}</label>
|
||||
{{ Form::text('send_mail_service_subject', $travel_user_booking_fewo->getServiceMailSubject(), ['class' => 'form-control']) }}
|
||||
</div>
|
||||
<div class="form-group col-md-12">
|
||||
<label class="form-label" for="send_mail_service_content">{{ __('Inhalt E-Mail ') }}</label>
|
||||
{{ Form::textarea('send_mail_service_content', $travel_user_booking_fewo->getServiceMailContent(), ['class' => 'form-control autoExpand', 'rows'=>1]) }}
|
||||
<em class="small">(Änderungen gelten nur für das senden der aktuellen E-Mail, werden nicht gespeichert.)</em>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-right mt-2">
|
||||
|
|
@ -299,8 +318,49 @@
|
|||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
|
||||
@if($travel_user_booking_fewo->id > 0)
|
||||
<div class="card mb-2">
|
||||
<div class="card-body">
|
||||
<h4>Mitarbeiter Mail</h4>
|
||||
@if($travel_user_booking_fewo->send_employee_mail)
|
||||
<table class="table table-striped border-bottom">
|
||||
<tbody>
|
||||
@foreach($travel_user_booking_fewo->send_employee_mail as $send_employee_mail)
|
||||
<tr>
|
||||
<td style="width: 25%"><strong>{!! $send_employee_mail['d'] !!}</strong><br>
|
||||
@if(is_array($send_employee_mail['m']))
|
||||
{!! implode(",", $send_employee_mail['m']) !!}
|
||||
@else
|
||||
{{$send_employee_mail['m']}}
|
||||
@endif</td>
|
||||
<td>{{$send_employee_mail['s']}}<br>
|
||||
<span class="small">{!! nl2br($send_employee_mail['c']) !!}</span></td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
@endif
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6">
|
||||
<label class="form-label" for="send_mail_employee_mail">{{ __('E-Mail Adresse Mitarbeiter') }}</label>
|
||||
{{ Form::text('send_mail_employee_mail', $send_mail_employee_mail, array('class'=>'form-control')) }}
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
<label class="form-label" for="send_mail_employee_subject">{{ __('Betreff E-Mail ') }}</label>
|
||||
{{ Form::text('send_mail_employee_subject', $travel_user_booking_fewo->getEmployeeMailSubject(), ['class' => 'form-control']) }}
|
||||
</div>
|
||||
<div class="form-group col-md-12">
|
||||
<label class="form-label" for="send_mail_employee_content">{{ __('Inhalt E-Mail ') }}</label>
|
||||
{{ Form::textarea('send_mail_employee_content', $travel_user_booking_fewo->getEmployeeMailContent(), ['class' => 'form-control autoExpand', 'rows'=>1]) }}
|
||||
<em class="small">(Änderungen gelten nur für das senden der aktuellen E-Mail, werden nicht gespeichert.)</em>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-right mt-2">
|
||||
<button type="submit" name="action" value="sendMailtoEmployee" class="btn btn-primary btn-sm" onclick="return confirm('{{__('Mail an Mitarbeiter versenden?')}}');">{{ __('E-Mail an Mitarbeiter versenden') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<script>
|
||||
function floatNumber(n) {
|
||||
|
|
@ -313,29 +373,53 @@
|
|||
function formatNumber(obj) {
|
||||
n = obj.val();
|
||||
n = n.replace(/\./g, '').replace(',', '.');
|
||||
if(isNaN(parseFloat(n))){
|
||||
obj.val(0);
|
||||
n = parseFloat(n).toFixed(2);
|
||||
console.log(n);
|
||||
if(isNaN(n)){
|
||||
return obj.val(0);
|
||||
}
|
||||
obj.val(parseFloat(n).toFixed(2).replace(".", ","));
|
||||
return obj.val(n.replace(".", ","));
|
||||
}
|
||||
|
||||
$( document ).ready(function() {
|
||||
|
||||
|
||||
@if($travel_user_booking_fewo->isInvoice())
|
||||
$("input[name='invoice_number']").on('focus', function () {
|
||||
if (!$(this).data('focused')) {
|
||||
$(this).data('focused', true);
|
||||
alert('Mietbestätigung/Anreiseinfo sind der Rechnungsnummer zugeordnet, bei Änderungen mussen die PDFs neu erstellt werden.');
|
||||
}
|
||||
});
|
||||
$("input[name='invoice_number']").on('onblur', function () {
|
||||
$(this).data('focused', false);
|
||||
});
|
||||
@endif
|
||||
|
||||
$('#collapseTravelInfo').on('shown.bs.collapse', function () {
|
||||
$('#travel_info_user_text').keyup();
|
||||
});
|
||||
$('input.input-auto-calc').on('change', function () {
|
||||
|
||||
formatNumber($("input[name='price_travel']"));
|
||||
formatNumber($("input[name='price_balance']"));
|
||||
formatNumber($("input[name='price_extra']"));
|
||||
formatNumber($("input[name='price_travel_total']"));
|
||||
formatNumber($("input[name='price_service']"));
|
||||
formatNumber($("input[name='price_deposit']"));
|
||||
formatNumber($("input[name='price_balance']"));
|
||||
|
||||
|
||||
price_travel = floatNumber($("input[name='price_travel']").val());
|
||||
price_balance =floatNumber($("input[name='price_balance']").val());
|
||||
price_extra =floatNumber($("input[name='price_extra']").val());
|
||||
price_service = floatNumber($("input[name='price_service']").val());
|
||||
price_deposit = floatNumber($("input[name='price_deposit']").val());
|
||||
price_balance =floatNumber($("input[name='price_balance']").val());
|
||||
price_total = parseFloat(price_travel + price_service + price_deposit + price_balance);
|
||||
|
||||
price_travel_total = parseFloat(price_travel + price_balance + price_extra);
|
||||
price_travel_total = parseFloat((Math.round(price_travel_total * 100) / 100)).toFixed(2).replace(".", ",");
|
||||
$("input[name='price_travel_total']").val(price_travel_total);
|
||||
|
||||
price_total = parseFloat(price_travel + price_balance + price_extra + price_service + price_deposit);
|
||||
price_total = parseFloat((Math.round(price_total * 100) / 100)).toFixed(2).replace(".", ",");
|
||||
$("input[name='price_total']").val(price_total);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -32,6 +32,48 @@
|
|||
|
||||
@include('travel.user.form')
|
||||
|
||||
<div class="card mb-2">
|
||||
<div class="card-body">
|
||||
<h4>FeWo Buchungen</h4>
|
||||
@if($travel_user->travel_user_booking_fewos)
|
||||
<div class="card-datatable table-responsive py-2">
|
||||
<table class="table table-striped border-bottom">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="max-width: 10px;"> </th>
|
||||
<th>{{__('ID')}}</th>
|
||||
<th>{{__('FeWo')}}</th>
|
||||
<th>{{__('vom')}}</th>
|
||||
<th>{{__('bis')}}</th>
|
||||
<th>{{__('Eingetragen')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('R.-Nr.')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($travel_user->travel_user_booking_fewos as $travel_user_booking_fewo)
|
||||
<tr>
|
||||
<td style="width:1%">
|
||||
<a href="{{route('travel_user_booking_fewo_detail', [$travel_user_booking_fewo->id])}}" class="btn icon-btn btn-sm btn-primary"><span class="far fa-edit"></span></a>
|
||||
</td>
|
||||
<td>{{ $travel_user_booking_fewo->id }}</td>
|
||||
<td>{{ $travel_user_booking_fewo->fewo_lodging->name }}</td>
|
||||
<td>{{ $travel_user_booking_fewo->from_date }}</td>
|
||||
<td>{{ $travel_user_booking_fewo->to_date }}</td>
|
||||
<td>{!! $travel_user_booking_fewo->getCheckedBadgeCalendar() !!}</td>
|
||||
<td>{{ $travel_user_booking_fewo->getStatuesName() }}</td>
|
||||
<td>{{ $travel_user_booking_fewo->booking_date }}</td>
|
||||
<td>{{ $travel_user_booking_fewo->invoice_number }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="text-left mt-3">
|
||||
<button type="submit" name="action" value="saveAll" class="btn btn-submit">{{ __('save changes') }}</button>
|
||||
<a href="{{route('travel_users')}}" class="btn btn-default">{{ __('back') }}</a>
|
||||
|
|
|
|||
|
|
@ -68,9 +68,6 @@
|
|||
|
||||
<hr>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-6">
|
||||
<label class="form-label" for="phone">{{ __('Phone') }}</label>
|
||||
|
|
@ -101,9 +98,5 @@
|
|||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -71,22 +71,21 @@ Route::group(['middleware' => ['auth']], function()
|
|||
$path = "";
|
||||
$filename = "";
|
||||
$headers = [];
|
||||
if ($class == 'invoices'){
|
||||
|
||||
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') {
|
||||
$headers = array('Content-Type: application/pdf',);
|
||||
$dir = $year."/";
|
||||
$filename = $file;
|
||||
if(Storage::disk('fewo_invoices')->exists( $dir.$filename )){
|
||||
$path = Storage::disk('fewo_invoices')->path($dir.$filename);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($class == 'infos'){
|
||||
if ($type == 'fewo') {
|
||||
$headers = array('Content-Type: application/pdf',);
|
||||
$dir = $year."/";
|
||||
$filename = $file;
|
||||
if(Storage::disk('fewo_infos')->exists( $dir.$filename )){
|
||||
$path = Storage::disk('fewo_infos')->path($dir.$filename);
|
||||
}
|
||||
|
|
@ -286,28 +285,26 @@ Route::group(['middleware' => ['superadmin']], function() {
|
|||
});
|
||||
|
||||
|
||||
|
||||
/*
|
||||
use App\Mail\MailResetPassword;
|
||||
|
||||
Route::get('/send_test_email', function(){
|
||||
try {
|
||||
//Mail::to('kevin.adametz@me.com')->send(new MailResetPassword('asdasd', Auth::user()));
|
||||
$mail_bbc = config('mail.mail_bbc');
|
||||
// Mail::to('info@adametz.media')->bcc(['k.adametz@kagado.de', 'kevin.adametz@me.com'])->send(new MailResetPassword('asdasd', Auth::user()));
|
||||
|
||||
Mail::raw('Sending emails with Mailgun and Laravel is easy!', function($message) {
|
||||
//Mail::to('kevin.adametz@me.com')->send(new MailResetPassword('asdasd', Auth::user()));
|
||||
|
||||
Mail::raw('Sending emails with Mailgun and Laravel is easy!', function($message) {
|
||||
$message->to('kevin.adametz@me.com', 'Kevin Adametz');
|
||||
$message->subject('testing Networktrips');
|
||||
});
|
||||
|
||||
|
||||
|
||||
} catch (\Exception $e) {
|
||||
dd($e->getMessage());
|
||||
}
|
||||
|
||||
|
||||
$fail = Mail::failures();
|
||||
dd($fail);
|
||||
|
||||
if(!empty($fail)) throw new \Exception('Could not send message to '.$fail[0]);
|
||||
|
||||
});
|
||||
*/
|
||||
|
||||
|
|
|
|||
BIN
storage/app/fewo/infos/2019/Anreiseinfo-12345.pdf
Normal file
BIN
storage/app/fewo/infos/2019/Anreiseinfo-12345.pdf
Normal file
Binary file not shown.
BIN
storage/app/fewo/infos/2019/Anreiseinfo-1243414.pdf
Normal file
BIN
storage/app/fewo/infos/2019/Anreiseinfo-1243414.pdf
Normal file
Binary file not shown.
BIN
storage/app/fewo/invoices/2019/12345.pdf
Normal file
BIN
storage/app/fewo/invoices/2019/12345.pdf
Normal file
Binary file not shown.
BIN
storage/app/fewo/invoices/2019/1243414.pdf
Normal file
BIN
storage/app/fewo/invoices/2019/1243414.pdf
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue