Deleting Date::Manip

[koha_fer] / opac / opac-reserve.pl

diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 1626fdc..5e85aa8 100755 (executable)
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -21,11 +21,12 @@ use CGI;
 use C4::Biblio;
 use C4::Auth;    # checkauth, getborrowernumber.
 use C4::Koha;
-use C4::Circulation::Circ2;
-use C4::Reserves2;
-use C4::Interface::CGI::Output;
+use C4::Circulation;
+use C4::Reserves;
+use C4::Output;
 use C4::Date;
 use C4::Context;
+use C4::Members;
 use C4::Branch; # GetBranches
 
 my $MAXIMUM_NUMBER_OF_RESERVES = C4::Context->preference("maxreserves");
@@ -43,7 +44,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 );
 
 # get borrower information ....
-my ( $borr, $flags ) = getpatroninformation( undef, $borrowernumber );
+my ( $borr, $flags ) = GetMemberDetails( $borrowernumber );
 
 # get biblionumber.....
 my $biblionumber = $query->param('biblionumber');
@@ -53,7 +54,7 @@ $template->param($bibdata);
 $template->param( biblionumber => $biblionumber );
 
 # get the rank number....
-my ( $rank, $reserves ) = FindReserves( $biblionumber, '' );
+my ( $rank, $reserves ) = GetReservesFromBiblionumber( $biblionumber);
 $template->param( reservecount => $rank );
 
 foreach my $res (@$reserves) {
@@ -147,8 +148,7 @@ foreach my $itm (@items) {
       if defined $itm->{'date_due'};
     $itm->{ $itm->{'publictype'} } = 1;
 
-    # FIXME CalcReserveFee is supposed to be internal-use-only
-    my $fee = CalcReserveFee( undef, $borrowernumber, $itm->{'biblionumber'},
+    my $fee = GetReserveFee( undef, $borrowernumber, $itm->{'biblionumber'},
         'a', ( $itm->{'biblioitemnumber'} ) );
     $fee = sprintf "%.02f", $fee;
     $itm->{'reservefee'} = $fee;
@@ -216,7 +216,7 @@ if ( $query->param('item_types_selected') ) {
                 }
             }
             $fee +=
-              CalcReserveFee( undef, $borrowernumber, $biblionumber, 'o',
+              GetReserveFee( undef, $borrowernumber, $biblionumber, 'o',
                 \@reqbibs );
         }
         $proceed = 1;
@@ -254,11 +254,11 @@ elsif ( $query->param('place_reserve') ) {
                 push @reqbibs, $item->{'biblioitemnumber'};
             }
         }
-        CreateReserve( undef, $branch, $borrowernumber, $biblionumber, 'o',
+        AddReserve( $branch, $borrowernumber, $biblionumber, 'o',
             \@reqbibs, $rank, '', $title );
     }
     if ( $query->param('all') ) {
-        CreateReserve( undef, $branch, $borrowernumber, $biblionumber, 'a',
+        AddReserve( $branch, $borrowernumber, $biblionumber, 'a',
             undef, $rank, '', $title );
     }
     print $query->redirect("/cgi-bin/koha/opac-user.pl");
@@ -296,12 +296,12 @@ else {
             debarred => 1
         );
     }
-    my ( $resnum, $reserves ) = FindReserves( '', $borrowernumber );
-    $template->param( RESERVES => $reserves );
-    if ( $resnum >= $MAXIMUM_NUMBER_OF_RESERVES ) {
+    my @reserves = GetReservesFromBorrowernumber( $borrowernumber );
+    $template->param( RESERVES => \@reserves );
+    if ( scalar(@$reserves) >= $MAXIMUM_NUMBER_OF_RESERVES ) {
         $template->param( message => 1 );
         $noreserves = 1;
-        $template->param( too_many_reserves => $resnum );
+        $template->param( too_many_reserves => scalar($reserves));
     }
     foreach my $res (@$reserves) {
         if ( $res->{'biblionumber'} == $biblionumber ) {