continue making hours/input/output/total display on invoices conditional on there...

[freeside.git] / httemplate / edit / agent_type.cgi

diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 4f1ad8b..637c710 100755 (executable)
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,22 +1,7 @@
+<!-- mason kludge -->
 <%
-#<!-- $Id: agent_type.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::agent_type;
-use FS::CGI qw(header menubar popurl);
-use FS::agent_type;
-use FS::part_pkg;
-use FS::type_pkgs;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
 
+my($agent_type);
 if ( $cgi->param('error') ) {
   $agent_type = new FS::agent_type ( {
     map { $_, scalar($cgi->param($_)) } fields('agent')
@@ -28,11 +13,10 @@ if ( $cgi->param('error') ) {
 } else { #adding
   $agent_type = new FS::agent_type {};
 }
-$action = $agent_type->typenum ? 'Edit' : 'Add';
-$hashref = $agent_type->hashref;
+my $action = $agent_type->typenum ? 'Edit' : 'Add';
+my $hashref = $agent_type->hashref;
 
-$p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header("$action Agent Type", menubar(
+print header("$action Agent Type", menubar(
   'Main Menu' => "$p",
   'View all agent types' => "${p}browse/agent_type.cgi",
 ));
@@ -50,7 +34,7 @@ print <<END;
 <BR><BR>Select which packages agents of this type may sell to customers<BR>
 END
 
-foreach $part_pkg ( qsearch('part_pkg',{}) ) {
+foreach my $part_pkg ( qsearch('part_pkg',{ 'disabled' => '' }) ) {
   print qq!<BR><INPUT TYPE="checkbox" NAME="pkgpart!,
         $part_pkg->getfield('pkgpart'), qq!" !,
        # ( 'CHECKED 'x scalar(
@@ -62,11 +46,11 @@ foreach $part_pkg ( qsearch('part_pkg',{}) ) {
           : '',
         qq!VALUE="ON"> !,
     qq!<A HREF="${p}edit/part_pkg.cgi?!, $part_pkg->pkgpart, 
-    '">', $part_pkg->getfield('pkg'), '</A>',
+    '">', $part_pkg->pkgpart. ": ". $part_pkg->getfield('pkg'), '</A>',
   ;
 }
 
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
+print qq!<BR><BR><INPUT TYPE="submit" VALUE="!,
       $hashref->{typenum} ? "Apply changes" : "Add agent type",
       qq!">!;