Bug 15629: Koha::Libraries - Remove GetBranchDetail
[koha.git] / reserve / request.pl
index c34a614..effae5e 100755 (executable)
@@ -1,24 +1,24 @@
 #!/usr/bin/perl
 
 
-#writen 2/1/00 by chris@katipo.oc.nz
+#written 2/1/00 by chris@katipo.oc.nz
 # Copyright 2000-2002 Katipo Communications
 # Parts Copyright 2011 Catalyst IT
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 =head1 request.pl
 
@@ -29,7 +29,7 @@ script to place reserves/requests
 use strict;
 use warnings;
 use C4::Branch;
-use CGI;
+use CGI qw ( -utf8 );
 use List::MoreUtils qw/uniq/;
 use Date::Calc qw/Date_to_Days/;
 use C4::Output;
@@ -39,17 +39,20 @@ use C4::Biblio;
 use C4::Items;
 use C4::Koha;
 use C4::Circulation;
-use C4::Dates qw/format_date/;
+use Koha::DateUtils;
+use C4::Utils::DataTables::Members;
 use C4::Members;
 use C4::Search;                # enabled_staff_search_views
 use Koha::DateUtils;
+use Koha::Borrower::Debarments qw(IsDebarred);
+use Koha::Holds;
+use Koha::Libraries;
 
 my $dbh = C4::Context->dbh;
