Corrected: Hiding renew link in the OPAC for items which cannot be renewed. Fixes...

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
index 0456d6a..36e78e1 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
@@ -222,7 +222,7 @@ $.tablesorter.addParser({
                     <!-- TMPL_UNLESS name="patron_flagged" -->
                     <td><!-- TMPL_IF NAME="status" --><a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Renew</a> <span class="renewals">(<!-- TMPL_VAR NAME="renewsleft" --> of <!-- TMPL_VAR NAME="renewsallowed" --> renewals remaining)</span>
                         <!-- TMPL_ELSE -->
-                            Not renewable
+                        Not renewable<!-- TMPL_IF NAME="too_many" --> <span class="renewals">(<!-- TMPL_VAR NAME="renewsleft" --> of <!-- TMPL_VAR NAME="renewsallowed" --> renewals remaining)</span><!-- TMPL_ELSE --><!-- TMPL_IF NAME="on_reserve" --> <span class="renewals">(On hold)</span><!-- /TMPL_IF --><!-- /TMPL_IF --> 
                         <!-- /TMPL_IF --></td>
                     <!-- /TMPL_UNLESS -->
                 <!-- /TMPL_IF -->

diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 528c2e0..5b997c7 100755 (executable)
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -125,9 +125,10 @@ foreach my $issue ( @issue_list ) {
 
     # check if item is renewable
     my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
-       ($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
-
-    $issue->{'status'} = $status || C4::Context->preference("OpacRenewalAllowed");
+    ($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
+    $issue->{'status'} = $status && C4::Context->preference("OpacRenewalAllowed");
+    $issue->{'too_many'} = 1 if $renewerror and $renewerror eq 'too_many';
+    $issue->{'on_reserve'} = 1 if $renewerror and $renewerror eq 'on_reserve';
 
     if ( $issue->{'overdue'} ) {
         push @overdues, $issue;