[freeside-commits] branch master updated. f30eaaf66cd0a947f388a03edd4522ba92a367bb

[Ivan Kohler]

The branch, master has been updated
       via  f30eaaf66cd0a947f388a03edd4522ba92a367bb (commit)
      from  fc263806f5e475559a0c4cfdb70a5f1cefe0ffa3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f30eaaf66cd0a947f388a03edd4522ba92a367bb
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed May 27 13:44:33 2020 -0700

    fix top subtotals on refund reports

diff --git a/httemplate/search/elements/cust_pay_or_refund.html b/httemplate/search/elements/cust_pay_or_refund.html
index fbcae9d4d..f925fecf2 100755
--- a/httemplate/search/elements/cust_pay_or_refund.html
+++ b/httemplate/search/elements/cust_pay_or_refund.html
@@ -58,6 +58,7 @@ Examples:
 
                 'group_column'   => 'payby',
                 'group_label'    => 'payby_name',
+                'amount_field'   => $amount_field,
                 'subtotal'       => { $opt{amount_field} => "sum($amount_field)" },
                 'subtotal_row'   => [ 'Subtotal',
                                       sub { sprintf($money, $_[0]->$amount_field) },
diff --git a/httemplate/search/elements/grouped-search/html b/httemplate/search/elements/grouped-search/html
index 24cf50e96..cb9c96ce6 100644
--- a/httemplate/search/elements/grouped-search/html
+++ b/httemplate/search/elements/grouped-search/html
@@ -5,6 +5,8 @@ my $conf = FS::Conf->new;
 my %opt = @_;
 $opt{'name'} ||= PL($opt{'name_singular'});
 
+my $amount_field = $opt{amount_field};
+
 my $group_info = $m->comp('core', %opt);
 
 my $redirect;
@@ -109,7 +111,7 @@ my $money = $conf->config('money_char') || '$';
 
 <DIV CLASS="fstabcontainer">
 % if ( $group->num_rows > 0 ) {
-<P><% emt('[quant,_1,_2]', $group->num_rows, $opt{name_singular}) %> for <% emt($money.$group->paid) %>
+<P><% emt('[quant,_1,_2]', $group->num_rows, $opt{name_singular}) %> for <% emt($money.$group->$amount_field()) %>
 </P>
 %# download links
 <P><% emt('Download results:') %>

-----------------------------------------------------------------------

Summary of changes:
 httemplate/search/elements/cust_pay_or_refund.html | 1 +
 httemplate/search/elements/grouped-search/html     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)