Bug 29969: Prevent crash if 'Update holds' clicked after bulk cancellation

[srvgit] / reserve / modrequest.pl

diff --git a/reserve/modrequest.pl b/reserve/modrequest.pl
index 79d95dc..d95e82e 100755 (executable)
--- a/reserve/modrequest.pl
+++ b/reserve/modrequest.pl
@@ -9,51 +9,58 @@
 #
 # 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 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.
+# 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., 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, see <http://www.gnu.org/licenses>.
+
+use Modern::Perl;
+use CGI qw ( -utf8 );
+use List::MoreUtils qw( uniq );
+use Try::Tiny;
 
-use strict;
-use CGI;
 use C4::Output;
-use C4::Reserves;
-use C4::Auth;
+use C4::Reserves qw( ModReserve ModReserveCancelAll );
+use C4::Auth qw( get_template_and_user );
+use Koha::DateUtils qw( dt_from_string );
 
-my $query = new CGI;
+my $query = CGI->new;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   
-        template_name   => "about.tmpl",
+        template_name   => "about.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { catalogue => 1 },
-        debug           => 1,
+        flagsrequired   => { reserveforothers => 1 },
     }
 );
 
-my @rank=$query->param('rank-request');
-my @biblionumber=$query->param('biblionumber');
-my @borrower=$query->param('borrowernumber');
-my @branch=$query->param('pickup');
-my @itemnumber=$query->param('itemnumber');
+my @reserve_id = $query->multi_param('reserve_id');
+my @rank = $query->multi_param('rank-request');
+my @borrower = $query->multi_param('borrowernumber');
+my @reservedates = $query->multi_param('reservedate');
+my @expirationdates = $query->multi_param('expirationdate');
+my @branch = $query->multi_param('pickup');
+my @itemnumber = $query->multi_param('itemnumber');
+my @biblionumber = $query->multi_param('biblionumber');
 my $count=@rank;
 
-my $CancelBiblioNumber=$query->param('CancelBiblioNumber');
-my $CancelBorrowerNumber=$query->param('CancelBorrowerNumber');
-my $CancelItemnumber=$query->param('CancelItemnumber');
+@biblionumber = uniq @biblionumber;
+
+my $CancelBiblioNumber = $query->param('CancelBiblioNumber');
+my $CancelBorrowerNumber = $query->param('CancelBorrowerNumber');
+my $CancelItemnumber = $query->param('CancelItemnumber');
 
 # 2 possibilitys : cancel an item reservation, or modify or cancel the queded list
 
-# 1) cancel an item reservation by fonction ModReserveCancelAll (in reserves.pm)
+# 1) cancel an item reservation by function ModReserveCancelAll (in reserves.pm)
 if ($CancelBorrowerNumber) {
     ModReserveCancelAll($CancelItemnumber, $CancelBorrowerNumber);
     $biblionumber[0] = $CancelBiblioNumber,
@@ -62,12 +69,42 @@ if ($CancelBorrowerNumber) {
 # 2) Cancel or modify the queue list of reserves (without item linked)
 else {
     for (my $i=0;$i<$count;$i++){
-        ModReserve($rank[$i],$biblionumber[$i],$borrower[$i],$branch[$i],$itemnumber[$i]); #from C4::Reserves
+        undef $itemnumber[$i] if !$itemnumber[$i];
+        my $suspend_until = $query->param( "suspend_until_" . $reserve_id[$i] );
+        my $cancellation_reason = $query->param("cancellation-reason");
+        my $params = {
+            rank => $rank[$i],
+            reserve_id => $reserve_id[$i],
+            expirationdate => $expirationdates[$i] ? dt_from_string($expirationdates[$i]) : undef,
+            branchcode => $branch[$i],
+            itemnumber => $itemnumber[$i],
+            defined $suspend_until ? ( suspend_until => $suspend_until ) : (),
+            cancellation_reason => $cancellation_reason,
+        };
+        if (C4::Context->preference('AllowHoldDateInFuture')) {
+            $params->{reservedate} = $reservedates[$i] ? dt_from_string($reservedates[$i]) : undef;
+        }
+
+        try {
+            ModReserve($params);
+        } catch {
+            if ($_->isa('Koha::Exceptions::ObjectNotFound')){
+                warn $_;
+            } else {
+                $_->rethrow;
+            }
+        }
     }
 }
+
 my $from=$query->param('from');
-if ($from eq 'borrower'){
-  print $query->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrower[0]");
- } else {
-   print $query->redirect("/cgi-bin/koha/reserve/request.pl?biblionumber=$biblionumber[0]");
+$from ||= q{};
+if ( $from eq 'borrower'){
+    print $query->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrower[0]");
+} elsif ( $from eq 'circ'){
+    print $query->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrower[0]");
+} else {
+     my $url = "/cgi-bin/koha/reserve/request.pl?";
+     $url .= "biblionumbers=" . join('/', @biblionumber);
+     print $query->redirect($url);
 }