X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_svc.cgi;h=deb3c80f9e641c50ff7ef780376863c4087f88fe;hb=037c3acd250f637182019d0a74361d5420f29c52;hp=f2555a29f9b4ba80577761b227da9ddf5716d6ff;hpb=cf16b23820da69e3c8d0156ae27e21c635bf1ec5;p=freeside.git

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index f2555a29f..deb3c80f9 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,240 +1,368 @@
-<!-- $Id: part_svc.cgi,v 1.13 2001-12-27 09:26:14 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';
-
+<% include('/elements/header.html', "$action Service Definition",
+           menubar('View all service definitions' => "${p}browse/part_svc.cgi"),
+           #" onLoad=\"visualize()\""
+          )
 %>
 
-<SCRIPT>
-function visualize(what) {
-  if (document.getElementById) {
-    document.getElementById('d<%= $p_svcdb %>').style.visibility = "visible";
-  } else {
-    document.l<%= $p_svcdb %>.visibility = "visible";
-  }
-}
-</SCRIPT>
-
-<%= 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>
-<% } %>
-
 <FORM NAME="dummy">
 
-      Service Part #<%= $part_svc->svcpart ? $part_svc->svcpart : "(NEW)" %>
+      Service Part #<% $part_svc->svcpart ? $part_svc->svcpart : "(NEW)" %>
 <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>
+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="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
+Service definitions are the templates for items you offer to your customers.
+<UL><LI>svc_acct - Accounts - anything with a username (Mailboxes, PPP accounts, shell accounts, RADIUS entries for broadband, etc.)
     <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 (always-on)
+    <LI>svc_phone - Customer phone numbers
+    <LI>svc_external - Externally-tracked service
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
        <LI>svc_wo - Work orders (Partially unimplemented)
 -->
 </UL>
 For the selected table, you can give fields default or fixed (unchangable)
-values.  For example, a SLIP/PPP account may have a default (or perhaps fixed)
-<B>slipip</B> of <B>0.0.0.0</B>, while a POP mailbox will probably have a fixed
-blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
-<B>/usr/bin/passwd</B>.
+values, or select an inventory class to manually or automatically fill in
+that field.
 <BR><BR>
-<SCRIPT>
-var svcdb = 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></FORM>
 
