X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Fpart_svc.cgi;h=ef0de13cccd3c1d8bfd61d4100409eaff25dbf5a;hb=edf90a3eb4219f72c8962ad86caacf409b896e8f;hp=5c33e68a4f564947b5b459bd2d1f48e771d89210;hpb=207b9834ab70d170865f1f8c7de5e43fc2c5b17d;p=freeside.git
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 5c33e68a4..ef0de13cc 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -8,9 +8,25 @@ if ( $cgi->param('showdisabled') ) {
%search = ( 'disabled' => '' );
}
-my @part_svc = qsearch('part_svc', \%search );
+my @part_svc =
+ sort { $a->getfield('svcpart') <=> $b->getfield('svcpart') }
+ qsearch('part_svc', \%search );
my $total = scalar(@part_svc);
+my %num_active_cust_svc = ();
+if ( $cgi->param('active') ) {
+ my $active_sth = dbh->prepare(
+ 'SELECT COUNT(*) FROM cust_svc WHERE svcpart = ?'
+ ) or die dbh->errstr;
+ foreach my $part_svc ( @part_svc ) {
+ $active_sth->execute($part_svc->svcpart) or die $active_sth->errstr;
+ $num_active_cust_svc{$part_svc->svcpart} =
+ $active_sth->fetchrow_arrayref->[0];
+ }
+ @part_svc = sort { $num_active_cust_svc{$b->svcpart} <=>
+ $num_active_cust_svc{$a->svcpart} } @part_svc;
+}
+
%>
<%= header('Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
@@ -21,8 +37,18 @@ function part_export_areyousure(href) {
}
- Services are items you offer to your customers.
-<%= $total %> services
+ Service definitions are the templates for items you offer to your customers.
+
+
+
+<%= $total %> service definitions
<%= $cgi->param('showdisabled')
? do { $cgi->param('showdisabled', 0);
'( hide disabled services )'; }
@@ -33,22 +59,24 @@ function part_export_areyousure(href) {
param('showdisabled') ? 2 : 3 %>>Service |
Table |
+<% if ( $cgi->param('active') ) { %>
+ Customer Services |
+<% } %>
Export |
Field |
Modifier |
-<% foreach my $part_svc ( sort {
- $a->getfield('svcpart') <=> $b->getfield('svcpart')
- } @part_svc ) {
+<% foreach my $part_svc ( @part_svc ) {
my $hashref = $part_svc->hashref;
my $svcdb = $hashref->{svcdb};
- my @dfields = fields($svcdb);
+ my $svc_x = "FS::$svcdb"->new( { svcpart => $part_svc->svcpart } );
+ my @dfields = $svc_x->fields;
push @dfields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
my @fields =
- grep { $_ ne 'svcnum' && $part_svc->part_svc_column($_)->columnflag }
- @dfields;
-
+ grep { $svc_x->pvf($_)
+ or $_ ne 'svcnum' && $part_svc->part_svc_column($_)->columnflag }
+ @dfields ;
my $rowspan = scalar(@fields) || 1;
my $url = "${p}edit/part_svc.cgi?$hashref->{svcpart}";
%>
@@ -64,6 +92,11 @@ function part_export_areyousure(href) {
<%= $hashref->{svc} %>
>
<%= $hashref->{svcdb} %> |
+<% if ( $cgi->param('active') ) { %>
+ >
+ <%= $num_active_cust_svc{$hashref->{svcpart}} %> active
+ |
+<% } %>
><%= itable() %>
<%
# my @part_export =
@@ -74,7 +107,7 @@ map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export
) {
%>
|
- <%= $part_export->exporttype %> to <%= $part_export->machine %> |
+ <%= $part_export->exportnum %>: <%= $part_export->exporttype %> to <%= $part_export->machine %> |
<% } %>
@@ -86,6 +119,7 @@ map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export
<% if ( $flag eq "D" ) { print "Default"; }
elsif ( $flag eq "F" ) { print "Fixed"; }
+ elsif ( not $flag ) { }
else { print "(Unknown!)"; }
%>
<%= $part_svc->part_svc_column($field)->columnvalue%> |
@@ -94,10 +128,6 @@ map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export
%>
<% } %>
-
-
- param('showdisabled') ? 7 : 8 %>>Add a new service definition |
-