Bug 13116 - Make it possible to propagate errors from C4::Reserves::CanItemBeReserved...

[koha.git] / reserve / request.pl

diff --git a/reserve/request.pl b/reserve/request.pl
index 8701586..dd271e6 100755 (executable)
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -49,7 +49,7 @@ my $sth;
 my $input = new CGI;
 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,
@@ -78,6 +78,8 @@ $findborrower =~ s|,| |g;
 my $borrowernumber_hold = $input->param('borrowernumber') || '';
 my $messageborrower;
 my $maxreserves;
+my $warnings;
+my $messages;
 
 my $date = C4::Dates->today('iso');
 my $action = $input->param('action');
@@ -122,13 +124,14 @@ if ($borrowernumber_hold && !$action) {
     my @getreservloop;
     my $count_reserv = 0;
 
-#   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 =
       GetReserveCount( $borrowerinfo->{'borrowernumber'} );
 
     if ( C4::Context->preference('maxreserves') && ($number_reserves >= C4::Context->preference('maxreserves')) ) {
+        $warnings = 1;
         $maxreserves = 1;
     }
 
@@ -136,7 +139,7 @@ if ($borrowernumber_hold && !$action) {
     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)) {
+        Date_to_Days(split /-/,$date) > Date_to_Days(split /-/,$expiry_date)) {
         $expiry = 1;
     }
 
@@ -162,6 +165,8 @@ if ($borrowernumber_hold && !$action) {
                 cardnumber          => $borrowerinfo->{'cardnumber'},
                 expiry              => $expiry,
                 diffbranch          => $diffbranch,
+                messages            => $messages,
+                warnings            => $warnings
     );
 }
 
@@ -186,9 +191,20 @@ foreach my $biblionumber (@biblionumbers) {
 
     my $dat = GetBiblioData($biblionumber);
 
-    unless ( CanBookBeReserved($borrowerinfo->{borrowernumber}, $biblionumber) ) {
-        $maxreserves = 1;
+       my $canReserve = CanBookBeReserved($borrowerinfo->{borrowernumber}, $biblionumber);
+       if ($canReserve eq 'OK') {
+               #All is OK and we can continue
+       }
+       elsif ( $canReserve eq 'tooManyReserves' ) {
+               $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)) {
@@ -196,13 +212,14 @@ foreach my $biblionumber (@biblionumbers) {
     }
 
     # 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 $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--;
         }
 
@@ -338,7 +355,7 @@ foreach my $biblionumber (@biblionumbers) {
                 $item->{ReservedForSurname}     = $ItemBorrowerReserveInfo->{'surname'};
                 $item->{ReservedForFirstname}     = $ItemBorrowerReserveInfo->{'firstname'};
                 $item->{ExpectedAtLibrary}     = $branches->{$expectedAt}{branchname};
-                $item->{waitingdate} = format_date($wait) if $wait;
+                $item->{waitingdate} = $wait;
             }
 
             # Management of the notforloan document
@@ -409,15 +426,14 @@ foreach my $biblionumber (@biblionumbers) {
                 && IsAvailableForItemLevelRequest($itemnumber)
                 && 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++;
             }
@@ -446,7 +462,7 @@ foreach my $biblionumber (@biblionumbers) {
 
     # existingreserves building
     my @reserveloop;
-    ( $count, $reserves ) = GetReservesFromBiblionumber($biblionumber,1);
+    $reserves = GetReservesFromBiblionumber({ biblionumber => $biblionumber, all_dates => 1 });
     foreach my $res ( sort {
             my $a_found = $a->{found} || '';
             my $b_found = $a->{found} || '';
@@ -475,7 +491,12 @@ foreach my $biblionumber (@biblionumbers) {
             $reserve{'itemnumber'}  = $res->{'itemnumber'};
             $reserve{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'};
             if($reserve{'holdingbranch'} eq $reserve{'wbrcode'}){
-                $reserve{'atdestination'} = 1;
+                # 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';