X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Fpart_svc.cgi;h=eef2676c06c0043bd868dbc6d3f50fe764abee95;hb=1a033848671cad2cbe7687b37fc718b3b2a68b83;hp=ef0de13cccd3c1d8bfd61d4100409eaff25dbf5a;hpb=bb6dfc07af5c7fee85f2c76ee22a833b41e13c36;p=freeside.git

diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index ef0de13cc..eef2676c0 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -1,6 +1,11 @@
-<!-- mason kludge -->
 <% 
 
+my %flag = (
+  'D' => 'Default',
+  'F' => 'Fixed',
+  ''  => '',
+);
+
 my %search;
 if ( $cgi->param('showdisabled') ) {
   %search = ();
@@ -13,22 +18,17 @@ my @part_svc =
     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];
-  }
+my %num_active_cust_svc = map { $_->svcpart => $_->num_cust_svc } @part_svc;
+
+if ( $cgi->param('orderby') eq 'active' ) {
   @part_svc = sort { $num_active_cust_svc{$b->svcpart} <=>
                      $num_active_cust_svc{$a->svcpart}     } @part_svc;
+} elsif ( $cgi->param('orderby') eq 'svc' ) { 
+  @part_svc = sort { lc($a->svc) cmp lc($b->svc) } @part_svc;
 }
 
 %>
-<%= header('Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
+<%= include("/elements/header.html",'Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
 
 <SCRIPT>
 function part_export_areyousure(href) {
@@ -55,21 +55,23 @@ function part_export_areyousure(href) {
       : do { $cgi->param('showdisabled', 1);
              '( <a href="'. $cgi->self_url. '">show disabled services</a> )'; }
 %>
+<% $cgi->param('showdisabled', ( 1 ^ $cgi->param('showdisabled') ) ); %>
 <%= table() %>
   <TR>
-    <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Service</TH>
+    <TH><A HREF="<%= do { $cgi->param('orderby', 'svcpart'); $cgi->self_url } %>">#</A></TH>
+    <% if ( $cgi->param('showdisabled') ) { %>
+      <TH>Status</TH>
+    <% } %>
+    <TH><A HREF="<%= do { $cgi->param('orderby', 'svc'); $cgi->self_url; } %>">Service</A></TH>
     <TH>Table</TH>
-<% if ( $cgi->param('active') ) { %>
-    <TH><FONT SIZE=-1>Customer<BR>Services</FONT></TH>
-<% } %>
+    <TH><A HREF="<%= do { $cgi->param('orderby', 'active'); $cgi->self_url; } %>"><FONT SIZE=-1>Customer<BR>Services</FONT></A></TH>
     <TH>Export</TH>
     <TH>Field</TH>
     <TH COLSPAN=2>Modifier</TH>
   </TR>
 
 <% foreach my $part_svc ( @part_svc ) {
-     my $hashref = $part_svc->hashref;
-     my $svcdb = $hashref->{svcdb};
+     my $svcdb = $part_svc->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
@@ -78,25 +80,30 @@ function part_export_areyousure(href) {
            or $_ ne 'svcnum' && $part_svc->part_svc_column($_)->columnflag }
             @dfields ;
      my $rowspan = scalar(@fields) || 1;
-     my $url = "${p}edit/part_svc.cgi?$hashref->{svcpart}";
+     my $url = "${p}edit/part_svc.cgi?". $part_svc->svcpart;
 %>
 
   <TR>
     <TD ROWSPAN=<%= $rowspan %>><A HREF="<%= $url %>">
-      <%= $hashref->{svcpart} %></A></TD>
-<% unless ( $cgi->param('showdisabled') ) { %>
+      <%= $part_svc->svcpart %></A></TD>
+<% if ( $cgi->param('showdisabled') ) { %>
     <TD ROWSPAN=<%= $rowspan %>>
-      <%= $hashref->{disabled} ? 'DISABLED' : '' %></TD>
+      <%= $part_svc->disabled
+            ? '<FONT COLOR="#FF0000"><B>Disabled</B></FONT>'
+            : '<FONT COLOR="#00CC00"><B>Enabled</B></FONT>'
+      %>
+    </TD>
 <% } %>
     <TD ROWSPAN=<%= $rowspan %>><A HREF="<%= $url %>">
-      <%= $hashref->{svc} %></A></TD>
+      <%= $part_svc->svc %></A></TD>
     <TD ROWSPAN=<%= $rowspan %>>
-      <%= $hashref->{svcdb} %></TD>
-<% if ( $cgi->param('active') ) { %>
+      <%= $svcdb %></TD>
     <TD ROWSPAN=<%= $rowspan %>>
-      <FONT COLOR="#00CC00"><B><%= $num_active_cust_svc{$hashref->{svcpart}} %></B></FONT>&nbsp;<A HREF="<%=$p%>search/<%= $hashref->{svcdb} %>.cgi?svcpart=<%= $hashref->{svcpart} %>">active</A>
+      <FONT COLOR="#00CC00"><B><%= $num_active_cust_svc{$part_svc->svcpart} %></B></FONT>&nbsp;<A HREF="<%=$p%>search/<%= $svcdb %>.cgi?svcpart=<%= $part_svc->svcpart %>">active</A>
+      <% if ( $num_active_cust_svc{$part_svc->svcpart} ) { %>
+        <BR><FONT SIZE="-1">[ <A HREF="<%=$p%>edit/bulk-cust_svc.html?svcpart=<%= $part_svc->svcpart %>">change</A> ]</FONT>
+      <% } %>
     </TD>
-<% } %>
     <TD ROWSPAN=<%= $rowspan %>><%= itable() %>
 <%
 #  my @part_export =
@@ -115,14 +122,11 @@ map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export
      foreach my $field ( @fields ) {
        my $flag = $part_svc->part_svc_column($field)->columnflag;
 %>
-     <%= $n1 %><TD><%= $field %></TD><TD>
+     <%= $n1 %>
+     <TD><%= $field %></TD>
+     <TD><%= $flag{$flag} %></TD>
+     <TD><%= $part_svc->part_svc_column($field)->columnvalue%></TD>
 
-<%     if ( $flag eq "D" ) { print "Default"; }
-         elsif ( $flag eq "F" ) { print "Fixed"; }
-         elsif ( not $flag ) { }
-         else { print "(Unknown!)"; }
-%>
-       </TD><TD><%= $part_svc->part_svc_column($field)->columnvalue%></TD>
 <%     $n1="</TR><TR>";
      }
 %>