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 0839f45..dd271e6 100755 (executable)
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -191,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)) {
@@ -208,7 +219,7 @@ foreach my $biblionumber (@biblionumbers) {
     my $alreadyreserved = 0;
 
     foreach my $res (@$reserves) {
-        if ( defined $res->{found} ) {
+        if ( defined $res->{found} ) { # found can be 'W' or 'T'
             $count--;
         }
 
@@ -415,7 +426,7 @@ foreach my $biblionumber (@biblionumbers) {
                 && IsAvailableForItemLevelRequest($itemnumber)
                 && CanItemBeReserved(
                     $borrowerinfo->{borrowernumber}, $itemnumber
-                )
+                ) eq 'OK'
               )
             {
                 $item->{available} = 1;