From 61a098f3c2902a046a585d2b02f7e2c8494e7a83 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sat, 9 Aug 2014 16:00:32 -0700 Subject: [PATCH] show costs in package list, RT#28856 --- httemplate/browse/part_pkg.cgi | 47 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index d0c14da4c..63822c7c9 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -10,7 +10,7 @@ 'agent_virt' => 1, 'agent_null_right' => [ $edit, $edit_global ], 'agent_null_right_link' => $edit_global, - 'agent_pos' => 6, + 'agent_pos' => 7, #5? 'query' => { 'select' => $select, 'table' => 'part_pkg', 'hashref' => \%hash, @@ -354,6 +354,51 @@ push @fields, sub { # $part_pkg->freq_pretty; #.'
' }; +push @header, 'Cost tracking'; +$align .= 'r'; #? +push @fields, sub { + my $part_pkg = shift; + #(my $plan = $plan_labels{$part_pkg->plan} ) =~ s/ / /g; + my $is_recur = ( $part_pkg->freq ne '0' ); + + [ + [ + { data => ' ', # $plan, + align=>'center', + colspan=>2, + }, + ], + [ + { data =>$money_char. + sprintf('%.2f ', $part_pkg->setup_cost ), + align=>'right' + }, + { data => ( $is_recur ? ' setup' : ' one-time' ), + align=>'left', + }, + ], + [ + { data=>( + $is_recur + ? $money_char. sprintf('%.2f', $part_pkg->recur_cost) + : '(no recurring)' #$part_pkg->freq_pretty + ), + align=> ( $is_recur ? 'right' : 'center' ), + colspan=> ( $is_recur ? 1 : 2 ), + }, + ( $is_recur + ? { data => ( $is_recur + ? ' '. $part_pkg->freq_pretty + : '' + ), + align=>'left', + } + : () + ), + ], + ]; +}; + ### # Agent goes here if displayed ### -- 2.11.0