View | Details | Raw Unified | Return to bug 36175
Collapse All | Expand All

(-)a/circ/circulation.pl (-1 / +1 lines)
Lines 422-428 if (@$barcodes) { Link Here
422
                $template_params->{getBarcodeMessageIteminfo} = $item->barcode;
422
                $template_params->{getBarcodeMessageIteminfo} = $item->barcode;
423
                $template_params->{NEEDSCONFIRMATION} = 1;
423
                $template_params->{NEEDSCONFIRMATION} = 1;
424
                $confirm_required = 1;
424
                $confirm_required = 1;
425
                if ( $needsconfirmation eq 'BOOKED_TO_ANOTHER' ) {
425
                if ( $needsconfirmation_key eq 'BOOKED_TO_ANOTHER' ) {
426
                    my $reduceddue =
426
                    my $reduceddue =
427
                        dt_from_string( $$needsconfirmation{$needsconfirmation_key}->start_date )->subtract( days => 1 );
427
                        dt_from_string( $$needsconfirmation{$needsconfirmation_key}->start_date )->subtract( days => 1 );
428
                    $template_params->{reduceddue} = $reduceddue;
428
                    $template_params->{reduceddue} = $reduceddue;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc (+4 lines)
Lines 181-186 Link Here
181
            options['dateFormat'] = "Y-m-d H:i";
181
            options['dateFormat'] = "Y-m-d H:i";
182
            options['altFormat'] = flatpickr_dateformat_string + " " + flatpickr_timeformat_string;
182
            options['altFormat'] = flatpickr_dateformat_string + " " + flatpickr_timeformat_string;
183
        }
183
        }
184
        let maxDate = $(input).data("flatpickr-maxdate");
185
        if( typeof maxDate !== 'undefined' ) {
186
            options['maxDate'] = new Date(maxDate);
187
        }
184
188
185
        let fp = $(input).flatpickr(options);
189
        let fp = $(input).flatpickr(options);
186
190
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-3 / +2 lines)
Lines 344-350 Link Here
344
                                    [% IF ( INVALID_DATE ) %]
344
                                    [% IF ( INVALID_DATE ) %]
345
                                        <p>
345
                                        <p>
346
                                          <input type="text" size="20" id="duedatespec" name="duedatespec" value="[% duedatespec | html %]" class="flatpickr" data-flatpickr-enable-time="true" data-flatpickr-on-close-focus="#barcode" />
346
                                          <input type="text" size="20" id="duedatespec" name="duedatespec" value="[% duedatespec | html %]" class="flatpickr" data-flatpickr-enable-time="true" data-flatpickr-on-close-focus="#barcode" />
347
                                            <label for="duedatespec">Due date</label>
347
                                          <label for="duedatespec">Due date</label>
348
                                        </p>
348
                                        </p>
349
                                    [% ELSE %]
349
                                    [% ELSE %]
350
                                        <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
350
                                        <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
Lines 353-359 Link Here
353
                                    [% IF ( BOOKED_TO_ANOTHER ) %]
353
                                    [% IF ( BOOKED_TO_ANOTHER ) %]
354
                                        <p>
354
                                        <p>
355
                                            <label for="reduceddue">Reducing due date to: <label>
355
                                            <label for="reduceddue">Reducing due date to: <label>
356
                                            <input type="text" size="20" id="reudceddue" name="reduceddue" value="[% reduceddue | $KohaDates with_hours => 1 %]" readonly="readonly">
356
                                            <input type="text" size="20" id="reduceddue" name="reduceddue" value="[% reduceddue | html %]" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-maxdate="[% reduceddue | html %]" required="required">
357
                                        </p>
357
                                        </p>
358
                                    [% END %]
358
                                    [% END %]
359
359
360
- 

Return to bug 36175