From 81e42b76f59d85f26df90b114c61c58b868b5152 Mon Sep 17 00:00:00 2001 From: Kevin Adametz Date: Wed, 25 Jan 2023 12:43:22 +0100 Subject: [PATCH] New DateRangePicker --- .../default/admin/reservationsEdit.html.twig | 41 +++-- .../default/admin/reservationsNew.html.twig | 38 +++-- .../views/default/pages/booking.html.twig | 7 +- .../views/default/pages/fewoBooking.html.twig | 10 +- app/config/config.yml | 1 + app/config/parameters.yml | 9 +- src/AppBundle/Entity/TravelProgram.php | 32 ++++ .../Resources/public/config.codekit3 | 17 +- .../Resources/public/js/fewoBooking.js | 56 +++--- web/js/_fewoBooking-script-min.js | 103 +++++++++++ web/js/fewoBooking-min.js | 12 +- web/js/fewoBooking-script-min.js | 160 ++++++++++++++++++ 12 files changed, 398 insertions(+), 88 deletions(-) create mode 100644 web/js/_fewoBooking-script-min.js create mode 100644 web/js/fewoBooking-script-min.js diff --git a/app/Resources/views/default/admin/reservationsEdit.html.twig b/app/Resources/views/default/admin/reservationsEdit.html.twig index b311f1f6..1b522567 100644 --- a/app/Resources/views/default/admin/reservationsEdit.html.twig +++ b/app/Resources/views/default/admin/reservationsEdit.html.twig @@ -19,10 +19,13 @@
-
- {{ form_widget(form.fromDate) }} - bis - {{ form_widget(form.toDate) }} + +
@@ -108,14 +111,15 @@ var maxDate = "{{ lastSeason.toDate|date('d-m-y') }}"; - $('#appbundle_feworeservation_fromDate, #appbundle_feworeservation_toDate').daterangepicker({ + + + + $('#fewo_booking_request_datepicker').daterangepicker({ isInvalidDate: checkDates, isCustomDate: checkCustom, "minDate": moment(), "maxDate": maxDate, "timePickerSeconds": true, - - "locale": { "format": "DD.MM.YYYY", "separator": " - ", @@ -151,35 +155,40 @@ "firstDay": 1 }, autoApply: true, - autoUpdateInput: false, + autoUpdateInput: true, + singleDatePicker: false, + alwaysShowCalendars: true, "startDate": startDate, "endDate": endDate, + allowInput: true, }, function(start, end, label) { - console.log(start); - // console.log("New date range selected: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD') + ' (predefined range: ' + label + ')"); + + // console.log('New date range selected: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD') + ' (predefined range: ' + label + ')'); // Lets update the fields manually this event fires on selection of range var selectedStartDate = start.format('DD.MM.YYYY'); // selected start var selectedEndDate = end.format('DD.MM.YYYY'); // selected end - + $checkinInput = $('#appbundle_feworeservation_fromDate'); - $checkoutInput = $('#appbundle_feworeservation_toDate'); - + $checkoutInput = $('#appbundle_feworeservation_toDate'); + // Updating Fields with selected dates $checkinInput.val(selectedStartDate); $checkoutInput.val(selectedEndDate); - + + /* // Setting the Selection of dates on calender on CHECKOUT FIELD (To get this it must be binded by Ids not Calss) var checkOutPicker = $checkoutInput.data('daterangepicker'); checkOutPicker.setStartDate(selectedStartDate); checkOutPicker.setEndDate(selectedEndDate); - + // Setting the Selection of dates on calender on CHECKIN FIELD (To get this it must be binded by Ids not Calss) var checkInPicker = $checkinInput.data('daterangepicker'); checkInPicker.setStartDate(selectedStartDate); checkInPicker.setEndDate(selectedEndDate); - + */ }); + $('#appbundle_feworeservation_fromDate, #appbundle_feworeservation_toDate').on('show.daterangepicker', function(ev, picker) { console.log(picker.startDate.format('YYYY-MM-DD')); console.log(picker.endDate.format('YYYY-MM-DD')); diff --git a/app/Resources/views/default/admin/reservationsNew.html.twig b/app/Resources/views/default/admin/reservationsNew.html.twig index d4084eaa..0571e94e 100644 --- a/app/Resources/views/default/admin/reservationsNew.html.twig +++ b/app/Resources/views/default/admin/reservationsNew.html.twig @@ -19,10 +19,14 @@
-
- {{ form_widget(form.fromDate) }} - bis - {{ form_widget(form.toDate) }} + + +
@@ -103,14 +107,12 @@ var maxDate = "{{ lastSeason.toDate|date('d-m-y') }}"; - $('#appbundle_feworeservation_fromDate, #appbundle_feworeservation_toDate').daterangepicker({ + $('#fewo_booking_request_datepicker').daterangepicker({ isInvalidDate: checkDates, isCustomDate: checkCustom, "minDate": moment(), "maxDate": maxDate, "timePickerSeconds": true, - - "locale": { "format": "DD.MM.YYYY", "separator": " - ", @@ -146,33 +148,37 @@ "firstDay": 1 }, autoApply: true, - autoUpdateInput: false, + autoUpdateInput: true, + singleDatePicker: false, + alwaysShowCalendars: true, "startDate": startDate, "endDate": endDate, + allowInput: true, }, function(start, end, label) { - console.log(start); - // console.log("New date range selected: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD') + ' (predefined range: ' + label + ')"); + + // console.log('New date range selected: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD') + ' (predefined range: ' + label + ')'); // Lets update the fields manually this event fires on selection of range var selectedStartDate = start.format('DD.MM.YYYY'); // selected start var selectedEndDate = end.format('DD.MM.YYYY'); // selected end - + $checkinInput = $('#appbundle_feworeservation_fromDate'); - $checkoutInput = $('#appbundle_feworeservation_toDate'); - + $checkoutInput = $('#appbundle_feworeservation_toDate'); + // Updating Fields with selected dates $checkinInput.val(selectedStartDate); $checkoutInput.val(selectedEndDate); - + + /* // Setting the Selection of dates on calender on CHECKOUT FIELD (To get this it must be binded by Ids not Calss) var checkOutPicker = $checkoutInput.data('daterangepicker'); checkOutPicker.setStartDate(selectedStartDate); checkOutPicker.setEndDate(selectedEndDate); - + // Setting the Selection of dates on calender on CHECKIN FIELD (To get this it must be binded by Ids not Calss) var checkInPicker = $checkinInput.data('daterangepicker'); checkInPicker.setStartDate(selectedStartDate); checkInPicker.setEndDate(selectedEndDate); - + */ }); $('#appbundle_feworeservation_fromDate, #appbundle_feworeservation_toDate').on('show.daterangepicker', function(ev, picker) { diff --git a/app/Resources/views/default/pages/booking.html.twig b/app/Resources/views/default/pages/booking.html.twig index f804604e..2c101e4b 100644 --- a/app/Resources/views/default/pages/booking.html.twig +++ b/app/Resources/views/default/pages/booking.html.twig @@ -284,9 +284,10 @@

- {{ getContextBySlug('gewuenschte-zahlungsart') }} - {% if(travel_program.category.id != 1) %} - {{ getContextBySlug('abweichende-anzahlungsbedingungen') }} + {% if(travel_program.paymentConditions != "") %} + {{ travel_program.paymentConditions|raw }} + {% else %} + {{ getContextBySlug('anzahlungsbedingungen') }} {% endif %}

diff --git a/app/Resources/views/default/pages/fewoBooking.html.twig b/app/Resources/views/default/pages/fewoBooking.html.twig index d30ef2b1..1a173752 100644 --- a/app/Resources/views/default/pages/fewoBooking.html.twig +++ b/app/Resources/views/default/pages/fewoBooking.html.twig @@ -62,14 +62,20 @@ -
+
+
+ +
+
+ -
Bei Datumsänderung, erst immer das Anreisedatum, dann das Abreisedatum im Kalender auswählen.
+ +
Bei Datumsänderung, immer erst das Anreisedatum, dann das Abreisedatum im Kalender auswählen.