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 @@
-
@@ -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 @@
- {{ 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 @@
|
- |