X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fagent_type.cgi;h=637c710ab5096b2390d6842e80bb38052c16bafa;hp=317fd60bc21c84f33758ab56440f3318327cd404;hb=6b9a0a746535a142c95a5841f5cb5d9dc44d2f21;hpb=51984ac3d3da3006809c6866fdecd4ad83610731

diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 317fd60bc..637c710ab 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,71 +1,7 @@
+<!-- mason kludge -->
 <%
-#
-# $Id: agent_type.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# agent_type.cgi: Add/Edit agent type (output form)
-#
-# ivan@sisd.com 97-dec-10
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'type' to 'atype' because Pg6.3 reserves the type word
-#	bmccane@maxbaud.net	98-apr-3
-#
-# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
-#
-# $Log: agent_type.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.11  1999/04/07 11:19:21  ivan
-# silly HTML typo
-#
-# Revision 1.10  1999/01/25 12:09:51  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.9  1999/01/19 05:13:32  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.8  1999/01/18 09:41:22  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.7  1999/01/18 09:22:29  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.6  1998/12/17 06:16:58  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.5  1998/11/21 07:58:27  ivan
-# package names link to them
-#
-# Revision 1.4  1998/11/21 07:45:19  ivan
-# visual, use FS::table_name when doing qsearch('table_name')
-#
-# Revision 1.3  1998/11/15 11:20:12  ivan
-# s/CGI-Base/CGI.pm/ causes s/QUERY_STRING/keywords/;
-#
-# Revision 1.2  1998/11/13 09:56:46  ivan
-# change configuration file layout to support multiple distinct databases (with
-# own set of config files, export, etc.)
-#
-
-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')
@@ -77,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",
 ));
@@ -99,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(
@@ -111,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!">!;