projects
/
srvgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'kc/new/bug_4218' into kcmaster
[srvgit]
/
opac
/
opac-account.pl
diff --git
a/opac/opac-account.pl
b/opac/opac-account.pl
index
8940abf
..
22d83b8
100755
(executable)
--- a/
opac/opac-account.pl
+++ b/
opac/opac-account.pl
@@
-24,7
+24,8
@@
use C4::Members;
use C4::Circulation;
use C4::Auth;
use C4::Output;
use C4::Circulation;
use C4::Auth;
use C4::Output;
-use C4::Date;
+use C4::Dates qw/format_date/;
+use warnings;
my $query = new CGI;
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
my $query = new CGI;
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
@@
-40,31
+41,25
@@
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
# get borrower information ....
my $borr = GetMemberDetails( $borrowernumber );
# get borrower information ....
my $borr = GetMemberDetails( $borrowernumber );
-
my @bordat;
$bordat[0] = $borr;
$template->param( BORROWER_INFO => \@bordat );
#get account details
my @bordat;
$bordat[0] = $borr;
$template->param( BORROWER_INFO => \@bordat );
#get account details
-my ( $total , $accts, $numaccts) = Get
BorrowerAcctRecord
( $borrowernumber );
+my ( $total , $accts, $numaccts) = Get
MemberAccountRecords
( $borrowernumber );
for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
$accts->[$i]{'date'} = format_date( $accts->[$i]{'date'} );
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'} =
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]{'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
}
# add the row parity
@@
-77,7
+72,8
@@
foreach my $row (@$accts) {
$template->param (
ACCOUNT_LINES => $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;