From 9123b86bb8a80967619f13fa9362b5b04bb0d59e Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Tue, 6 Nov 2007 14:28:31 -0600 Subject: [PATCH] Fix for bug 1402, now if a renewal fails, the librarian is aware of it Another patch to come Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/modules/members/moremember.tmpl | 3 +++ members/moremember.pl | 5 +++++ reserve/renewscript.pl | 16 +++++++--------- 3 files changed, 15 insertions(+), 9 deletions(-) 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 a61a519f7f..24b7a3b139 100644 --- 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 @@ ">Check In + + Renewal Failed + diff --git a/members/moremember.pl b/members/moremember.pl index c1cccbd99b..302b186104 100755 --- 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 99e1faee2e..804f2fab95 100755 --- 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 ); } -- 2.20.1