X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_svc.cgi;h=89f75a5f4c2d7cce7559c0bd03a40a26bd03f87e;hp=01574e992944613a0964a02daea0fb60492e2bb3;hb=c70c1b17103b5bd20adb3c8a7c23ca2238fca73d;hpb=1e4aa8069f25e1b4101da20bb9e0d3f60357ea52

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 01574e992..89f75a5f4 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,59 +1,101 @@
-<!-- $Id: part_svc.cgi,v 1.6 2001-09-04 14:44:06 ivan Exp $ -->
-<% 
-   my $part_svc;
-   if ( $cgi->param('error') ) { #error
-     $part_svc = new FS::part_svc ( {
-       map { $_, scalar($cgi->param($_)) } fields('part_svc')
-     } );
-   } elsif ( $cgi->keywords ) { #edit
-     my($query) = $cgi->keywords;
-     $query =~ /^(\d+)$/ or die "malformed query: $query";
-     $part_svc=qsearchs('part_svc', { 'svcpart'=>$1 } )
-       or die "unknown svcpart: $1";
-   } else { #adding
-     $part_svc = new FS::part_svc {};
-   }
-   my $action = $part_svc->svcpart ? 'Edit' : 'Add';
-   my $hashref = $part_svc->hashref;
-   my $p_svcdb = $part_svc->svcdb || 'svc_acct';
-
-%>
+<%
+my $part_svc;
+my $clone = '';
+my $error = '';
+if ( $cgi->param('magic') eq 'process' ) {
 
-<SCRIPT>
-function visualize(what) {
-  if (document.getElementById) {
-    document.getElementById('d<%= $p_svcdb %>').style.visibility = "visible";
+  my $svcpart = $cgi->param('svcpart');
+  my $old = qsearchs('part_svc', { 'svcpart' => $svcpart }) if $svcpart;
+  
+  $cgi->param( 'svc_acct__usergroup',
+               join(',', $cgi->param('svc_acct__usergroup') ) );
+  
+  my $new = new FS::part_svc ( {
+    map {
+      $_, scalar($cgi->param($_));
+  #  } qw(svcpart svc svcdb)
+    } ( fields('part_svc'),
+        map { my $svcdb = $_;
+              my @fields = fields($svcdb);
+              push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
+              map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  } @fields;
+            } grep defined( $FS::Record::dbdef->table($_) ),
+                   qw( svc_acct svc_domain svc_forward svc_www svc_broadband )
+      )
+  } );
+  
+  my %exportnums =
+    map { $_->exportnum => $cgi->param('exportnum'.$_->exportnum) }
+        qsearch('part_export', {} );
+  
+  if ( $svcpart ) {
+    $error = $new->replace($old, '1.3-COMPAT', [ 'usergroup' ], \%exportnums );
   } else {
-    document.l<%= $p_svcdb %>.visibility = "visible";
+    $error = $new->insert( [ 'usergroup' ], \%exportnums );
+    $svcpart = $new->getfield('svcpart');
   }
+
+  unless ( $error ) { #no error, redirect
+    #print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
+    print $cgi->redirect("${p}browse/part_svc.cgi");
+    myexit;
+  }
+
+  $part_svc = $new; #??
+  #$part_svc = new FS::part_svc ( {
+  #  map { $_, scalar($cgi->param($_)) } fields('part_svc')
+  #} );
+
+} elsif ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {#clone
+  #$cgi->param('clone') =~ /^(\d+)$/ or die "malformed query: $query";
+  $part_svc = qsearchs('part_svc', { 'svcpart'=>$1 } )
+    or die "unknown svcpart: $1";
+  $clone = $part_svc->svcpart;
+  $part_svc->svcpart('');
+} elsif ( $cgi->keywords ) { #edit
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/ or die "malformed query: $query";
+  $part_svc=qsearchs('part_svc', { 'svcpart'=>$1 } )
+    or die "unknown svcpart: $1";
+} else { #adding
+  $part_svc = new FS::part_svc {};
 }
-</SCRIPT>
 
+my $action = $part_svc->svcpart ? 'Edit' : 'Add';
+my $hashref = $part_svc->hashref;
+#   my $p_svcdb = $part_svc->svcdb || 'svc_acct';
+
+
+           #" onLoad=\"visualize()\""
+%>
+<!-- mason kludge -->
 <%= header("$action Service Definition",
            menubar( 'Main Menu'         => $p,
                     'View all service definitions' => "${p}browse/part_svc.cgi"
                   ),
-           " onLoad=\"visualize()\""
            )
 %>
 
-<% if ( $cgi->param('error') ) { %>
-<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% if ( $error ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $error %></FONT>
 <% } %>
 
 <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>
+<INPUT TYPE="hidden" NAME="magic" VALUE="process">
+<INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
+<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 - Domains
-    <LI>svc_acct_sm - <B>depreciated</B> (use svc_forward for new installations) Virtual domain mail aliasing.
     <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
+    <LI>svc_broadband - Broadband/High-speed Internet service
+    <LI>svc_external - Externally-tracked service
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
        <LI>svc_wo - Work orders (Partially unimplemented)
 -->
@@ -64,166 +106,227 @@ values.  For example, a SLIP/PPP account may have a default (or perhaps fixed)
 blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
 <B>/usr/bin/passwd</B>.
 <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 ) ) { %>
-  if (svcdb == "<%= $svcdb %>" ) {
-    <% foreach my $not ( grep { $_ ne $svcdb } (
-                           qw(svc_acct svc_domain svc_acct_sm svc_forward svc_www) ) ) { %>
-      if (document.getElementById) {
-        document.getElementById('d<%= $not %>').style.visibility = "hidden";
-      } else {
-        document.l<%= $not %>.visibility = "hidden";
-      }
-    <% } %>
-    if (document.getElementById) {
-      document.getElementById('d<%= $svcdb %>').style.visibility = "visible";
-    } else {
-      document.l<%= $svcdb %>.visibility = "visible";
-    }
-  }
-<% } %>
-}
-</SCRIPT>
-<% my @dbs = $hashref->{svcdb}
-             ? ( $hashref->{svcdb} )
-             : qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ); %>
-Table<SELECT NAME="svcdb" SIZE=1 onChange="changed(this)">
-<% foreach my $svcdb (@dbs) { %>
-<OPTION VALUE="<%= $svcdb %>" <%= ' SELECTED'x($svcdb eq $hashref->{svcdb}) %>><%= $svcdb %>
-<% } %>
-</SELECT>
 
 <%
