Fix for bug 1740

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 361a0ca..69a9985 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -319,7 +319,12 @@ for (var i=0;i<ItemsNodes.length;i++){
             <td><!-- TMPL_VAR NAME="replacementprice" --></td>
             <td>
             <!-- TMPL_IF name="norenew" -->
-                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">On Hold</a>
+                           <!-- TMPL_IF EXPR="norenew_reason eq 'on_reserve'" -->
+                    <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">On Hold</a>
+                               <!-- /TMPL_IF -->
+                               <!-- TMPL_IF EXPR="norenew_reason eq 'too_many'" -->
+                                   Too Many Renewals
+                               <!-- /TMPL_IF -->
             <!-- TMPL_ELSE -->
             <!-- TMPL_IF NAME="red" -->
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" onClick="javascript:uncheck_sibling(this);" />

diff --git a/members/moremember.pl b/members/moremember.pl
index 13cd8eb..caac7bd 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -238,11 +238,11 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
 
     $row{'charge'} = sprintf( "%.2f", $charge );
 
-    #check item is not reserved
-    my ( $restype, $reserves ) = CheckReserves( $issue->[$i]{'itemnumber'} );
-    $row{'norenew'} = ($restype) ? 1 : 0;
+       my ( $renewokay,$renewerror ) = CanBookBeRenewed( $borrowernumber, $issue->[$i]{'itemnumber'});
+       $row{'norenew'} = !$renewokay;
+       $row{'norenew_reason'} = $renewerror;
        $row{'renew_failed'} = $renew_failed[$issue->[$i]{'itemnumber'}];               
-  $row{'return_failed'} = $return_failed[$issue->[$i]{'barcode'}];   
+       $row{'return_failed'} = $return_failed[$issue->[$i]{'barcode'}];   
     push( @issuedata, \%row );
 }