diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2017-10-17 09:41:12 -0400 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2017-10-17 09:48:29 -0400 |
| commit | f654e068b6e7be55bdbd749293c1bda7737cf870 (patch) | |
| tree | 843df1771e186692b7b6db0b60d55bbcbcb60526 /httemplate/graph/elements | |
| parent | 5dabafc5e63ae7559ca6d2867e653660b981e639 (diff) | |
RT# 78019 - Added total revenue line to Package churn report
Diffstat (limited to 'httemplate/graph/elements')
| -rw-r--r-- | httemplate/graph/elements/monthly.html | 2 | ||||
| -rw-r--r-- | httemplate/graph/elements/report.html | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/httemplate/graph/elements/monthly.html b/httemplate/graph/elements/monthly.html index 1a9428115..cfe5a3c6d 100644 --- a/httemplate/graph/elements/monthly.html +++ b/httemplate/graph/elements/monthly.html @@ -59,6 +59,7 @@ Example: 'no_graph' => \@no_graph, 'bottom_link' => \@bottom_link, 'transpose' => $opt{'daily'}, + 'sprintf_fields' => $sprintf_fields, map { $_, $opt{$_} } (qw(title nototal graph_type @@ -79,6 +80,7 @@ my $fromparam = $opt{'link_fromparam'} || 'begin'; my $toparam = $opt{'link_toparam'} || 'end'; my @items = @{ $opt{'items'} }; +my $sprintf_fields = $opt{'sprintf_fields'}; foreach my $other (qw( labels graph_labels colors links )) { if ( ref($opt{$other}) eq 'HASH' ) { diff --git a/httemplate/graph/elements/report.html b/httemplate/graph/elements/report.html index b5d214816..70c3a9e94 100644 --- a/httemplate/graph/elements/report.html +++ b/httemplate/graph/elements/report.html @@ -249,7 +249,7 @@ any delimiter and linked from the elements in @data. % my $e = 0; % foreach ( @$data_row ) { % my $entry = $_; -% $entry = $money_char . sprintf($sprintf, $entry); +% $entry = $money_char . sprintf($sprintf_fields->{$row} ? $sprintf_fields->{$row} : $sprintf, $entry); % $entry = $link_prefix . shift(@$links) . "\">$entry</A>" if $link_prefix; % push @{$cell[$i]}, $entry; % $bottom_total[$e++] += $_ unless $opt{no_graph}[$i-1]; @@ -343,6 +343,7 @@ my $conf = new FS::Conf; my $money_char = $opt{'disable_money'} ? '' : $conf->config('money_char'); my @items = @{ $opt{'items'} }; +my $sprintf_fields = $opt{'sprintf_fields'}; foreach my $other (qw( col_labels row_labels graph_labels axis_labels colors links )) { if ( ref($opt{$other}) eq 'HASH' ) { |