X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-renew.pl;h=ca58f3ded8ff56cd1312d4dd3ba74f3cdcbe7754;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=66afc60d2e36a6a503e28927d81759ec025a754f;hpb=6ecba451a315fd2e83882a66b0fa09440b1ad9a7;p=koha_fer

diff --git a/opac/opac-renew.pl b/opac/opac-renew.pl
index 66afc60d2e..ca58f3ded8 100755
--- a/opac/opac-renew.pl
+++ b/opac/opac-renew.pl
@@ -2,12 +2,35 @@
 
 #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
+
+# 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 2 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+use strict;
+use warnings;
 
 use CGI;
 use C4::Circulation;
 use C4::Auth;
-
+use C4::Context;
+use C4::Items;
+use C4::Members;
+use Date::Calc qw( Today Date_to_Days );
 my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
@@ -20,14 +43,50 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 		  debug           => 1,
 	}
 ); 
-my $itemnumber     = $query->param('item');
-my $borrowernumber = $query->param("borrowernumber");
+my @items          = $query->param('item');
 
-my $status = CanBookBeRenewed( $borrowernumber, $itemnumber );
-if ( $status == 1 ) {
-    AddRenewal( $borrowernumber, $itemnumber );
-}
+my $opacrenew = C4::Context->preference("OpacRenewalAllowed");
 
-if ( $query->param('from') eq 'opac_user' ) {
-    print $query->redirect("/cgi-bin/koha/opac-user.pl");
+my $errorstring='';
+my $member_details = GetMemberDetails($borrowernumber);
+
+if (   $member_details->{'BlockExpiredPatronOpacActions'}
+    && $member_details->{'is_expired'} )
+{
+    $errorstring = 'card_expired';
+}
+else {
+    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 = GetMemberDetails($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 );
+        }
+        else {
+            $errorstring .= $error . "|";
+        }
+    }
 }
+
+print $query->redirect("/cgi-bin/koha/opac-user.pl?renew_error=$errorstring");
+