projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
fa71778
)
this should add the info s1 was looking for, RT#5539
author
ivan
<ivan>
Wed, 10 Jun 2009 07:58:21 +0000
(07:58 +0000)
committer
ivan
<ivan>
Wed, 10 Jun 2009 07:58:21 +0000
(07:58 +0000)
httemplate/search/cust_pkg.cgi
patch
|
blob
|
history
diff --git
a/httemplate/search/cust_pkg.cgi
b/httemplate/search/cust_pkg.cgi
index
bd4a946
..
e797e35
100755
(executable)
--- a/
httemplate/search/cust_pkg.cgi
+++ b/
httemplate/search/cust_pkg.cgi
@@
-10,6
+10,8
@@
'Package',
'Class',
'Status',
'Package',
'Class',
'Status',
+ 'Setup',
+ 'Base Recur',
'Freq.',
'Setup',
'Last bill',
'Freq.',
'Setup',
'Last bill',
@@
-33,6
+35,14
@@
},
'classname',
sub { ucfirst(shift->status); },
},
'classname',
sub { ucfirst(shift->status); },
+ sub { sprintf( $money_char.'%.2f',
+ shift->part_pkg->option('setup_fee'),
+ );
+ },
+ sub { sprintf( $money_char.'%.2f',
+ shift->part_pkg->base_recur
+ );
+ },
sub { #shift->part_pkg->freq_pretty;
#my $part_pkg = $part_pkg{shift->pkgpart};
sub { #shift->part_pkg->freq_pretty;
#my $part_pkg = $part_pkg{shift->pkgpart};
@@
-99,13
+109,15
@@
'',
'',
'',
'',
'',
'',
+ '',
+ '',
FS::UI::Web::cust_colors(),
'',
],
FS::UI::Web::cust_colors(),
'',
],
- 'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '',
+ 'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '',
'', '',
FS::UI::Web::cust_styles() ],
'size' => [ '', '', '', '', '-1' ],
FS::UI::Web::cust_styles() ],
'size' => [ '', '', '', '', '-1' ],
- 'align' => 'rrlcclrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
+ 'align' => 'rrlcc
rr
lrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
'links' => [
$link,
$link,
'links' => [
$link,
$link,
@@
-121,6
+133,8
@@
'',
'',
'',
'',
'',
'',
+ '',
+ '',
( map { $_ ne 'Cust. Status' ? $clink : '' }
FS::UI::Web::cust_header(
$cgi->param('cust_fields')
( map { $_ ne 'Cust. Status' ? $clink : '' }
FS::UI::Web::cust_header(
$cgi->param('cust_fields')
@@
-136,6
+150,9
@@
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('List packages');
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('List packages');
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
+
# my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
my %search_hash = ();
# my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
my %search_hash = ();