fines summary

diff --git a/Open-ILS/src/perlmods/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/OpenILS/WWW/EGCatLoader.pm
index eecc750..44dc711 100644 (file)
--- 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 c702b95..e343c9c 100644 (file)
--- 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 3c156cc..fc63b31 100644 (file)
--- 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 %]
-
 
 <form method='POST' id='circ-form'>
     <div id='action_div'>

diff --git a/Open-ILS/web/templates/default/opac/myopac/fines.tt2 b/Open-ILS/web/templates/default/opac/myopac/fines.tt2
index 49ecf30..727322f 100644 (file)
--- a/Open-ILS/web/templates/default/opac/myopac/fines.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/fines.tt2
@@ -8,8 +8,6 @@
 </style>
 [% 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 @@
     </thead>
     <tbody>
         <tr>
-            <td colspan="3"><em>XXX TODO</em></td>
+            <td>[% money(ctx.fines.total_owed) %]</td>
+            <td>[% money(ctx.fines.total_paid) %]</td>
+            <td>[% money(ctx.fines.balance_owed) %]</td>
         </tr>
     </tbody>
 </table>

diff --git a/Open-ILS/web/templates/default/opac/myopac/holds.tt2 b/Open-ILS/web/templates/default/opac/myopac/holds.tt2
index 86df64b..cea7f41 100644 (file)
--- a/Open-ILS/web/templates/default/opac/myopac/holds.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/holds.tt2
@@ -7,7 +7,6 @@
 </style>
 [% END %]
 
-[% USE date %]
 [% PROCESS "default/opac/common.tt2" %]
 [% WRAPPER "default/opac/base.tt2" %]
 [% INCLUDE "default/opac/myopac/_links.tt2" myopac_page = "holds" %]