X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=reserve%2Fmodrequest.pl;h=79d95dcec41100c18c30bb03007731a48d0b07f9;hb=62391ab1d77ef9e1c8f88c5e72264450b262af93;hp=36ef7a66b7536c8ca47fea1ccb48c245d6ab7c24;hpb=36db394d23be90e16ee238cd6ac29c0760cf326a;p=koha_gimpoz

diff --git a/reserve/modrequest.pl b/reserve/modrequest.pl
index 36ef7a66b7..79d95dcec4 100755
--- a/reserve/modrequest.pl
+++ b/reserve/modrequest.pl
@@ -23,32 +23,51 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-#use DBI;
-use C4::Search;
 use CGI;
 use C4::Output;
-use C4::Reserves2;
+use C4::Reserves;
+use C4::Auth;
 
-my $input = new CGI;
-#print $input->header;
+my $query = new CGI;
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {   
+        template_name   => "about.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { catalogue => 1 },
+        debug           => 1,
+    }
+);
 
-#print $input->Dump;
-
-my @rank=$input->param('rank-request');
-my @biblionumber=$input->param('biblionumber');
-my @borrower=$input->param('borrowernumber');
-my @branch=$input->param('pickup');
+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 $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
+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)
+if ($CancelBorrowerNumber) {
+    ModReserveCancelAll($CancelItemnumber, $CancelBorrowerNumber);
+    $biblionumber[0] = $CancelBiblioNumber,
 }
 
-my $from=$input->param('from');
+# 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
+    }
+}
+my $from=$query->param('from');
 if ($from eq 'borrower'){
-  print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrower[0]");
+  print $query->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrower[0]");
  } else {
-   print $input->redirect("/cgi-bin/koha/request.pl?biblionumber=$biblionumber[0]");
+   print $query->redirect("/cgi-bin/koha/reserve/request.pl?biblionumber=$biblionumber[0]");
 }