Fix for bug 1402, now if a renewal fails, the librarian is aware of it

Another patch to come

Signed-off-by: Chris Cormack <crc@liblime.com>
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 a61a519..24b7a3b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -214,6 +214,9 @@
             <!-- /TMPL_IF -->
             </td>
             <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Check In</a></td>
+                       <!-- TMPL_IF NAME="renew_failed" -->
+                       <td>Renewal Failed</td>
+                       <!-- /TMPL_IF -->
         </tr>
         <!-- /tmpl_loop -->
         <tr>

diff --git a/members/moremember.pl b/members/moremember.pl
index c1cccbd..302b186 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -50,6 +50,10 @@ my $dbh = C4::Context->dbh;
 
 my $input = new CGI;
 my $print = $input->param('print');
+my @failedrenews = $input->param('failedrenew');
+my @renew_failed;
+for (@failedrenews) { $renew_failed[$_] = 1; }
+
 my $template_name;
 
 if    ($print eq "page") { $template_name = "members/moremember-print.tmpl";   }
@@ -208,6 +212,7 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
     #check item is not reserved
     my ( $restype, $reserves ) = CheckReserves( $issue->[$i]{'itemnumber'} );
     $row{'norenew'} = ($restype) ? 1 : 0;
+       $row{'renew_failed'} = $renew_failed[$issue->[$i]{'itemnumber'}];               
     push( @issuedata, \%row );
 }
 

diff --git a/reserve/renewscript.pl b/reserve/renewscript.pl
index 99e1fae..804f2fa 100755 (executable)
--- a/reserve/renewscript.pl
+++ b/reserve/renewscript.pl
@@ -44,16 +44,14 @@ my $branch=$input->param('branch');
 #
 my $cardnumber = $input->param("cardnumber");
 my $borrowernumber = $input->param("borrowernumber");
-
+my $failedrenews;
 foreach my $itemno (@data) {
-    #check status before renewing issue
-#    warn "CanBookbeRenewed";
+    # check status before renewing issue
     if (CanBookBeRenewed($borrowernumber,$itemno)){
-#      warn "$itemno can be renewed for $borrowernumber";
         AddRenewal($borrowernumber,$itemno,$branch);
-#      warn "renewal added";
-#    }else {
-#      warn "cannot renew";
+    }
+       else {
+               $failedrenews.="&failedrenew=$itemno";        
        }
 }
 
@@ -62,11 +60,11 @@ foreach my $itemno (@data) {
 #
 if ($input->param('destination') eq "circ"){
     print $input->redirect(
-        '/cgi-bin/koha/circ/circulation.pl?findborrower='.$cardnumber
+        '/cgi-bin/koha/circ/circulation.pl?findborrower='.$cardnumber.$failedrenews
     );
 }
 else {
     print $input->redirect(
-        '/cgi-bin/koha/members/moremember.pl?borrowernumber='.$borrowernumber
+        '/cgi-bin/koha/members/moremember.pl?borrowernumber='.$borrowernumber.$failedrenews
     );
 }