@@ -, +, @@ corrections --- koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc | 4 ++++ .../prog/en/modules/circ/circulation_batch_checkouts.tt | 6 +----- koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt | 8 ++------ koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc @@ -93,11 +93,15 @@ options['minDate'] = new Date().fp_incr(1); options['allowInvalidPreload'] = true; } + if( $(this).data("flatpickr-pastinclusive") === true ) { + options['maxDate'] = "today"; + } if( $(this).data("flatpickr-pastdate") === true ) { options['maxDate'] = new Date().fp_incr(-1); } if ( $(this).data('flatpickr-enable-time') === true ) { options['enableTime'] = true; + options['dateFormat'] = flatpickr_dateformat_string + " " + flatpickr_timeformat_string; } $(this).flatpickr(options); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt @@ -112,11 +112,7 @@
Due date: - [% IF Koha.Preference('SpecifyDueDate') %] - - [% ELSE %] - - [% END %] +
[% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -171,11 +171,7 @@ [% END %]
- [% IF Koha.Preference('SpecifyDueDate') %] - - [% ELSE %] - - [% END %] +
@@ -224,7 +220,7 @@
- +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -808,7 +808,7 @@
Specify return date [% INCLUDE 'date-format.inc' %]:
- +
[% IF ( return_date_override_remember ) %] --