X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=reserve%2Fplacerequest.pl;h=c614200a676515df69b35d4bfb0ee374afb8e013;hb=68ee1ceb9d67974eb53832dbd2008d39c05fad71;hp=28e886898cffccea7b880c699845c27e9b4e342d;hpb=6bb0b6b2d90402bf1c618f32ddfde83529e63ba8;p=koha.git

diff --git a/reserve/placerequest.pl b/reserve/placerequest.pl
index 28e886898c..c614200a67 100755
--- a/reserve/placerequest.pl
+++ b/reserve/placerequest.pl
@@ -21,8 +21,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
 use C4::Biblio;
@@ -33,27 +32,34 @@ use C4::Circulation;
 use C4::Members;
 use C4::Auth qw/checkauth/;
 
+use Koha::Items;
+use Koha::Patrons;
+
 my $input = CGI->new();
 
 checkauth($input, 0, { reserveforothers => 'place_holds' }, 'intranet');
 
-my @bibitems=$input->param('biblioitem');
-my @reqbib=$input->param('reqbib'); 
-my $biblionumber=$input->param('biblionumber');
-my $borrowernumber=$input->param('borrowernumber');
-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 $borrower=GetMember('borrowernumber'=>$borrowernumber);
-my $checkitem=$input->param('checkitem');
+my @bibitems       = $input->multi_param('biblioitem');
+my @reqbib         = $input->multi_param('reqbib');
+my $biblionumber   = $input->param('biblionumber');
+my $borrowernumber = $input->param('borrowernumber');
+my $notes          = $input->param('notes');
+my $branch         = $input->param('pickup');
+my $startdate      = $input->param('reserve_date') || '';
+my @rank           = $input->multi_param('rank-request');
+my $type           = $input->param('type');
+my $title          = $input->param('title');
+my $checkitem      = $input->param('checkitem');
 my $expirationdate = $input->param('expiration_date');
+my $itemtype       = $input->param('itemtype') || undef;
+
+my $borrower = Koha::Patrons->find( $borrowernumber );
+$borrower = $borrower->unblessed if $borrower;
 
 my $multi_hold = $input->param('multi_hold');
 my $biblionumbers = $multi_hold ? $input->param('biblionumbers') : ($biblionumber . '/');
 my $bad_bibs = $input->param('bad_bibs');
+my $holds_to_place_count = $input->param('holds_to_place_count') || 1;
 
 my %bibinfos = ();
 my @biblionumbers = split '/', $biblionumbers;
@@ -66,41 +72,28 @@ foreach my $bibnum (@biblionumbers) {
 
 my $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 (defined $checkitem && $checkitem ne ''){
-    $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' && $borrower ) {
 
-if ($type eq 'str8' && $borrower){
-
-    foreach my $biblionumber (keys %bibinfos) {
-        my $count=@bibitems;
-        @bibitems=sort @bibitems;
-        my $i2=1;
+    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];
+        $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++;
             }
         }
 
-    if (defined $checkitem && $checkitem ne ''){
-		my $item = GetItem($checkitem);
-        	if ($item->{'biblionumber'} ne $biblionumber) {
-                	$biblionumber = $item->{'biblionumber'};
-        	}
-	}
-
-
+        if ( defined $checkitem && $checkitem ne '' ) {
+            my $item = Koha::Items->find($checkitem);
+            if ( $item->biblionumber ne $biblionumber ) {
+                $biblionumber = $item->biblionumber;
+            }
+        }
 
         if ($multi_hold) {
             my $bibinfo = $bibinfos{$biblionumber};
@@ -108,7 +101,11 @@ if ($type eq 'str8' && $borrower){
                        $bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found);
         } else {
             # place a request on 1st available
-            AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found);
+            for ( my $i = 0 ; $i < $holds_to_place_count ; $i++ ) {
+                AddReserve( $branch, $borrower->{'borrowernumber'},
+                    $biblionumber, \@realbi, $rank[0], $startdate, $expirationdate, $notes, $title,
+                    $checkitem, $found, $itemtype );
+            }
         }
     }
 
@@ -117,13 +114,16 @@ if ($type eq 'str8' && $borrower){
             $biblionumbers .= $bad_bibs;
         }
         print $input->redirect("request.pl?biblionumbers=$biblionumbers&multi_hold=1");
-    } else {
+    }
+    else {
         print $input->redirect("request.pl?biblionumber=$biblionumber");
     }
-} elsif ($borrower eq ''){
-	print $input->header();
-	print "Invalid borrower number please try again";
-# Not sure that Dump() does HTML escaping. Use firebug or something to trace
-# instead.
-#	print $input->Dump;
+}
+elsif ( $borrowernumber eq '' ) {
+    print $input->header();
+    print "Invalid borrower number please try again";
+
+    # Not sure that Dump() does HTML escaping. Use firebug or something to trace
+    # instead.
+    #print $input->Dump;
 }