From 4e71ddabec880029714fa42f944a7e8b971de974 Mon Sep 17 00:00:00 2001 From: Kevin Adametz Date: Sat, 25 Dec 2021 03:11:08 +0100 Subject: [PATCH] 12.21 --- app/Resources/views/base.html.twig | 19 ++- .../views/default/components/header.html.twig | 50 ++++++ .../pages/cms/fewoTravelProgram.html.twig | 52 +++++-- .../default/pages/cms/iqTravelGuide.html.twig | 2 +- .../views/default/pages/fewoBooking.html.twig | 3 +- src/AppBundle/Controller/CmsController.php | 1 + .../Controller/ComponentController.php | 47 +++++- src/AppBundle/Entity/Page.php | 11 +- .../Entity/TravelPeriodRepository.php | 34 +++-- src/AppBundle/Entity/TravelProgram.php | 83 +++++++--- .../Export/ContactSternToursCrmExporter.php | 8 +- .../Listener/KernelControllerListener.php | 2 - .../Resources/public/css/new_header.css | 41 ++++- .../Resources/public/js/fewoBooking.js | 3 +- web/css/my-custom-blessed1.css | 21 ++- web/css/my-custom.css | 29 +--- web/js/fewoBooking.js | 143 ++++++++++++++++++ 17 files changed, 448 insertions(+), 101 deletions(-) create mode 100644 web/js/fewoBooking.js diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index e2d8ca77..c9b8d728 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -90,7 +90,11 @@
- {{ render(controller('AppBundle:Component:header')) }} + {% if page is defined %} + {{ render(controller('AppBundle:Component:header', {'page': page})) }} + {% else %} + {{ render(controller('AppBundle:Component:header', {'page': null})) }} + {% endif %} {% block header2 %}
@@ -119,7 +123,6 @@
- {% block breadcrumb %} {% if page is defined %} {{ render(controller('AppBundle:Component:breadcrumb', {'page': page})) }} @@ -170,6 +173,18 @@ {% block javascripts %} + + + {% endblock javascripts %} diff --git a/app/Resources/views/default/components/header.html.twig b/app/Resources/views/default/components/header.html.twig index 48d6003c..7d049414 100644 --- a/app/Resources/views/default/components/header.html.twig +++ b/app/Resources/views/default/components/header.html.twig @@ -19,6 +19,56 @@ {% endif %} @@ -139,7 +144,7 @@
{% endif %} -
+
{# ********* AUSSTATTUNG ********* @@ -149,14 +154,14 @@
{{ fewo_lodging.equipment|raw }}
-
+
{# ********* TERMINE UND PREISE ********* #} -
-

Saisons

+
+

Saisons Preise

{% if fewo_lodging.prices is not empty %} @@ -182,14 +187,20 @@ - + {# {{ price.season.fromDate|date }} - + #} + + {{ price.season.fromDate|date }} + - + {# {{ price.season.toDate|date }} - + #} + + {{ price.season.toDate|date }} + {{ price.season.minimumStay }} {{ price.season.minimumStay < 2 ? 'Nacht' : 'Nächte' }} @@ -214,14 +225,23 @@ Momentan sind für dieses Programm keine Termine verfügbar. {% endif %}
+
-

Buchung

- -

Bitte klicken Sie einen Anreisetermin (grüne Zahl), um zur Buchungsmaske zu gelagen.

- +
+

Kalender Buchen

+ +
Bitte klicken Sie im Kalender auf einen freien Buchungstag (grün), um zum Buchungsformular zu gelagen.
+
{% include 'default/pages/cms/calendarLodgingProgram.html.twig' %} - -
+
diff --git a/app/Resources/views/default/pages/cms/iqTravelGuide.html.twig b/app/Resources/views/default/pages/cms/iqTravelGuide.html.twig index dd8e6d16..6680f082 100644 --- a/app/Resources/views/default/pages/cms/iqTravelGuide.html.twig +++ b/app/Resources/views/default/pages/cms/iqTravelGuide.html.twig @@ -4,7 +4,7 @@
{% if(api is defined) %}
- {% if(api.nodes_active.image.url is defined) %} + {% if(api.nodes_active.image.url is defined and api.nodes_active.image.url != "") %}
diff --git a/app/Resources/views/default/pages/fewoBooking.html.twig b/app/Resources/views/default/pages/fewoBooking.html.twig index 41ad3612..d30ef2b1 100644 --- a/app/Resources/views/default/pages/fewoBooking.html.twig +++ b/app/Resources/views/default/pages/fewoBooking.html.twig @@ -61,7 +61,7 @@ --> - +
{{ form_widget(form.fromDate) }} @@ -69,6 +69,7 @@ {{ form_widget(form.toDate) }}
+
Bei Datumsänderung, erst immer das Anreisedatum, dann das Abreisedatum im Kalender auswählen.