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

(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-1 / +15 lines)
Lines 416-421 function LoadIssuesTable() { Link Here
416
416
417
                            span_style = "display: none";
417
                            span_style = "display: none";
418
                            span_class = "renewals-allowed";
418
                            span_class = "renewals-allowed";
419
420
                            if (oObj.on_reserve) {
421
                                msg +=
422
                                    "<span style='display: block;'>" +
423
                                    "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" +
424
                                    oObj.biblionumber +
425
                                    "'>" +
426
                                    __("On hold") +
427
                                    "</a>" +
428
                                    "</span>";
429
                            }
419
                        } else if (oObj.can_renew_error == "too_soon") {
430
                        } else if (oObj.can_renew_error == "too_soon") {
420
                            msg +=
431
                            msg +=
421
                                "<span class='renewals-disabled'>" +
432
                                "<span class='renewals-disabled'>" +
Lines 564-570 function LoadIssuesTable() { Link Here
564
                                __("Recalled") +
575
                                __("Recalled") +
565
                                "</a>"
576
                                "</a>"
566
                            );
577
                            );
567
                        } else if (oObj.can_renew_error == "on_reserve") {
578
                        } else if (
579
                            oObj.can_renew_error == "on_reserve" ||
580
                            oObj.on_reserve
581
                        ) {
568
                            return (
582
                            return (
569
                                "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" +
583
                                "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" +
570
                                oObj.biblionumber +
584
                                oObj.biblionumber +
(-)a/svc/checkouts (-2 / +10 lines)
Lines 158-165 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
158
    my ($charge) = GetIssuingCharges( $c->{itemnumber}, $c->{borrowernumber} );
158
    my ($charge) = GetIssuingCharges( $c->{itemnumber}, $c->{borrowernumber} );
159
    my $fine = GetFine( $c->{itemnumber}, $c->{borrowernumber} );
159
    my $fine = GetFine( $c->{itemnumber}, $c->{borrowernumber} );
160
160
161
    my $item; # Will be fetched only if needed
161
    my $checkout_obj = Koha::Checkouts->find( $c->{issue_id} );
162
    my $checkout_obj = Koha::Checkouts->find( $c->{issue_id} );
162
    my ( $can_renew, $can_renew_error, $info ) = CanBookBeRenewed( $checkout_obj->patron, $checkout_obj );
163
    my ( $can_renew, $can_renew_error, $info ) = CanBookBeRenewed( $checkout_obj->patron, $checkout_obj );
164
    my $on_reserve;
165
    if ( $can_renew_error eq 'overdue' ) {
166
        $item ||= $checkout_obj->item;
167
        # Set on_reserve if overdued (see C4::Circulation::CanBookBeRenewed)
168
        $on_reserve = 1
169
            if $item->current_holds( { skip_future_holds => 1 } )->search( { non_priority => 0 } )->count;
170
    }
163
    my $can_renew_date = $can_renew_error && $can_renew_error eq 'too_soon'
171
    my $can_renew_date = $can_renew_error && $can_renew_error eq 'too_soon'
164
        ? output_pref(
172
        ? output_pref(
165
        {
173
        {
Lines 219-225 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
219
227
220
    my $recalled = 0;
228
    my $recalled = 0;
221
    if ( C4::Context->preference('UseRecalls') ) {
229
    if ( C4::Context->preference('UseRecalls') ) {
222
        my $item   = Koha::Items->find( $c->{itemnumber} );
230
        $item ||= $checkout_obj->item;
223
        my $recall = undef;
231
        my $recall = undef;
224
        $recall = $item->check_recalls if $item->can_be_waiting_recall;
232
        $recall = $item->check_recalls if $item->can_be_waiting_recall;
225
        if ( defined $recall ) {
233
        if ( defined $recall ) {
Lines 308-313 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
308
        },
316
        },
309
        issued_today => !$c->{not_issued_today},
317
        issued_today => !$c->{not_issued_today},
310
        recalled     => $recalled,
318
        recalled     => $recalled,
319
        on_reserve   => $on_reserve,
311
    };
320
    };
312
321
313
    if ( $c->{not_issued_today} ) {
322
    if ( $c->{not_issued_today} ) {
314
- 

Return to bug 41017