X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=reserve%2Frequest.pl;h=0b3bebca855a57f3d7fc174b0a6153a53d5b6996;hb=6059599fac4cfd0b12af48348a6d349974205697;hp=b3411aecd1b7cc0fd9140bef702629e3e15b6891;hpb=0b66bd800d9c5137240e48c2821a6871427d169d;p=koha.git

diff --git a/reserve/request.pl b/reserve/request.pl
index b3411aecd1..0b3bebca85 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-# $Id$
 
 #writen 2/1/00 by chris@katipo.oc.nz
 # Copyright 2000-2002 Katipo Communications
@@ -16,9 +15,9 @@
 # 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
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 =head1 request.pl
 
@@ -27,19 +26,21 @@ script to place reserves/requests
 =cut
 
 use strict;
+use warnings;
 use C4::Branch; # GetBranches get_branchinfos_of
 use CGI;
 use List::MoreUtils qw/uniq/;
-use Date::Calc qw/Today Date_to_Days/;
+use Date::Calc qw/Date_to_Days/;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Auth;
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Biblio;
+use C4::Items;
 use C4::Koha;
 use C4::Circulation;
-use C4::Date;
+use C4::Dates qw/format_date/;
 use C4::Members;
+use C4::Search;		# enabled_staff_search_views
 
 my $dbh = C4::Context->dbh;
 my $sth;
@@ -50,26 +51,69 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { reserveforothers => 1 },
+        flagsrequired   => { reserveforothers => 'place_holds' },
     }
 );
 
-# get biblio information....
-my $biblionumber = $input->param('biblionumber');
-my $dat          = GetBiblioData($biblionumber);
+my $multihold = $input->param('multi_hold');
+$template->param(multi_hold => $multihold);
+my $showallitems = $input->param('showallitems');
+
+# get Branches and Itemtypes
+my $branches = GetBranches();
+my $itemtypes = GetItemTypes();
+    
+my $default = C4::Context->userenv->{branch};
+my @values;
+my %label_of;
+    
+foreach my $branchcode (sort keys %{$branches} ) {
+    push @values, $branchcode;
+    $label_of{$branchcode} = $branches->{$branchcode}->{branchname};
+}
+my $CGIbranch = CGI::scrolling_list(
+                                    -name     => 'pickup',
+                                    -id          => 'pickup',
+                                    -values   => \@values,
+                                    -default  => $default,
+                                    -labels   => \%label_of,
+                                    -size     => 1,
+                                    -multiple => 0,
+                                   );
 
 # Select borrowers infos
 my $findborrower = $input->param('findborrower');
+$findborrower = '' unless defined $findborrower;
 $findborrower =~ s|,| |g;
-my $cardnumber = $input->param('cardnumber');
+my $cardnumber = $input->param('cardnumber') || '';
 my $borrowerslist;
 my $messageborrower;