+
+my %vfields;
+
 #these might belong somewhere else for other user interfaces 
 #pry need to eventually create stuff that's shared amount UIs
+my $conf = new FS::Conf;
 my %defs = (
   'svc_acct' => {
     'dir'       => 'Home directory',
     'uid'       => 'UID (set to fixed and blank for dial-only)',
     '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)',
+#    'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
+    'popnum'    => {
+                     desc => 'Access number',
+                     type => 'select',
+                     select_table => 'svc_acct_pop',
+                     select_key   => 'popnum',
+                     select_label => 'city',
+                   },
+    'username'  => {
+                      desc => 'Username',
+                      type => 'disabled',
+                   },
+    '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)',
+    'shell'     => {
+                     desc =>'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
+                     type =>'select',
+                     select_list => [ $conf->config('shells') ],
+                   },
     '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',
+                   },
+    'usergroup' => {
+                     desc =>'ICRADIUS/FreeRADIUS groups',
+                     type =>'radius_usergroup_selector',
+                   },
   },
   'svc_domain' => {
     'domain'    => 'Domain',
   },
-  'svc_acct_sm' => {
-    'domuser'   => 'domuser@virtualdomain.com',
-    'domuid'    => 'UID where domuser@virtualdomain.com mail is forwarded',
-    'domsvc'    => 'svcnum from svc_domain for virtualdomain.com',
-  },
   'svc_forward' => {
     'srcsvc'    => 'service from which mail is to be forwarded',
     'dstsvc'    => 'service to which mail is to be forwarded',
     'dst'       => 'someone@another.domain.com to use when dstsvc is 0',
   },
-  'svc_charge' => {
-    'amount'    => 'amount',
-  },
-  'svc_wo' => {
-    'worker'    => 'Worker',
-    '_date'      => 'Date',
-  },
+#  'svc_charge' => {
+#    'amount'    => 'amount',
+#  },
+#  'svc_wo' => {
+#    'worker'    => 'Worker',
+#    '_date'      => 'Date',
+#  },
   'svc_www' => {
     #'recnum' => '',
     #'usersvc' => '',
   },
