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

(-)a/circ/circulation.pl (-5 / +8 lines)
Lines 104-109 if (!C4::Auth::haspermission( C4::Context->userenv->{id} , { circulate => 'force Link Here
104
    $force_allow_issue = 0;
104
    $force_allow_issue = 0;
105
}
105
}
106
106
107
my $onsite_checkout = $query->param('onsite_checkout');
108
107
my @failedrenews = $query->param('failedrenew');    # expected to be itemnumbers
109
my @failedrenews = $query->param('failedrenew');    # expected to be itemnumbers
108
our %renew_failed = ();
110
our %renew_failed = ();
109
for (@failedrenews) { $renew_failed{$_} = 1; }
111
for (@failedrenews) { $renew_failed{$_} = 1; }
Lines 158-164 else { Link Here
158
my ($datedue,$invalidduedate);
160
my ($datedue,$invalidduedate);
159
161
160
my $duedatespec_allow = C4::Context->preference('SpecifyDueDate');
162
my $duedatespec_allow = C4::Context->preference('SpecifyDueDate');
161
if($duedatespec_allow){
163
if( $onsite_checkout ) {
164
    $datedue = output_pref({ dt => dt_from_string, dateonly => 1, dateformat => 'iso' });
165
    $datedue .= ' 23:59:00';
166
} elsif( $duedatespec_allow ) {
162
    if ($duedatespec) {
167
    if ($duedatespec) {
163
        if ($duedatespec =~ C4::Dates->regexp('syspref')) {
168
        if ($duedatespec =~ C4::Dates->regexp('syspref')) {
164
                $datedue = dt_from_string($duedatespec);
169
                $datedue = dt_from_string($duedatespec);
Lines 336-342 if ($barcode) { Link Here
336
        }
341
        }
337
    }
342
    }
338
343
339
    unless( $query->param('onsite_checkout') and C4::Context->preference("OnSiteCheckoutsForce") ) {
344
    unless( $onsite_checkout and C4::Context->preference("OnSiteCheckoutsForce") ) {
340
        delete $question->{'DEBT'} if ($debt_confirmed);
345
        delete $question->{'DEBT'} if ($debt_confirmed);
341
        foreach my $impossible ( keys %$error ) {
346
        foreach my $impossible ( keys %$error ) {
342
            $template->param(
347
            $template->param(
Lines 361-373 if ($barcode) { Link Here
361
                    getTitleMessageIteminfo => $getmessageiteminfo->{'title'},
366
                    getTitleMessageIteminfo => $getmessageiteminfo->{'title'},
362
                    getBarcodeMessageIteminfo => $getmessageiteminfo->{'barcode'},
367
                    getBarcodeMessageIteminfo => $getmessageiteminfo->{'barcode'},
363
                    NEEDSCONFIRMATION  => 1,
368
                    NEEDSCONFIRMATION  => 1,
364
                    onsite_checkout => $query->param('onsite_checkout'),
369
                    onsite_checkout => $onsite_checkout,
365
                );
370
                );
366
                $confirm_required = 1;
371
                $confirm_required = 1;
367
            }
372
            }
368
        }
373
        }
369
        unless($confirm_required) {
374
        unless($confirm_required) {
370
            my $onsite_checkout = $query->param('onsite_checkout');
371
            AddIssue( $borrower, $barcode, $datedue, $cancelreserve, undef, undef, { onsite_checkout => $onsite_checkout, auto_renew => $session->param('auto_renew') } );
375
            AddIssue( $borrower, $barcode, $datedue, $cancelreserve, undef, undef, { onsite_checkout => $onsite_checkout, auto_renew => $session->param('auto_renew') } );
372
            $session->clear('auto_renew');
376
            $session->clear('auto_renew');
373
            $inprocess = 1;
377
            $inprocess = 1;
374
- 

Return to bug 13255