X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-reserve.pl;h=699179b74b249077f994333cd83f797f98d28cf2;hb=bb032138e72a6428e404d9f3593430b7fd989f45;hp=5e85aa8b15254f42fff3c14de212f2349f1c6d25;hpb=e9ae8c0686629747415ade8e2b8d69defeccbc62;p=koha_fer

diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 5e85aa8b15..699179b74b 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -16,18 +16,21 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-require Exporter;
+use warnings;
 use CGI;
-use C4::Biblio;
 use C4::Auth;    # checkauth, getborrowernumber.
 use C4::Koha;
 use C4::Circulation;
 use C4::Reserves;
+use C4::Biblio;
+use C4::Items;
 use C4::Output;
-use C4::Date;
+use C4::Dates qw/format_date/;
 use C4::Context;
 use C4::Members;
 use C4::Branch; # GetBranches
+use C4::Debug;
+# use Data::Dumper;
 
 my $MAXIMUM_NUMBER_OF_RESERVES = C4::Context->preference("maxreserves");
 
@@ -42,282 +45,454 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         debug           => 1,
     }
 );
+my $OPACDisplayRequestPriority = (C4::Context->preference("OPACDisplayRequestPriority")) ? 1 : 0;
+sub get_out ($$$) {
+	output_html_with_http_headers(shift,shift,shift); # $query, $cookie, $template->output;
+	exit;
+}
 
 # get borrower information ....
-my ( $borr, $flags ) = GetMemberDetails( $borrowernumber );
+my ( $borr ) = GetMemberDetails( $borrowernumber );
 
-# get biblionumber.....
-my $biblionumber = $query->param('biblionumber');
+# get branches and itemtypes
+my $branches = GetBranches();
+my $itemTypes = GetItemTypes();
+
+# There are two ways of calling this script, with a single biblio num
+# or multiple biblio nums.
+my $biblionumbers = $query->param('biblionumbers');
+my $reserveMode = $query->param('reserve_mode');
+if ($reserveMode && ($reserveMode eq 'single')) {
+    my $bib = $query->param('single_bib');
+    $biblionumbers = "$bib/";
+}
+if (! $biblionumbers) {
+    $biblionumbers = $query->param('biblionumber');
+}
 
-my $bibdata = GetBiblioData($biblionumber);
-$template->param($bibdata);
-$template->param( biblionumber => $biblionumber );
+if ((! $biblionumbers) && (! $query->param('place_reserve'))) {
+    $template->param(message=>1, no_biblionumber=>1);
+    &get_out($query, $cookie, $template->output);
+}
 
-# get the rank number....
-my ( $rank, $reserves ) = GetReservesFromBiblionumber( $biblionumber);
-$template->param( reservecount => $rank );
+# Pass the numbers to the page so they can be fed back
+# when the hold is confirmed. TODO: Not necessary?
+$template->param( biblionumbers => $biblionumbers );
 
