From 1d0a2eabeb628e5b9fda75c28316ee269193175a Mon Sep 17 00:00:00 2001 From: senator Date: Thu, 27 Jan 2011 12:36:52 -0500 Subject: [PATCH] fines summary --- Open-ILS/src/perlmods/OpenILS/WWW/EGCatLoader.pm | 10 +++++++++- Open-ILS/web/templates/default/opac/common.tt2 | 4 ++-- Open-ILS/web/templates/default/opac/myopac/circs.tt2 | 2 -- Open-ILS/web/templates/default/opac/myopac/fines.tt2 | 6 +++--- Open-ILS/web/templates/default/opac/myopac/holds.tt2 | 1 - 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/OpenILS/WWW/EGCatLoader.pm index eecc750a88..44dc7118c8 100644 --- a/Open-ILS/src/perlmods/OpenILS/WWW/EGCatLoader.pm +++ b/Open-ILS/src/perlmods/OpenILS/WWW/EGCatLoader.pm @@ -682,7 +682,10 @@ sub load_myopac_fines { my $ctx = $self->ctx; $ctx->{"fines"} = { "circulation" => [], - "grocery" => [] + "grocery" => [], + "total_paid" => 0, + "total_owed" => 0, + "balance_owed" => 0 }; my $limit = $self->cgi->param('limit') || 0; @@ -726,6 +729,11 @@ sub load_myopac_fines { $last_billing = pop(@billings); } + # XXX TODO switch to some money-safe non-fp library for math + $ctx->{"fines"}->{$_} += $mobts->$_ for ( + qw/total_paid total_owed balance_owed/ + ); + push( @{$ctx->{"fines"}->{$mobts->grocery ? "grocery" : "circulation"}}, { diff --git a/Open-ILS/web/templates/default/opac/common.tt2 b/Open-ILS/web/templates/default/opac/common.tt2 index c702b9516a..e343c9cd73 100644 --- a/Open-ILS/web/templates/default/opac/common.tt2 +++ b/Open-ILS/web/templates/default/opac/common.tt2 @@ -23,5 +23,5 @@ [% END %] [% PROCESS 'default/opac/marc_attrs.tt2' %] - - +[% USE date %] +[% USE money = format('$%.2f') %] diff --git a/Open-ILS/web/templates/default/opac/myopac/circs.tt2 b/Open-ILS/web/templates/default/opac/myopac/circs.tt2 index 3c156cc130..fc63b312eb 100644 --- a/Open-ILS/web/templates/default/opac/myopac/circs.tt2 +++ b/Open-ILS/web/templates/default/opac/myopac/circs.tt2 @@ -15,8 +15,6 @@ [% PROCESS "default/opac/common.tt2" %] [% WRAPPER "default/opac/base.tt2" %] [% INCLUDE "default/opac/myopac/_links.tt2" myopac_page = "circs" %] -[% USE date %] -
diff --git a/Open-ILS/web/templates/default/opac/myopac/fines.tt2 b/Open-ILS/web/templates/default/opac/myopac/fines.tt2 index 49ecf3071b..727322f78b 100644 --- a/Open-ILS/web/templates/default/opac/myopac/fines.tt2 +++ b/Open-ILS/web/templates/default/opac/myopac/fines.tt2 @@ -8,8 +8,6 @@ [% END %] -[% USE date %] -[% USE money = format('$%.2f') %] [% PROCESS "default/opac/common.tt2" %] [% WRAPPER "default/opac/base.tt2" %] [% INCLUDE "default/opac/myopac/_links.tt2" myopac_page = "fines" %] @@ -24,7 +22,9 @@ - XXX TODO + [% money(ctx.fines.total_owed) %] + [% money(ctx.fines.total_paid) %] + [% money(ctx.fines.balance_owed) %] diff --git a/Open-ILS/web/templates/default/opac/myopac/holds.tt2 b/Open-ILS/web/templates/default/opac/myopac/holds.tt2 index 86df64b4dd..cea7f419c9 100644 --- a/Open-ILS/web/templates/default/opac/myopac/holds.tt2 +++ b/Open-ILS/web/templates/default/opac/myopac/holds.tt2 @@ -7,7 +7,6 @@ [% END %] -[% USE date %] [% PROCESS "default/opac/common.tt2" %] [% WRAPPER "default/opac/base.tt2" %] [% INCLUDE "default/opac/myopac/_links.tt2" myopac_page = "holds" %] -- 2.11.0