+  'svc_broadband' => {
+    'speed_down' => 'Maximum download speed for this service in Kbps.  0 denotes unlimited.',
+    'speed_up' => 'Maximum upload speed for this service in Kbps.  0 denotes unlimited.',
+    'ip_addr' => 'IP address.  Leave blank for automatic assignment.',
+    'blocknum' => 'Address block.',
+  },
+  'svc_external' => {
+    #'id' => '',
+    #'title' => '',
+  },
 );
 
-#  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
-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($rowspan)=scalar(@rows);
-
-  #my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>";
-#  $visibility = $svcdb eq $part_svc->svcdb ? "SHOW" : "HIDDEN";
-#  $visibility = $svcdb eq $p_svcdb ? "visible" : "hidden";
-  my $visibility = "hidden";
-%>
-<SCRIPT>
-if (document.getElementById) {
-    document.write("<DIV ID=\"d<%= $svcdb %>\" STYLE=\"visibility: <%= $visibility %>; position: absolute\">");
-} else {
-<% $visibility="show" if $visibility eq "visible"; %>
-    document.write("<LAYER ID=\"l<%= $svcdb %>\" VISIBILITY=\"<%= $visibility %>\">");
-}
+  foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
+    my $self = "FS::$svcdb"->new;
+    $vfields{$svcdb} = {};
+    foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them
+      my $pvf = $self->pvf($field);
+      my @list = $pvf->list;
+      if (scalar @list) {
+        $defs{$svcdb}->{$field} = { desc        => $pvf->label,
+                                    type        => 'select',
+                                    select_list => \@list };
+      } else {
+        $defs{$svcdb}->{$field} = $pvf->label;
+      } #endif
+      $vfields{$svcdb}->{$field} = $pvf;
+      warn "\$vfields{$svcdb}->{$field} = $pvf";
+    } #next $field
+  } #next $svcdb
+  
+  my @dbs = $hashref->{svcdb}
+             ? ( $hashref->{svcdb} )
+             : qw( svc_acct svc_domain svc_forward svc_www svc_broadband svc_external );
 
