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

(-)a/C4/Reserves.pm (-1 / +1 lines)
Lines 372-378 sub GetReservesFromItemnumber { Link Here
372
    my $query = "
372
    my $query = "
373
    SELECT reservedate,borrowernumber,branchcode,reserve_id,waitingdate
373
    SELECT reservedate,borrowernumber,branchcode,reserve_id,waitingdate
374
    FROM   reserves
374
    FROM   reserves
375
    WHERE  itemnumber=? AND ( reservedate <= CURRENT_DATE() OR
375
    WHERE  itemnumber=? AND ( reservedate <= CAST(now() AS date) OR
376
           waitingdate IS NOT NULL )
376
           waitingdate IS NOT NULL )
377
    ORDER BY priority
377
    ORDER BY priority
378
    ";
378
    ";
(-)a/catalogue/detail.pl (-1 / +1 lines)
Lines 249-255 foreach my $item (@items) { Link Here
249
        $item->{ExpectedAtLibrary}      = $branches->{$expectedAt}{branchname};
249
        $item->{ExpectedAtLibrary}      = $branches->{$expectedAt}{branchname};
250
        $item->{Reservedcardnumber}             = $ItemBorrowerReserveInfo->{'cardnumber'};
250
        $item->{Reservedcardnumber}             = $ItemBorrowerReserveInfo->{'cardnumber'};
251
        # Check waiting status
251
        # Check waiting status
252
        $item->{waitingdate} = format_date($wait) if $wait;
252
        $item->{waitingdate} = $wait;
253
    }
253
    }
254
254
255
255
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 / +2 lines)
Lines 1-5 Link Here
1
[% USE KohaDates %]
1
[% USE KohaDates %]
2
[% USE AuthorisedValues %]
2
[% USE AuthorisedValues %]
3
[% USE KohaDates %]
3
4
4
[% ShowCourseReserves = 0 %]
5
[% ShowCourseReserves = 0 %]
5
[% IF UseCourseReserves %]
6
[% IF UseCourseReserves %]
Lines 634-640 function verify_images() { Link Here
634
                            [% END %]
635
                            [% END %]
635
                            [% item.ExpectedAtLibrary %]
636
                            [% item.ExpectedAtLibrary %]
636
                            [% IF ( item.waitingdate ) %]
637
                            [% IF ( item.waitingdate ) %]
637
                                since [% item.waitingdate %]
638
                                since [% item.waitingdate | $KohaDates %]
638
                            [% ELSE %]
639
                            [% ELSE %]
639
                                [% IF ( item.reservedate ) %]
640
                                [% IF ( item.reservedate ) %]
640
                                    (placed [% item.reservedate %])
641
                                    (placed [% item.reservedate %])
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-1 / +1 lines)
Lines 456-462 function checkMultiHold() { Link Here
456
                    [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
456
                    [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
457
                    [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedForBorrowernumber %]">[% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemloo.ExpectedAtLibrary %]
457
                    [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedForBorrowernumber %]">[% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemloo.ExpectedAtLibrary %]
458
                    since
458
                    since
459
                    [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber %]&amp;CancelBorrowerNumber=[% itemloo.ReservedForBorrowernumber %]&amp;CancelItemnumber=[% itemloo.itemnumber %]"  onclick="if (window.confirm('Are you sure you want to delete this hold?')) {return true;} else {return false;}">Cancel hold</a>
459
                    [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber %]&amp;CancelBorrowerNumber=[% itemloo.ReservedForBorrowernumber %]&amp;CancelItemnumber=[% itemloo.itemnumber %]"  onclick="if (window.confirm('Are you sure you want to delete this hold?')) {return true;} else {return false;}">Cancel hold</a>
460
460
461
                    [% END %]
461
                    [% END %]
462
            [% ELSE %]
462
            [% ELSE %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt (-1 / +2 lines)
Lines 1-4 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaDates %]
2
[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog &rsaquo;  Placing a hold
3
[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog &rsaquo;  Placing a hold
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'calendar.inc' %]
5
[% INCLUDE 'calendar.inc' %]
Lines 529-535 Link Here
529
                                  <span class="waiting">[% IF ( itemLoo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %] for patron
530
                                  <span class="waiting">[% IF ( itemLoo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %] for patron
530
                                    [% IF ( itemLoo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemLoo.ExpectedAtLibrary %]
531
                                    [% IF ( itemLoo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemLoo.ExpectedAtLibrary %]
531
                                    since
532
                                    since
532
                                    [% IF ( itemLoo.waitingdate ) %][% itemLoo.waitingdate %][% ELSE %][% IF ( itemLoo.reservedate ) %][% itemLoo.reservedate %][% END %][% END %].
533
                                    [% IF ( itemLoo.waitingdate ) %][% itemLoo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemLoo.reservedate ) %][% itemLoo.reservedate %][% END %][% END %].
533
                                  </span>
534
                                  </span>
534
                                [% ELSE %]
535
                                [% ELSE %]
535
                                  <span class="notonhold">Not on hold</span>
536
                                  <span class="notonhold">Not on hold</span>
(-)a/opac/opac-reserve.pl (-1 / +1 lines)
Lines 447-453 foreach my $biblioNum (@biblionumbers) { Link Here
447
            $itemLoopIter->{ReservedForFirstname}      = $ItemBorrowerReserveInfo->{'firstname'};
447
            $itemLoopIter->{ReservedForFirstname}      = $ItemBorrowerReserveInfo->{'firstname'};
448
            $itemLoopIter->{ExpectedAtLibrary}         = $expectedAt;
448
            $itemLoopIter->{ExpectedAtLibrary}         = $expectedAt;
449
            #waiting status
449
            #waiting status
450
            $itemLoopIter->{waitingdate} = format_date($wait) if $wait;
450
            $itemLoopIter->{waitingdate} = $wait;
451
        }
451
        }
452
452
453
        $itemLoopIter->{notforloan} = $itemInfo->{notforloan};
453
        $itemLoopIter->{notforloan} = $itemInfo->{notforloan};
(-)a/reserve/request.pl (-2 / +1 lines)
Lines 338-344 foreach my $biblionumber (@biblionumbers) { Link Here
338
                $item->{ReservedForSurname}     = $ItemBorrowerReserveInfo->{'surname'};
338
                $item->{ReservedForSurname}     = $ItemBorrowerReserveInfo->{'surname'};
339
                $item->{ReservedForFirstname}     = $ItemBorrowerReserveInfo->{'firstname'};
339
                $item->{ReservedForFirstname}     = $ItemBorrowerReserveInfo->{'firstname'};
340
                $item->{ExpectedAtLibrary}     = $branches->{$expectedAt}{branchname};
340
                $item->{ExpectedAtLibrary}     = $branches->{$expectedAt}{branchname};
341
                $item->{waitingdate} = format_date($wait) if $wait;
341
                $item->{waitingdate} = $wait;
342
            }
342
            }
343
343
344
            # Management of the notforloan document
344
            # Management of the notforloan document
345
- 

Return to bug 9788