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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-10 / +16 lines)
Lines 801-819 Link Here
801
                                                        [% IF ( itemloo.nocancel ) %]
801
                                                        [% IF ( itemloo.nocancel ) %]
802
                                                                <span>Can't be cancelled when item is in transit</span>
802
                                                                <span>Can't be cancelled when item is in transit</span>
803
                                                        [% ELSE %]
803
                                                        [% ELSE %]
804
                                                            [% IF ( itemloo.waitingdate ) %]<span>Waiting</span>[% ELSE %]<span>On hold</span>[% END %]
805
                                                            [% IF ( itemloo.canreservefromotherbranches ) %]
806
                                                                <span>for</span> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedFor.borrowernumber | uri %]">[% itemloo.ReservedFor.firstname | html %] [% itemloo.ReservedFor.surname | html %]</a>
807
                                                            [% END %]
808
                                                            [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %]
809
                                                            [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] <span>since</span>
810
                                                            [% IF ( itemloo.waitingdate ) %]
804
                                                            [% IF ( itemloo.waitingdate ) %]
811
                                                                [% itemloo.waitingdate | $KohaDates %]
805
                                                                [% IF ( itemloo.canreservefromotherbranches ) %]
806
                                                                    <span>Waiting for [% INCLUDE 'patron-title.inc' patron=itemloo.ReservedFor %] at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since [% itemloo.waitingdate | $KohaDates %]</span>
807
                                                                [% ELSE %]
808
                                                                    <span>Waiting at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since [% itemloo.waitingdate | $KohaDates %]</span>
809
                                                                [% END %]
812
                                                            [% ELSE %]
810
                                                            [% ELSE %]
813
                                                                [% IF ( itemloo.reservedate ) %]
811
                                                                [% IF ( itemloo.canreservefromotherbranches ) %]
814
                                                                    [% itemloo.reservedate | html %]
812
                                                                    [% IF itemloo.reservedate %]
813
                                                                        <span>On hold for [% INCLUDE 'patron-title.inc' patron=itemloo.ReservedFor %] expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since</span>
814
                                                                    [% ELSE %]
815
                                                                        <span>On hold expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %]</span>
816
                                                                    [% END %]
817
                                                                [% ELSIF itemloo.reservedate %]
818
                                                                    <span>On hold expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since [% itemloo.reservedate | $KohaDates %]</span>
819
                                                                [% ELSE %]
820
                                                                    <span>On hold expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %]</span>
815
                                                                [% END %]
821
                                                                [% END %]
816
                                                            [% END %].
822
                                                            [% END %]
817
                                                            <a class="info cancel-hold" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber | html %]&amp;CancelBorrowerNumber=[% itemloo.ReservedFor.borrowernumber | html %]&amp;CancelItemnumber=[% itemloo.itemnumber | html %]">Cancel hold</a>
823
                                                            <a class="info cancel-hold" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber | html %]&amp;CancelBorrowerNumber=[% itemloo.ReservedFor.borrowernumber | html %]&amp;CancelItemnumber=[% itemloo.itemnumber | html %]">Cancel hold</a>
818
                                                        [% END # /IF itemloo.nocancel %]
824
                                                        [% END # /IF itemloo.nocancel %]
819
                                                    [% ELSE %]
825
                                                    [% ELSE %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (-16 / +4 lines)
Lines 438-461 Link Here
438
                                                                [% IF ( itemLoo.reservedate ) %]
438
                                                                [% IF ( itemLoo.reservedate ) %]
439
                                                                    <span class="waiting">
439
                                                                    <span class="waiting">
440
                                                                        [% IF ( itemLoo.waitingdate ) %]
440
                                                                        [% IF ( itemLoo.waitingdate ) %]
441
                                                                            <span>Waiting</span>
441
                                                                            <span>Waiting for patron at [% itemLoo.ExpectedAtLibrary | html %] since [% itemLoo.waitingdate | $KohaDates %]</span>
442
                                                                        [% ELSIF ( itemLoo.reservedate ) %]
443
                                                                            <span>On hold for patron expected at [% itemLoo.ExpectedAtLibrary | html %] since [% itemLoo.reservedate | $KohaDates %]</span>
442
                                                                        [% ELSE %]
444
                                                                        [% ELSE %]
443
                                                                            <span>On hold</span>
445
                                                                            <span>On hold for patron expected at [% itemLoo.ExpectedAtLibrary | html %]</span>
444
                                                                        [% END %]
446
                                                                        [% END %]
445
                                                                            <span>for patron</span>
446
                                                                        [% IF ( itemLoo.waitingdate ) %]
447
                                                                            <span>at</span>
448
                                                                        [% ELSE %]
449
                                                                            <span>expected at</span>
450
                                                                        [% END %]
451
                                                                        [% itemLoo.ExpectedAtLibrary | html %] <span>since</span>
452
                                                                        [% IF ( itemLoo.waitingdate ) %]
453
                                                                            [% itemLoo.waitingdate | $KohaDates %]
454
                                                                        [% ELSE %]
455
                                                                            [% IF ( itemLoo.reservedate ) %]
456
                                                                                [% itemLoo.reservedate | html %]
457
                                                                            [% END %]
458
                                                                        [% END %].
459
                                                                    </span>
447
                                                                    </span>
460
                                                                [% ELSE %]
448
                                                                [% ELSE %]
461
                                                                    <span class="notonhold">Not on hold</span>
449
                                                                    <span class="notonhold">Not on hold</span>
(-)a/opac/opac-reserve.pl (-1 / +1 lines)
Lines 515-521 foreach my $biblioNum (@biblionumbers) { Link Here
515
515
516
        if ( my $first_hold = $holds->next ) {
516
        if ( my $first_hold = $holds->next ) {
517
            $itemLoopIter->{backgroundcolor} = 'reserved';
517
            $itemLoopIter->{backgroundcolor} = 'reserved';
518
            $itemLoopIter->{reservedate}     = output_pref({ dt => dt_from_string($first_hold->reservedate), dateonly => 1 }); # FIXME Should be formatted in the template
518
            $itemLoopIter->{reservedate}     = $first_hold->reservedate,
519
            $itemLoopIter->{ExpectedAtLibrary}         = $first_hold->branchcode;
519
            $itemLoopIter->{ExpectedAtLibrary}         = $first_hold->branchcode;
520
            $itemLoopIter->{waitingdate} = $first_hold->waitingdate;
520
            $itemLoopIter->{waitingdate} = $first_hold->waitingdate;
521
        }
521
        }
(-)a/reserve/request.pl (-2 / +1 lines)
Lines 431-437 if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) Link Here
431
                    my $p = Koha::Patrons->find( $first_hold->borrowernumber );
431
                    my $p = Koha::Patrons->find( $first_hold->borrowernumber );
432
432
433
                    $item->{backgroundcolor} = 'reserved';
433
                    $item->{backgroundcolor} = 'reserved';
434
                    $item->{reservedate}     = output_pref({ dt => dt_from_string( $first_hold->reservedate ), dateonly => 1 }); # FIXME Should be formatted in the template
434
                    $item->{reservedate}     = $first_hold->reservedate;
435
                    $item->{ReservedFor}     = $p;
435
                    $item->{ReservedFor}     = $p;
436
                    $item->{ExpectedAtLibrary}     = $first_hold->branchcode;
436
                    $item->{ExpectedAtLibrary}     = $first_hold->branchcode;
437
                    $item->{waitingdate} = $first_hold->waitingdate;
437
                    $item->{waitingdate} = $first_hold->waitingdate;
438
- 

Return to bug 30992