diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2014-04-27 14:19:59 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2014-04-27 14:19:59 -0700 |
| commit | a7d8494c57376bfc493fbaa234b250cc86a79a94 (patch) | |
| tree | 71c2443321738bccb4c6bbaa0e4f1495e6c099da /httemplate/browse/part_pkg.cgi | |
| parent | 14b88b83f22a15b5abb5ba94328f213923a3bb95 (diff) | |
"on hold" package ordering and status, RT#28508
also
even with flag set to do so, don't adjust bill dates forward on a package which is billing while suspended, RT#27882
Diffstat (limited to 'httemplate/browse/part_pkg.cgi')
| -rwxr-xr-x | httemplate/browse/part_pkg.cgi | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index 574cf7af3..d0c14da4c 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -128,9 +128,16 @@ $select = " ( $count_cust_pkg AND ( cancel IS NULL OR cancel = 0 ) AND susp IS NOT NULL AND susp != 0 + AND setup IS NOT NULL AND setup != 0 ) AS num_suspended, ( $count_cust_pkg + AND ( cancel IS NULL OR cancel = 0 ) + AND susp IS NOT NULL AND susp != 0 + AND ( setup IS NULL OR setup = 0 ) + ) AS num_on_hold, + + ( $count_cust_pkg AND cancel IS NOT NULL AND cancel != 0 ) AS num_cancelled @@ -382,6 +389,7 @@ if ( $acl_edit_global ) { #if ( $cgi->param('active') ) { push @header, 'Customer<BR>packages'; my %col = ( + 'on hold' => '7E0079', #purple! 'not yet billed' => '009999', #teal? cyan? 'active' => '00CC00', 'suspended' => 'FF9900', @@ -397,10 +405,11 @@ if ( $acl_edit_global ) { my $label = $_; if ( $magic eq 'active' && $part_pkg->freq == 0 ) { $magic = 'inactive'; - #$label = 'one-time charge', - $label = 'charge', + #$label = 'one-time charge'; + $label = 'charge'; } $label= 'not yet billed' if $magic eq 'not_yet_billed'; + $label= 'on hold' if $magic eq 'on_hold'; [ { @@ -425,7 +434,7 @@ if ( $acl_edit_global ) { ), }, ], - } (qw( not_yet_billed active suspended cancelled )) + } (qw( on_hold not_yet_billed active suspended cancelled )) ), ($acl_config ? [ {}, |