X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Fpkg_class.html;h=eb33c0fb0a31a7288d0b2a929b697cd3cc012b10;hb=90e15da7354b55cc5461b58ac087096ed47e0240;hp=4f02ca22df4b78524abaf02c5010862e7fa90dd1;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1;p=freeside.git
diff --git a/httemplate/browse/pkg_class.html b/httemplate/browse/pkg_class.html
index 4f02ca22d..eb33c0fb0 100644
--- a/httemplate/browse/pkg_class.html
+++ b/httemplate/browse/pkg_class.html
@@ -5,13 +5,14 @@
'disableable' => 1,
'disabled_statuspos' => 2,
'query' => { 'table' => 'pkg_class',
+ 'addl_from' => ' LEFT JOIN pkg_category USING (categorynum)',
'hashref' => {},
- 'extra_sql' => 'ORDER BY classnum',
+ 'order_by' => 'ORDER BY classnum',
},
'count_query' => $count_query,
- 'header' => [ '#', 'Class', ],
- 'fields' => [ 'classnum', 'classname' ],
- 'links' => [ $link, $link ],
+ 'header' => $header,
+ 'fields' => $fields,
+ 'links' => $links,
)
%>
<%init>
@@ -19,13 +20,30 @@
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+my $conf = new FS::Conf;
+
my $html_init =
- 'Package classes define groups of packages, for reporting and '.
- 'convenience purposes.
'.
+ 'Package classes define groups of packages, for taxation, ordering '.
+ 'convenience and reporting.
'.
qq!Add a package class
!;
my $count_query = 'SELECT COUNT(*) FROM pkg_class';
my $link = [ $p.'edit/pkg_class.html?', 'classnum' ];
+my $header = [ '#', 'Class' ];
+my $fields = [ 'classnum', 'classname' ];
+my $links = [ $link, $link ];
+
+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;
+$sth->execute
+ or die "Error executing $cat_query: ". $sth->errstr;
+if ($sth->fetchrow_arrayref->[0]) {
+ push @$header, 'Category';
+ push @$fields, 'categoryname';
+ push @$links, [ $p.'edit/pkg_category.html?', 'categorynum' ]
+}
+
%init>