-foreach my $res (@$reserves) {
-    if ( $res->{'found'} eq 'W' ) {
-        $rank--;
-    }
+# Each biblio number is suffixed with '/', e.g. "1/2/3/"
+my @biblionumbers = split /\//, $biblionumbers;
+if (($#biblionumbers < 0) && (! $query->param('place_reserve'))) {
+    # TODO: New message?
+    $template->param(message=>1, no_biblionumber=>1);
+    &get_out($query, $cookie, $template->output);
 }
 
-$rank++;
-$template->param( rank => $rank );
-
 # pass the pickup branch along....
-my $branch = $query->param('branch');
+my $branch = $query->param('branch') || C4::Context->userenv->{branch} || '' ;
+($branches->{$branch}) or $branch = "";     # Confirm branch is real
 $template->param( branch => $branch );
 
-my $branches = GetBranches();
-
-# make sure it's a real branch
-if ( !$branches->{$branch} ) {
-    $branch = '';
-}
-$template->param( branchname => $branches->{$branch}->{'branchname'} );
-
 # make branch selection options...
-my @branches;
-my @select_branch;
-my %select_branches;
-
-my @CGIbranchlooparray;
-
-foreach my $branch ( keys %$branches ) {
-    if ($branch) {
-        my %line;
-        $line{branch} = $branches->{$branch}->{'branchname'};
-        $line{value}  = $branch;
-        push @CGIbranchlooparray, \%line;
-    }
-}
-@CGIbranchlooparray =
-  sort { $a->{branch} cmp $b->{branch} } @CGIbranchlooparray;
-my $CGIbranchloop = \@CGIbranchlooparray;
+my $CGIbranchloop = GetBranchesLoop($branch);
 $template->param( CGIbranch => $CGIbranchloop );
 
-#### THIS IS A BIT OF A HACK BECAUSE THE BIBLIOITEMS DATA IS A LITTLE MESSED UP!
-# get the itemtype data....
-my @items = GetItemInfosOf($biblionumber);
-
-#######################################################
-# old version, add so that old templates still work
-my %types_old;
-foreach my $itm (@items) {
-    my $ity = $itm->{'itemtype'};
-    unless ( $types_old{$ity} ) {
-        $types_old{$ity}->{'itemtype'} = $ity;
-        $types_old{$ity}->{'branchinfo'}->{ $itm->{'branchcode'} } = 1;
-        $types_old{$ity}->{'description'} = $itm->{'description'};
-    }
-    else {
-        $types_old{$ity}->{'branchinfo'}->{ $itm->{'branchcode'} }++;
-    }
-}
+#
+#
+# Build hashes of the requested biblio(item)s and items.
+#
+#
 
-foreach my $type ( values %types_old ) {
-    my $copies = "";
-    foreach my $bc ( keys %{ $type->{'branchinfo'} } ) {
-        $copies .=
-            $branches->{$bc}->{'branchname'} . "("
-          . $type->{'branchinfo'}->{$bc} . ")";
-    }
-    $type->{'copies'} = $copies;
-}
+# Hash of biblionumber to biblio/biblioitems record.
+my %biblioDataHash;
 
-my @types_old = values %types_old;
+# Hash of itemnumber to item info.
+my %itemInfoHash;
 
-# end old version
-################################
+foreach my $biblioNumber (@biblionumbers) {
 
-my @temp;
-foreach my $itm (@items) {
-    push @temp, $itm if $itm->{'itemtype'};
-}
-@items = @temp;
-my $itemcount = @items;
-$template->param( itemcount => $itemcount );
-
-my %types;
-my %itemtypes;
-my @duedates;
-foreach my $itm (@items) {
-    push @duedates, { date_due => format_date( $itm->{'date_due'} ) }
-      if defined $itm->{'date_due'};
-    $itm->{ $itm->{'publictype'} } = 1;
-
-    my $fee = GetReserveFee( undef, $borrowernumber, $itm->{'biblionumber'},
-        'a', ( $itm->{'biblioitemnumber'} ) );
-    $fee = sprintf "%.02f", $fee;
-    $itm->{'reservefee'} = $fee;
-    my $pty = $itm->{'publictype'};
-    $itemtypes{ $itm->{'itemtype'} } = $itm;
-    unless ( $types{$pty} ) {
-        $types{$pty}->{'count'} = 1;
-        $types{$pty}->{ $itm->{'itemtype'} } = 1;
-        push @{ $types{$pty}->{'items'} }, $itm;
+    my $biblioData = GetBiblioData($biblioNumber);
+    $biblioDataHash{$biblioNumber} = $biblioData;
+
+    my @itemInfos = GetItemsInfo($biblioNumber);
+    $biblioData->{itemInfos} = \@itemInfos;
+    foreach my $itemInfo (@itemInfos) {
+        $itemInfoHash{$itemInfo->{itemnumber}} = $itemInfo;
     }
-    else {
-        unless ( $types{$pty}->{ $itm->{'itemtype'} } ) {
-            $types{$pty}->{'count'}++;
-            $types{$pty}->{ $itm->{'itemtype'} } = 1;
-            push @{ $types{$pty}->{'items'} }, $itm;
+
+    # Compute the priority rank.
+    my ( $rank, $reserves ) = GetReservesFromBiblionumber($biblioNumber,1);
+    $biblioData->{reservecount} = $rank;
+    foreach my $res (@$reserves) {
+        my $found = $res->{'found'};
+        if ( $found && ($found eq 'W') ) {
+            $rank--;
         }
     }
+    $rank++;
+    $biblioData->{rank} = $rank;
 }
 
-$template->param( ITEMS => \@duedates );
+#
+#
+# If this is the second time through this script, it
+# means we are carrying out the hold request, possibly
+# with a specific item for each biblionumber.
+#
+#
+if ( $query->param('place_reserve') ) {
+    my $notes = $query->param('notes');
+	my $canreserve=0;
+
+    # List is composed of alternating biblio/item/branch
+    my $selectedItems = $query->param('selecteditems');
+
+    if ($query->param('reserve_mode') eq 'single') {
+        # This indicates non-JavaScript mode, so there was
+        # only a single biblio number selected.
+        my $bib = $query->param('single_bib');
+        my $item = $query->param("checkitem_$bib");
+        if ($item eq 'any') {
+            $item = '';
+        }
+        my $branch = $query->param('branch');
+        $selectedItems = "$bib/$item/$branch/";
+    }
 
-my $width = keys %types;
-my @publictypes = sort { $b->{'count'} <=> $a->{'count'} } values %types;
-my $typecount;
-foreach my $pt (@publictypes) {
-    $typecount += $pt->{'count'};
-}
-$template->param( onlyone => 1 ) if $typecount == 1;
-
-my @typerows;
-for ( my $rownum = 0 ; $rownum < $publictypes[0]->{'count'} ; $rownum++ ) {
-    my @row;
-    foreach my $pty (@publictypes) {
-        my @items = @{ $pty->{'items'} };
-        push @row, $items[$rownum] if defined $items[$rownum];
+    $selectedItems =~ s!/$!!;
+    my @selectedItems = split /\//, $selectedItems, -1;
+
+    # Make sure there is a biblionum/itemnum/branch triplet for each item.
+    # The itemnum can be 'any', meaning next available.
+    my $selectionCount = @selectedItems;
+    if (($selectionCount == 0) || (($selectionCount % 3) != 0)) {
+        $template->param(message=>1, bad_data=>1);
+        &get_out($query, $cookie, $template->output);
     }
-    my $last = @row;
-    $row[ $last - 1 ]->{'last'} = 1 if $last == $width;
-    my $fill = ( $width - $last ) * 2;
-    $fill-- if $fill;
-    push @typerows, { ROW => \@row, fill => $fill };
-}
-$template->param( TYPE_ROWS => \@typerows );
-$width = 2 * $width - 1;
-$template->param( totalwidth => 2 * $width - 1, );
-
-if ( $query->param('item_types_selected') ) {
-
-    # this is what happens after the itemtypes have been selected. Stage 2
-    my @itemtypes = $query->param('itemtype');
-    my $fee       = 0;
-    my $proceed   = 0;
-    if (@itemtypes) {
-        my %newtypes;
-        foreach my $itmtype (@itemtypes) {
-            $newtypes{$itmtype} = $itemtypes{$itmtype};
+
+    while (@selectedItems) {
+        my $biblioNum = shift(@selectedItems);
+        my $itemNum   = shift(@selectedItems);
+        my $branch    = shift(@selectedItems); # i.e., branch code, not name
+
+        my $singleBranchMode = $template->param('singleBranchMode');
+        if ($singleBranchMode) {
+            $branch = $borr->{'branchcode'};
         }
-        my @types = values %newtypes;
-        $template->param( TYPES => \@types );
-        foreach my $type (@itemtypes) {
-            my @reqbibs;
-            foreach my $item (@items) {
-                if ( $item->{'itemtype'} eq $type ) {
-                    push @reqbibs, $item->{'biblioitemnumber'};
-                }
+
+        my $biblioData = $biblioDataHash{$biblioNum};
+        my $found;
+
+	# Check for user supplied reserve date
+	my $startdate;
+	if (
+	    C4::Context->preference( 'AllowHoldDateInFuture' ) &&
+	    C4::Context->preference( 'OPACAllowHoldDateInFuture' )
+	    ) {
+	    $startdate = $query->param("reserve_date_$biblioNum");
+	}
+	
+	my $expiration_date = $query->param("expiration_date_$biblioNum");
+
+        # If a specific item was selected and the pickup branch is the same as the
+        # holdingbranch, force the value $rank and $found.
+        my $rank = $biblioData->{rank};
+        if ($itemNum ne ''){
+        	$canreserve = 1 if CanItemBeReserved($borrowernumber,$itemNum);
+            $rank = '0' unless C4::Context->preference('ReservesNeedReturns');
+            my $item = GetItem($itemNum);
+            if ( $item->{'holdingbranch'} eq $branch ){
+                $found = 'W' unless C4::Context->preference('ReservesNeedReturns');
             }
-            $fee +=
-              GetReserveFee( undef, $borrowernumber, $biblionumber, 'o',
-                \@reqbibs );
         }
-        $proceed = 1;
-    }
-    elsif ( $query->param('all') ) {
-        $template->param( all => 1 );
-        # No idea why fee would be set to 1 ... it's supposed to be a monetary value, not a flag
-		# -- JF
-		#$fee = 1;
- 		$proceed = 1;
-    }
-    if ( $proceed && $branch ) {
-        $fee = sprintf "%.02f", $fee;
-		if ($fee > 1) {
-        $template->param( fee => $fee, istherefee => $fee > 0 ? 1 : 0 );
-		}
-        $template->param( item_types_selected => 1 );
-        $template->param( no_branch_selected => 1 ) unless ( $branch != '' );
-    }
-    else {
-        $template->param( message            => 1 );
-        $template->param( no_items_selected  => 1 ) unless ($proceed);
-        $template->param( no_branch_selected => 1 ) unless ($branch);
+        else {
+        	$canreserve = 1 if CanBookBeReserved($borrowernumber,$biblioNum);
+            # Inserts a null into the 'itemnumber' field of 'reserves' table.
+            $itemNum = undef;
+        }
+
+        # Here we actually do the reserveration. Stage 3.
+        AddReserve($branch, $borrowernumber, $biblioNum, 'a', [$biblioNum], $rank, $startdate, $expiration_date, $notes,
+                   $biblioData->{'title'}, $itemNum, $found) if ($canreserve);
     }
+
+    print $query->redirect("/cgi-bin/koha/opac-user.pl#opac-user-holds");
+    exit;
 }
-elsif ( $query->param('place_reserve') ) {
-
-    # here we actually do the reserveration. Stage 3.
-    my $title     = $bibdata->{'title'};
-    my @itemtypes = $query->param('itemtype');
-    foreach my $type (@itemtypes) {
-        my @reqbibs;
-        foreach my $item (@items) {
-            if ( $item->{'itemtype'} eq $type ) {
-                push @reqbibs, $item->{'biblioitemnumber'};
-            }
+
+#
+#
+# Here we check that the borrower can actually make reserves Stage 1.
+#
+#
+my $noreserves     = 0;
+my $maxoutstanding = C4::Context->preference("maxoutstanding");
+$template->param( noreserve => 1 ) unless $maxoutstanding;
+if ( $borr->{'amountoutstanding'} && ($borr->{'amountoutstanding'} > $maxoutstanding) ) {
+    my $amount = sprintf "\$%.02f", $borr->{'amountoutstanding'};
+    $template->param( message => 1 );
+    $noreserves = 1;
+    $template->param( too_much_oweing => $amount );
+}
+if ( $borr->{gonenoaddress} && ($borr->{gonenoaddress} eq 1) ) {
+    $noreserves = 1;
+    $template->param(
+                     message => 1,
+                     GNA     => 1
+                    );
+}
+if ( $borr->{lost} && ($borr->{lost} eq 1) ) {
+    $noreserves = 1;
+    $template->param(
+                     message => 1,
+                     lost    => 1
+                    );
+}
+if ( $borr->{debarred} && ($borr->{debarred} eq 1) ) {
+    $noreserves = 1;
+    $template->param(
+                     message  => 1,
+                     debarred => 1
+                    );
+}
+
+my @reserves = GetReservesFromBorrowernumber( $borrowernumber );
+$template->param( RESERVES => \@reserves );
+if ( $MAXIMUM_NUMBER_OF_RESERVES && (scalar(@reserves) >= $MAXIMUM_NUMBER_OF_RESERVES) ) {
+    $template->param( message => 1 );
+    $noreserves = 1;
+    $template->param( too_many_reserves => scalar(@reserves));
+}
+foreach my $res (@reserves) {
+    foreach my $biblionumber (@biblionumbers) {
+        if ( $res->{'biblionumber'} == $biblionumber && $res->{'borrowernumber'} == $borrowernumber) {
+#            $template->param( message => 1 );
+#            $noreserves = 1;
+#            $template->param( already_reserved => 1 );
+            $biblioDataHash{$biblionumber}->{already_reserved} = 1;
         }
-        AddReserve( $branch, $borrowernumber, $biblionumber, 'o',
-            \@reqbibs, $rank, '', $title );
-    }
-    if ( $query->param('all') ) {
-        AddReserve( $branch, $borrowernumber, $biblionumber, 'a',
-            undef, $rank, '', $title );
     }
-    print $query->redirect("/cgi-bin/koha/opac-user.pl");
 }
-else {
-
-    # Here we check that the borrower can actually make reserves Stage 1.
-    my $noreserves     = 0;
-    my $maxoutstanding = C4::Context->preference("maxoutstanding");
-    $template->param( noreserve => 1 ) unless $maxoutstanding;
-    if ( $borr->{'amountoutstanding'} > $maxoutstanding ) {
-        my $amount = sprintf "\$%.02f", $borr->{'amountoutstanding'};
-        $template->param( message => 1 );
-        $noreserves = 1;
-        $template->param( too_much_oweing => $amount );
+
+unless ($noreserves) {
+    $template->param( select_item_types => 1 );
+}
+
+
+#
+#
+# Build the template parameters that will show the info
+# and items for each biblionumber.
+#
+#
+my $notforloan_label_of = get_notforloan_label_of();
+
+my $biblioLoop = [];
+my $numBibsAvailable = 0;
+my $itemdata_enumchron = 0;
+my $itemLevelTypes = C4::Context->preference('item-level_itypes');
+$template->param('item-level_itypes' => $itemLevelTypes);
+
+foreach my $biblioNum (@biblionumbers) {
+
+    my $record = GetMarcBiblio($biblioNum);
+    # Init the bib item with the choices for branch pickup
+    my %biblioLoopIter = ( branchChoicesLoop => $CGIbranchloop );
+
+    # Get relevant biblio data.
+    my $biblioData = $biblioDataHash{$biblioNum};
+    if (! $biblioData) {
+        $template->param(message=>1, bad_biblionumber=>$biblioNum);
+        &get_out($query, $cookie, $template->output);
     }
-    if ( $borr->{gonenoaddress} eq 1 ) {
-        $noreserves = 1;
-        $template->param(
-            message => 1,
-            GNA     => 1
-        );
+
+    $biblioLoopIter{biblionumber} = $biblioData->{biblionumber};
+    $biblioLoopIter{title} = $biblioData->{title};
+    $biblioLoopIter{subtitle} = GetRecordValue('subtitle', $record, GetFrameworkCode($biblioData->{biblionumber}));
+    $biblioLoopIter{author} = $biblioData->{author};
+    $biblioLoopIter{rank} = $biblioData->{rank};
+    $biblioLoopIter{reservecount} = $biblioData->{reservecount};
+    $biblioLoopIter{already_reserved} = $biblioData->{already_reserved};
+
+    if (!$itemLevelTypes && $biblioData->{itemtype}) {
+        $biblioLoopIter{description} = $itemTypes->{$biblioData->{itemtype}}{description};
+        $biblioLoopIter{imageurl} = getitemtypeimagesrc() . "/". $itemTypes->{$biblioData->{itemtype}}{imageurl};
     }
-    if ( $borr->{lost} eq 1 ) {
-        $noreserves = 1;
-        $template->param(
-            message => 1,
-            lost    => 1
-        );
+
+    foreach my $itemInfo (@{$biblioData->{itemInfos}}) {
+        $debug and warn $itemInfo->{'notforloan'};
+
+        # Get reserve fee.
+        my $fee = GetReserveFee(undef, $borrowernumber, $itemInfo->{'biblionumber'}, 'a',
+                                ( $itemInfo->{'biblioitemnumber'} ) );
+        $itemInfo->{'reservefee'} = sprintf "%.02f", ($fee ? $fee : 0.0);
+
+        if ($itemLevelTypes && $itemInfo->{itype}) {
+            $itemInfo->{description} = $itemTypes->{$itemInfo->{itype}}{description};
+            $itemInfo->{imageurl} = getitemtypeimagesrc() . "/". $itemTypes->{$itemInfo->{itype}}{imageurl};
+        }
+
+        if (!$itemInfo->{'notforloan'} && !($itemInfo->{'itemnotforloan'} > 0)) {
+            $biblioLoopIter{forloan} = 1;
+        }
+    }
+
+    $biblioLoopIter{itemTypeDescription} = $itemTypes->{$biblioData->{itemtype}}{description};
+
+    $biblioLoopIter{itemLoop} = [];
+    my $numCopiesAvailable = 0;
+    foreach my $itemInfo (@{$biblioData->{itemInfos}}) {
+        my $itemNum = $itemInfo->{itemnumber};
+        my $itemLoopIter = {};
+
+        $itemLoopIter->{itemnumber} = $itemNum;
+        $itemLoopIter->{barcode} = $itemInfo->{barcode};
+        $itemLoopIter->{homeBranchName} = $branches->{$itemInfo->{homebranch}}{branchname};
+        $itemLoopIter->{callNumber} = $itemInfo->{itemcallnumber};
+        $itemLoopIter->{enumchron} = $itemInfo->{enumchron};
+        $itemLoopIter->{copynumber} = $itemInfo->{copynumber};
+        if ($itemLevelTypes) {
+            $itemLoopIter->{description} = $itemInfo->{description};
+            $itemLoopIter->{imageurl} = $itemInfo->{imageurl};
+        }
+
+        # If the holdingbranch is different than the homebranch, we show the
+        # holdingbranch of the document too.
+        if ( $itemInfo->{homebranch} ne $itemInfo->{holdingbranch} ) {
+            $itemLoopIter->{holdingBranchName} =
+              $branches->{ $itemInfo->{holdingbranch} }{branchname};
+        }
+
+        # If the item is currently on loan, we display its return date and
+        # change the background color.
+        my $issues= GetItemIssue($itemNum);
+        if ( $issues->{'date_due'} ) {
+            $itemLoopIter->{dateDue} = format_date($issues->{'date_due'});
+            $itemLoopIter->{backgroundcolor} = 'onloan';
+        }
+
+        # checking reserve
+        my ($reservedate,$reservedfor,$expectedAt) = GetReservesFromItemnumber($itemNum);
+        my $ItemBorrowerReserveInfo = GetMemberDetails( $reservedfor, 0);
+
+        if ( defined $reservedate ) {
+            $itemLoopIter->{backgroundcolor} = 'reserved';
+            $itemLoopIter->{reservedate}     = format_date($reservedate);
+            $itemLoopIter->{ReservedForBorrowernumber} = $reservedfor;
+            $itemLoopIter->{ReservedForSurname}        = $ItemBorrowerReserveInfo->{'surname'};
+            $itemLoopIter->{ReservedForFirstname}      = $ItemBorrowerReserveInfo->{'firstname'};
+            $itemLoopIter->{ExpectedAtLibrary}         = $expectedAt;
+        }
+
+        $itemLoopIter->{notforloan} = $itemInfo->{notforloan};
+        $itemLoopIter->{itemnotforloan} = $itemInfo->{itemnotforloan};
+
+        # Management of the notforloan document
+        if ( $itemLoopIter->{notforloan} || $itemLoopIter->{itemnotforloan}) {
+            $itemLoopIter->{backgroundcolor} = 'other';
+            $itemLoopIter->{notforloanvalue} =
+              $notforloan_label_of->{ $itemLoopIter->{notforloan} };
+        }
+
+        # Management of lost or long overdue items
+        if ( $itemInfo->{itemlost} ) {
+
+            # FIXME localized strings should never be in Perl code
+            $itemLoopIter->{message} =
+                $itemInfo->{itemlost} == 1 ? "(lost)"
+              : $itemInfo->{itemlost} == 2 ? "(long overdue)"
+              : "";
+            $itemInfo->{backgroundcolor} = 'other';
+        }
+
+        # Check of the transfered documents
+        my ( $transfertwhen, $transfertfrom, $transfertto ) =
+          GetTransfers($itemNum);
+        if ( $transfertwhen && ($transfertwhen ne '') ) {
+            $itemLoopIter->{transfertwhen} = format_date($transfertwhen);
+            $itemLoopIter->{transfertfrom} =
+              $branches->{$transfertfrom}{branchname};
+            $itemLoopIter->{transfertto} = $branches->{$transfertto}{branchname};
+            $itemLoopIter->{nocancel} = 1;
+        }
+
+        # If there is no loan, return and transfer, we show a checkbox.
+        $itemLoopIter->{notforloan} = $itemLoopIter->{notforloan} || 0;
+
+        my $branch = C4::Circulation::_GetCircControlBranch($itemLoopIter, $borr);
+
+        my $branchitemrule = GetBranchItemRule( $branch, $itemInfo->{'itype'} );
+        my $policy_holdallowed = 1;
+
+        if ( $branchitemrule->{'holdallowed'} == 0 ||
+                ( $branchitemrule->{'holdallowed'} == 1 && $borr->{'branchcode'} ne $itemInfo->{'homebranch'} ) ) {
+            $policy_holdallowed = 0;
+        }
+
+        if (IsAvailableForItemLevelRequest($itemNum) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum)) {
+            $itemLoopIter->{available} = 1;
+            $numCopiesAvailable++;
+        }
+
+	# FIXME: move this to a pm
+        my $dbh = C4::Context->dbh;
+        my $sth2 = $dbh->prepare("SELECT * FROM reserves WHERE borrowernumber=? AND itemnumber=? AND found='W'");
+        $sth2->execute($itemLoopIter->{ReservedForBorrowernumber}, $itemNum);
+        while (my $wait_hashref = $sth2->fetchrow_hashref) {
+            $itemLoopIter->{waitingdate} = format_date($wait_hashref->{waitingdate});
+        }
+	$itemLoopIter->{imageurl} = getitemtypeimagelocation( 'opac', $itemTypes->{ $itemInfo->{itype} }{imageurl} );
+
+    # Show serial enumeration when needed
+    if ($itemLoopIter->{enumchron}) {
+        $itemdata_enumchron = 1;
     }
-    if ( $borr->{debarred} eq 1 ) {
-        $noreserves = 1;
-        $template->param(
-            message  => 1,
-            debarred => 1
-        );
+    $template->param( itemdata_enumchron => $itemdata_enumchron );
+
+        push @{$biblioLoopIter{itemLoop}}, $itemLoopIter;
     }
-    my @reserves = GetReservesFromBorrowernumber( $borrowernumber );
-    $template->param( RESERVES => \@reserves );
-    if ( scalar(@$reserves) >= $MAXIMUM_NUMBER_OF_RESERVES ) {
-        $template->param( message => 1 );
-        $noreserves = 1;
-        $template->param( too_many_reserves => scalar($reserves));
+
+    if ($numCopiesAvailable > 0) {
+        $numBibsAvailable++;
+        $biblioLoopIter{bib_available} = 1;
+        $biblioLoopIter{holdable} = 1;
     }
-    foreach my $res (@$reserves) {
-        if ( $res->{'biblionumber'} == $biblionumber ) {
-            $template->param( message => 1 );
-            $noreserves = 1;
-            $template->param( already_reserved => 1 );
-        }
+    if ($biblioLoopIter{already_reserved}) {
+        $biblioLoopIter{holdable} = undef;
     }
-    unless ($noreserves) {
-        $template->param( TYPES             => \@types_old );
-        $template->param( select_item_types => 1 );
+    if(not CanBookBeReserved($borrowernumber,$biblioNum)){
+        $biblioLoopIter{holdable} = undef;
     }
+
+    push @$biblioLoop, \%biblioLoopIter;
 }
 
+if ( $numBibsAvailable == 0 ) {
+    $template->param( none_available => 1, message => 1 );
+}
+
+my $itemTableColspan = 5;
+if (!$template->param('OPACItemHolds')) {
+    $itemTableColspan--;
+}
+if ($template->param('singleBranchMode')) {
+    $itemTableColspan--;
+}
+$template->param(itemtable_colspan => $itemTableColspan);
+
+# display infos
+$template->param(bibitemloop => $biblioLoop);
+$template->param( showpriority=>1 ) if $OPACDisplayRequestPriority;
+# can set reserve date in future
+if (
+    C4::Context->preference( 'AllowHoldDateInFuture' ) &&
+    C4::Context->preference( 'OPACAllowHoldDateInFuture' )
+    ) {
+    $template->param(
+	    reserve_in_future         => 1,
+    );
+}
+
+$template->param( DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar() );
+
 output_html_with_http_headers $query, $cookie, $template->output;
 
-# Local Variables:
-# tab-width: 8
-# End: