X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=reserve%2Fmodrequest.pl;h=3e9e5631b8f207333b6fa79d6d3af9c042756e20;hb=075ef09f48b66df7766c22e1c9ecf1d3cf7a039a;hp=a319214ca12bd0d3f597def51598a10010161ad4;hpb=c0a44fe1151c38ee58514f418d8b127729849a94;p=srvgit

diff --git a/reserve/modrequest.pl b/reserve/modrequest.pl
index a319214ca1..3e9e5631b8 100755
--- a/reserve/modrequest.pl
+++ b/reserve/modrequest.pl
@@ -9,46 +9,103 @@
 #
 # 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
-
-use strict;
-#use DBI;
-use C4::Search;
-use CGI;
+# 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 URI;
+use List::MoreUtils qw( uniq );
+use Try::Tiny;
+
 use C4::Output;
-use C4::Reserves2;
+use C4::Reserves qw( ModReserve ModReserveCancelAll );
+use C4::Auth qw( checkauth );
+use Koha::BackgroundJob::BatchUpdateBiblioHoldsQueue;
 
-my $input = new CGI;
-#print $input->header;
+my $query = CGI->new;
 
-#print $input->Dump;
+checkauth($query, 0, { reserveforothers => '*' }, 'intranet');
 
-my @rank=$input->param('rank-request');
-my @biblionumber=$input->param('biblionumber');
-my @borrower=$input->param('borrowernumber');
-my @branch=$input->param('pickup');
+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;
 
-# goes through and manually changes the reserves record....
-# no attempt is made to check consistency.
-for (my $i=0;$i<$count;$i++){
-    UpdateReserve($rank[$i],$biblionumber[$i],$borrower[$i],$branch[$i]); #from C4::Reserves2
+@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 function ModReserveCancelAll (in reserves.pm)
+if ($CancelBorrowerNumber) {
+    ModReserveCancelAll($CancelItemnumber, $CancelBorrowerNumber);
+    $biblionumber[0] = $CancelBiblioNumber,
+}
+
+# 2) Cancel or modify the queue list of reserves (without item linked)
+else {
+    for (my $i=0;$i<$count;$i++){
+        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] || 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] || undef;
+        }
+
+        try {
+            ModReserve($params);
+        } catch {
+            if ($_->isa('Koha::Exceptions::ObjectNotFound')){
+                warn $_;
+            } else {
+                $_->rethrow;
+            }
+        }
+    }
+    my @biblio_ids = uniq @biblionumber;
+    Koha::BackgroundJob::BatchUpdateBiblioHoldsQueue->new->enqueue(
+        {
+            biblio_ids => \@biblio_ids
+        }
+    );
 }
 
-my $from=$input->param('from');
-if ($from eq 'borrower'){
-  print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrower[0]");
- } else {
-   print $input->redirect("/cgi-bin/koha/reserve/request.pl?bib=$biblionumber[0]");
+my $from=$query->param('from');
+$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 = URI->new("/cgi-bin/koha/reserve/request.pl");
+     $url->query_form( biblionumber => [@biblionumber]);
+     print $query->redirect($url);
 }