X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=htdocs%2Fbrowse%2Fpart_pkg.cgi;h=d4c359b287d57946a7ad1adc01f0a68ab9747911;hp=885ac67b3c2fbe889c2b9e0882649a817dbfb065;hb=e6cf4af2b9d3ffefebe1a3e358f0674f566b56bc;hpb=6b95d380233ca8eb73084864628d589de6985c4b

diff --git a/htdocs/browse/part_pkg.cgi b/htdocs/browse/part_pkg.cgi
index 885ac67b3..d4c359b28 100755
--- a/htdocs/browse/part_pkg.cgi
+++ b/htdocs/browse/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.2 1998-11-21 07:00:32 ivan Exp $
+# $Id: part_pkg.cgi,v 1.8 1999-04-09 04:22:34 ivan Exp $
 #
 # ivan@sisd.com 97-dec-5,9
 #
@@ -10,12 +10,34 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.2  1998-11-21 07:00:32  ivan
+# Revision 1.8  1999-04-09 04:22:34  ivan
+# also table()
+#
+# Revision 1.7  1999/04/09 03:52:55  ivan
+# explicit & for table/itable/ntable
+#
+# Revision 1.6  1999/01/19 05:13:27  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.5  1999/01/18 09:41:17  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/17 05:25:19  ivan
+# fix visual and other bugs
+#
+# Revision 1.3  1998/11/21 07:23:45  ivan
+# visual
+#
+# Revision 1.2  1998/11/21 07:00:32  ivan
 # visual
 #
 
 use strict;
+use vars qw( $cgi $p $part_pkg );
 use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar popurl table);
@@ -23,16 +45,17 @@ use FS::part_pkg;
 use FS::pkg_svc;
 use FS::part_svc;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-print $cgi->header, header("Package Part Listing",menubar(
-  'Main Menu' => popurl(2),
-  'Add new package' => popurl(2). "/edit/part_pkg.cgi",
+$p = popurl(2);
+
+print $cgi->header( '-expires' => 'now' ), header("Package Part Listing",menubar(
+  'Main Menu' => $p,
 )), "One or more services are grouped together into a package and given",
   " pricing information. Customers purchase packages, not services.<BR><BR>", 
-  table, <<END;
+  &table(), <<END;
     <TABLE BORDER>
       <TR>
         <TH COLSPAN=2>Package</TH>
@@ -45,8 +68,6 @@ print $cgi->header, header("Package Part Listing",menubar(
       </TR>
 END
 
-my($part_pkg);
-my($p)=popurl(2);
 foreach $part_pkg ( sort { 
   $a->getfield('pkgpart') <=> $b->getfield('pkgpart')
 } qsearch('part_pkg',{}) ) {
@@ -56,10 +77,10 @@ foreach $part_pkg ( sort {
   my($rowspan)=scalar(@pkg_svc);
   print <<END;
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_pkg.cgi?$hashref->{pkgpart}">
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">
           $hashref->{pkgpart}
         </A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkg}</A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkg}</A></TD>
         <TD ROWSPAN=$rowspan>$hashref->{comment}</TD>
         <TD ROWSPAN=$rowspan>$hashref->{setup}</TD>
         <TD ROWSPAN=$rowspan>$hashref->{freq}</TD>
@@ -71,7 +92,7 @@ END
   foreach $pkg_svc ( @pkg_svc ) {
     my($svcpart)=$pkg_svc->getfield('svcpart');
     my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
-    print $n,qq!<TD><A HREF="../edit/part_svc.cgi?$svcpart">!,
+    print $n,qq!<TD><A HREF="${p}edit/part_svc.cgi?$svcpart">!,
           $part_svc->getfield('svc'),"</A></TD><TD>",
           $pkg_svc->getfield('quantity'),"</TD></TR>\n";
     $n="<TR>";
@@ -81,7 +102,8 @@ END
 }
 
 print <<END;
-    </TR></TABLE>
+   <TR><TD COLSPAN=2><I><A HREF="${p}edit/part_pkg.cgi">Add new package</A></I></TD></TR>
+    </TABLE>
   </BODY>
 </HTML>
 END