Bug 14883: Librarians are not warned if patron is restricted when placing holds

[koha-ffzg.git] / reserve / request.pl

diff --git a/reserve/request.pl b/reserve/request.pl
index 06dc6bf..4544ad2 100755 (executable)
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -39,11 +39,12 @@ 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);
 
 my $dbh = C4::Context->dbh;
 my $sth;
@@ -82,7 +83,7 @@ my $maxreserves;
 my $warnings;
 my $messages;
 
-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{};
 
@@ -175,7 +176,9 @@ if ($borrowernumber_hold && !$action) {
                 expiry              => $expiry,
                 diffbranch          => $diffbranch,
                 messages            => $messages,
-                warnings            => $warnings
+                warnings            => $warnings,
+                restricted          => IsDebarred($borrowerinfo->{'borrowernumber'}),
+                amount_outstanding  => GetMemberAccountRecords($borrowerinfo->{borrowernumber}),
     );
 }
 
@@ -201,6 +204,7 @@ foreach my $biblionumber (@biblionumbers) {
     my $dat = GetBiblioData($biblionumber);
 
     my $canReserve = CanBookBeReserved( $borrowerinfo->{borrowernumber}, $biblionumber );
+    $canReserve //= '';
     if ( $canReserve eq 'OK' ) {
 
         #All is OK and we can continue
@@ -357,7 +361,7 @@ foreach my $biblionumber (@biblionumbers) {
                 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'};
@@ -392,7 +396,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};
@@ -515,9 +519,9 @@ foreach my $biblionumber (@biblionumbers) {
            $reserve{'hidename'} = 1;
            $reserve{'cardnumber'} = $reserveborrowerinfo->{'cardnumber'};
        }
-        $reserve{'expirationdate'} = format_date( $res->{'expirationdate'} )
+        $reserve{'expirationdate'} = output_pref({ dt => dt_from_string( $res->{'expirationdate'} ), dateonly => 1 })
             unless ( !defined($res->{'expirationdate'}) || $res->{'expirationdate'} eq '0000-00-00' );
-        $reserve{'date'}           = format_date( $res->{'reservedate'} );
+        $reserve{'date'}           = output_pref({ dt => dt_from_string( $res->{'reservedate'} ), dateonly => 1 });
         $reserve{'borrowernumber'} = $res->{'borrowernumber'};
         $reserve{'biblionumber'}   = $res->{'biblionumber'};
         $reserve{'borrowernumber'} = $res->{'borrowernumber'};