diff options
| author | ivan <ivan> | 2009-11-04 00:53:12 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2009-11-04 00:53:12 +0000 |
| commit | a5351dba7b097a440e60b5cb71b6382d8e5f61ab (patch) | |
| tree | fd5fa2df8b3de5d623978807b4b829deae7bdf1e /httemplate | |
| parent | fa1f500a69ca68c068d5ad15839b620c39c184ec (diff) | |
fix customer package search (fallout from customer classes) & add "not yet billed" status to customer package report
Diffstat (limited to 'httemplate')
| -rwxr-xr-x | httemplate/browse/part_pkg.cgi | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index c6cbb81a3..d9b90cf84 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -96,8 +96,15 @@ $select = " *, ( $count_cust_pkg + AND ( setup IS NULL OR cancel = 0 ) AND ( cancel IS NULL OR cancel = 0 ) - AND ( susp IS NULL OR susp = 0 ) + AND ( susp IS NULL OR susp = 0 ) + ) AS num_not_yet_billed, + + ( $count_cust_pkg + AND setup IS NOT NULL AND setup != 0 + AND ( cancel IS NULL OR cancel = 0 ) + AND ( susp IS NULL OR susp = 0 ) ) AS num_active, ( $count_cust_pkg @@ -283,6 +290,8 @@ if ( $acl_edit_global ) { 'cancelled' => 'FF0000', #'one-time charge' => '000000', 'charge' => '000000', + #'not yet billed' => '000000', + 'not yet billed' => '000000', ); my $cust_pkg_link = $p. 'search/cust_pkg.cgi?pkgpart='; push @fields, sub { my $part_pkg = shift; @@ -294,6 +303,8 @@ if ( $acl_edit_global ) { $magic = 'inactive'; #$label = 'one-time charge', $label = 'charge', + } else { + $label =~ s/_/ /g; } [ @@ -319,7 +330,7 @@ if ( $acl_edit_global ) { ), }, ], - } (qw( active suspended cancelled )) + } qw(not_yet_billed active suspended cancelled) ]; }; $align .= 'r'; #} |