bugfixes; fields isn't exported by derived classes

[freeside.git] / htdocs / browse / part_svc.cgi

diff --git a/htdocs/browse/part_svc.cgi b/htdocs/browse/part_svc.cgi
index 53de101..93864a4 100755 (executable)
--- a/htdocs/browse/part_svc.cgi
+++ b/htdocs/browse/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.3 1998-11-20 23:10:57 ivan Exp $
+# $Id: part_svc.cgi,v 1.6 1998-12-30 23:03:20 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14, 97-dec-9
 #
@@ -10,7 +10,16 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.3  1998-11-20 23:10:57  ivan
+# Revision 1.6  1998-12-30 23:03:20  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.5  1998/12/17 05:25:21  ivan
+# fix visual and other bugs
+#
+# Revision 1.4  1998/11/21 02:26:22  ivan
+# visual
+#
+# Revision 1.3  1998/11/20 23:10:57  ivan
 # visual
 #
 # Revision 1.2  1998/11/20 08:50:37  ivan
@@ -21,16 +30,18 @@ use strict;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch);
-use FS::part_svc qw(fields);
+use FS::Record qw(qsearch fields);
+use FS::part_svc);
 use FS::CGI qw(header menubar popurl table);
 
 my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
+my $p = popurl(2);
+
 print $cgi->header, header('Service Part Listing', menubar(
-  'Main Menu' => popurl(2),
+  'Main Menu' => $p,
 )),<<END;
     Services are items you offer to your customers.<BR><BR>
 END
@@ -44,7 +55,6 @@ print table, <<END;
 END
 
 my($part_svc);
-my($p)=popurl(2);
 foreach $part_svc ( sort {
   $a->getfield('svcpart') <=> $b->getfield('svcpart')
 } qsearch('part_svc',{}) ) {
@@ -57,32 +67,34 @@ foreach $part_svc ( sort {
           grep /^${svcdb}__/,
             fields('part_svc')
   ;
-  my($rowspan)=scalar(@rows);
+  my($rowspan)=scalar(@rows) || 1;
   print <<END;
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_svc.cgi?$hashref->{svcpart}">
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_svc.cgi?$hashref->{svcpart}">
           $hashref->{svcpart}</A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_svc.cgi?$hashref->{svcpart}">          $hashref->{svc}</A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_svc.cgi?$hashref->{svcpart}">          $hashref->{svc}</A></TD>
         <TD ROWSPAN=$rowspan>$hashref->{svcdb}</TD>
 END
+
+  my($n1)='';
   my($row);
   foreach $row ( @rows ) {
     my($flag)=$part_svc->getfield($svcdb.'__'.$row.'_flag');
-    print "<TD>$row</TD><TD>";
+    print $n1,"<TD>$row</TD><TD>";
     if ( $flag eq "D" ) { print "Default"; }
       elsif ( $flag eq "F" ) { print "Fixed"; }
       else { print "(Unknown!)"; }
-    print "</TD><TD>",$part_svc->getfield($svcdb."__".$row),"</TD></TR><TR>";
+    print "</TD><TD>",$part_svc->getfield($svcdb."__".$row),"</TD>";
+    $n1="</TR><TR>";
   }
 print "</TR>";
 }
 
 print <<END;
       <TR>
-        <TD COLSPAN=2><A HREF="$p/edit/part_svc.cgi"><I>Add new service</I></A></TD>
+        <TD COLSPAN=2><A HREF="${p}edit/part_svc.cgi"><I>Add new service</I></A></TD>
       </TR>
     </TABLE>
-    </CENTER>
   </BODY>
 </HTML>
 END