-<%
-#these might belong somewhere else for other user interfaces 
-#pry need to eventually create stuff that's shared amount UIs
-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'     => '',
-    '_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',
-  },
-  '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_www' => {
-    #'recnum' => '',
-    #'usersvc' => '',
-  },
-);
+% #YUCK.  false laziness w/part_svc.pm.  go away virtual fields, please
+% my %vfields;
+% foreach my $svcdb ( FS::part_svc->svc_tables() ) {
+%   eval "use FS::$svcdb;";
+%   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);
+%     $vfields{$svcdb}->{$field} = $pvf;
+%     #warn "\$vfields{$svcdb}->{$field} = $pvf";
+%   } #next $field
+% } #next $svcdb
+%
+%  #code duplication w/ edit/part_svc.cgi, should move this hash to part_svc.pm
+%  # and generalize the subs
+%  # condition sub is tested to see whether to disable display of this choice
+%  # params: ( $def, $layer, $field )  (see SUB below)
+%  my $inv_sub = sub {
+%                      $_[0]->{disable_inventory}
+%                        || $_[0]->{'type'} ne 'text'
+%                    };
+%  tie my %flag, 'Tie::IxHash',
+%    ''  => { 'desc' => 'No default', },
+%    'D' => { 'desc' => 'Default',
+%             'condition' =>
+%               sub { $_[0]->{disable_default} }, 
+%           },
+%    'F' => { 'desc' => 'Fixed (unchangeable)',
+%             'condition' =>
+%               sub { $_[0]->{disable_fixed} }, 
+%           },
+%    'S' => { 'desc' => 'Selectable Choice',
+%             'condition' =>
+%               sub { !ref($_[0]) || $_[0]->{disable_select} }, 
+%           },
+%# need to template-ize httemplate/edit/svc_* first
+%#    'M' => { 'desc' => 'Manual selection from inventory',
+%#             'condition' => $inv_sub,
+%#           },
+%    'A' => { 'desc' => 'Automatically fill in from inventory',
+%             'condition' => $inv_sub,
+%           },
+%    'X' => { 'desc' => 'Excluded',
+%             'condition' =>
+%               sub { ! $vfields{$_[1]}->{$_[2]} },
+%
+%           },
+%  ;
+%  
+%  my @dbs = $hashref->{svcdb}
+%             ? ( $hashref->{svcdb} )
+%             : FS::part_svc->svc_tables();
+%
+%  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( svc svcpart ) ],
+%    'form_checkbox'  => [ 'disabled' ],
+%    'layer_callback' => sub {
+%      my $layer = shift;
+%      
+%      my $html = qq!<INPUT TYPE="hidden" NAME="svcdb" VALUE="$layer">!;
+%
+%      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(). 
+%               "<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 .= include('/elements/table-grid.html', 'cellpadding' => 4 ).
+%               '<TR>'.
+%                 '<TH CLASS="grid" BGCOLOR="#cccccc">Field</TH>'.
+%                 '<TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=2>Modifier</TH>'.
+%               '</TR>';
+%
+%      my $bgcolor1 = '#eeeeee';
+%      my $bgcolor2 = '#ffffff';
+%      my $bgcolor;
+%
+%      #yucky kludge
+%      my @fields = defined( dbdef->table($layer) )
+%                      ? grep {
+%                               $_ ne 'svcnum' &&
+%                               ( !FS::part_svc->svc_table_fields($layer)
+%                                     ->{$_}->{disable_part_svc_column}   ||
+%                                 $part_svc->part_svc_column($_)->columnflag
+%                               )
+%                             }
+%                             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 $def = $defs{$layer}{$field};
+%        my $def = FS::part_svc->svc_table_fields($layer)->{$field};
+%        my $label = $def->{'def_label'} || $def->{'label'};
+%        my $formatter = $def->{'format'} || sub { shift };
+%        my $part_svc_column = $part_svc->part_svc_column($field);
+%        my $value = &$formatter($part_svc_column->columnvalue);
+%        my $flag = $part_svc_column->columnflag;
+%
+%        if ( $bgcolor eq $bgcolor1 ) {
+%          $bgcolor = $bgcolor2;
+%        } else {
+%          $bgcolor = $bgcolor1;
+%        }
+%        
+%        $html .= qq!<TR><TD CLASS="grid" BGCOLOR="$bgcolor" ALIGN="right">!.
+%                 ( $label || $field ).
+%                 "</TD>";
+%        $flag = '' if $def->{type} eq 'disabled';
+%
+%        $html .= qq!<TD CLASS="grid" BGCOLOR="$bgcolor">!;
+%
+%        if ( $def->{type} eq 'disabled' ) {
+%        
+%          $html .= 'No default';
+%
+%        } else {
+%
+%          $html .= qq!<SELECT NAME="${layer}__${field}_flag"!.
+%                      qq! onChange="${layer}__${field}_flag_changed(this)">!;
+%
+%          foreach my $f ( keys %flag ) {
+%
+%            #here is where the SUB from above is called, to skip some choices
+%            next if $flag{$f}->{condition}
+%                 && &{ $flag{$f}->{condition} }( $def, $layer, $field );
+%
+%            $html .= qq!<OPTION VALUE="$f"!.
+%                     ' SELECTED'x($flag eq $f ).
+%                     '>'. $flag{$f}->{desc};
+%
+%          }
+%
+%          $html .= '</SELECT>';
+%
+%          $html .= join("\n",
+%            '<SCRIPT>',
+%            "  function ${layer}__${field}_flag_changed(what) {",
+%            '    var f = what.options[what.selectedIndex].value;',
+%            '    if ( f == "" || f == "X" ) { //disable',
+%            "      what.form.${layer}__${field}.disabled = true;".
+%            "      what.form.${layer}__${field}.style.backgroundColor = '#dddddd';".
+%            "      if ( what.form.${layer}__${field}_classnum ) {".
+%            "        what.form.${layer}__${field}_classnum.disabled = true;".
+%            "        what.form.${layer}__${field}_classnum.style.backgroundColor = '#dddddd';".
+%            "      }".
+%            '    } else if ( f == "D" || f == "F" || f =="S" ) { //enable, text box',
+%            "      what.form.${layer}__${field}.disabled = false;".
+%            "      what.form.${layer}__${field}.style.backgroundColor = '#ffffff';".
+%            "      if ( f == 'S' || '${field}' == 'usergroup' ) {". # kludge
+%            "        what.form.${layer}__${field}.multiple = true;".
+%            "      } else {".
+%            "        what.form.${layer}__${field}.multiple = false;".
+%            "      }".
+%            "      what.form.${layer}__${field}.style.display = '';".
+%            "      if ( what.form.${layer}__${field}_classnum ) {".
+%            "        what.form.${layer}__${field}_classnum.disabled = false;".
+%            "        what.form.${layer}__${field}_classnum.style.backgroundColor = '#ffffff';".
+%            "        what.form.${layer}__${field}_classnum.style.display = 'none';".
+%            "      }".
+%            '    } else if ( f == "M" || f == "A" ) { //enable, inventory',
+%            "      what.form.${layer}__${field}.disabled = false;".
+%            "      what.form.${layer}__${field}.style.backgroundColor = '#ffffff';".
+%            "      what.form.${layer}__${field}.style.display = 'none';".
+%            "      if ( what.form.${layer}__${field}_classnum ) {".
+%            "        what.form.${layer}__${field}_classnum.disabled = false;".
+%            "        what.form.${layer}__${field}_classnum.style.backgroundColor = '#ffffff';".
+%            "        what.form.${layer}__${field}_classnum.style.display = '';".
+%            "      }".
+%            '    }',
+%            '  }',
+%            '</SCRIPT>',
+%          );
+%
+%        }
+%
+%        $html .= qq!</TD><TD CLASS="grid" BGCOLOR="$bgcolor">!;
+%
+%        my $disabled = $flag ? ''
+%                             : 'DISABLED STYLE="background-color: #dddddd"';
+%
+%        if ( !$def->{type} || $def->{type} eq 'text' ) {
+%
+%          my $nodisplay = ' STYLE="display:none"';
+%          my $is_inv = ( $flag =~ /^[MA]$/ );
+%
+%          $html .=
+%            qq!<INPUT TYPE="text" NAME="${layer}__${field}" VALUE="$value" !.
+%            $disabled.
+%            ( $is_inv ? $nodisplay : $disabled ).
+%            '>';
+%
+%          $html .= include('/elements/select-table.html',
+%                             'element_name' => "${layer}__${field}_classnum",
+%                             'element_etc'  => ( $is_inv
+%                                                   ? $disabled
+%                                                   : $nodisplay
+%                                               ),
+%                             'table'        => 'inventory_class',
+%                             'name_col'     => 'classname',
+%                             'value'        => $value,
+%                             'empty_label'  => 'Select inventory class',
+%                          );
+%
+%        } elsif ( $def->{type} eq 'select' ) {
+%
+%          $html .= qq!<SELECT NAME="${layer}__${field}" $disabled!;
+%          $html .= ' MULTIPLE' if $flag eq 'S';
+%          $html .= '>';
+%          $html .= '<OPTION> </OPTION>' unless $value;
+%          if ( $def->{select_table} ) {
+%            foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
+%              my $rvalue = $record->getfield($def->{select_key});
+%              my $select_label = $def->{select_label};
+%              $html .= qq!<OPTION VALUE="$rvalue"!.
+%                  (grep(/^$rvalue$/, split(',',$value)) ? ' SELECTED>' : '>' ).
+%                  $record->$select_label(). '</OPTION>';
+%            } #next $record
+%          } else { # select_list
+%            foreach my $item ( @{$def->{select_list}} ) {
+%              $html .= qq!<OPTION VALUE="$item"!.
+%                    (grep(/^$item$/, split(',',$value)) ? ' SELECTED>' : '>' ).
+%                    $item. '</OPTION>';
+%            } #next $item
+%          } #endif
+%          $html .= '</SELECT>';
+%
+%        } elsif ( $def->{type} eq 'radius_usergroup_selector' ) {
+%
+%          #XXX disable the RADIUS usergroup selector?  ugh it sure does need
+%          #an overhaul, people have dum group problems because of it
+%
+%          $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};
+%
+%        }
+%
+%        $html .= "</TD></TR>\n";
+%
+%      } #foreach my $field (@fields) {
+%
+%      $part_svc->svcpart('') if $clone; #undone
+%      $html .= "</TABLE>";
+%
+%      $html .= include('/elements/progress-init.html',
+%                         $layer, #form name
+%                         [ qw(svc svcpart disabled exportnum), @fields ],
+%                         'process/part_svc.cgi',
+%                         $p.'browse/part_svc.cgi',
+%                         $layer,
+%                      );
+%      $html .= '<BR><INPUT NAME="submit" TYPE="button" VALUE="'.
+%               ($hashref->{svcpart} ? 'Apply changes' : 'Add service'). '" '.
+%               ' onClick="document.'. "$layer.submit.disabled=true; ".
+%               "fixup(document.$layer); $layer". 'process();">';
+%
+%      #$html .= '<BR><INPUT TYPE="submit" VALUE="'.
+%      #         ($hashref->{svcpart} ? 'Apply changes' : 'Add service'). '">';
+%
+%      $html;
+%
+%    },
+%  );
+%
+%
 
