X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-renew.pl;h=03c4a714a4a411bd2cf18a2e922a0a795fb4956c;hb=091d6c513bcbee224ff06477e79be48cea7fe825;hp=88bbacbe728380a4d28206f87bcc14e831e660ed;hpb=90fe0170f23a3932388fb1ec85a55b8424289a99;p=koha.git

diff --git a/opac/opac-renew.pl b/opac/opac-renew.pl
index 88bbacbe72..03c4a714a4 100755
--- a/opac/opac-renew.pl
+++ b/opac/opac-renew.pl
@@ -2,37 +2,96 @@
 
 #written 18/1/2000 by chris@katipo.co.nz
 # adapted for use in the hlt opac by finlay@katipo.co.nz 29/11/2002
-#script to renew items from the web
+# script to renew items from the web
+# Parts Copyright 2010,2011 Catalyst IT
 
-use CGI;
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
+
+
+use strict;
+use warnings;
+
+use CGI qw ( -utf8 );
 use C4::Circulation;
 use C4::Auth;
-
+use C4::Context;
+use C4::Items;
+use C4::Members;
+use Koha::Patrons;
+use Date::Calc qw( Today Date_to_Days );
 my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 	{
-		  template_name   => "opac-user.tmpl",
-		  query           => $query,
-		  type            => "opac",
-		  authnotrequired => 0,
-		  flagsrequired   => { borrow => 1 },
-		  debug           => 1,
+        template_name   => "opac-user.tt",
+        query           => $query,
+        type            => "opac",
+        authnotrequired => 0,
+        debug           => 1,
 	}
 ); 
-my @items          = $query->param('item');
-my $borrowernumber = $query->param('borrowernumber') || $query->param('bornum');
+my @items = $query->multi_param('item');
+
 my $opacrenew = C4::Context->preference("OpacRenewalAllowed");
 
-for my $itemnumber ( @items ) {
-    my ($status,$error) = CanBookBeRenewed( $borrowernumber, $itemnumber );
-    if ( $status == 1 && $opacrenew == 1 ) {
-        AddRenewal( $borrowernumber, $itemnumber );
+my $errorstring = q{};
+my $renewed     = q{};
+
+my $patron = Koha::Patrons->find( $borrowernumber );
+
+if (   $patron->category->effective_BlockExpiredPatronOpacActions
+    && $patron->is_expired )
+{
+    $errorstring = 'card_expired';
+}
+else {
+    my @renewed;
+    for my $itemnumber (@items) {
+        my ( $status, $error ) =
+          CanBookBeRenewed( $borrowernumber, $itemnumber );
+        if ( $status == 1 && $opacrenew == 1 ) {
+            my $renewalbranch = C4::Context->preference('OpacRenewalBranch');
+            my $branchcode;
+            if ( $renewalbranch eq 'itemhomebranch' ) {
+                my $item = GetItem($itemnumber);
+                $branchcode = $item->{'homebranch'};
+            }
+            elsif ( $renewalbranch eq 'patronhomebranch' ) {
+                my $borrower = GetMember( borrowernumber => $borrowernumber );
+                $branchcode = $borrower->{'branchcode'};
+            }
+            elsif ( $renewalbranch eq 'checkoutbranch' ) {
+                my $issue = GetOpenIssue($itemnumber);
+                $branchcode = $issue->{'branchcode'};
+            }
+            elsif ( $renewalbranch eq 'NULL' ) {
+                $branchcode = '';
+            }
+            else {
+                $branchcode = 'OPACRenew';
+            }
+            AddRenewal( $borrowernumber, $itemnumber, $branchcode );
+            push( @renewed, $itemnumber );
+        }
+        else {
+            $errorstring .= $error . "|";
+        }
     }
+    $renewed = join( ':', @renewed );
 }
-# FIXME: else return ERROR to user!!
 
-if ( $query->param('from') eq 'opac_user' ) {
-    print $query->redirect("/cgi-bin/koha/opac-user.pl");
-} 
-# FIXME: ELSE WHAT?  No response at all.  Not very robust.
+print $query->redirect("/cgi-bin/koha/opac-user.pl?renew_error=$errorstring&renewed=$renewed");
+