summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2015-03-23 17:51:20 -0700
committerMark Wells <mark@freeside.biz>2015-03-25 11:21:24 -0700
commit5adac2bcd86a2bb0ddf7b016b5ed1dcd04635aa0 (patch)
treecbdfc9be4ee5960bbe37a0bb72cd57788515e965 /httemplate
parent08f209da036763c1f45e194de865a94dc5293ada (diff)
remove obsolete FCC DS0 options
Diffstat (limited to 'httemplate')
-rw-r--r--httemplate/browse/pkg_class.html7
-rwxr-xr-xhttemplate/edit/part_pkg.cgi2
-rw-r--r--httemplate/edit/pkg_class.html20
3 files changed, 5 insertions, 24 deletions
diff --git a/httemplate/browse/pkg_class.html b/httemplate/browse/pkg_class.html
index 2aa2857a5..eb33c0fb0 100644
--- a/httemplate/browse/pkg_class.html
+++ b/httemplate/browse/pkg_class.html
@@ -5,6 +5,7 @@
'disableable' => 1,
'disabled_statuspos' => 2,
'query' => { 'table' => 'pkg_class',
+ 'addl_from' => ' LEFT JOIN pkg_category USING (categorynum)',
'hashref' => {},
'order_by' => 'ORDER BY classnum',
},
@@ -34,12 +35,6 @@ my $header = [ '#', 'Class' ];
my $fields = [ 'classnum', 'classname' ];
my $links = [ $link, $link ];
-if($conf->exists('cust_main-require_censustract')) {
- push @{$fields}, 'fcc_ds0s';
- push @{$header}, 'FCC form 477 voice-grade equivalents';
- push @{$links}, '';
-}
-
my $cat_query = 'SELECT COUNT(*) FROM pkg_class where categorynum IS NOT NULL';
my $sth = dbh->prepare($cat_query)
or die "Error preparing $cat_query: ". dbh->errstr;
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 1702a6dc7..6629407f0 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -68,8 +68,6 @@
'svc_dst_pkgpart' => 'Include services of package',
'supp_dst_pkgpart' => 'When ordering package, also order',
'report_option' => 'Report classes',
- 'fcc_ds0s' => 'Voice-grade equivalents',
- 'fcc_voip_class' => 'Category',
'delay_start' => 'Default delay (days)',
},
diff --git a/httemplate/edit/pkg_class.html b/httemplate/edit/pkg_class.html
index 95c6f3082..498c34a6b 100644
--- a/httemplate/edit/pkg_class.html
+++ b/httemplate/edit/pkg_class.html
@@ -1,16 +1,4 @@
-<% include( 'elements/class_Common.html',
- 'name_singular' => 'Package Class',
- 'table' => 'pkg_class',
- %opt,
- )
-%>
-<%init>
-
-my $conf = new FS::Conf;
-
-my %opt = ();
-if($conf->exists('cust_main-require_censustract')) {
- $opt{'addl_fields'} = [ 'fcc_ds0s' ];
- $opt{'addl_labels'} = { 'fcc_ds0s' => 'FCC form 477 voice-grade equivalents' };
-}
-</%init>
+<& elements/class_Common.html,
+ 'name_singular' => 'Package Class',
+ 'table' => 'pkg_class',
+&>