diff options
| author | Mark Wells <mark@freeside.biz> | 2014-12-04 12:58:51 -0800 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2014-12-04 12:58:51 -0800 |
| commit | 478c4c0029aca4a9b39ba908c04c8669cde3a6a4 (patch) | |
| tree | ef5208bc737e9b77d522f11e98dd6ba2e993a27c /FS | |
| parent | 61e2f89c40a50478d12b4818400caff32d20f61a (diff) | |
fix census tract format, #32499, etc.
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/Report/FCC_477.pm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/FS/FS/Report/FCC_477.pm b/FS/FS/Report/FCC_477.pm index f5d6a06ec..20d402d7d 100644 --- a/FS/FS/Report/FCC_477.pm +++ b/FS/FS/Report/FCC_477.pm @@ -355,8 +355,10 @@ sub fbs_sql { my $agentnum = $opt{agentnum}; my $q = $opt{ignore_quantity} ? '1' : 'COALESCE(cust_pkg.quantity, 1)'; + my $censustract = "replace(cust_location.censustract, '.', '')"; + my @select = ( - 'cust_location.censustract', + "$censustract AS censustract", 'technology', 'broadband_downstream', 'broadband_upstream', @@ -381,8 +383,7 @@ sub fbs_sql { is_fixed_broadband() ); push @where, "cust_main.agentnum = $agentnum" if $agentnum; - my $group_by = 'cust_location.censustract, technology, '. - 'broadband_downstream, broadband_upstream '; + my $group_by = "$censustract, technology, broadband_downstream, broadband_upstream "; my $order_by = $group_by; "SELECT ".join(', ', @select) . " @@ -400,9 +401,10 @@ sub fvs_sql { my $date = $opt{date} || time; my $agentnum = $opt{agentnum}; my $q = $opt{ignore_quantity} ? '1' : 'COALESCE(cust_pkg.quantity, 1)'; + my $censustract = "replace(cust_location.censustract, '.', '')"; my @select = ( - 'cust_location.censustract', + "$censustract AS censustract", # VoIP indicator (0 for non-VoIP, 1 for VoIP) 'COALESCE(is_voip, 0)', # number of lines/subscriptions @@ -426,7 +428,7 @@ sub fvs_sql { "(is_voip = 1 OR is_phone = 1)", ); push @where, "cust_main.agentnum = $agentnum" if $agentnum; - my $group_by = 'cust_location.censustract, COALESCE(is_voip, 0)'; + my $group_by = "$censustract, COALESCE(is_voip, 0)"; my $order_by = $group_by; "SELECT ".join(', ', @select) . " |