-my $sth;
 my $input = new CGI;
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user(
     {
-        template_name   => "reserve/request.tmpl",
+        template_name   => "reserve/request.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
@@ -65,104 +68,116 @@ my $showallitems = $input->param('showallitems');
 my $branches = GetBranches();
 my $itemtypes = GetItemTypes();
 
-my $default = C4::Context->userenv->{branch};
-my @values;
-my %label_of;
-
-foreach my $branchcode ( sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches ) {
-    push @values, $branchcode;
-    $label_of{$branchcode} = $branches->{$branchcode}->{branchname};
+my $userbranch = '';
+if (C4::Context->userenv && C4::Context->userenv->{'branch'}) {
+    $userbranch = C4::Context->userenv->{'branch'};
 }
-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 $borrowernumber_hold = $input->param('borrowernumber') || '';
-my $borrowerslist;
 my $messageborrower;
 my $warnings;
 my $messages;
+my $exceeded_maxreserves;
 
-my $date = C4::Dates->today('iso');
+my $date = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
 my $action = $input->param('action');
 $action ||= q{};
 
 if ( $action eq 'move' ) {
   my $where = $input->param('where');
-  my $borrowernumber = $input->param('borrowernumber');
-  my $biblionumber = $input->param('biblionumber');
-  AlterPriority( $where, $borrowernumber, $biblionumber );
+  my $reserve_id = $input->param('reserve_id');
+  AlterPriority( $where, $reserve_id );
 } elsif ( $action eq 'cancel' ) {
-  my $borrowernumber = $input->param('borrowernumber');
-  my $biblionumber = $input->param('biblionumber');
-  CancelReserve( $biblionumber, '', $borrowernumber );
+  my $reserve_id = $input->param('reserve_id');
+  CancelReserve({ reserve_id => $reserve_id });
 } elsif ( $action eq 'setLowestPriority' ) {
-  my $borrowernumber = $input->param('borrowernumber');
-  my $biblionumber   = $input->param('biblionumber');
-  ToggleLowestPriority( $borrowernumber, $biblionumber );
+  my $reserve_id = $input->param('reserve_id');
+  ToggleLowestPriority( $reserve_id );
 } elsif ( $action eq 'toggleSuspend' ) {
-  my $borrowernumber = $input->param('borrowernumber');
-  my $biblionumber   = $input->param('biblionumber');
+  my $reserve_id = $input->param('reserve_id');
   my $suspend_until  = $input->param('suspend_until');
-  ToggleSuspend( $borrowernumber, $biblionumber, $suspend_until );
+  ToggleSuspend( $reserve_id, $suspend_until );
 }
 
 if ($findborrower) {
-    my $borrowers = Search($findborrower, 'cardnumber');
-
-    if ($borrowers && @$borrowers) {
-        if ( @$borrowers == 1 ) {
-            $borrowernumber_hold = $borrowers->[0]->{'borrowernumber'};
-        }
-        else {
-            $borrowerslist = $borrowers;
-        }
+    my $borrower = C4::Members::GetMember( cardnumber => $findborrower );
+    if ( $borrower ) {
+        $borrowernumber_hold = $borrower->{borrowernumber};
     } else {
-        $messageborrower = "'$findborrower'";
+        my $dt_params = { iDisplayLength => -1 };
+        my $results = C4::Utils::DataTables::Members::search(
+            {
+                searchmember => $findborrower,
+                dt_params => $dt_params,
+            }
+        );
+        my $borrowers = $results->{patrons};
+        if ( scalar @$borrowers == 1 ) {
+            $borrowernumber_hold = $borrowers->[0]->{borrowernumber};
+        } elsif ( @$borrowers ) {
+            $template->param( borrowers => $borrowers );
+        } else {
+            $messageborrower = "'$findborrower'";
+        }
     }
 }
 
+my @biblionumbers = ();
+my $biblionumbers = $input->param('biblionumbers');
+if ($multihold) {
+    @biblionumbers = split '/', $biblionumbers;
+} else {
+    push @biblionumbers, $input->param('biblionumber');
+}
+
+
 # If we have the borrowernumber because we've performed an action, then we
 # don't want to try to place another reserve.
 if ($borrowernumber_hold && !$action) {
     my $borrowerinfo = GetMember( borrowernumber => $borrowernumber_hold );
     my $diffbranch;
-    my @getreservloop;
-    my $count_reserv = 0;
-    my $maxreserves;
 
-#   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" ...
+    # 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 =
+    my $reserves_count =
       GetReserveCount( $borrowerinfo->{'borrowernumber'} );
 
-    if ( C4::Context->preference('maxreserves') && ($number_reserves >= C4::Context->preference('maxreserves')) ) {
-               $warnings = 1;
-        $maxreserves = 1;
+    my $new_reserves_count = scalar( @biblionumbers );
+
+    my $maxreserves = C4::Context->preference('maxreserves');
+    if ( $maxreserves
+        && ( $reserves_count + $new_reserves_count > $maxreserves ) )
+    {
+        my $new_reserves_allowed =
+            $maxreserves - $reserves_count > 0
+          ? $maxreserves - $reserves_count
+          : 0;
+        $warnings             = 1;
+        $exceeded_maxreserves = 1;
+        $template->param(
+            new_reserves_allowed => $new_reserves_allowed,
+            new_reserves_count   => $new_reserves_count,
+            reserves_count       => $reserves_count,
+            maxreserves          => $maxreserves,
+        );
     }
 
     # 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;
+        Date_to_Days(split /-/,$date) > Date_to_Days(split /-/,$expiry_date)) {
+        $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;
     }
 
@@ -179,98 +194,78 @@ if ($borrowernumber_hold && !$action) {
                 borroweremail       => $borrowerinfo->{'email'},
                 borroweremailpro    => $borrowerinfo->{'emailpro'},
                 borrowercategory    => $borrowerinfo->{'category'},
-                borrowerreservs     => $count_reserv,
                 cardnumber          => $borrowerinfo->{'cardnumber'},
-                maxreserves         => $maxreserves,
                 expiry              => $expiry,
                 diffbranch          => $diffbranch,
-                               messages            => $messages,
-                               warnings            => $warnings
+                messages            => $messages,
+                warnings            => $warnings,
+                restricted          => IsDebarred($borrowerinfo->{'borrowernumber'}),
+                amount_outstanding  => GetMemberAccountRecords($borrowerinfo->{borrowernumber}),
     );
 }
 
 $template->param( messageborrower => $messageborrower );
 
-my $CGIselectborrower;
-if ($borrowerslist) {
-    my @values;
-    my %labels;
-
-    foreach my $borrower (
-        sort {
-                uc($a->{surname}
-              . $a->{firstname}) cmp uc($b->{surname}
-              . $b->{firstname})
-        } @{$borrowerslist}
-      )
-    {
-        push @values, $borrower->{borrowernumber};
-
-        $labels{ $borrower->{borrowernumber} } = sprintf(
-            '%s, %s ... (%s - %s) ... %s',
-            $borrower->{surname} ||'',    $borrower->{firstname} || '',
-            $borrower->{cardnumber} || '', $borrower->{categorycode} || '',
-            $borrower->{address} || '',
-        );
-    }
-
-    $CGIselectborrower = CGI::scrolling_list(
-        -name     => 'borrowernumber',
-        -values   => \@values,
-        -labels   => \%labels,
-        -size     => 7,
-        -multiple => 0,
-    );
-}
-
 # FIXME launch another time GetMember perhaps until
 my $borrowerinfo = GetMember( borrowernumber => $borrowernumber_hold );
 
-my @biblionumbers = ();
-my $biblionumbers = $input->param('biblionumbers');
-if ($multihold) {
-    @biblionumbers = split '/', $biblionumbers;
-} else {
-    push @biblionumbers, $input->param('biblionumber');
-}
-
 my $itemdata_enumchron = 0;
 my @biblioloop = ();
 foreach my $biblionumber (@biblionumbers) {
 
     my %biblioloopiter = ();
-       my $maxreserves;
 
-    my $dat          = GetBiblioData($biblionumber);
+    my $dat = GetBiblioData($biblionumber);
+
+    my $canReserve = CanBookBeReserved( $borrowerinfo->{borrowernumber}, $biblionumber );
+    $canReserve //= '';
+    if ( $canReserve eq 'OK' ) {
 
-    unless ( CanBookBeReserved($borrowerinfo->{borrowernumber}, $biblionumber) ) {
-               $warnings = 1;
-        $maxreserves = 1;
+        #All is OK and we can continue
     }
+    elsif ( $canReserve eq 'tooManyReserves' ) {
+        $exceeded_maxreserves = 1;
+    }
+    elsif ( $canReserve eq 'ageRestricted' ) {
+        $template->param( $canReserve => 1 );
+        $biblioloopiter{$canReserve} = 1;
+    }
+    else {
+        $biblioloopiter{$canReserve} = 1;
+    }
+
+    my $alreadypossession;
+    if (not C4::Context->preference('AllowHoldsOnPatronsPossessions') and CheckIfIssuedToPatron($borrowerinfo->{borrowernumber},$biblionumber)) {
+        $alreadypossession = 1;
+    }
+
     # get existing reserves .....
-    my ( $count, $reserves ) = GetReservesFromBiblionumber($biblionumber,1);
+    my $reserves = GetReservesFromBiblionumber({ biblionumber => $biblionumber, all_dates => 1 });
+    my $count = scalar( @$reserves );
     my $totalcount = $count;
-    my $alreadyreserved;
+    my $holds_count = 0;
+    my $alreadyreserved = 0;
 
     foreach my $res (@$reserves) {
-        if ( defined $res->{found} && $res->{found} eq 'W' ) {
+        if ( defined $res->{found} ) { # found can be 'W' or 'T'
             $count--;
         }
 
-        if ( defined $borrowerinfo && ($borrowerinfo->{borrowernumber} eq $res->{borrowernumber}) ) {
-            $warnings = 1;
+        if ( defined $borrowerinfo && defined($borrowerinfo->{borrowernumber}) && ($borrowerinfo->{borrowernumber} eq $res->{borrowernumber}) ) {
+            $holds_count++;
+        }
+    }
+
+    if ( $holds_count ) {
             $alreadyreserved = 1;
             $biblioloopiter{warn} = 1;
             $biblioloopiter{alreadyres} = 1;
-        }
     }
 
-    $template->param( alreadyreserved => $alreadyreserved,
-                      messages => $messages,
-                      warnings => $warnings,
-                                         maxreserves=>$maxreserves
-                                         );
-
+    $template->param(
+        alreadyreserved => $alreadyreserved,
+        alreadypossession => $alreadypossession,
+    );
 
     # FIXME think @optionloop, is maybe obsolete, or  must be switchable by a systeme preference fixed rank or not
     # make priorities options
@@ -288,7 +283,6 @@ foreach my $biblionumber (@biblionumbers) {
     # adding a fixed value for priority options
     my $fixedRank = $count+1;
 
-    my @branchcodes;
     my %itemnumbers_of_biblioitem;
     my @itemnumbers;
 
@@ -296,11 +290,11 @@ foreach my $biblionumber (@biblionumbers) {
     if (my $items = get_itemnumbers_of($biblionumber)->{$biblionumber}){
         @itemnumbers  = @$items;
     }
-       my @hostitems = get_hostitemnumbers_of($biblionumber);
-       if (@hostitems){
-               $template->param('hostitemsflag' => 1);
-               push(@itemnumbers, @hostitems);
-       }
+    my @hostitems = get_hostitemnumbers_of($biblionumber);
+    if (@hostitems){
+        $template->param('hostitemsflag' => 1);
+        push(@itemnumbers, @hostitems);
+    }
 
     if (!@itemnumbers) {
         $template->param('noitems' => 1);
@@ -333,15 +327,21 @@ foreach my $biblionumber (@biblionumbers) {
         my $num_override  = 0;
         my $hiddencount   = 0;
 
-        $biblioitem->{description} =
-          $itemtypes->{ $biblioitem->{itemtype} }{description};
-       if($biblioitem->{biblioitemnumber} ne $biblionumber){
-               $biblioitem->{hostitemsflag}=1;
-       }
+        if ( $biblioitem->{biblioitemnumber} ne $biblionumber ) {
+            $biblioitem->{hostitemsflag} = 1;
+        }
+
         $biblioloopiter{description} = $biblioitem->{description};
-        $biblioloopiter{itypename} = $biblioitem->{description};
-        $biblioloopiter{imageurl} =
-          getitemtypeimagelocation('intranet', $itemtypes->{$biblioitem->{itemtype}}{imageurl});
+        $biblioloopiter{itypename}   = $biblioitem->{description};
+        if ( $biblioitem->{itemtype} ) {
+
+            $biblioitem->{description} =
+              $itemtypes->{ $biblioitem->{itemtype} }{description};
+
+            $biblioloopiter{imageurl} =
+              getitemtypeimagelocation( 'intranet',
+                $itemtypes->{ $biblioitem->{itemtype} }{imageurl} );
+        }
 
         foreach my $itemnumber ( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} } )    {
             my $item = $iteminfos_of->{$itemnumber};
@@ -366,29 +366,26 @@ foreach my $biblionumber (@biblionumbers) {
                        $item->{hosttitle} = GetBiblioData($item->{biblionumber})->{title};
                }
                
-            #   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_sqldatetime($issues->{date_due});
+                $item->{date_due} = $issues->{date_due_sql};
                 $item->{backgroundcolor} = 'onloan';
             }
 
             # checking reserve
-            my ($reservedate,$reservedfor,$expectedAt) = GetReservesFromItemnumber($itemnumber);
-            my $ItemBorrowerReserveInfo = GetMember( borrowernumber => $reservedfor );
-
+            my ($reservedate,$reservedfor,$expectedAt,$reserve_id,$wait) = GetReservesFromItemnumber($itemnumber);
             if ( defined $reservedate ) {
+                my $ItemBorrowerReserveInfo = GetMember( borrowernumber => $reservedfor );
+
                 $item->{backgroundcolor} = 'reserved';
-                $item->{reservedate}     = format_date($reservedate);
+                $item->{reservedate}     = output_pref({ dt => dt_from_string( $reservedate ), dateonly => 1 });
                 $item->{ReservedForBorrowernumber}     = $reservedfor;
                 $item->{ReservedForSurname}     = $ItemBorrowerReserveInfo->{'surname'};
                 $item->{ReservedForFirstname}     = $ItemBorrowerReserveInfo->{'firstname'};
                 $item->{ExpectedAtLibrary}     = $branches->{$expectedAt}{branchname};
-
+                $item->{waitingdate} = $wait;
             }
 
             # Management of the notforloan document
@@ -418,7 +415,7 @@ foreach my $biblionumber (@biblionumbers) {
               GetTransfers($itemnumber);
 
             if ( defined $transfertwhen && $transfertwhen ne '' ) {
-                $item->{transfertwhen} = format_date($transfertwhen);
+                $item->{transfertwhen} = output_pref({ dt => dt_from_string( $transfertwhen ), dateonly => 1 });
                 $item->{transfertfrom} =
                   $branches->{$transfertfrom}{branchname};
                 $item->{transfertto} = $branches->{$transfertto}{branchname};
@@ -426,15 +423,15 @@ foreach my $biblionumber (@biblionumbers) {
             }
 
             # If there is no loan, return and transfer, we show a checkbox.
-            $item->{notforloan} = $item->{notforloan} || 0;
+            $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("IndependentBranches") ) {
                 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 ) ) {
+                    unless ( C4::Context->IsSuperLibrarian ) {
                         $item->{cantreserve} = 1 if ( $item->{homebranch} ne $userenv->{branch} );
                     }
                 }
@@ -443,44 +440,29 @@ foreach my $biblionumber (@biblionumbers) {
             my $branch = C4::Circulation::_GetCircControlBranch($item, $borrowerinfo);
 
             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 (
-                   $policy_holdallowed
-                && !$item->{cantreserve}
-                && IsAvailableForItemLevelRequest($itemnumber)
+                   !$item->{cantreserve}
+                && !$exceeded_maxreserves
+                && IsAvailableForItemLevelRequest($item, $borrowerinfo)
                 && CanItemBeReserved(
                     $borrowerinfo->{borrowernumber}, $itemnumber
-                )
+                ) eq 'OK'
               )
             {
                 $item->{available} = 1;
                 $num_available++;
             }
             elsif ( C4::Context->preference('AllowHoldPolicyOverride') ) {
-
-# If AllowHoldPolicyOverride is set, it should override EVERY restriction, not just branch item rules
+                # If AllowHoldPolicyOverride is set, it should override EVERY restriction, not just branch item rules
                 $item->{override} = 1;
                 $num_override++;
             }
 
             # 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});
-            }
-
             # Show serial enumeration when needed
             if ($item->{enumchron}) {
                 $itemdata_enumchron = 1;
@@ -493,7 +475,6 @@ foreach my $biblionumber (@biblionumbers) {
             $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;
         }
@@ -504,77 +485,90 @@ foreach my $biblionumber (@biblionumbers) {
 
     # existingreserves building
     my @reserveloop;
-    ( $count, $reserves ) = GetReservesFromBiblionumber($biblionumber,1);
-    foreach my $res ( sort {
-            my $a_found = $a->{found} || '';
-            my $b_found = $a->{found} || '';
+    my @reserves = Koha::Holds->search( { biblionumber => $biblionumber }, { order_by => 'priority' } );
+    foreach my $res (
+        sort {
+            my $a_found = $a->found() || '';
+            my $b_found = $a->found() || '';
             $a_found cmp $b_found;
-        } @$reserves ) {
+        } @reserves
+      )
+    {
         my %reserve;
         my @optionloop;
         for ( my $i = 1 ; $i <= $totalcount ; $i++ ) {
             push(
-                 @optionloop,
-                 {
-                  num      => $i,
-                  selected => ( $i == $res->{priority} ),
-                 }
-                );
+                @optionloop,
+                {
+                    num      => $i,
+                    selected => ( $i == $res->priority() ),
+                }
+            );
         }
 
-        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;
+        if ( $res->is_found() ) {
+            $reserve{'holdingbranch'} = $res->item()->holdingbranch();
+            $reserve{'biblionumber'}  = $res->item()->biblionumber();
+            $reserve{'barcodenumber'} = $res->item()->barcode();
+            $reserve{'wbrcode'}       = $res->branchcode();
+            $reserve{'itemnumber'}    = $res->itemnumber();
+            $reserve{'wbrname'}       = $res->branch()->branchname();
+
+            if ( $reserve{'holdingbranch'} eq $reserve{'wbrcode'} ) {
+
+                # Just because the holdingbranch matches the reserve branch doesn't mean the item
+                # has arrived at the destination, check for an open transfer for the item as well
+                my ( $transfertwhen, $transfertfrom, $transferto ) =
+                  C4::Circulation::GetTransfers( $res->itemnumber() );
+                if ( not $transferto or $transferto ne $res->branchcode() ) {
+                    $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{'found'}     = $res->is_found();
+            $reserve{'intransit'} = $res->is_in_transit();
+        }
+        elsif ( $res->priority() > 0 ) {
+            if ( my $item = $res->item() )  {
+                $reserve{'itemnumber'}      = $item->id();
+                $reserve{'barcodenumber'}   = $item->barcode();
                 $reserve{'item_level_hold'} = 1;
             }
         }
 
         #     get borrowers reserve info
-        my $reserveborrowerinfo = GetMember( borrowernumber => $res->{'borrowernumber'} );
-        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;
-        $reserve{'suspend'} = $res->{'suspend'};
-        $reserve{'suspend_until'} = $res->{'suspend_until'};
+        if ( C4::Context->preference('HidePatronName') ) {
+            $reserve{'hidename'}   = 1;
+            $reserve{'cardnumber'} = $res->borrower()->cardnumber();
+        }
+        $reserve{'expirationdate'} = output_pref( { dt => dt_from_string( $res->expirationdate ), dateonly => 1 } )
+          unless ( !defined( $res->expirationdate ) || $res->expirationdate eq '0000-00-00' );
+        $reserve{'date'}           = output_pref( { dt => dt_from_string( $res->reservedate ), dateonly => 1 } );
+        $reserve{'borrowernumber'} = $res->borrowernumber();
+        $reserve{'biblionumber'}   = $res->biblionumber();
+        $reserve{'borrowernumber'} = $res->borrowernumber();
+        $reserve{'firstname'}      = $res->borrower()->firstname();
+        $reserve{'surname'}        = $res->borrower()->surname();
+        $reserve{'notes'}          = $res->reservenotes();
+        $reserve{'waiting_date'}   = $res->waitingdate();
+        $reserve{'waiting_until'}  = $res->is_waiting() ? $res->waiting_expires_on() : undef;
+        $reserve{'ccode'}          = $res->item() ? $res->item()->ccode() : undef;
+        $reserve{'barcode'}        = $res->item() ? $res->item()->barcode() : undef;
+        $reserve{'priority'}       = $res->priority();
+        $reserve{'lowestPriority'} = $res->lowestPriority();
+        $reserve{'optionloop'}     = \@optionloop;
+        $reserve{'suspend'}        = $res->suspend();
+        $reserve{'suspend_until'}  = $res->suspend_until();
+        $reserve{'reserve_id'}     = $res->reserve_id();
+
+        if ( C4::Context->preference('IndependentBranches') && $flags->{'superlibrarian'} != 1 ) {
+            $reserve{'branchloop'} = [ Koha::Libraries->find( $res->branchcode() ) ];
+        }
+        else {
+            $reserve{'branchloop'} = GetBranchesLoop( $res->branchcode() );
+        }
+
         push( @reserveloop, \%reserve );
     }
 
@@ -582,8 +576,7 @@ foreach my $biblionumber (@biblionumbers) {
     my $time = time();
 
     $template->param(
-                     CGIbranch   => $CGIbranch,
-
+                     branchloop  => GetBranchesLoop($userbranch),
                      time        => $time,
                      fixedRank   => $fixedRank,
                     );
@@ -607,7 +600,6 @@ foreach my $biblionumber (@biblionumbers) {
                      borrower_branchcode => $borrowerinfo->{'branchcode'},
         );
     }
-    $template->param(CGIselectborrower => $CGIselectborrower) if defined $CGIselectborrower;
 
     $biblioloopiter{biblionumber} = $biblionumber;
     $biblioloopiter{title} = $dat->{title};
@@ -623,7 +615,7 @@ foreach my $biblionumber (@biblionumbers) {
 
 $template->param( biblioloop => \@biblioloop );
 $template->param( biblionumbers => $biblionumbers );
-$template->param( DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar() );
+$template->param( exceeded_maxreserves => $exceeded_maxreserves );
 
 if ($multihold) {
     $template->param( multi_hold => 1 );
@@ -640,3 +632,13 @@ $template->param(
 
 # printout the page
 output_html_with_http_headers $input, $cookie, $template->output;
+
+sub sort_borrowerlist {
+    my $borrowerslist = shift;
+    my $ref           = [];
+    push @{$ref}, sort {
+        uc( $a->{surname} . $a->{firstname} ) cmp
+          uc( $b->{surname} . $b->{firstname} )
+    } @{$borrowerslist};
+    return $ref;
+}