projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rate CDRs immediately, RT#15839
[freeside.git]
/
httemplate
/
browse
/
part_pkg.cgi
diff --git
a/httemplate/browse/part_pkg.cgi
b/httemplate/browse/part_pkg.cgi
index
ae869dd
..
7668060
100755
(executable)
--- 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'
},
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',
},
],
[
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
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',
}
: ()
),
],
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;
[
( map {
my $dst_pkg = $_->dst_pkg;
[