From f2be8e54b4112c4588bef043dd88368dd4de8dfa Mon Sep 17 00:00:00 2001 From: Kevin Adametz Date: Thu, 7 Nov 2019 17:09:18 +0100 Subject: [PATCH] Rabatt export, optimize --- trunk/app/Resources/views/base.html.twig | 6 +- .../default/components/embed/modal.html.twig | 5 + .../navSidebarApiWidgetInner.html.twig | 64 +++++++++++++ .../sidebar/navSidebarWidget.html.twig | 4 + .../sidebar/searchSidebarWidget.html.twig | 6 +- .../email/bookingConfirmationEmail.txt.twig | 6 +- .../email/components/bookingSummary.txt.twig | 2 +- .../components/fewoBookingSummary.txt.twig | 2 +- .../views/default/pages/booking.html.twig | 11 ++- .../pages/bookingConfirmation.html.twig | 2 +- .../default/pages/cms/iqTravelGuide.html.twig | 96 +++++++++++++++++++ .../views/default/pages/fewoBooking.html.twig | 2 +- .../pages/fewoBookingConfirmation.html.twig | 2 +- .../default/pages/iq/travelGuide.html.twig | 94 ++++++++++++++++++ .../Controller/BookingController.php | 16 +++- .../AppBundle/Controller/CmsController.php | 24 ++++- .../Controller/ComponentController.php | 34 ++++++- trunk/src/AppBundle/Entity/TravelCountry.php | 95 ++++++++++++++++++ .../Export/BookingSternToursCrmExporter.php | 19 +++- .../Listener/KernelControllerListener.php | 36 +++++-- .../src/AppBundle/Service/KeywordService.php | 22 ++++- trunk/src/AppBundle/Twig/AppExtension.php | 3 +- trunk/src/AppBundle/Util.php | 35 +++++++ 23 files changed, 552 insertions(+), 34 deletions(-) create mode 100644 trunk/app/Resources/views/default/components/sidebar/navSidebarApiWidgetInner.html.twig create mode 100644 trunk/app/Resources/views/default/pages/cms/iqTravelGuide.html.twig create mode 100644 trunk/app/Resources/views/default/pages/iq/travelGuide.html.twig diff --git a/trunk/app/Resources/views/base.html.twig b/trunk/app/Resources/views/base.html.twig index c5cb1b16..41d2c741 100644 --- a/trunk/app/Resources/views/base.html.twig +++ b/trunk/app/Resources/views/base.html.twig @@ -147,9 +147,11 @@ {% if site_loading is defined and page is defined %} {{ render(controller('AppBundle:Component:makeSidebarWidget', {'site_loading': site_loading, 'page': page})) }} + {% elseif site_loading is defined and api is defined %} + {{ render(controller('AppBundle:Component:makeSidebarWidget', {'site_loading': site_loading, 'page': null, 'api': api})) }} {% else %} - {% if site_loading is defined %} - {{ render(controller('AppBundle:Component:makeSidebarWidget', {'site_loading': site_loading, 'page': null, 'search_form': search_form})) }} + {% if site_loading is defined and search_form is defined %} + {{ render(controller('AppBundle:Component:makeSidebarWidget', {'site_loading': site_loading, 'page': null, 'api': null, 'search_form': search_form})) }} {% else %} {{ render(controller('AppBundle:Component:makeSidebarWidget', {'site_loading': 'default'})) }} {% endif %} diff --git a/trunk/app/Resources/views/default/components/embed/modal.html.twig b/trunk/app/Resources/views/default/components/embed/modal.html.twig index 5d5b5dba..49c2972d 100644 --- a/trunk/app/Resources/views/default/components/embed/modal.html.twig +++ b/trunk/app/Resources/views/default/components/embed/modal.html.twig @@ -1,3 +1,8 @@ +