X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fbrowse%2Fpart_svc.cgi;h=9fb359d1ddbf270c4efbcd19149e9dca1e6f7c67;hp=c66b8ac631b3ab91292ed7ef7145f2889b373a83;hb=3ef62a0570055da710328937e7f65dbb2c027c62;hpb=b159f42fa3f48cc2ca3b43773e7661e17d2fb072
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index c66b8ac63..9fb359d1d 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);
%>
@@ -22,6 +24,14 @@ function part_export_areyousure(href) {
Services are items you offer to your customers.
+
+
+
<%= $total %> services
<%= $cgi->param('showdisabled')
? do { $cgi->param('showdisabled', 0);
@@ -38,16 +48,16 @@ function part_export_areyousure(href) {
Modifier |
-<% foreach my $part_svc ( sort {
- $a->getfield('svcpart') <=> $b->getfield('svcpart')
- } @part_svc ) {
- my($hashref)=$part_svc->hashref;
- my($svcdb)=$hashref->{svcdb};
+<% foreach my $part_svc ( @part_svc ) {
+ my $hashref = $part_svc->hashref;
+ my $svcdb = $hashref->{svcdb};
+ my @dfields = fields($svcdb);
+ push @dfields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
my @fields =
grep { $_ ne 'svcnum' && $part_svc->part_svc_column($_)->columnflag }
- fields($svcdb);
+ @dfields;
- my($rowspan)=scalar(@fields) || 1;
+ my $rowspan = scalar(@fields) || 1;
my $url = "${p}edit/part_svc.cgi?$hashref->{svcpart}";
%>
@@ -64,35 +74,16 @@ function part_export_areyousure(href) {
<%= $hashref->{svcdb} %>
><%= itable() %>
<%
- my @part_export = qsearch('part_export', { svcpart => $part_svc->svcpart } );
- foreach my $part_export ( @part_export ) {
+# my @part_export =
+map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export_svc', { svcpart => $part_svc->svcpart } ) ;
+ foreach my $part_export (
+ map { qsearchs('part_export', { exportnum => $_->exportnum } ) }
+ qsearch('export_svc', { svcpart => $part_svc->svcpart } )
+ ) {
%>
|
- <%= $part_export->exporttype %> to <%= $part_export->machine %> (edit | delete) |
-
- <%= itable() %>
- <% my %opt = $part_export->options;
- foreach my $opt ( keys %opt ) { %>
- |
<%= $opt %> | <%= $opt{$opt} %> |
- <% } %>
-
-
+ <%= $part_export->exporttype %> to <%= $part_export->machine %> |
<% } %>
- Add a new export |
-<% if (@part_export) { %>
-
- |
-<% } %>
<% my($n1)='';
@@ -111,10 +102,6 @@ function part_export_areyousure(href) {
%>
<% } %>
-
-
- param('showdisabled') ? 7 : 8 %>>Add a new service definition |
-