diff options
| author | ivan <ivan> | 2011-07-12 22:58:41 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-07-12 22:58:41 +0000 |
| commit | 077bb34b3467c3320440c49b76064f664c0eee98 (patch) | |
| tree | b0c918069f206b43dbf47844135e6d58d2034b5b /httemplate/browse/part_pkg.cgi | |
| parent | 0b81782a6257456e04fb8a5a7faf0dbfbf7bc166 (diff) | |
fix UI for package editing w/recur_show_zero, add setup_show_zero, RT#9777
Diffstat (limited to 'httemplate/browse/part_pkg.cgi')
| -rwxr-xr-x | httemplate/browse/part_pkg.cgi | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index ae869dda6..766806044 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -220,33 +220,39 @@ push @fields, sub { sprintf('%.2f', $part_pkg->option('setup_fee') ), align=>'right' }, - { data => ( $is_recur ? ' setup' : ' one-time' ), + { data => ( ( $is_recur ? ' setup' : ' one-time' ). + ( $part_pkg->option('recur_fee') == 0 + && $part_pkg->setup_show_zero + ? ' (printed on invoices)' + : '' + ) + ), align=>'left', }, ], [ - { data=>( $is_recur - ? $money_char.sprintf('%.2f ', $part_pkg->option('recur_fee')) - : $part_pkg->freq_pretty - ), + { data=>( + $is_recur + ? $money_char. sprintf('%.2f ', $part_pkg->option('recur_fee')) + : $part_pkg->freq_pretty + ), align=> ( $is_recur ? 'right' : 'center' ), colspan=> ( $is_recur ? 1 : 2 ), }, ( $is_recur - ? { data => ( $is_recur ? $part_pkg->freq_pretty : '' ), + ? { data => ( $is_recur + ? $part_pkg->freq_pretty. + ( $part_pkg->option('recur_fee') == 0 + && $part_pkg->recur_show_zero + ? ' (printed on invoices)' + : '' + ) + : '' ), align=>'left', } : () ), ], - [ { data => - ( $part_pkg->option('recur_fee') == 0 && $part_pkg->recur_show_zero ) - ? ' (printed on invoices)' - : '', - align => 'center', #? - colspan => 2, - }, - ], ( map { my $dst_pkg = $_->dst_pkg; [ |