-
-my $date = sprintf( '%04d-%02d-%02d', Today() );
+my $warnings;
+my $messages;
+
+my $date = C4::Dates->today('iso');
+my $action = $input->param('action');
+
+if ( $action eq 'move' ) {
+  my $where = $input->param('where');
+  my $borrowernumber = $input->param('borrowernumber');
+  my $biblionumber = $input->param('biblionumber');
+                     
+  AlterPriority( $where, $borrowernumber, $biblionumber );
+
+} elsif ( $action eq 'cancel' ) {
+  my $borrowernumber = $input->param('borrowernumber');
+  my $biblionumber = $input->param('biblionumber');
+  CancelReserve( $biblionumber, '', $borrowernumber );
+} elsif ( $action eq 'setLowestPriority' ) {
+  my $borrowernumber = $input->param('borrowernumber');
+  my $biblionumber   = $input->param('biblionumber');
+  ToggleLowestPriority( $borrowernumber, $biblionumber );
+}
 
 if ($findborrower) {
     my ( $count, $borrowers ) =
-      SearchBorrower($findborrower, 'cardnumber', 'web' );
+      SearchMember($findborrower, 'cardnumber', 'web' );
 
     my @borrowers = @$borrowers;
 
@@ -88,41 +132,56 @@ if ($findborrower) {
 
 if ($cardnumber) {
     my $borrowerinfo = GetMemberDetails( 0, $cardnumber );
-    my $expiry;
     my $diffbranch;
     my @getreservloop;
     my $count_reserv = 0;
     my $maxreserves;
 
-# 	we check the reserves of the borrower, and if he can reserv a document
+#   we check the reserves of the borrower, and if he can reserv a document
 # FIXME At this time we have a simple count of reservs, but, later, we could improve the infos "title" ...
 
     my $number_reserves =
-      CountReservesFromBorrower( $borrowerinfo->{'borrowernumber'} );
+      GetReserveCount( $borrowerinfo->{'borrowernumber'} );
 
-    if ( $number_reserves > C4::Context->preference('maxreserves') ) {
+    if ( C4::Context->preference('maxreserves') && $number_reserves >= C4::Context->preference('maxreserves') ) {
+		$warnings = 1;
         $maxreserves = 1;
     }
 
-    # we check the date expiricy of the borrower
-    my $warning = (Date_to_Days(split /-/,$date) > Date_to_Days( split /-/,$borrowerinfo->{'dateexpiry'}));
-     
-    if ( $warning > 0 ) {
-        $expiry = 1;
+    # we check the date expiry of the borrower (only if there is an expiry date, otherwise, set to 1 (warn)
+    my $expiry_date = $borrowerinfo->{dateexpiry};
+    my $expiry = 0; # flag set if patron account has expired
+    if ($expiry_date and $expiry_date ne '0000-00-00' and
+            Date_to_Days(split /-/,$date) > Date_to_Days(split /-/,$expiry_date)) {
+		$messages = $expiry = 1;
     }
+     
 
     # check if the borrower make the reserv in a different branch
     if ( $borrowerinfo->{'branchcode'} ne C4::Context->userenv->{'branch'} ) {
+		$messages = 1;
         $diffbranch = 1;
     }
 
     $template->param(
-        borrowersurname   => $borrowerinfo->{'surname'},
-        borrowerfirstname => $borrowerinfo->{'firstname'},
-        borrowerreservs   => $count_reserv,
-        maxreserves       => $maxreserves,
-        expiry            => $expiry,
-        diffbranch        => $diffbranch
+                borrowernumber => $borrowerinfo->{'borrowernumber'},
+                borrowersurname   => $borrowerinfo->{'surname'},
+                borrowerfirstname => $borrowerinfo->{'firstname'},
+                borrowerstreetaddress => $borrowerinfo->{'address'},
+                borrowercity => $borrowerinfo->{'city'},
+                borrowerphone => $borrowerinfo->{'phone'},
+                borrowermobile => $borrowerinfo->{'mobile'},
+                borrowerfax => $borrowerinfo->{'fax'},
+                borrowerphonepro => $borrowerinfo->{'phonepro'},
+                borroweremail => $borrowerinfo->{'email'},
+                borroweremailpro => $borrowerinfo->{'emailpro'},
+                borrowercategory => $borrowerinfo->{'category'},
+                borrowerreservs   => $count_reserv,
+                maxreserves       => $maxreserves,
+                expiry            => $expiry,
+                diffbranch        => $diffbranch,
+				messages => $messages,
+				warnings => $warnings
     );
 }
 
@@ -147,7 +206,7 @@ if ($borrowerslist) {
             '%s, %s ... (%s - %s) ... %s',
             $borrower->{surname},    $borrower->{firstname},
             $borrower->{cardnumber}, $borrower->{categorycode},
-            $borrower->{streetaddress},
+            $borrower->{address},
         );
     }
 
@@ -160,273 +219,389 @@ if ($borrowerslist) {
     );
 }
 
-# get existing reserves .....
-my ( $count, $reserves ) = FindReserves($biblionumber);
-my $totalcount = $count;
-my $alreadyreserved;
-
 # FIXME launch another time GetMemberDetails perhaps until
 my $borrowerinfo = GetMemberDetails( 0, $cardnumber );
 
-foreach my $res (@$reserves) {
-    if ( ( $res->{found} eq 'W' ) or ( $res->{priority} == 0 ) ) {
-        $count--;
-    }
-
-    if ( $borrowerinfo->{borrowernumber} eq $res->{borrowernumber} ) {
-        $alreadyreserved = 1;
-    }
-}
-
-$template->param( alreadyreserved => $alreadyreserved );
-
-# FIXME think @optionloop, is maybe obsolete, or  must be switchable by a systeme preference fixed rank or not
-# make priorities options
-
-my @optionloop;
-for ( 1 .. $count + 1 ) {
-    push(
-        @optionloop,
-        {
-            num      => $_,
-            selected => ( $_ == $count + 1 ),
-        }
-    );
-}
-# adding a fixed value for priority options
-my $fixedRank = $count+1;
-
-my @branchcodes;
-my %itemnumbers_of_biblioitem;
-my @itemnumbers  = @{ get_itemnumbers_of($biblionumber)->{$biblionumber} };
-my $iteminfos_of = GetItemInfosOf(@itemnumbers);
-
-foreach my $itemnumber (@itemnumbers) {
-    push( @branchcodes,
-        $iteminfos_of->{$itemnumber}->{homebranch},
-        $iteminfos_of->{$itemnumber}->{holdingbranch} );
-
-    my $biblioitemnumber = $iteminfos_of->{$itemnumber}->{biblioitemnumber};
-    push( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} }, $itemnumber );
-}
-
-@branchcodes = uniq @branchcodes;
-
-my @biblioitemnumbers = keys %itemnumbers_of_biblioitem;
-
-my $branchinfos_of      = get_branchinfos_of(@branchcodes);
-my $notforloan_label_of = get_notforloan_label_of();
-my $biblioiteminfos_of  = GetBiblioItemInfosOf(@biblioitemnumbers);
-
-my @itemtypes;
-foreach my $biblioitemnumber (@biblioitemnumbers) {
-    push @itemtypes, $biblioiteminfos_of->{$biblioitemnumber}{itemtype};
+my @biblionumbers = ();
+my $biblionumbers = $input->param('biblionumbers');
+if ($multihold) {
+    @biblionumbers = split '/', $biblionumbers;
+} else {
+    push @biblionumbers, $input->param('biblionumber');
 }
 
-my $itemtypeinfos_of = get_itemtypeinfos_of(@itemtypes);
+my @biblioloop = ();
+foreach my $biblionumber (@biblionumbers) {
 
-my @bibitemloop;
+    my %biblioloopiter = ();
+	my $maxreserves;
 
-foreach my $biblioitemnumber (@biblioitemnumbers) {
-    my $biblioitem = $biblioiteminfos_of->{$biblioitemnumber};
+    my $dat          = GetBiblioData($biblionumber);
 
-    $biblioitem->{description} =
-      $itemtypeinfos_of->{ $biblioitem->{itemtype} }{description};
+    if ( not CanBookBeReserved($borrowerinfo->{borrowernumber}, $biblionumber) ) {
+ 		$warnings = 1;
+        $maxreserves = 1;
+    }
+    # get existing reserves .....
+    my ( $count, $reserves ) = GetReservesFromBiblionumber($biblionumber,1);
+    my $totalcount = $count;
+    my $alreadyreserved;
+
+    foreach my $res (@$reserves) {
+        if ( defined $res->{found} && $res->{found} eq 'W' ) {
+            $count--;
+        }
 
-    foreach
-      my $itemnumber ( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} } )
-    {
-        my $item = $iteminfos_of->{$itemnumber};
+        if ( defined $borrowerinfo && ($borrowerinfo->{borrowernumber} eq $res->{borrowernumber}) ) {
+            $warnings = 1;
+            $alreadyreserved = 1;
+            $biblioloopiter{warn} = 1;
+            $biblioloopiter{alreadyres} = 1;
+        }
+    }
 
-        $item->{homebranchname} =
-          $branchinfos_of->{ $item->{homebranch} }{branchname};
+    $template->param( alreadyreserved => $alreadyreserved,
+                      messages => $messages,
+                      warnings => $warnings,
+					  maxreserves=>$maxreserves
+					  );
+    
+    
+    # FIXME think @optionloop, is maybe obsolete, or  must be switchable by a systeme preference fixed rank or not
+    # make priorities options
+    
+    my @optionloop;
+    for ( 1 .. $count + 1 ) {
+        push(
+             @optionloop,
+             {
+              num      => $_,
+              selected => ( $_ == $count + 1 ),
+             }
+            );
+    }
+    # adding a fixed value for priority options
+    my $fixedRank = $count+1;
 
-        # if the holdingbranch is different than the homebranch, we show the
-        # holdingbranch of the document too
-        if ( $item->{homebranch} ne $item->{holdingbranch} ) {
-            $item->{holdingbranchname} =
-              $branchinfos_of->{ $item->{holdingbranch} }{branchname};
-        }
+    my @branchcodes;
+    my %itemnumbers_of_biblioitem;
+    my @itemnumbers;
+    
+    ## $items is array of 'item' table numbers
+    if (my $items = get_itemnumbers_of($biblionumber)->{$biblionumber}){
+        @itemnumbers  = @$items;
+    }
+    else {
+        $template->param('noitems' => 1);
+        $biblioloopiter{noitems} = 1;
+    }
+    
+    ## Hash of item number to 'item' table fields
+    my $iteminfos_of = GetItemInfosOf(@itemnumbers);
+    
+    ## Here we go backwards again to create hash of biblioitemnumber to itemnumbers,
+    ## when by definition all of the itemnumber have the same biblioitemnumber
+    foreach my $itemnumber (@itemnumbers) {
+        my $biblioitemnumber = $iteminfos_of->{$itemnumber}->{biblioitemnumber};
+        push( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} }, $itemnumber );
+    }
+    
+    ## Should be same as biblionumber
+    my @biblioitemnumbers = keys %itemnumbers_of_biblioitem;
+    
+    my $notforloan_label_of = get_notforloan_label_of();
+    
+    ## Hash of biblioitemnumber to 'biblioitem' table records
+    my $biblioiteminfos_of  = GetBiblioItemInfosOf(@biblioitemnumbers);
+    
+    my @bibitemloop;
+    
+    foreach my $biblioitemnumber (@biblioitemnumbers) {
+        my $biblioitem = $biblioiteminfos_of->{$biblioitemnumber};
+        my $num_available = 0;
+        my $num_override  = 0;
+        my $hiddencount   = 0;
         
-# 	add information
-	$item->{itemcallnumber} = $item->{itemcallnumber};
-	
-        # if the item is currently on loan, we display its return date and
-        # change the background color
-        my $issues= GetItemIssue($itemnumber);
-        if ( $issues->{'date_due'} ) {
-            $item->{date_due} = format_date($issues->{'date_due'});
-            $item->{backgroundcolor} = 'onloan';
-        }
+        $biblioitem->{description} =
+          $itemtypes->{ $biblioitem->{itemtype} }{description};
+        $biblioloopiter{description} = $biblioitem->{description};
+        $biblioloopiter{itypename} = $biblioitem->{description};
+        $biblioloopiter{imageurl} =
+          getitemtypeimagelocation('intranet', $itemtypes->{$biblioitem->{itemtype}}{imageurl});
+        
+        foreach my $itemnumber ( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} } )    {
+            my $item = $iteminfos_of->{$itemnumber};
+            
+            unless (C4::Context->preference('item-level_itypes')) {
+                $item->{itype} = $biblioitem->{itemtype};
+            }
+            
+            $item->{itypename} = $itemtypes->{ $item->{itype} }{description};
+            $item->{imageurl} = getitemtypeimagelocation( 'intranet', $itemtypes->{ $item->{itype} }{imageurl} );
+            $item->{homebranchname} = $branches->{ $item->{homebranch} }{branchname};
+            
+            # if the holdingbranch is different than the homebranch, we show the
+            # holdingbranch of the document too
+            if ( $item->{homebranch} ne $item->{holdingbranch} ) {
+                $item->{holdingbranchname} =
+                  $branches->{ $item->{holdingbranch} }{branchname};
+            }
+            
+            #   add information
+            $item->{itemcallnumber} = $item->{itemcallnumber};
+            
+            # if the item is currently on loan, we display its return date and
+            # change the background color
+            my $issues= GetItemIssue($itemnumber);
+            if ( $issues->{'date_due'} ) {
+                $item->{date_due} = format_date($issues->{'date_due'});
+                $item->{backgroundcolor} = 'onloan';
+            }
+            
+            # checking reserve
+            my ($reservedate,$reservedfor,$expectedAt) = GetReservesFromItemnumber($itemnumber);
+            my $ItemBorrowerReserveInfo = GetMemberDetails( $reservedfor, 0);
+            
+            if ( defined $reservedate ) {
+                $item->{backgroundcolor} = 'reserved';
+                $item->{reservedate}     = format_date($reservedate);
+                $item->{ReservedForBorrowernumber}     = $reservedfor;
+                $item->{ReservedForSurname}     = $ItemBorrowerReserveInfo->{'surname'};
+                $item->{ReservedForFirstname}     = $ItemBorrowerReserveInfo->{'firstname'};
+                $item->{ExpectedAtLibrary}     = $branches->{$expectedAt}{branchname};
+                
+            }
+            
+            # Management of the notforloan document
+            if ( $item->{notforloan} ) {
+                $item->{backgroundcolor} = 'other';
+                $item->{notforloanvalue} =
+                  $notforloan_label_of->{ $item->{notforloan} };
+            }
+     
+            # Management of lost or long overdue items
+            if ( $item->{itemlost} ) {
+                
+                # FIXME localized strings should never be in Perl code
+                $item->{message} =
+                  $item->{itemlost} == 1 ? "(lost)"
+                    : $item->{itemlost} == 2 ? "(long overdue)"
+                      : "";
+                $item->{backgroundcolor} = 'other';
+                if (GetHideLostItemsPreference($borrowernumber) && !$showallitems) {
+                    $item->{hide} = 1;
+                    $hiddencount++;
+                }
+            }
+            
+            # Check the transit status
+            my ( $transfertwhen, $transfertfrom, $transfertto ) =
+              GetTransfers($itemnumber);
+            
+            if ( defined $transfertwhen && $transfertwhen ne '' ) {
+                $item->{transfertwhen} = format_date($transfertwhen);
+                $item->{transfertfrom} =
+                  $branches->{$transfertfrom}{branchname};
+                $item->{transfertto} = $branches->{$transfertto}{branchname};
+                $item->{nocancel} = 1;
+            }
+            
+            # If there is no loan, return and transfer, we show a checkbox.
+            $item->{notforloan} = $item->{notforloan} || 0;
+            
+            # if independent branches is on we need to check if the person can reserve
+            # for branches they arent logged in to
+            if ( C4::Context->preference("IndependantBranches") ) { 
+                if (! C4::Context->preference("canreservefromotherbranches")){
+                    # cant reserve items so need to check if item homebranch and userenv branch match if not we cant reserve
+                    my $userenv = C4::Context->userenv;
+                    if ( ($userenv) && ( $userenv->{flags} % 2 != 1 ) ) {
+                        $item->{cantreserve} = 1 if ( $item->{homebranch} ne $userenv->{branch} );
+                    }
+                }
+            }
+            
+            my $branch = C4::Circulation::_GetCircControlBranch($item, $borrowerinfo);
 
-        # checking reserve
-        my ($reservedate,$reservedfor,$expectedAt) = GetFirstReserveDateFromItem($itemnumber);
-        my $ItemBorrowerReserveInfo = GetMemberDetails( $reservedfor, 0);
-
-        if ( defined $reservedate ) {
-            $item->{backgroundcolor} = 'reserved';
-            $item->{reservedate}     = format_date($reservedate);
-            $item->{ReservedForBorrowernumber}     = $reservedfor;
-            $item->{ReservedForSurname}     = $ItemBorrowerReserveInfo->{'surname'};
-            $item->{ReservedForFirstname}     = $ItemBorrowerReserveInfo->{'firstname'};
-            $item->{ExpectedAtLibrary}     = $expectedAt;
+            my $branchitemrule = GetBranchItemRule( $branch, $item->{'itype'} );
+            my $policy_holdallowed = 1;
             
-        }
+            $item->{'holdallowed'} = $branchitemrule->{'holdallowed'};
+            
+            if ( $branchitemrule->{'holdallowed'} == 0 ||
+                 ( $branchitemrule->{'holdallowed'} == 1 && $borrowerinfo->{'branchcode'} ne $item->{'homebranch'} ) ) {
+                $policy_holdallowed = 0;
+            }
+            
+            if (IsAvailableForItemLevelRequest($itemnumber) and not $item->{cantreserve} and CanItemBeReserved($borrowerinfo->{borrowernumber}, $itemnumber) ) {
+                if ( $policy_holdallowed ) {
+                    $item->{available} = 1;
+                    $num_available++;
+                }
+            } elsif (C4::Context->preference( 'AllowHoldPolicyOverride' ) ) {
+                    $item->{override} = 1;
+                    $num_override++;
+            }
+            # If AllowHoldPolicyOverride is set, it should override EVERY restriction, not just branch item rules
+            if (C4::Context->preference( 'AllowHoldPolicyOverride' ) && !$item->{available} ) {
+                $item->{override} = 1;
+                $num_override++;
+            }   
 
-        # Management of the notforloan document
-        if ( $item->{notforloan} ) {
-            $item->{backgroundcolor} = 'other';
-            $item->{notforloanvalue} =
-              $notforloan_label_of->{ $item->{notforloan} };
+            # If none of the conditions hold true, then neither override nor available is set and the item cannot be checked
+            
+            # FIXME: move this to a pm
+            my $sth2 = $dbh->prepare("SELECT * FROM reserves WHERE borrowernumber=? AND itemnumber=? AND found='W'");
+            $sth2->execute($item->{ReservedForBorrowernumber},$item->{itemnumber});
+            while (my $wait_hashref = $sth2->fetchrow_hashref) {
+                $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
+            }
+            push @{ $biblioitem->{itemloop} }, $item;
         }
-
-        # Management of lost or long overdue items
-        if ( $item->{itemlost} ) {
-
-            # FIXME localized strings should never be in Perl code
-            $item->{message} =
-                $item->{itemlost} == 1 ? "(lost)"
-              : $item->{itemlost} == 2 ? "(long overdue)"
-              : "";
-            $item->{backgroundcolor} = 'other';
+        
+        if ( $num_override == scalar( @{ $biblioitem->{itemloop} } ) ) { # That is, if all items require an override
+            $template->param( override_required => 1 );
+        } elsif ( $num_available == 0 ) {
+            $template->param( none_available => 1 );
+            $template->param( warnings => 1 );
+            $biblioloopiter{warn} = 1;
+            $biblioloopiter{none_avail} = 1;
         }
+        $template->param( hiddencount => $hiddencount);
+        
+        push @bibitemloop, $biblioitem;
+    }
 
-        # Check of the transfered documents
-        my ( $transfertwhen, $transfertfrom, $transfertto ) =
-          GetTransfers($itemnumber);
-
-        if ( $transfertwhen ne '' ) {
-            $item->{transfertwhen} = format_date($transfertwhen);
-            $item->{transfertfrom} =
-              $branchinfos_of->{$transfertfrom}{branchname};
-            $item->{transfertto} = $branchinfos_of->{$transfertto}{branchname};
-		$item->{nocancel} = 1;
+    # existingreserves building
+    my @reserveloop;
+    ( $count, $reserves ) = GetReservesFromBiblionumber($biblionumber,1);
+    foreach my $res ( sort { 
+            my $a_found = $a->{found} || '';
+            my $b_found = $a->{found} || '';
+            $a_found cmp $b_found; 
+        } @$reserves ) {
+        my %reserve;
+        my @optionloop;
+        for ( my $i = 1 ; $i <= $totalcount ; $i++ ) {
+            push(
+                 @optionloop,
+                 {
+                  num      => $i,
+                  selected => ( $i == $res->{priority} ),
+                 }
+                );
         }
-
-        # If there is no loan, return and transfer, we show a checkbox.
-        $item->{notforloan} = $item->{notforloan} || 0;
-
-        # An item is available only if:
-        if (
-            not defined $reservedate    # not reserved yet
-            and $issues->{'date_due'} eq ''         # not currently on loan
-            and not $item->{itemlost}   # not lost
-            and not $item->{notforloan} # not forbidden to loan
-            and $transfertwhen eq ''    # not currently on transfert
-          )
-        {
-            $item->{available} = 1;
+        
+        if ( defined $res->{'found'} && $res->{'found'} eq 'W' || $res->{'found'} eq 'T' ) {
+            my $item = $res->{'itemnumber'};
+            $item = GetBiblioFromItemNumber($item,undef);
+            $reserve{'wait'}= 1; 
+            $reserve{'holdingbranch'}=$item->{'holdingbranch'};
+            $reserve{'biblionumber'}=$item->{'biblionumber'};
+            $reserve{'barcodenumber'}   = $item->{'barcode'};
+            $reserve{'wbrcode'} = $res->{'branchcode'};
+            $reserve{'itemnumber'}  = $res->{'itemnumber'};
+            $reserve{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'};
+            if($reserve{'holdingbranch'} eq $reserve{'wbrcode'}){
+                $reserve{'atdestination'} = 1;
+            }
+            # set found to 1 if reserve is waiting for patron pickup
+            $reserve{'found'} = 1 if $res->{'found'} eq 'W';
+            $reserve{'intransit'} = 1 if $res->{'found'} eq 'T';
+        } elsif ($res->{priority} > 0) {
+            if (defined($res->{itemnumber})) {
+                my $item = GetItem($res->{itemnumber});
+                $reserve{'itemnumber'}  = $res->{'itemnumber'};
+                $reserve{'barcodenumber'}   = $item->{'barcode'};
+                $reserve{'item_level_hold'} = 1;
+            }
         }
-
-        push @{ $biblioitem->{itemloop} }, $item;
+        
+        #     get borrowers reserve info
+        my $reserveborrowerinfo = GetMemberDetails( $res->{'borrowernumber'}, 0);
+        if (C4::Context->preference('HidePatronName')){
+	    $reserve{'hidename'} = 1;
+	    $reserve{'cardnumber'} = $reserveborrowerinfo->{'cardnumber'};
+	}
+        $reserve{'expirationdate'} = format_date( $res->{'expirationdate'} ) 
+            unless ( !defined($res->{'expirationdate'}) || $res->{'expirationdate'} eq '0000-00-00' );
+        $reserve{'date'}           = format_date( $res->{'reservedate'} );
+        $reserve{'borrowernumber'} = $res->{'borrowernumber'};
+        $reserve{'biblionumber'}   = $res->{'biblionumber'};
+        $reserve{'borrowernumber'} = $res->{'borrowernumber'};
+        $reserve{'firstname'}      = $reserveborrowerinfo->{'firstname'};
+        $reserve{'surname'}        = $reserveborrowerinfo->{'surname'};	    
+        $reserve{'notes'}          = $res->{'reservenotes'};
+        $reserve{'wait'}           =
+          ( ( defined $res->{'found'} and $res->{'found'} eq 'W' ) or ( $res->{'priority'} eq '0' ) );
+        $reserve{'constrainttypea'} = ( $res->{'constrainttype'} eq 'a' );
+        $reserve{'constrainttypeo'} = ( $res->{'constrainttype'} eq 'o' );
+        $reserve{'voldesc'}         = $res->{'volumeddesc'};
+        $reserve{'ccode'}           = $res->{'ccode'};
+        $reserve{'barcode'}         = $res->{'barcode'};
+        $reserve{'priority'}    = $res->{'priority'};
+        $reserve{'lowestPriority'}    = $res->{'lowestPriority'};
+        $reserve{'branchloop'} = GetBranchesLoop($res->{'branchcode'});
+        $reserve{'optionloop'} = \@optionloop;
+        
+        push( @reserveloop, \%reserve );
     }
+    
+    # get the time for the form name...
+    my $time = time();
+    
+    $template->param(
+                     CGIbranch   => $CGIbranch,
 
-    push @bibitemloop, $biblioitem;
-}
-
-# existingreserves building
-my @reserveloop;
-my $branches = GetBranches();
-my ( $count, $reserves ) = FindReservesInQueue($biblionumber);
-foreach my $res ( sort { $a->{found} cmp $b->{found} } @$reserves ) {
-    my %reserve;
-    my @optionloop;
-    for ( my $i = 1 ; $i <= $totalcount ; $i++ ) {
-        push(
-            @optionloop,
-            {
-                num      => $i,
-                selected => ( $i == $res->{priority} ),
-            }
+                     time        => $time,
+                     fixedRank   => $fixedRank,
+                    );
+    
+    # display infos
+    $template->param(
+                     optionloop        => \@optionloop,
+                     bibitemloop       => \@bibitemloop,
+                     date              => $date,
+                     biblionumber      => $biblionumber,
+                     findborrower      => $findborrower,
+                     cardnumber        => $cardnumber,
+                     title             => $dat->{title},
+                     author            => $dat->{author},
+                     holdsview => 1,
+                     C4::Search::enabled_staff_search_views,
+                    );
+    if (defined $borrowerinfo && exists $borrowerinfo->{'branchcode'}) {
+        $template->param(
+                     borrower_branchname => $branches->{$borrowerinfo->{'branchcode'}}->{'branchname'},
+                     borrower_branchcode => $borrowerinfo->{'branchcode'},
         );
     }
-    my @branchloop;
-    foreach my $br ( keys %$branches ) {
-        my %abranch;
-        $abranch{'selected'}   = ( $br eq $res->{'branchcode'} );
-        $abranch{'branch'}     = $br;
-        $abranch{'branchname'} = $branches->{$br}->{'branchname'};
-        push( @branchloop, \%abranch );
-    }
+    $template->param(CGIselectborrower => $CGIselectborrower) if defined $CGIselectborrower;
 
-    if ( ( $res->{'found'} eq 'W' ) or ( $res->{'priority'} eq '0' ) ) {
-        my $item = $res->{'itemnumber'};
-        $item = getiteminformation($item,undef);
-        $reserve{'wait'}= 1; 
-        $reserve{'holdingbranch'}=$item->{'holdingbranch'};
-        $reserve{'biblionumber'}=$item->{'biblionumber'};
-        $reserve{'barcodenumber'}	= $item->{'barcode'};
-        $reserve{'wbrcode'} = $res->{'branchcode'};
-        $reserve{'itemnumber'}	= $res->{'itemnumber'};
-        $reserve{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'};
-        if($reserve{'holdingbranch'} eq $reserve{'wbrcode'}){
-            $reserve{'atdestination'} = 1;
-        }
+    $biblioloopiter{biblionumber} = $biblionumber;
+    $biblioloopiter{title} = $dat->{title};
+    $biblioloopiter{rank} = $fixedRank;
+    $biblioloopiter{reserveloop} = \@reserveloop;
+
+    if (@reserveloop) {
+        $template->param( reserveloop => \@reserveloop );
     }
     
-#     get borrowers reserve info
-my $reserveborrowerinfo = GetMemberDetails( $res->{'borrowernumber'}, 0);
-
-    $reserve{'date'}           = format_date( $res->{'reservedate'} );
-    $reserve{'borrowernumber'} = $res->{'borrowernumber'};
-    $reserve{'biblionumber'}   = $res->{'biblionumber'};
-    $reserve{'borrowernumber'} = $res->{'borrowernumber'};
-    $reserve{'firstname'}      = $reserveborrowerinfo->{'firstname'};
-    $reserve{'surname'}        = $reserveborrowerinfo->{'surname'};
-    $reserve{'notes'}          = $res->{'reservenotes'};
-    $reserve{'wait'}           =
-      ( ( $res->{'found'} eq 'W' ) or ( $res->{'priority'} eq '0' ) );
-    $reserve{'constrainttypea'} = ( $res->{'constrainttype'} eq 'a' );
-    $reserve{'constrainttypeo'} = ( $res->{'constrainttype'} eq 'o' );
-    $reserve{'voldesc'}         = $res->{'volumeddesc'};
-    $reserve{'ccode'}           = $res->{'ccode'};
-    $reserve{'barcode'}         = $res->{'barcode'};
-    $reserve{'priority'}	= $res->{'priority'};
-    $reserve{'branchloop'} = \@branchloop;
-    $reserve{'optionloop'} = \@optionloop;
-
-    push( @reserveloop, \%reserve );
-}
-
-my $default = C4::Context->userenv->{branch};
-my @values;
-my %label_of;
 
-foreach my $branchcode ( keys %{$branches} ) {
-    push @values, $branchcode;
-    $label_of{$branchcode} = $branches->{$branchcode}->{branchname};
+    push @biblioloop, \%biblioloopiter;
 }
-my $CGIbranch = CGI::scrolling_list(
-    -name     => 'pickup',
-    -values   => \@values,
-    -default  => $default,
-    -labels   => \%label_of,
-    -size     => 1,
-    -multiple => 0,
-);
 
-# get the time for the form name...
-my $time = time();
-
-$template->param(
-    CGIbranch   => $CGIbranch,
-    reserveloop => \@reserveloop,
-    time        => $time,
-    fixedRank	=> $fixedRank,
-);
+$template->param( biblioloop => \@biblioloop );
+$template->param( biblionumbers => $biblionumbers );
+$template->param( DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar() );
 
-# display infos
-$template->param(
-    optionloop        => \@optionloop,
-    bibitemloop       => \@bibitemloop,
-    date              => $date,
-    biblionumber      => $biblionumber,
-    findborrower      => $findborrower,
-    cardnumber        => $cardnumber,
-    CGIselectborrower => $CGIselectborrower,
-    title             => $dat->{title},
-    author            => $dat->{author}
-);
+if ($multihold) {
+    $template->param( multi_hold => 1 );
+}
 
+if ( C4::Context->preference( 'AllowHoldDateInFuture' ) ) {
+    $template->param( reserve_in_future => 1 );
+}
+    
 # printout the page
 output_html_with_http_headers $input, $cookie, $template->output;