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 35c61f1..d220fed 100755 (executable)
--- a/opac/opac-account.pl
+++ b/opac/opac-account.pl
@@ -1,52 +1,58 @@
 #!/usr/bin/perl
 
-# wrriten 15/10/2002 by finlay@katipo.oc.nz
-# script to display borrowers account details in the opac
+# 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 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
+
 
 use strict;
-use C4::Output;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Members;
-use C4::Circulation::Circ2;
+use C4::Circulation;
 use C4::Auth;
-use C4::Interface::CGI::Output;
-use HTML::Template;
-use C4::Date;
+use C4::Output;
+use warnings;
 
 my $query = new CGI;
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "opac-account.tmpl",
-                            query => $query,
-                            type => "opac",
-                            authnotrequired => 0,
-                            flagsrequired => {borrow => 1},
-                            debug => 1,
-                            });
-
-# get borrower information ....
-my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
-
-my @bordat;
-$bordat[0] = $borr;
-
-$template->param( BORROWER_INFO => \@bordat );
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "opac-account.tt",
+        query           => $query,
+        type            => "opac",
+        authnotrequired => 0,
+        debug           => 1,
+    }
+);
 
+my $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber );
+$template->param( BORROWER_INFO => $borrower );
 
 #get account details
-my ($numaccts,$accts,$total) = getboracctrecord(undef,$borr);
+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'});
-       if($accts->[$i]{'amount'} >= 0){
-               $accts->[$i]{'amountcredit'} = 1;
-       }
-    $accts->[$i]{'amountoutstanding'} =sprintf("%.2f", $accts->[$i]{'amountoutstanding'});
-       if($accts->[$i]{'amountoutstanding'} >= 0){
-               $accts->[$i]{'amountoutstandingcredit'} = 1;
-       }
-    if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
-       $accts->[$i]{'print_title'};
+for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
+    $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'} || '0.00' );
+    if ( $accts->[$i]{'amountoutstanding'} >= 0 ) {
+        $accts->[$i]{'amountoutstandingcredit'} = 1;
     }
 }
 
@@ -54,19 +60,14 @@ for (my $i=0;$i<$numaccts;$i++){
 my $num = 0;
 foreach my $row (@$accts) {
     $row->{'even'} = 1 if $num % 2 == 0;
-    $row->{'odd'} = 1 if $num % 2 == 1;
+    $row->{'odd'}  = 1 if $num % 2 == 1;
     $num++;
 }
 
+$template->param (
+    ACCOUNT_LINES => $accts,
+    total => sprintf( "%.2f", $total ),
+       accountview => 1
+);
 
-$template->param( ACCOUNT_LINES => $accts,
-                            LibraryName => C4::Context->preference("LibraryName"),
-                               suggestion => C4::Context->preference("suggestion"),
-                               virtualshelves => C4::Context->preference("virtualshelves")
- );
-
-$template->param( total => sprintf("%.2f",$total) );
-
-#$template->param(loggeninuser => $loggedinuser);
-output_html_with_http_headers $query, $cookie, $template->output;
-
+output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };