From 8b2ec705c96722f2805f0f58668638563a216893 Mon Sep 17 00:00:00 2001 From: Kevin Adametz Date: Wed, 6 Feb 2019 15:11:58 +0100 Subject: [PATCH] 06 Feb --- trunk/app/Resources/views/admin.html.twig | 33 +- trunk/app/Resources/views/base.html.twig | 38 +- .../default/admin/fewoGroupImage.html.twig | 2 +- .../default/admin/lodgingGroupEdit.html.twig | 4 +- .../admin/lodgingsEditCalendar.html.twig | 5 +- .../components/booking/fewoSummary.html.twig | 54 +- .../components/departuresModal.html.twig | 6 +- .../views/default/components/header.html.twig | 6 +- .../default/components/home/slider.html.twig | 4 +- .../default/components/pageBox.html.twig | 2 +- .../default/components/sidebar.html.twig | 229 +++--- .../sidebar/navSidebarWidget.html.twig | 3 +- .../sidebar/pageSliderSidebarWidget.html.twig | 48 +- .../sidebar/textSliderSidebarWidget.html.twig | 28 +- .../email/components/bookingSummary.txt.twig | 2 +- .../components/fewoBookingSummary.txt.twig | 54 +- .../fewoBookingConfirmationEmail.txt.twig | 10 +- .../email/fewoBookingServiceEmail.txt.twig | 2 +- .../views/default/pages/booking.html.twig | 121 +-- .../pages/bookingConfirmation.html.twig | 173 +++- .../cms/calendarLodgingProgram.html.twig | 5 +- .../pages/cms/fewoTravelProgram.html.twig | 102 +-- .../views/default/pages/cms/ssSudan.html.twig | 2 - .../default/pages/cms/travelProgram.html.twig | 140 ++-- .../views/default/pages/fewoBooking.html.twig | 90 +-- trunk/app/config/config_dev.yml | 6 +- .../AppBundle/Controller/AdminController.php | 4 +- .../Controller/BookingController.php | 13 +- .../AppBundle/Controller/CmsController.php | 4 +- .../Controller/ComponentController.php | 4 + .../Controller/DefaultController.php | 41 +- .../Controller/FewoBookingController.php | 366 ++++++--- .../AppBundle/Entity/FewoBookingRequest.php | 26 +- trunk/src/AppBundle/Entity/FewoLodging.php | 40 +- .../Entity/FewoLodgingRepository.php | 16 + trunk/src/AppBundle/Entity/FewoSeason.php | 1 - trunk/src/AppBundle/Entity/PageRepository.php | 3 +- .../Entity/TravelPeriodRepository.php | 12 +- trunk/src/AppBundle/Entity/Traveler.php | 5 + .../Export/BookingSternToursCrmExporter.php | 2 +- .../FewoBookingSternToursCrmExporter.php | 42 +- .../Export/SternToursCrmExporter.php | 12 +- .../AppBundle/Form/FewoBookingRequestType.php | 29 +- trunk/src/AppBundle/Form/FewoLodgingType.php | 2 + .../Listener/KernelControllerListener.php | 9 + trunk/src/AppBundle/Resources/config.codekit3 | 170 +++- .../AppBundle/Resources/public/css/custom.css | 755 ++++++++++++++++-- .../public/css/daterangepicker-min.css | 1 + .../Resources/public/css/daterangepicker.css | 149 ++-- .../Resources/public/css/fewo-min.css | 1 + .../AppBundle/Resources/public/css/fewo.css | 102 +++ .../Resources/public/css/header-min.css | 2 +- .../AppBundle/Resources/public/css/header.css | 2 +- .../Resources/public/css/my-custom.less | 5 +- .../Resources/public/css/my-fewo.css | 617 ++++++++++++++ .../Resources/public/css/my-fewo.css.map | 1 + .../Resources/public/css/my-fewo.less | 4 + .../AppBundle/Resources/public/js/booking.js | 266 +++--- .../AppBundle/Resources/public/js/custom.js | 296 ++++--- .../Resources/public/js/fewoBooking-min.js | 11 + .../Resources/public/js/fewoBooking.js | 117 ++- .../Resources/public/js/travelProgram.js | 25 - .../min/daterangepicker-min.js | 8 + .../Service/LodgingCalendarService.php | 137 +++- trunk/src/AppBundle/Util/CalendarDayState.php | 36 +- .../FewoBookingRequestValidator.php | 5 +- trunk/web/android-chrome-192x192.png | Bin 0 -> 28693 bytes trunk/web/apple-touch-icon.png | Bin 0 -> 28317 bytes trunk/web/browserconfig.xml | 9 + trunk/web/css/header-min.css | 2 +- trunk/web/css/my-custom.css | 2 +- trunk/web/css/my-fewo.css | 1 + trunk/web/css/my-fewo.css.map | 1 + trunk/web/favicon-16x16.png | Bin 0 -> 1504 bytes trunk/web/favicon-32x32.png | Bin 0 -> 2527 bytes trunk/web/favicon.ico | Bin 6518 -> 12014 bytes trunk/web/js/custom-min.js | 33 +- trunk/web/js/fewoBooking-min.js | 11 + trunk/web/manifest.json | 49 -- trunk/web/mstile-150x150.png | Bin 0 -> 17526 bytes trunk/web/safari-pinned-tab.svg | 42 + trunk/web/site.webmanifest | 15 + trunk/web/travelsearch.php | 6 + 83 files changed, 3467 insertions(+), 1214 deletions(-) create mode 100644 trunk/src/AppBundle/Resources/public/css/daterangepicker-min.css create mode 100644 trunk/src/AppBundle/Resources/public/css/fewo-min.css create mode 100644 trunk/src/AppBundle/Resources/public/css/fewo.css create mode 100644 trunk/src/AppBundle/Resources/public/css/my-fewo.css create mode 100644 trunk/src/AppBundle/Resources/public/css/my-fewo.css.map create mode 100755 trunk/src/AppBundle/Resources/public/css/my-fewo.less create mode 100644 trunk/src/AppBundle/Resources/public/js/fewoBooking-min.js create mode 100644 trunk/src/AppBundle/Resources/public/vendor/daterangepicker/min/daterangepicker-min.js create mode 100644 trunk/web/android-chrome-192x192.png create mode 100644 trunk/web/apple-touch-icon.png create mode 100644 trunk/web/browserconfig.xml create mode 100644 trunk/web/css/my-fewo.css create mode 100644 trunk/web/css/my-fewo.css.map create mode 100644 trunk/web/favicon-16x16.png create mode 100644 trunk/web/favicon-32x32.png create mode 100644 trunk/web/js/fewoBooking-min.js delete mode 100644 trunk/web/manifest.json create mode 100644 trunk/web/mstile-150x150.png create mode 100644 trunk/web/safari-pinned-tab.svg create mode 100644 trunk/web/site.webmanifest diff --git a/trunk/app/Resources/views/admin.html.twig b/trunk/app/Resources/views/admin.html.twig index 494e9911..0188c587 100644 --- a/trunk/app/Resources/views/admin.html.twig +++ b/trunk/app/Resources/views/admin.html.twig @@ -20,20 +20,10 @@ + + {% block stylesheets %} - {% stylesheets - 'bundles/app/css/bootstrap-3.3.7.css' - filter='cssrewrite' - %} - - {% endstylesheets %} - {% stylesheets - 'bundles/app/css/custom.css' - filter='cssrewrite' - %} - - {% endstylesheets %} {% stylesheets 'bundles/app/css/daterangepicker.css' filter='cssrewrite' @@ -48,7 +38,10 @@ - + + + + @@ -116,19 +109,7 @@ {#TODO ausmisten und im gleichen zuge das CSS für den Datepicker einfügen#} {% block javascripts %} - {% javascripts - '@AppBundle/Resources/public/js/jquery-ui-1.12.1.js' - '@AppBundle/Resources/public/js/bootstrap-3.3.7.js' - '@AppBundle/Resources/public/js/jquery.prettyPhoto-3.1.6.js' - '@AppBundle/Resources/public/js/parallax.js' - '@AppBundle/Resources/public/js/owl.carousel-2.2.0.js' - '@AppBundle/Resources/public/js/bootstrap-select-1.12.0.js' - '@AppBundle/Resources/public/vendor/daterangepicker/moment.min.js' - '@AppBundle/Resources/public/vendor/daterangepicker/daterangepicker.js' - '@AppBundle/Resources/public/js/custom.js' - %} - - {% endjavascripts %} + {% endblock javascripts %} diff --git a/trunk/app/Resources/views/base.html.twig b/trunk/app/Resources/views/base.html.twig index 57bfa909..a6ef7778 100644 --- a/trunk/app/Resources/views/base.html.twig +++ b/trunk/app/Resources/views/base.html.twig @@ -34,24 +34,14 @@ {% endblock %} {% endblock %} - - - - - - - - - - - - - - - - - - + + + + + + + + {% block canonical_tag %} {% if canonical_url is not defined and page is defined %} @@ -110,7 +100,7 @@ {% block header2 %}
-
+
@@ -133,7 +123,7 @@ {# #TODO additional section classes if not home #}
-
+
@@ -157,7 +147,7 @@ offers_sidebar_widget_block: block('offers_sidebar_widget') ?? null, feedbacks_sidebar_widget_block: block('feedbacks_sidebar_widget') ?? null, } %} -
+
{% block body %}{% endblock %}
@@ -170,8 +160,12 @@ {% include 'default/components/footer.html.twig' %} -
+ + + + +
{% embed 'default/components/embed/modal.html.twig' with {id: 'default'} %}{% endembed %} diff --git a/trunk/app/Resources/views/default/admin/fewoGroupImage.html.twig b/trunk/app/Resources/views/default/admin/fewoGroupImage.html.twig index 3731473d..89650f56 100644 --- a/trunk/app/Resources/views/default/admin/fewoGroupImage.html.twig +++ b/trunk/app/Resources/views/default/admin/fewoGroupImage.html.twig @@ -15,7 +15,7 @@ {{ form_row(form.file, {label: 'Bild'}) }} {% else %}
- {{ image.description }} + {{ image.description }}
{% endif %} {{ form_row(form.fileName, {label: 'Name'}) }} diff --git a/trunk/app/Resources/views/default/admin/lodgingGroupEdit.html.twig b/trunk/app/Resources/views/default/admin/lodgingGroupEdit.html.twig index 97d01267..fa337174 100644 --- a/trunk/app/Resources/views/default/admin/lodgingGroupEdit.html.twig +++ b/trunk/app/Resources/views/default/admin/lodgingGroupEdit.html.twig @@ -35,7 +35,7 @@ {% for image in lodgingGroup.images %} {% if image.comp == 'pre' %} - {{ image.description }} + {{ image.description }} {{ image.pos }} {{ image.fileName }} {{ image.description }} @@ -85,7 +85,7 @@ {% for image in lodgingGroup.images %} {% if image.comp == 'post' %} - {{ image.description }} + {{ image.description }} {{ image.pos }} {{ image.fileName }} {{ image.description }} diff --git a/trunk/app/Resources/views/default/admin/lodgingsEditCalendar.html.twig b/trunk/app/Resources/views/default/admin/lodgingsEditCalendar.html.twig index d26f857d..152c7057 100644 --- a/trunk/app/Resources/views/default/admin/lodgingsEditCalendar.html.twig +++ b/trunk/app/Resources/views/default/admin/lodgingsEditCalendar.html.twig @@ -6,6 +6,7 @@
{% endif %} +
@@ -66,8 +67,10 @@
- {% if counter%2 == 0 %} + {% if counter%2 == 0 or calendar|length ==counter %}
{% endif %} + + {% endfor %} 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 7ce20e5b..ddbb2994 100644 --- a/trunk/app/Resources/views/default/components/booking/fewoSummary.html.twig +++ b/trunk/app/Resources/views/default/components/booking/fewoSummary.html.twig @@ -1,16 +1,54 @@ +{% if(isPossible) %} + + + + + {% for season, values in priceResult.season %} + + + + + + + + + + + + + + + + + + + + {% endfor %}
- + {{ total_price_per_night|number_format(2) }} € + Datum: - ({{ fewo_booking_request.numberDays }} {{ fewo_booking_request.numberDays < 2 ? 'Nacht' : 'Nächte' }} x {{ fewo_price.perNight|number_format(2) }} €) + {{ fewo_booking_request.fromDate|date }} - {{ fewo_booking_request.toDate|date }}
+ Saison: + + {{ season }} +
+ Mindestbelegung: + + {{ values.minimumStay }} {{ values.minimumStay < 2 ? 'Nacht' : 'Nächte' }} +
+ + {{ values.price|number_format(2) }} € + + {{ values.numberDays }} {{ values.numberDays < 2 ? 'Nacht' : 'Nächte' }} x {{ values.perNight|number_format(2) }} € +
- + {{ fewo_price.flatPrice|number_format(2) }} € + + {{ priceResult.flatPrice|number_format(2) }} € Service-Gebühr @@ -18,7 +56,7 @@
- + {{ fewo_lodging.deposit|number_format(2) }} € + + {{ priceResult.deposit|number_format(2) }} € Kaution @@ -26,9 +64,15 @@
- = {{ total_price|number_format(2) }} € + = {{ priceResult.total_price|number_format(2) }} € Gesamtpreis der Reise
+{% else %} + + Leider ist der gewünschter Zeitraum ist nicht buchbar.
+ Bitte ändern Sie das Datum, rote Felder sind bereits gebucht. + +{% endif %} \ No newline at end of file diff --git a/trunk/app/Resources/views/default/components/departuresModal.html.twig b/trunk/app/Resources/views/default/components/departuresModal.html.twig index 59953d0a..773dc25d 100644 --- a/trunk/app/Resources/views/default/components/departuresModal.html.twig +++ b/trunk/app/Resources/views/default/components/departuresModal.html.twig @@ -20,13 +20,14 @@ {# @var departure \AppBundle\Entity\TravelDeparturePoint #} - {% if departure.flightTime[startWeekday] is defined %} + {% if departure.flightTime is defined %} + {% if departure.flightTime.startWeekday is defined %} {% if departure.flightTime[startWeekday] != "" %} {% endif %} {% endif %}

{{ departure.name }}

- {% if departure.flightTime[startWeekday] is defined %} + {% if departure.flightTime.startWeekday is defined %}
{% for flightTime in departure.flightTime[startWeekday]|split('\n') %} {% if flightTime != "" %} @@ -35,6 +36,7 @@ {% endfor %}
{% endif %} + {% endif %} {{ departure.extraCharge|number_format(2) }} € diff --git a/trunk/app/Resources/views/default/components/header.html.twig b/trunk/app/Resources/views/default/components/header.html.twig index d647981a..bb5ec7ae 100644 --- a/trunk/app/Resources/views/default/components/header.html.twig +++ b/trunk/app/Resources/views/default/components/header.html.twig @@ -1,6 +1,6 @@
-
+
  • Mo-Fr: 09:00 - 22:00 | Sa: 10:00 - 22:00 | So: 11:00 - 22:00 Uhr
    • @@ -19,7 +19,7 @@
-
+