From 8c514bbd4d6fc65541bcda119dda75e0a42718d4 Mon Sep 17 00:00:00 2001 From: Kevin Adametz Date: Thu, 28 Mar 2019 14:54:10 +0100 Subject: [PATCH] Fewo Booking Booking via API in CRM v3 --- .../default/admin/lodgingsEdit.html.twig | 2 + .../components/booking/fewoSummary.html.twig | 2 +- .../components/booking/insurance.html.twig | 18 +- .../components/booking/summary.html.twig | 10 +- .../views/default/components/footer.html.twig | 4 +- .../views/default/components/header.html.twig | 7 +- .../sidebar/aboutSternToursWidget.html.twig | 4 +- .../email/components/bookingSummary.txt.twig | 4 + .../components/fewoBookingSummary.txt.twig | 5 +- .../email/contactServiceEmail.txt.twig | 2 +- .../views/default/pages/booking.html.twig | 73 +- .../cms/calendarLodgingProgram.html.twig | 8 +- .../views/default/pages/fewoBooking.html.twig | 24 +- .../pages/fewoBookingConfirmation.html.twig | 6 +- trunk/app/config/services.yml | 1 + .../AppBundle/Controller/AdminController.php | 5 + .../Controller/BookingController.php | 13 +- .../Controller/FewoBookingController.php | 19 +- trunk/src/AppBundle/Entity/CMSContent.php | 253 + .../AppBundle/Entity/CMSContentRepository.php | 25 + .../AppBundle/Entity/FewoBookingRequest.php | 44 +- trunk/src/AppBundle/Entity/FewoLodging.php | 64 + .../AppBundle/Entity/TravelInsurancePrice.php | 63 + .../Export/ContactSternToursCrmExporter.php | 4 +- .../FewoBookingSternToursCrmExporter.php | 141 +- .../Export/SternToursCrmExporter.php | 14 +- .../src/AppBundle/Form/ContactRequestType.php | 2 +- .../AppBundle/Form/FewoBookingRequestType.php | 70 +- trunk/src/AppBundle/Form/FewoLodgingType.php | 6 + .../Listener/KernelControllerListener.php | 2 +- trunk/src/AppBundle/Resources/config.codekit3 | 17950 +--------------- .../Resources/public/css/booking.css | 18 + .../AppBundle/Resources/public/js/custom.js | 9 +- trunk/src/AppBundle/Twig/AppExtension.php | 31 +- trunk/src/AppBundle/Util.php | 3 +- .../FewoBookingRequestValidator.php | 2 +- trunk/web/css/my-custom.css | 2 +- trunk/web/js/custom-min.js | 2 +- 38 files changed, 868 insertions(+), 18044 deletions(-) create mode 100644 trunk/src/AppBundle/Entity/CMSContent.php create mode 100644 trunk/src/AppBundle/Entity/CMSContentRepository.php diff --git a/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig b/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig index fda20976..67945e13 100644 --- a/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig +++ b/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig @@ -260,6 +260,8 @@ {{ form_row(form.zipCode, {'label': 'PLZ'}) }} {{ form_row(form.city, {'label': 'Ort'}) }} {{ form_row(form.maximumPersons, {'label': 'Maximale Personenanzahl'}) }} + {{ form_row(form.maximumAdults, {'label': 'Maximale Erwachsene'}) }} + {{ form_row(form.maximumChilds, {'label': 'Maximale Kinder'}) }} {{ form_row(form.deposit, {'label': 'Kaution'}) }} {# diff --git a/trunk/app/Resources/views/default/components/booking/fewoSummary.html.twig b/trunk/app/Resources/views/default/components/booking/fewoSummary.html.twig index ddbb2994..092f38fe 100644 --- a/trunk/app/Resources/views/default/components/booking/fewoSummary.html.twig +++ b/trunk/app/Resources/views/default/components/booking/fewoSummary.html.twig @@ -66,7 +66,7 @@ = {{ priceResult.total_price|number_format(2) }} € - Gesamtpreis der Reise + Miete inkl. Kaution diff --git a/trunk/app/Resources/views/default/components/booking/insurance.html.twig b/trunk/app/Resources/views/default/components/booking/insurance.html.twig index 26f10a49..8bc389d9 100644 --- a/trunk/app/Resources/views/default/components/booking/insurance.html.twig +++ b/trunk/app/Resources/views/default/components/booking/insurance.html.twig @@ -11,7 +11,7 @@ @@ -49,16 +49,19 @@ {% block body %}

Leistungen & Preisliste

-