X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-account.pl;h=673b70e0ec46a0424d85f8d0975fb6c763cee0e0;hb=8e9fc9b38565e574d9537250b579db023234cbcb;hp=9a658c2e857405ecf9d44a5bda70eae901787b49;hpb=2b8ef909457e3ac081831552787d300dd5154d19;p=koha_fer

diff --git a/opac/opac-account.pl b/opac/opac-account.pl
index 9a658c2e85..673b70e0ec 100755
--- a/opac/opac-account.pl
+++ b/opac/opac-account.pl
@@ -1,42 +1,62 @@
 #!/usr/bin/perl
 
+# 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 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
+
 # wrriten 15/10/2002 by finlay@katipo.oc.nz
 # script to display borrowers account details in the opac
 
 use strict;
-use C4::Output;
 use CGI;
-use C4::Search;
-use C4::Circulation::Circ2;
+use C4::Members;
+use C4::Circulation;
 use C4::Auth;
+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,
-			     });
+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 $borr = GetMemberDetails( $borrowernumber );
 my @bordat;
 $bordat[0] = $borr;
 
 $template->param( BORROWER_INFO => \@bordat );
 
-
 #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]{'amount'}+=0.00;
-    $accts->[$i]{'amountoutstanding'}+=0.00;
-    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;
     }
 }
 
@@ -44,13 +64,15 @@ 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 );
-
-$template->param( total => $total );
+output_html_with_http_headers $query, $cookie, $template->output;
 
-print $query->header(-cookie => $cookie), $template->output;