@@ -, +, @@
summary page.
---
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 26 +++++++++-----------
opac/opac-user.pl | 17 +++++++++++--
2 files changed, 27 insertions(+), 16 deletions(-)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -200,21 +200,19 @@
[% IF ( OpacRenewalAllowed ) %]
- [% IF ( ISSUE.status ) %]
- [% IF ( canrenew ) %]
- Renew
- [% END %]
- ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)
- [% ELSE %]
- Not renewable
- [% IF ( ISSUE.too_many ) %]
- ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)
- [% ELSE %]
- [% IF ( ISSUE.on_reserve ) %]
- (On hold)
- [% END %]
- [% END %]
+ [% IF ( ISSUE.status ) %]
+ [% IF ( canrenew ) %]
+ Renew
[% END %]
+ ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)
+ [% ELSIF ( ISSUE.too_many ) %]
+ Not renewable
+ [% ELSIF ( ISSUE.too_soon ) %]
+ No renewal before [% ISSUE.soonestrenewdate %]
+ ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)
+ [% ELSIF ( ISSUE.on_reserve ) %]
+ (On hold)
+ [% END %]
|
[% END %]
[% IF ( OPACFinesTab ) %]
--- a/opac/opac-user.pl
+++ a/opac/opac-user.pl
@@ -182,8 +182,21 @@ if ($issues){
if($status && C4::Context->preference("OpacRenewalAllowed")){
$issue->{'status'} = $status;
}
- $issue->{'too_many'} = 1 if $renewerror and $renewerror eq 'too_many';
- $issue->{'on_reserve'} = 1 if $renewerror and $renewerror eq 'on_reserve';
+
+ if ($renewerror) {
+ $issue->{'too_many'} = 1 if $renewerror eq 'too_many';
+ $issue->{'on_reserve'} = 1 if $renewerror eq 'on_reserve';
+
+ if ( $renewerror eq 'too_soon' ) {
+ $issue->{'too_soon'} = 1;
+ $issue->{'soonestrenewdate'} = output_pref(
+ C4::Circulation::GetSoonestRenewDate(
+ $issue->{borrowernumber},
+ $issue->{itemnumber}
+ )
+ );
+ }
+ }
if ( $issue->{'overdue'} ) {
push @overdues, $issue;
--