From 79f809fedf5fc96da31039122c8326d31b6662b6 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 22 Oct 2010 08:54:32 +0000 Subject: [PATCH] fix package def report totals to break down not yet billed vs. active package counts, RT#10317 --- httemplate/browse/part_pkg.cgi | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index 3c3016ba2..3881606d9 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -96,6 +96,13 @@ $select = " *, ( $count_cust_pkg + AND ( setup IS NULL OR setup = 0 ) + AND ( cancel IS NULL OR cancel = 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, @@ -309,6 +316,7 @@ if ( $acl_edit_global ) { #if ( $cgi->param('active') ) { push @header, 'Customer
packages'; my %col = ( + 'not yet billed' => '009999', #teal? cyan? 'active' => '00CC00', 'suspended' => 'FF9900', 'cancelled' => 'FF0000', @@ -326,6 +334,7 @@ if ( $acl_edit_global ) { #$label = 'one-time charge', $label = 'charge', } + $label= 'not yet billed' if $magic eq 'not_yet_billed'; [ { @@ -350,7 +359,7 @@ if ( $acl_edit_global ) { ), }, ], - } (qw( active suspended cancelled )) + } (qw( not_yet_billed active suspended cancelled )) ]; }; $align .= 'r'; #} -- 2.11.0