-#  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
-) ) {
+Table <% $widget->html %>
 
-#  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);
+<% include('/elements/footer.html') %>
 
-  #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 %>\">");
-}
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
-function fixup(what) {
-  what.svc.value = document.dummy.svc.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 = '';
+my $part_svc;
+my $clone = '';
+if ( $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>
-<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';
 
-  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";
-    print "- <FONT SIZE=-1>$defs{$svcdb}{$field}</FONT>"
-      if defined $defs{$svcdb}{$field};
-    print "</TD>";
-    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}__${field}_flag" VALUE="D"!.
-      ' CHECKED'x($flag eq 'D'). ">Default ";
-    print qq!<INPUT TYPE="radio" NAME="${svcdb}__${field}_flag" VALUE="F"!.
-      ' CHECKED'x($flag eq 'F'). ">Fixed ";
-    print qq!<INPUT TYPE="text" NAME="${svcdb}__${field}" VALUE="$value">!,
-      "</TD></TR>\n";
-    #$ptmp='';
-  }
-  print "</TABLE>" unless $svcdb eq 'konq_kludge';
+my $action = $part_svc->svcpart ? 'Edit' : 'Add';
+my $hashref = $part_svc->hashref;
+#   my $p_svcdb = $part_svc->svcdb || 'svc_acct';
 
-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>";
-%>
 
-<TAG onLoad="
-    if (document.getElementById) {
-      document.getElementById('d<%= $p_svcdb %>').style.visibility = 'visible';
-    } else {
-      document.l<%= $p_svcdb %>.visibility = 'visible';
-    }
-">
+</%init>
+
 
-  </BODY>
-</HTML>