-function fixup(what) {
-  what.svc.value = document.dummy.svc.value;
-  what.svcdb.value = document.dummy.svcdb.options[document.dummy.svcdb.selectedIndex].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="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 "</TD>";
-    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE=""!.
-      ' CHECKED'x($flag eq ''). ">Off</TD>";
-    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="D"!.
-      ' CHECKED'x($flag eq 'D'). ">Default ";
-    print qq!<INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="F"!.
-      ' CHECKED'x($flag eq 'F'). ">Fixed ";
-    print qq!<INPUT TYPE="text" NAME="${svcdb}__${row}" VALUE="$value">!,
-      "</TD></TR>\n";
-    #$ptmp='';
-  }
-  print "</TABLE>" unless $svcdb eq 'konq_kludge';
-
-print qq!\n<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{svcpart} ? "Apply changes" : "Add service",
-      qq!">! unless $svcdb eq 'konq_kludge';
-
-  print "</FORM>";
-  print <<END;
-    <SCRIPT>
-    if (document.getElementById) {
-      document.write("</DIV>");
-    } else {
-      document.write("</LAYER>");
-    }
-    </SCRIPT>
-END
-}
-#print "</TABLE>";
-%>
+  tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } grep dbdef->table($_), @dbs;
+  my $widget = new HTML::Widgets::SelectLayers(
+    #'selected_layer' => $p_svcdb,
+    'selected_layer' => $hashref->{svcdb} || 'svc_acct',
+    'options'        => \%svcdb,
+    'form_name'      => 'dummy',
+    #'form_action'    => 'process/part_svc.cgi',
+    'form_action'    => 'part_svc.cgi', #self
+    'form_text'      => [ qw( magic svc svcpart ) ],
+    'form_checkbox'  => [ 'disabled' ],
+    'layer_callback' => sub {
+      my $layer = shift;
+      my $html = qq!<INPUT TYPE="hidden" NAME="svcdb" VALUE="$layer">!;
 
-<TAG onLoad="
-    if (document.getElementById) {
-      document.getElementById('d<%= $p_svcdb %>').style.visibility = 'visible';
-    } else {
-      document.l<%= $p_svcdb %>.visibility = 'visible';
-    }
-">
+      my $columns = 3;
+      my $count = 0;
+      my @part_export =
+        map { qsearch( 'part_export', {exporttype => $_ } ) }
+          keys %{FS::part_export::export_info($layer)};
+      $html .= '<BR><BR>'. table().
+               table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
+      foreach my $part_export ( @part_export ) {
+        $html .= '<TD><INPUT TYPE="checkbox"'.
+                 ' NAME="exportnum'. $part_export->exportnum. '"  VALUE="1" ';
+        $html .= 'CHECKED'
+          if ( $clone || $part_svc->svcpart ) #null svcpart search causing error
+              && qsearchs( 'export_svc', {
+                                   exportnum => $part_export->exportnum,
+                                   svcpart   => $clone || $part_svc->svcpart });
+        $html .= '>'. $part_export->exportnum. ': '. $part_export->exporttype.
+                 ' to '. $part_export->machine. '</TD>';
+        $count++;
+        $html .= '</TR><TR>' unless $count % $columns;
+      }
+      $html .= '</TR></TABLE><BR><BR>';
+
+      $html .=  table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>";
+      #yucky kludge
+      my @fields = defined( $FS::Record::dbdef->table($layer) )
+                      ? grep { $_ ne 'svcnum' } fields($layer)
+                      : ();
+      push @fields, 'usergroup' if $layer eq 'svc_acct'; #kludge
+      $part_svc->svcpart($clone) if $clone; #haha, undone below
+      foreach my $field (@fields) {
+        my $part_svc_column = $part_svc->part_svc_column($field);
+        my $value = $error
+                      ? $cgi->param("${layer}__${field}")
+                      : $part_svc_column->columnvalue;
+        my $flag = $error
+                     ? $cgi->param("${layer}__${field}_flag")
+                     : $part_svc_column->columnflag;
+        my $def = $defs{$layer}{$field};
+        my $desc = ref($def) ? $def->{desc} : $def;
+        
+        $html .= "<TR><TD>$field";
+        $html .= "- <FONT SIZE=-1>$desc</FONT>" if $desc;
+        $html .=  "</TD>";
+        $flag = '' if ref($def) && $def->{type} eq 'disabled';
+        $html .=
+          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
+          ' CHECKED'x($flag eq ''). ">Off</TD>".
+          '<TD>';
+        unless ( ref($def) && $def->{type} eq 'disabled' ) {
+          $html .= 
+            qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
+            ' CHECKED'x($flag eq 'D'). ">Default ".
+            qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
+            ' CHECKED'x($flag eq 'F'). ">Fixed ";
+          $html .= '<BR>';
+        }
+        if ( ref($def) ) {
+          if ( $def->{type} eq 'select' ) {
+            $html .= qq!<SELECT NAME="${layer}__${field}">!;
+            $html .= '<OPTION> </OPTION>' unless $value;
+            if ( $def->{select_table} ) {
+              foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
+                my $rvalue = $record->getfield($def->{select_key});
+                $html .= qq!<OPTION VALUE="$rvalue"!.
+                         ( $rvalue==$value ? ' SELECTED>' : '>' ).
+                         $record->getfield($def->{select_label}). '</OPTION>';
+              } #next $record
+            } else { # select_list
+              foreach my $item ( @{$def->{select_list}} ) {
+                $html .= qq!<OPTION VALUE="$item"!.
+                         ( $item eq $value ? ' SELECTED>' : '>' ).
+                         $item. '</OPTION>';
+              } #next $item
+            } #endif
+            $html .= '</SELECT>';
+          } elsif ( $def->{type} eq 'radius_usergroup_selector' ) {
+            $html .= FS::svc_acct::radius_usergroup_selector(
+              [ split(',', $value) ], "${layer}__${field}" );
+          } elsif ( $def->{type} eq 'disabled' ) {
+            $html .=
+              qq!<INPUT TYPE="hidden" NAME="${layer}__${field}" VALUE="">!;
+          } else {
+            $html .= '<font color="#ff0000">unknown type'. $def->{type};
+          }
+        } else {
+          $html .=
+            qq!<INPUT TYPE="text" NAME="${layer}__${field}" VALUE="$value">!;
+        }
 
+        if($vfields{$layer}->{$field}) {
+          $html .= qq!<BR><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="X"!.
+          ' CHECKED'x($flag eq 'X'). ">Excluded ";
+        }
+        $html .= "</TD></TR>\n";
+      }
+      $part_svc->svcpart('') if $clone; #undone
+      $html .= "</TABLE>";
+
+      $html .= '<BR><INPUT TYPE="submit" VALUE="'.
+               ($hashref->{svcpart} ? 'Apply changes' : 'Add service'). '">';
+
+      $html;
+
+    },
+  );
+
+%>
+Table <%= $widget->html %>
   </BODY>
 </HTML>