Bug 15344: Remove some other calls of GetMemberDetails from pl scripts

[koha.git] / opac / opac-account.pl

diff --git a/opac/opac-account.pl b/opac/opac-account.pl
index 8940abf..d220fed 100755 (executable)
--- a/opac/opac-account.pl
+++ b/opac/opac-account.pl
@@ -1,70 +1,59 @@
 #!/usr/bin/perl
 
+# Copyright Katipo Communications 2002
+# Copyright Biblibre 2007,2010
+#
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-# wrriten 15/10/2002 by finlay@katipo.oc.nz
-# script to display borrowers account details in the opac
 
 use strict;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Members;
 use C4::Circulation;
 use C4::Auth;
 use C4::Output;
-use C4::Date;
+use warnings;
 
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-account.tmpl",
+        template_name   => "opac-account.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
-        flagsrequired   => { borrow => 1 },
         debug           => 1,
     }
 );
 
-# get borrower information ....
-my $borr = GetMemberDetails( $borrowernumber );
-
-my @bordat;
-$bordat[0] = $borr;
-
-$template->param( BORROWER_INFO => \@bordat );
+my $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber );
+$template->param( BORROWER_INFO => $borrower );
 
 #get account details
-my ( $total , $accts, $numaccts) = GetBorrowerAcctRecord( $borrowernumber );
+my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
 
 for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
-    $accts->[$i]{'date'} = format_date( $accts->[$i]{'date'} );
-    $accts->[$i]{'amount'} = sprintf( "%.2f", $accts->[$i]{'amount'} );
+    $accts->[$i]{'amount'} = sprintf( "%.2f", $accts->[$i]{'amount'} || '0.00');
     if ( $accts->[$i]{'amount'} >= 0 ) {
         $accts->[$i]{'amountcredit'} = 1;
     }
     $accts->[$i]{'amountoutstanding'} =
-      sprintf( "%.2f", $accts->[$i]{'amountoutstanding'} );
+      sprintf( "%.2f", $accts->[$i]{'amountoutstanding'} || '0.00' );
     if ( $accts->[$i]{'amountoutstanding'} >= 0 ) {
         $accts->[$i]{'amountoutstandingcredit'} = 1;
     }
-    if (   $accts->[$i]{'accounttype'} ne 'F'
-        && $accts->[$i]{'accounttype'} ne 'FU' )
-    {
-        $accts->[$i]{'print_title'};
-    }
 }
 
 # add the row parity
@@ -77,8 +66,8 @@ foreach my $row (@$accts) {
 
 $template->param (
     ACCOUNT_LINES => $accts,
-    total => sprintf( "%.2f", $total )
+    total => sprintf( "%.2f", $total ),
+       accountview => 1
 );
 
-output_html_with_http_headers $query, $cookie, $template->output;
-
+output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };