From 346a7427a512674c93ba0d65fce660ad3a8580fb Mon Sep 17 00:00:00 2001 From: Kevin Adametz Date: Wed, 8 May 2019 14:05:35 +0200 Subject: [PATCH] Fewo Mail MA, optimation Fewo, view User Fewos --- .env | 6 +- .idea/dictionaries/kevinadametz.xml | 7 + .idea/workspace.xml | 709 ++++++++---------- app/Http/Controllers/API/FewoController.php | 20 +- .../TravelUserBookingFewoController.php | 34 +- app/Http/Controllers/TravelUserController.php | 2 - app/Models/FewoLodging.php | 1 + app/Models/TravelUserBookingFewo.php | 129 +++- .../TravelUserBookingFewoRepository.php | 10 +- config/mail.php | 6 +- ...03_20_132556_create_fewo_lodging_table.php | 1 + ...create_travel_user_booking_fewos_table.php | 7 +- public/css/application.css | 4 +- public/css/incoice_fewo_pdf.css | 32 - public/css/stern_fewo_pdf.css | 166 ++++ resources/lang/de/validation.php | 1 + resources/views/emails/content.blade.php | 4 +- resources/views/emails/invoice.blade.php | 10 +- resources/views/home.blade.php | 14 +- resources/views/pdf/invoice_fewo.blade.php | 215 +----- resources/views/pdf/layout.blade.php | 49 ++ .../views/pdf/travel_info_fewo.blade.php | 197 +---- .../views/travel/user/booking/form.blade.php | 168 +++-- resources/views/travel/user/detail.blade.php | 42 ++ resources/views/travel/user/form.blade.php | 7 - routes/web.php | 37 +- .../app/fewo/infos/2019/Anreiseinfo-12345.pdf | Bin 0 -> 9605 bytes .../fewo/infos/2019/Anreiseinfo-1243414.pdf | Bin 0 -> 9604 bytes storage/app/fewo/invoices/2019/12345.pdf | Bin 0 -> 10828 bytes storage/app/fewo/invoices/2019/1243414.pdf | Bin 0 -> 10836 bytes 30 files changed, 915 insertions(+), 963 deletions(-) create mode 100644 .idea/dictionaries/kevinadametz.xml delete mode 100644 public/css/incoice_fewo_pdf.css create mode 100644 public/css/stern_fewo_pdf.css create mode 100644 resources/views/pdf/layout.blade.php create mode 100644 storage/app/fewo/infos/2019/Anreiseinfo-12345.pdf create mode 100644 storage/app/fewo/infos/2019/Anreiseinfo-1243414.pdf create mode 100644 storage/app/fewo/invoices/2019/12345.pdf create mode 100644 storage/app/fewo/invoices/2019/1243414.pdf diff --git a/.env b/.env index b3b80ff..fcd44b8 100755 --- a/.env +++ b/.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 diff --git a/.idea/dictionaries/kevinadametz.xml b/.idea/dictionaries/kevinadametz.xml new file mode 100644 index 0000000..2e2ffb3 --- /dev/null +++ b/.idea/dictionaries/kevinadametz.xml @@ -0,0 +1,7 @@ + + + + fewo + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 86b7a8e..3ff4e92 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,41 +2,32 @@ - - - - - - + + + + - - + + - - + - - - - - - - + + + + + - - - + - - + - @@ -84,69 +75,10 @@