X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2F477partIIB.html;h=94aa818fb94a124b2fd79627f78788ebff650fb3;hb=3d62ec9362d0b22c17a17da6197f8b2fc219a54e;hp=278dfdc8b737b679d55ea93097032efb7dfb4519;hpb=4ef5b3b917b7802a136551ad567dc9d649700f53;p=freeside.git
diff --git a/httemplate/search/477partIIB.html b/httemplate/search/477partIIB.html
index 278dfdc8b..94aa818fb 100755
--- a/httemplate/search/477partIIB.html
+++ b/httemplate/search/477partIIB.html
@@ -22,9 +22,10 @@ die "access denied"
my $html_init = '
Part IIB
';
my %search_hash = ();
-for ( qw(agentnum magic classnum) ) {
+for ( qw(agentnum magic) ) {
$search_hash{$_} = $cgi->param($_) if $cgi->param($_);
}
+$search_hash{'classnum'} = [ $cgi->param('classnum') ];
my @row_option = grep { /^\d+$/ } $cgi->param('part2b_row_option')
if $cgi->param('part2b_row_option');
@@ -46,10 +47,10 @@ my $column_value = sub {
my $count_sql = delete($sql_query->{'count_query'});
if ( $row == 2 ) {
- $count_sql =~ s/COUNT\(\*\) FROM/COALESCE( sum(CASE WHEN cust_main.company IS NULL OR cust_main.company = '' THEN fcc_ds0s END), 0 ) FROM/
+ $count_sql =~ s/COUNT\(\*\) FROM/sum(COALESCE(CASE WHEN cust_main.company IS NULL OR cust_main.company = '' THEN CASE WHEN part_pkg.fcc_ds0s IS NOT NULL AND part_pkg.fcc_ds0s > 0 THEN part_pkg.fcc_ds0s WHEN pkg_class.fcc_ds0s IS NOT NULL AND pkg_class.fcc_ds0s > 0 THEN pkg_class.fcc_ds0s ELSE 0 END ELSE 0 END, 0) ) FROM/
or die "couldn't parse count_sql";
} else {
- $count_sql =~ s/COUNT\(\*\) FROM/COALESCE( sum(fcc_ds0s), 0 ) FROM/
+ $count_sql =~ s/COUNT\(\*\) FROM/sum(COALESCE(CASE WHEN part_pkg.fcc_ds0s IS NOT NULL AND part_pkg.fcc_ds0s > 0 THEN part_pkg.fcc_ds0s WHEN pkg_class.fcc_ds0s IS NOT NULL AND pkg_class.fcc_ds0s > 0 THEN pkg_class.fcc_ds0s ELSE 0 END, 0)) FROM/
or die "couldn't parse count_sql";
}
@@ -69,8 +70,8 @@ my $column_value = sub {
my @headers = (
'',
- 'with broadband',
'without broadband',
+ 'with broadband',
'wholesale',
);