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

(-)a/circ/circulation.pl (-4 / +1 lines)
Lines 200-209 $template->param( auto_renew => $session->param('auto_renew') ); Link Here
200
my ($datedue,$invalidduedate);
200
my ($datedue,$invalidduedate);
201
201
202
my $duedatespec_allow = C4::Context->preference('SpecifyDueDate');
202
my $duedatespec_allow = C4::Context->preference('SpecifyDueDate');
203
if( $onsite_checkout && !$duedatespec_allow ) {
203
if( $duedatespec_allow ) {
204
    $datedue = output_pref({ dt => dt_from_string, dateonly => 1, dateformat => 'iso' });
205
    $datedue .= ' 23:59:00';
206
} elsif( $duedatespec_allow ) {
207
    if ( $duedatespec ) {
204
    if ( $duedatespec ) {
208
        $datedue = eval { dt_from_string( $duedatespec ) };
205
        $datedue = eval { dt_from_string( $duedatespec ) };
209
        if (! $datedue ) {
206
        if (! $datedue ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-27 lines)
Lines 1079-1106 Link Here
1079
1079
1080
        [% UNLESS ( patron.borrowernumber ) %][% UNLESS ( borrowers ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]
1080
        [% UNLESS ( patron.borrowernumber ) %][% UNLESS ( borrowers ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]
1081
1081
1082
        // On-site checkout
1083
        function toggle_onsite_checkout(){
1084
            if ( $("#onsite_checkout").prop('checked') ) {
1085
                $("#duedatespec").val("[% todaysdate | $KohaDates  with_hours => 1 %]")
1086
                [% IF !Koha.Preference('SpecifyDueDate') %]
1087
                    $("#duedatespec").datetimepicker('destroy');
1088
                [% END %]
1089
            } else {
1090
                $("#duedatespec").datetimepicker({
1091
                    onClose: function(dateText, inst) {
1092
                        if (validate_date(dateText, inst) ) {
1093
                            $("#barcode").focus();
1094
                        }
1095
                    },
1096
                    hour: 23,
1097
                    minute: 59
1098
                }).on("change", function(e, value) {
1099
                    if ( ! is_valid_date( $(this).val() ) ) {$(this).val("");}
1100
                });
1101
            }
1102
        }
1103
1104
        function Dopop(link) {
1082
        function Dopop(link) {
1105
            var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
1083
            var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
1106
        }
1084
        }
Lines 1129-1138 Link Here
1129
                    }
1107
                    }
1130
                });
1108
                });
1131
            [% END %]
1109
            [% END %]
1132
            toggle_onsite_checkout();
1133
            $("#onsite_checkout").click(function(){
1134
                toggle_onsite_checkout();
1135
            });
1136
1110
1137
            [% IF HIGHHOLDS %]
1111
            [% IF HIGHHOLDS %]
1138
                [% IF !override_high_holds %]
1112
                [% IF !override_high_holds %]
1139
- 

Return to bug 24101