MT 2285 : enhancement for patronSearch

[koha.git] / reserve / placerequest.pl

diff --git a/reserve/placerequest.pl b/reserve/placerequest.pl
index 07f415e..b299c17 100755 (executable)
--- a/reserve/placerequest.pl
+++ b/reserve/placerequest.pl
@@ -22,69 +22,105 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use warnings;
 use C4::Biblio;
+use C4::Items;
 use CGI;
 use C4::Output;
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Circulation;
 use C4::Members;
 
 my $input = new CGI;
 #print $input->header;
 
+
 my @bibitems=$input->param('biblioitem');
-my @reqbib=$input->param('reqbib');
+# FIXME I think reqbib does not exist anymore, it's used in line 82, to AddReserve of contraint type 'o'
+#       I bet it's a 2.x feature, reserving a given biblioitem, that is useless in Koha 3.0
+#       we can remove this line, the AddReserve of constrainttype 'o',
+#       and probably remove the reserveconstraint table as well, I never could fill anything in this table.
+my @reqbib=$input->param('reqbib'); 
 my $biblionumber=$input->param('biblionumber');
 my $borrower=$input->param('member');
 my $notes=$input->param('notes');
 my $branch=$input->param('pickup');
+my $startdate=$input->param('reserve_date') || '';
 my @rank=$input->param('rank-request');
 my $type=$input->param('type');
 my $title=$input->param('title');
-my $borrowernumber=borrdata($borrower,'');
+my $borrowernumber=GetMember('cardnumber'=>$borrower);
 my $checkitem=$input->param('checkitem');
+
+my $multi_hold = $input->param('multi_hold');
+my $biblionumbers = $multi_hold ? $input->param('biblionumbers') : ($biblionumber . '/');
+my $bad_bibs = $input->param('bad_bibs');
+
+my %bibinfos = ();
+my @biblionumbers = split '/', $biblionumbers;
+foreach my $bibnum (@biblionumbers) {
+    my %bibinfo = ();
+    $bibinfo{title} = $input->param("title_$bibnum");
+    $bibinfo{rank} = $input->param("rank_$bibnum");
+    $bibinfos{$bibnum} = \%bibinfo;
+}
+
 my $found;
 
-#new op : if we have an item selectionned, and the pickup branch is the same as the holdingbranch of the document, we force the value $rank and $found .
+# if we have an item selectionned, and the pickup branch is the same as the holdingbranch
+# of the document, we force the value $rank and $found .
 if ($checkitem ne ''){
-               $rank[0] = '0';
-               my $item = $checkitem;
-               $item = GetItem($item);
-               if ( $item->{'holdingbranch'} eq $branch ){
-               $found = 'W';   
-               }
+    $rank[0] = '0' unless C4::Context->preference('ReservesNeedReturns');
+    my $item = $checkitem;
+    $item = GetItem($item);
+    if ( $item->{'holdingbranch'} eq $branch ){
+        $found = 'W' unless C4::Context->preference('ReservesNeedReturns');
+    }
+}
 
+if ($type eq 'str8' && $borrowernumber ne ''){
 
-}
+    foreach my $biblionumber (keys %bibinfos) {
+        my $count=@bibitems;
+        @bibitems=sort @bibitems;
+        my $i2=1;
+        my @realbi;
+        $realbi[0]=$bibitems[0];
+        for (my $i=1;$i<$count;$i++) {
+            my $i3=$i2-1;
+            if ($realbi[$i3] ne $bibitems[$i]) {
+                $realbi[$i2]=$bibitems[$i];
+                $i2++;
+            }
+        }
+        my $const;
 
-# END of new op .
+        if ($multi_hold) {
+            my $bibinfo = $bibinfos{$biblionumber};
+            AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',[$biblionumber],
+                       $bibinfo->{rank},$startdate,$notes,$bibinfo->{title},$checkitem,$found);
+        } else {
+            if ($input->param('request') eq 'any'){
+                # place a request on 1st available
+                AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$notes,$title,$checkitem,$found);
+            } elsif ($reqbib[0] ne ''){
+                # FIXME : elsif probably never reached, (see top of the script)
+                # place a request on a given item
+                AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$startdate,$notes,$title,$checkitem, $found);
+            } else {
+                AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$notes,$title,$checkitem, $found);
+            }
+        }
+    }
 
-if ($type eq 'str8' && $borrowernumber ne ''){
-       my $count=@bibitems;
-       @bibitems=sort @bibitems;
-       my $i2=1;
-       my @realbi;
-       $realbi[0]=$bibitems[0];
-       for (my $i=1;$i<$count;$i++) {
-               my $i3=$i2-1;
-               if ($realbi[$i3] ne $bibitems[$i]) {
-                       $realbi[$i2]=$bibitems[$i];
-                       $i2++;
-               }
-       }
-       my $env;
-       my $const;
-       if ($input->param('request') eq 'any'){
-       $const='a';
-  CreateReserve(\$env,$branch,$borrowernumber->{'borrowernumber'},$biblionumber,$const,\@realbi,$rank[0],$notes,$title,$checkitem,$found);
-       } elsif ($reqbib[0] ne ''){
-       $const='o';
-  CreateReserve(\$env,$branch,$borrowernumber->{'borrowernumber'},$biblionumber,$const,\@reqbib,$rank[0],$notes,$title,$checkitem, $found);
-       } else {
-  CreateReserve(\$env,$branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$notes,$title,$checkitem, $found);
-       }
-       
-print $input->redirect("request.pl?biblionumber=$biblionumber");
+    if ($multi_hold) {
+        if ($bad_bibs) {
+            $biblionumbers .= $bad_bibs;
+        }
+        print $input->redirect("request.pl?biblionumbers=$biblionumbers&multi_hold=1");
+    } else {
+        print $input->redirect("request.pl?biblionumber=$biblionumber");
+    }
 } elsif ($borrowernumber eq ''){
        print $input->header();
        print "Invalid card number please try again";