@@ -, +, @@ --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt | 4 ++++ koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++-- opac/opac-detail.pl | 4 ++++ opac/opac-user.pl | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt @@ -146,6 +146,10 @@ + [% ELSE %] + +
No recalls have been made.
+ [% END %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc +++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc @@ -38,7 +38,7 @@ Checked out [% END %] [% END %] - [% IF loggedinusername %]Recall[% END %] + [% IF item.avail_for_recall %]Recall[% END %] [% END %] [% IF NOT ( item.isa('Koha::Item') ) AND item.transfertwhen %] [%# transfertwhen is set in C4::Search, do not have it for course reserves %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -240,11 +240,11 @@ Using this account is not recommended because some parts of Koha will not functi [% ISSUE.title |html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield %][% END %] [% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron %][% END %] - [% IF ( ISSUE.recalled ) %]This item has been recalled. Please return by the new due date.[% END %] + [% IF ( ISSUE.recalled ) %]
This item has been recalled. Please return by the new due date.[% END %] [% ISSUE.author %] - [% IF ( ISSUE.overdue ) %] + [% IF ( ISSUE.overdue || ISSUE.recalled ) %] Date due: --- a/opac/opac-detail.pl +++ a/opac/opac-detail.pl @@ -709,6 +709,10 @@ if ( not $viewallitems and @items > $max_items_to_display ) { if grep /^$itm->{itemnumber}$/, @itemnumbers_on_order; } + if ( $itm->{datedue} && $borrowernumber && $itm->{borrowernumber} != $borrowernumber ) { + $itm->{avail_for_recall} = 1; + } + my $itembranch = $itm->{$separatebranch}; if ($currentbranch and C4::Context->preference('OpacSeparateHoldings')) { if ($itembranch and $itembranch eq $currentbranch) { --- a/opac/opac-user.pl +++ a/opac/opac-user.pl @@ -237,7 +237,7 @@ if ($issues){ } } - my $recall = Koha::Recalls->find($issue->{itemnumber}); + my $recall = Koha::Recalls->find({ itemnumber => $issue->{itemnumber} }); if (defined $recall){ $issue->{recalled} = 1; } --