bug 5237: Testing renewals on patron barcodes with + signs at the end

[koha.git] / reserve / renewscript.pl

diff --git a/reserve/renewscript.pl b/reserve/renewscript.pl
index 28e81f2..4444e7c 100755 (executable)
--- a/reserve/renewscript.pl
+++ b/reserve/renewscript.pl
@@ -18,14 +18,16 @@
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
+# 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 URI::Escape;
+use C4::Dates qw/format_date_in_iso/;
 my $input = new CGI;
 
 #Set Up User_env
@@ -37,8 +39,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { borrowers => 1 },
-        debug           => 1,
+        flagsrequired   => { circulate => 1 },
+        debug           => 0,
     }
 );
 
@@ -53,8 +55,19 @@ if ($input->param('renew_all')) {
 else {
     @data = $input->param('items[]');
 }
-my @barcodes = $input->param('barcodes[]');
+
+my @barcodes;
+if ($input->param('return_all')) {
+    @barcodes = $input->param('all_barcodes[]');
+} else {
+    @barcodes = $input->param('barcodes[]');
+}
+
 my $branch=$input->param('branch');
+my $datedue;
+if ($input->param('newduedate')){
+    $datedue=C4::Dates->new($input->param('newduedate'));
+}
 
 # warn "barcodes : @barcodes";
 #
@@ -62,12 +75,14 @@ my $branch=$input->param('branch');
 #
 my $cardnumber = $input->param("cardnumber");
 my $borrowernumber = $input->param("borrowernumber");
+my $exemptfine = $input->param("exemptfine") || 0;
+my $override_limit = $input->param("override_limit") || 0;
 my $failedrenews;
 foreach my $itemno (@data) {
     # check status before renewing issue
-       my ($renewokay,$error) = CanBookBeRenewed($borrowernumber,$itemno);
+       my ($renewokay,$error) = CanBookBeRenewed($borrowernumber,$itemno,$override_limit);
     if ($renewokay){
-        AddRenewal($borrowernumber,$itemno,$branch);
+        AddRenewal($borrowernumber,$itemno,$branch,$datedue);
     }
        else {
                $failedrenews.="&failedrenew=$itemno";        
@@ -75,9 +90,9 @@ foreach my $itemno (@data) {
 }
 my $failedreturn;
 foreach my $barcode (@barcodes) {
-    # check status before renewing issue  
+    # check status before renewing issue
    my ( $returned, $messages, $issueinformation, $borrower ) = 
-    AddReturn($barcode,$branch,1);
+    AddReturn($barcode, $branch, $exemptfine);
    $failedreturn.="&failedreturn=$barcode" unless ($returned);
 }
 
@@ -85,6 +100,7 @@ foreach my $barcode (@barcodes) {
 # redirection to the referrer page
 #
 if ($input->param('destination') eq "circ"){
+    $cardnumber = uri_escape($cardnumber);
     print $input->redirect(
         '/cgi-bin/koha/circ/circulation.pl?findborrower='.$cardnumber.$failedrenews.$failedreturn
     );