X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Fpart_svc.cgi;h=3fece29257dcf64ac819c1c277e0ab2b897c3abb;hb=d38d8201fb8d7f18b199cf8805c17c0121dd1288;hp=4c9b1bd957655a05e21a441510f64a015befc79a;hpb=e6ea57971831f25d682d97a0ba508c39b66ecd8b;p=freeside.git
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 4c9b1bd95..3fece2925 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -8,7 +8,9 @@ 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);
%>
@@ -21,8 +23,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 )'; }
@@ -38,17 +50,16 @@ function part_export_areyousure(href) {
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}";
%>
@@ -74,7 +85,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 +97,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 +106,6 @@ map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export
%>
<% } %>
-
-
- param('showdisabled') ? 7 : 8 %>>Add a new service definition |
-