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

(-)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 %] since [% itemLoo.waitingdate | $KohaDates %]</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 (-2 / +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
        }
522
- 

Return to bug 30992