From 57d69d5c1f98f778a0df82795ce21ee7bd21042a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Sep 2001 20:42:00 +0000
Subject: finally fix part_svc!!!

---
 httemplate/edit/part_svc.cgi         | 37 +++++++++++++++++++-----------------
 httemplate/edit/process/part_svc.cgi |  6 +++++-
 2 files changed, 25 insertions(+), 18 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 01574e992..c0d632fa5 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.6 2001-09-04 14:44:06 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.7 2001-09-06 20:42:00 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -145,10 +145,9 @@ 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) );
   #my($rowspan)=scalar(@rows);
 
   #my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>";
@@ -177,22 +176,26 @@ function fixup(what) {
   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};
+  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}__${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">!,
+    print qq!<INPUT TYPE="text" NAME="${svcdb}__${field}" VALUE="$value">!,
       "</TD></TR>\n";
     #$ptmp='';
   }
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 093d86a75..5652c5805 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -8,7 +8,11 @@ my $new = new FS::part_svc ( {
   map {
     $_, scalar($cgi->param($_));
 #  } qw(svcpart svc svcdb)
-  } fields('part_svc')
+  } ( fields('part_svc'),
+      map { my $svcdb = $_;
+            map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  }
+              fields($svcdb)
+          } qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ) )
 } );
 
 my $error;
-- 
cgit v1.2.1