X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_svc.cgi;h=c3a4942eaf181f5862a52da86e26bb9222d750d1;hb=69569a366264e4114f37d0e1036b5a09ceb56fd7;hp=5696e43f879f89a68d9b0c0e81440931d477d837;hpb=b752b1bede0539c9822b999e08e994f63036320d;p=freeside.git

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 5696e43f8..c3a4942ea 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.5 2001-08-30 15:30:26 ivan Exp $ -->
+<!-- mason kludge -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -31,7 +31,7 @@ function visualize(what) {
 
 <%= header("$action Service Definition",
            menubar( 'Main Menu'         => $p,
-                    'View all services' => "${p}browse/part_svc.cgi"
+                    'View all service definitions' => "${p}browse/part_svc.cgi"
                   ),
            " onLoad=\"visualize()\""
            )
@@ -44,14 +44,14 @@ function visualize(what) {
 <FORM NAME="dummy">
 
       Service Part #<%= $part_svc->svcpart ? $part_svc->svcpart : "(NEW)" %>
-
-<PRE>
-Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>">
-</PRE>
+<BR><BR>
+Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>"><BR>
+Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>><BR>
+<BR>
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
-    <LI>svc_domain - Virtual domains
-    <LI>svc_acct_sm - Virtual domain mail aliasing (*depreciated*)
+    <LI>svc_domain - Domains
+    <LI>svc_acct_sm - <B>deprecated</B> (use svc_forward for new installations) Virtual domain mail aliasing.
     <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
@@ -66,7 +66,6 @@ blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
 <BR><BR>
 <SCRIPT>
 var svcdb = null;
-var something = null;
 function changed(what) {
   svcdb = what.options[what.selectedIndex].value;
 <% foreach my $svcdb ( qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ) ) { %>
@@ -95,7 +94,7 @@ Table<SELECT NAME="svcdb" SIZE=1 onChange="changed(this)">
 <% foreach my $svcdb (@dbs) { %>
 <OPTION VALUE="<%= $svcdb %>" <%= ' SELECTED'x($svcdb eq $hashref->{svcdb}) %>><%= $svcdb %>
 <% } %>
-</SELECT>
+</SELECT></FORM>
 
 <%
 #these might belong somewhere else for other user interfaces 
@@ -107,12 +106,18 @@ my %defs = (
     'slipip'    => 'IP address (Set to fixed and blank to disable dialin, or, set a value to be exported to RADIUS Framed-IP-Address.  Use the special value <code>0e0</code> [zero e zero] to enable export to RADIUS without a Framed-IP-Address.)',
     'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
     'username'  => 'Username',
-    'quota'     => '(unimplemented)',
+    'quota'     => '',
     '_password' => 'Password',
     'gid'       => 'GID (when blank, defaults to UID)',
     'shell'     => 'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
     'finger'    => 'GECOS',
-    'domsvc'    => 'svcnum from svc_domain',
+    'domsvc'    => {
+                     desc =>'svcnum from svc_domain',
+                     type =>'select',
+                     select_table => 'svc_domain',
+                     select_key   => 'svcnum',
+                     select_label => 'domain',
+                   },
   },
   'svc_domain' => {
     'domain'    => 'Domain',
@@ -145,10 +150,13 @@ foreach my $svcdb ( qw(
   konq_kludge svc_acct svc_domain svc_acct_sm svc_forward svc_www
 ) ) {
 
-  my(@rows)=map { /^${svcdb}__(.*)$/; $1 }
-    grep ! /_flag$/,
-      grep /^${svcdb}__/,
-        fields('part_svc');
+#  my(@fields) = $svcdb eq 'konq_kludge'
+#                  ? ()
+#                  : grep { $_ ne 'svcnum' } fields($svcdb);
+  #yucky kludge
+  my(@fields) = defined( $FS::Record::dbdef->table($svcdb) )
+                  ? grep { $_ ne 'svcnum' } fields($svcdb)
+                  : ();
   #my($rowspan)=scalar(@rows);
 
   #my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>";
@@ -166,34 +174,61 @@ if (document.getElementById) {
 
 function fixup(what) {
   what.svc.value = document.dummy.svc.value;
-  what.svcdb.value = document.dummy.svcdb.options[document.dummy.svcdb.selectedIndex].value
+  what.svcdb.value = document.dummy.svcdb.options[document.dummy.svcdb.selectedIndex].value;
+  if (document.dummy.disabled.checked)
+    what.disabled.value = 'Y';
+  else
+    what.disabled.value = '';
 }
 </SCRIPT>
 <FORM NAME="<%= $svcdb %>" ACTION="process/part_svc.cgi" METHOD=POST onSubmit="fixup(this)">
 <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
 <INPUT TYPE="hidden" NAME="svc" VALUE="<%= $hashref->{svc} %>">
+<INPUT TYPE="hidden" NAME="disabled" VALUE="<%= $hashref->{disabled} %>">
 <INPUT TYPE="hidden" NAME="svcdb" VALUE="<%= $svcdb %>">
 <%
-  print "$svcdb" unless $svcdb eq 'konq_kludge';
-  print "<BR><TABLE BORDER=1><TH>Field</TH><TH COLSPAN=2>Modifier</TH>" unless $svcdb eq 'konq_kludge';
-
-  my($row);
-  foreach $row (@rows) {
-    my $value = $part_svc->getfield($svcdb. '__'. $row);
-    my $flag = $part_svc->getfield($svcdb. '__'. $row. '_flag');
-    #print "<TR>$ptmp<TD>$row";
-    print "<TR><TD>$row";
-    print "- <FONT SIZE=-1>$defs{$svcdb}{$row}</FONT>"
-      if defined $defs{$svcdb}{$row};
+  #print "$svcdb<BR>" unless $svcdb eq 'konq_kludge';
+  print table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>" unless $svcdb eq 'konq_kludge';
+
+  foreach my $field (@fields) {
+    my $part_svc_column = $part_svc->part_svc_column($field);
+    my $value = $cgi->param('error')
+                  ? $cgi->param("${svcdb}__${field}")
+                  : $part_svc_column->columnvalue;
+    my $flag = $cgi->param('error')
+                 ? $cgi->param("${svcdb}__${field}_flag")
+                 : $part_svc_column->columnflag;
+    #print "<TR>$ptmp<TD>$field";
+    print "<TR><TD>$field";
+    my $def = $defs{$svcdb}{$field};
+    my $desc = ref($def) ? $def->{desc} : $def;
+    
+    print "- <FONT SIZE=-1>$desc</FONT>" if $desc;
     print "</TD>";
-    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE=""!.
+    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${field}_flag" VALUE=""!.
       ' CHECKED'x($flag eq ''). ">Off</TD>";
-    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="D"!.
+    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${field}_flag" VALUE="D"!.
       ' CHECKED'x($flag eq 'D'). ">Default ";
-    print qq!<INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="F"!.
+    print qq!<INPUT TYPE="radio" NAME="${svcdb}__${field}_flag" VALUE="F"!.
       ' CHECKED'x($flag eq 'F'). ">Fixed ";
-    print qq!<INPUT TYPE="text" NAME="${svcdb}__${row}" VALUE="$value">!,
-      "</TD></TR>\n";
+    print '<BR>';
+    if ( ref($def) ) {
+      if ( $def->{type} eq 'select' ) {
+        print qq!<SELECT NAME="${svcdb}__${field}">!;
+        print '<OPTION>' unless $value;
+        foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
+          my $rvalue = $record->getfield($def->{select_key});
+          print qq!<OPTION VALUE="$rvalue"!.
+                ( $rvalue==$value ? ' SELECTED>' : '>' ).
+                $record->getfield($def->{select_label});
+        }
+      } else {
+        print '<font color="#ff0000">unknown type'. $def->{type};
+      }
+    } else {
+      print qq!<INPUT TYPE="text" NAME="${svcdb}__${field}" VALUE="$value">!;
+    }
+    print "</TD></TR>\n";
     #$ptmp='';
   }
   print "</TABLE>" unless $svcdb eq 'konq_kludge';