From 51984ac3d3da3006809c6866fdecd4ad83610731 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Jul 2001 07:36:04 +0000
Subject: templates!!!

---
 httemplate/edit/agent.cgi                          | 112 ++++++
 httemplate/edit/agent_type.cgi                     | 128 ++++++
 httemplate/edit/cust_credit.cgi                    | 125 ++++++
 httemplate/edit/cust_main.cgi                      | 432 +++++++++++++++++++++
 httemplate/edit/cust_main_county-expand.cgi        |  92 +++++
 httemplate/edit/cust_main_county.cgi               | 104 +++++
 httemplate/edit/cust_pay.cgi                       | 101 +++++
 httemplate/edit/cust_pkg.cgi                       | 171 ++++++++
 httemplate/edit/part_pkg.cgi                       | 180 +++++++++
 httemplate/edit/part_referral.cgi                  |  94 +++++
 httemplate/edit/part_svc.cgi                       | 218 +++++++++++
 httemplate/edit/process/agent.cgi                  |  73 ++++
 httemplate/edit/process/agent_type.cgi             | 100 +++++
 httemplate/edit/process/cust_credit.cgi            |  80 ++++
 httemplate/edit/process/cust_main.cgi              | 196 ++++++++++
 .../edit/process/cust_main_county-expand.cgi       | 104 +++++
 httemplate/edit/process/cust_main_county.cgi       |  64 +++
 httemplate/edit/process/cust_pay.cgi               |  71 ++++
 httemplate/edit/process/cust_pkg.cgi               |  84 ++++
 httemplate/edit/process/part_pkg.cgi               | 152 ++++++++
 httemplate/edit/process/part_referral.cgi          |  69 ++++
 httemplate/edit/process/part_svc.cgi               |  30 ++
 httemplate/edit/process/svc_acct.cgi               | 100 +++++
 httemplate/edit/process/svc_acct_pop.cgi           |  70 ++++
 httemplate/edit/process/svc_acct_sm.cgi            |  87 +++++
 httemplate/edit/process/svc_domain.cgi             |  84 ++++
 httemplate/edit/svc_acct.cgi                       | 232 +++++++++++
 httemplate/edit/svc_acct_pop.cgi                   | 106 +++++
 httemplate/edit/svc_acct_sm.cgi                    | 251 ++++++++++++
 httemplate/edit/svc_domain.cgi                     | 168 ++++++++
 30 files changed, 3878 insertions(+)
 create mode 100755 httemplate/edit/agent.cgi
 create mode 100755 httemplate/edit/agent_type.cgi
 create mode 100755 httemplate/edit/cust_credit.cgi
 create mode 100755 httemplate/edit/cust_main.cgi
 create mode 100755 httemplate/edit/cust_main_county-expand.cgi
 create mode 100755 httemplate/edit/cust_main_county.cgi
 create mode 100755 httemplate/edit/cust_pay.cgi
 create mode 100755 httemplate/edit/cust_pkg.cgi
 create mode 100755 httemplate/edit/part_pkg.cgi
 create mode 100755 httemplate/edit/part_referral.cgi
 create mode 100755 httemplate/edit/part_svc.cgi
 create mode 100755 httemplate/edit/process/agent.cgi
 create mode 100755 httemplate/edit/process/agent_type.cgi
 create mode 100755 httemplate/edit/process/cust_credit.cgi
 create mode 100755 httemplate/edit/process/cust_main.cgi
 create mode 100755 httemplate/edit/process/cust_main_county-expand.cgi
 create mode 100755 httemplate/edit/process/cust_main_county.cgi
 create mode 100755 httemplate/edit/process/cust_pay.cgi
 create mode 100755 httemplate/edit/process/cust_pkg.cgi
 create mode 100755 httemplate/edit/process/part_pkg.cgi
 create mode 100755 httemplate/edit/process/part_referral.cgi
 create mode 100755 httemplate/edit/process/part_svc.cgi
 create mode 100755 httemplate/edit/process/svc_acct.cgi
 create mode 100755 httemplate/edit/process/svc_acct_pop.cgi
 create mode 100755 httemplate/edit/process/svc_acct_sm.cgi
 create mode 100755 httemplate/edit/process/svc_domain.cgi
 create mode 100755 httemplate/edit/svc_acct.cgi
 create mode 100755 httemplate/edit/svc_acct_pop.cgi
 create mode 100755 httemplate/edit/svc_acct_sm.cgi
 create mode 100755 httemplate/edit/svc_domain.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
new file mode 100755
index 000000000..b4508da81
--- /dev/null
+++ b/httemplate/edit/agent.cgi
@@ -0,0 +1,112 @@
+<%
+#
+# $Id: agent.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 97-dec-12
+#
+# 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.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/04/07 11:27:50  ivan
+# avoid perl's silly arguement not numeric error
+#
+# Revision 1.6  1999/01/25 12:09:50  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:31  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:21  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 06:16:57  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/23 07:52:08  ivan
+# *** empty log message ***
+#
+
+use strict;
+use vars qw ( $cgi $agent $action $hashref $p $agent_type );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header menubar popurl);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::agent;
+use FS::agent_type;
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  $agent = new FS::agent ( {
+    map { $_, scalar($cgi->param($_)) } fields('agent')
+  } );
+} elsif ( $cgi->keywords ) {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $agent = qsearchs( 'agent', { 'agentnum' => $1 } );
+} else { #adding
+  $agent = new FS::agent {};
+}
+$action = $agent->agentnum ? 'Edit' : 'Add';
+$hashref = $agent->hashref;
+
+$p = popurl(2);
+
+print $cgi->header( '-expires' => 'now' ), header("$action Agent", menubar(
+  'Main Menu' => $p,
+  'View all agents' => $p. 'browse/agent.cgi',
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print '<FORM ACTION="', popurl(1), 'process/agent.cgi" METHOD=POST>',
+      qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$hashref->{agentnum}">!,
+      "Agent #", $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)";
+
+print <<END;
+<PRE>
+Agent                     <INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="$hashref->{agent}">
+Agent type                <SELECT NAME="typenum" SIZE=1>
+END
+
+foreach $agent_type (qsearch('agent_type',{})) {
+  print "<OPTION VALUE=". $agent_type->typenum;
+  print " SELECTED"
+    if $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum );
+  print ">", $agent_type->getfield('typenum'), ": ",
+        $agent_type->getfield('atype'),"\n";
+}
+
+print <<END;
+</SELECT>
+Frequency (unimplemented) <INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}">
+Program (unimplemented)   <INPUT TYPE="text" NAME="prog" VALUE="$hashref->{prog}">
+</PRE>
+END
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{agentnum} ? "Apply changes" : "Add agent",
+      qq!">!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
new file mode 100755
index 000000000..317fd60bc
--- /dev/null
+++ b/httemplate/edit/agent_type.cgi
@@ -0,0 +1,128 @@
+<%
+#
+# $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);
+
+if ( $cgi->param('error') ) {
+  $agent_type = new FS::agent_type ( {
+    map { $_, scalar($cgi->param($_)) } fields('agent')
+  } );
+} elsif ( $cgi->keywords ) { #editing
+  my( $query ) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $agent_type=qsearchs('agent_type',{'typenum'=>$1});
+} else { #adding
+  $agent_type = new FS::agent_type {};
+}
+$action = $agent_type->typenum ? 'Edit' : 'Add';
+$hashref = $agent_type->hashref;
+
+$p = popurl(2);
+print $cgi->header( '-expires' => 'now' ), header("$action Agent Type", menubar(
+  'Main Menu' => "$p",
+  'View all agent types' => "${p}browse/agent_type.cgi",
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print '<FORM ACTION="', popurl(1), 'process/agent_type.cgi" METHOD=POST>',
+      qq!<INPUT TYPE="hidden" NAME="typenum" VALUE="$hashref->{typenum}">!,
+      "Agent Type #", $hashref->{typenum} ? $hashref->{typenum} : "(NEW)";
+
+print <<END;
+<BR><BR>Agent Type <INPUT TYPE="text" NAME="atype" SIZE=32 VALUE="$hashref->{atype}">
+<BR><BR>Select which packages agents of this type may sell to customers<BR>
+END
+
+foreach $part_pkg ( qsearch('part_pkg',{}) ) {
+  print qq!<BR><INPUT TYPE="checkbox" NAME="pkgpart!,
+        $part_pkg->getfield('pkgpart'), qq!" !,
+       # ( 'CHECKED 'x scalar(
+        qsearchs('type_pkgs',{
+          'typenum' => $agent_type->getfield('typenum'),
+          'pkgpart'  => $part_pkg->getfield('pkgpart'),
+        })
+          ? 'CHECKED '
+          : '',
+        qq!VALUE="ON"> !,
+    qq!<A HREF="${p}edit/part_pkg.cgi?!, $part_pkg->pkgpart, 
+    '">', $part_pkg->getfield('pkg'), '</A>',
+  ;
+}
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{typenum} ? "Apply changes" : "Add agent type",
+      qq!">!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
new file mode 100755
index 000000000..d3d0dc15f
--- /dev/null
+++ b/httemplate/edit/cust_credit.cgi
@@ -0,0 +1,125 @@
+<%
+#
+# $Id: cust_credit.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: cust_credit.cgi custnum [ -paybatch ]
+#        http://server.name/path/cust_credit?custnum [ -paybatch ]
+#
+# some hooks in here for modifications as well as additions, but needs (lots) more work.
+# also see process/cust_credit.cgi, the script that processes the form.
+#
+# ivan@voicenet.com 96-dec-05
+#
+# paybatch field, differentiates between credits & credits+refunds by commandline
+# ivan@voicenet.com 96-dec-08
+#
+# added (but commented out) sprintf("%.2f" in amount field.  Hmm.
+# ivan@voicenet.com 97-jan-3
+#
+# paybatch stuff thrown out - has checkbox now instead.  
+# (well, sort of.  still passed around for backward compatability and possible editing hook)
+# ivan@voicenet.com 97-apr-21
+#
+# rewrite ivan@sisd.com 98-mar-16
+#
+# $Log: cust_credit.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/02/28 00:03:33  ivan
+# removed misleading comments
+#
+# Revision 1.6  1999/01/25 12:09:52  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:33  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:23  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/23 02:26:06  ivan
+# *** empty log message ***
+#
+# Revision 1.2  1998/12/17 06:16:59  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+
+use strict;
+use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
+use Date::Format;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(header popurl);
+use FS::Record qw(fields);
+#use FS::cust_credit;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  #$cust_credit = new FS::cust_credit ( {
+  #  map { $_, scalar($cgi->param($_)) } fields('cust_credit')
+  #} );
+  $custnum = $cgi->param('custnum');
+  $amount = $cgi->param('amount');
+  #$refund = $cgi->param('refund');
+  $reason = $cgi->param('reason');
+} else {
+  ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $custnum = $1;
+  $amount = '';
+  #$refund = 'yes';
+  $reason = '';
+}
+$_date = time;
+
+$otaker = getotaker;
+
+$p1 = popurl(1);
+
+print $cgi->header( '-expires' => 'now' ), header("Post Credit", '');
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+print <<END;
+    <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
+    <PRE>
+END
+
+$crednum = "";
+print qq!Credit #<B>!, $crednum ? $crednum : " <I>(NEW)</I>", qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
+
+print qq!\nCustomer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
+
+print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
+
+print qq!\nDate: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
+
+print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+print qq!<INPUT TYPE="hidden" NAME="credited" VALUE="">!;
+
+#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
+
+print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!;
+
+print qq!\nReason <INPUT TYPE="text" NAME="reason" VALUE="$reason" SIZE=72>!;
+
+print <<END;
+</PRE>
+<BR>
+<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
+END
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
new file mode 100755
index 000000000..8902e3dce
--- /dev/null
+++ b/httemplate/edit/cust_main.cgi
@@ -0,0 +1,432 @@
+<%
+#<!-- $Id: cust_main.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $ -->
+
+use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
+             $last $first $ss $company $address1 $address2 $city $zip 
+             $daytime $night $fax @invoicing_list $invoicing_list $payinfo
+             $payname %payby %paybychecked $refnum $otaker $r );
+use vars qw ( $conf $pkgpart $username $password $popnum $ulen $ulen2 );
+#use CGI::Switch;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+#use FS::Record qw(qsearch qsearchs fields);
+use FS::Record qw(qsearch qsearchs fields dbdef);
+use FS::CGI qw(header popurl itable table);
+use FS::cust_main;
+use FS::agent;
+use FS::part_referral;
+use FS::cust_main_county;
+
+  #for misplaced logic below
+  use FS::part_pkg;
+
+  #for false laziness below
+  use FS::svc_acct_pop;
+
+  #for (other) false laziness below
+  use FS::agent;
+  use FS::type_pkgs;
+
+$conf = new FS::Conf;
+
+#get record
+
+if ( $cgi->param('error') ) {
+  $cust_main = new FS::cust_main ( {
+    map { $_, scalar($cgi->param($_)) } fields('cust_main')
+  } );
+  $custnum = $cust_main->custnum;
+  $pkgpart = $cgi->param('pkgpart_svcpart') || '';
+  if ( $pkgpart =~ /^(\d+)_/ ) {
+    $pkgpart = $1;
+  } else {
+    $pkgpart = '';
+  }
+  $username = $cgi->param('username');
+  $password = $cgi->param('_password');
+  $popnum = $cgi->param('popnum');
+} elsif ( $cgi->keywords ) { #editing
+  my( $query ) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $custnum=$1;
+  $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
+  $pkgpart = 0;
+  $username = '';
+  $password = '';
+  $popnum = 0;
+} else {
+  $custnum='';
+  $cust_main = new FS::cust_main ( {} );
+  $cust_main->setfield('otaker',&getotaker);
+  $pkgpart = 0;
+  $username = '';
+  $password = '';
+  $popnum = 0;
+}
+$action = $custnum ? 'Edit' : 'Add';
+
+# top
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Customer $action", '');
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
+      qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
+      qq!Customer # !, ( $custnum ? $custnum : " (NEW)" ),
+      
+;
+
+# agent
+
+$r = qq!<font color="#ff0000">*</font>!;
+
+@agents = qsearch( 'agent', {} );
+#die "No agents created!" unless @agents;
+die "You have not created any agents.  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
+$agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
+if ( scalar(@agents) == 1 ) {
+  print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
+} else {
+  print qq!<BR><BR>${r}Agent <SELECT NAME="agentnum" SIZE="1">!;
+  my $agent;
+  foreach $agent (sort {
+    $a->agent cmp $b->agent;
+  } @agents) {
+      print '<OPTION VALUE="', $agent->agentnum, '"',
+      " SELECTED"x($agent->agentnum==$agentnum),
+      ">", $agent->agentnum,": ", $agent->agent;
+  }
+  print "</SELECT>";
+}
+
+#referral
+
+$refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
+if ( $custnum && ! $conf->exists('editreferrals') ) {
+  print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
+} else {
+  my(@referrals) = qsearch('part_referral',{});
+  if ( scalar(@referrals) == 1 ) {
+    $refnum ||= $referrals[0]->refnum;
+    print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
+  } else {
+    print qq!<BR><BR>${r}Referral <SELECT NAME="refnum" SIZE="1">!;
+    print "<OPTION> " unless $refnum;
+    my($referral);
+    foreach $referral (sort {
+      $a->refnum <=> $b->refnum;
+    } @referrals) {
+      print "<OPTION" . " SELECTED"x($referral->refnum==$refnum),
+      ">", $referral->refnum, ": ", $referral->referral;
+    }
+    print "</SELECT>";
+  }
+}
+
+
+# contact info
+
+($last,$first,$ss,$company,$address1,$address2,$city,$zip)=(
+  $cust_main->last,
+  $cust_main->first,
+  $cust_main->ss,
+  $cust_main->company,
+  $cust_main->address1,
+  $cust_main->address2,
+  $cust_main->city,
+  $cust_main->zip,
+);
+
+print "<BR><BR>Billing address", &itable("#cccccc"), <<END;
+<TR><TH ALIGN="right">${r}Contact name<BR>(last, first)</TH><TD COLSPAN=3>
+END
+
+print <<END;
+<INPUT TYPE="text" NAME="last" VALUE="$last"> , 
+<INPUT TYPE="text" NAME="first" VALUE="$first">
+END
+
+print <<END;
+</TD><TD ALIGN="right">SS#</TD><TD><INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11></TD></TR>
+<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70></TD></TR>
+<TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TD></TR>
+<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70></TD></TR>
+<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
+END
+
+$cust_main->country( $conf->config('countrydefault') || 'US' )
+  unless $cust_main->country;
+$cust_main->state( $conf->config('statedefault') || 'CA' )
+  unless $cust_main->state || $cust_main->country ne 'US';
+foreach ( qsearch('cust_main_county',{}) ) {
+  print "<OPTION";
+  print " SELECTED" if ( $cust_main->state eq $_->state
+                         && $cust_main->county eq $_->county 
+                         && $cust_main->country eq $_->country
+                       );
+  print ">",$_->state;
+  print " (",$_->county,")" if $_->county;
+  print " / ", $_->country;
+}
+print qq!</SELECT></TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10></TD></TR>!;
+
+($daytime,$night,$fax)=(
+  $cust_main->daytime,
+  $cust_main->night,
+  $cust_main->fax,
+);
+
+print <<END;
+<TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18></TD></TR>
+<TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18></TD></TR>
+<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12></TD></TR>
+END
+
+print "</TABLE>$r required fields<BR>";
+
+# service address
+
+if ( defined $cust_main->dbdef_table->column('ship_last') ) {
+
+  print "\n", <<END;
+  <SCRIPT>
+  function changed(what) {
+    what.form.same.checked = false;
+  }
+  function samechanged(what) {
+    if ( what.checked ) {
+END
+print "      what.form.ship_$_.value = what.form.$_.value;\n"
+  for (qw( last first company address1 address2 city zip daytime night fax ));
+print <<END;
+      what.form.ship_state.selectedIndex = what.form.state.selectedIndex;
+    }
+  }
+  </SCRIPT>
+END
+
+  print '<BR>Service address ',
+        '(<INPUT TYPE="checkbox" NAME="same" onClick="samechanged(this)"';
+  unless ( $cust_main->ship_last ) {
+    print ' CHECKED';
+    foreach (
+      qw( last first company address1 address2 city state zip daytime night fax)
+    ) {
+      $cust_main->set("ship_$_", $cust_main->get($_) );
+    }
+  }
+  print '>same as billing address)<BR>';
+
+  my($ship_last,$ship_first,$ship_company,$ship_address1,$ship_address2,$ship_city,$ship_zip)=(
+    $cust_main->ship_last,
+    $cust_main->ship_first,
+    $cust_main->ship_company,
+    $cust_main->ship_address1,
+    $cust_main->ship_address2,
+    $cust_main->ship_city,
+    $cust_main->ship_zip,
+  );
+
+  print &itable("#cccccc"), <<END;
+  <TR><TH ALIGN="right">${r}Contact name<BR>(last, first)</TH><TD COLSPAN=5>
+END
+
+  print <<END;
+  <INPUT TYPE="text" NAME="ship_last" VALUE="$ship_last" onChange="changed(this)"> , 
+  <INPUT TYPE="text" NAME="ship_first" VALUE="$ship_first" onChange="changed(this)">
+END
+
+  print <<END;
+  </TD></TR>
+  <TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_company" VALUE="$ship_company" SIZE=70 onChange="changed(this)"></TD></TR>
+  <TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_address1" VALUE="$ship_address1" SIZE=70 onChange="changed(this)"></TD></TR>
+  <TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_address2" VALUE="$ship_address2" SIZE=70 onChange="changed(this)"></TD></TR>
+  <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="ship_city" VALUE="$ship_city" onChange="changed(this)"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="ship_state" SIZE="1" onChange="changed(this)">
+END
+
+  $cust_main->ship_country( $conf->config('countrydefault') || 'US' )
+    unless $cust_main->ship_country;
+  $cust_main->ship_state( $conf->config('statedefault') || 'CA' )
+    unless $cust_main->ship_state || $cust_main->ship_country ne 'US';
+  foreach ( qsearch('cust_main_county',{}) ) {
+    print "<OPTION";
+    print " SELECTED" if ( $cust_main->ship_state eq $_->state
+                           && $cust_main->ship_county eq $_->county 
+                           && $cust_main->ship_country eq $_->country
+                         );
+    print ">",$_->state;
+    print " (",$_->county,")" if $_->county;
+    print " / ", $_->country;
+  }
+  print qq!</SELECT></TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="ship_zip" VALUE="$ship_zip" SIZE=10 onChange="changed(this)"></TD></TR>!;
+
+  my($ship_daytime,$ship_night,$ship_fax)=(
+    $cust_main->ship_daytime,
+    $cust_main->ship_night,
+    $cust_main->ship_fax,
+  );
+
+  print <<END;
+  <TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_daytime" VALUE="$ship_daytime" SIZE=18 onChange="changed(this)"></TD></TR>
+  <TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_night" VALUE="$ship_night" SIZE=18 onChange="changed(this)"></TD></TR>
+  <TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_fax" VALUE="$ship_fax" SIZE=12 onChange="changed(this)"></TD></TR>
+END
+
+  print "</TABLE>$r required fields<BR>";
+
+}
+
+# billing info
+
+sub expselect {
+  my $prefix = shift;
+  my( $m, $y ) = (0, 0);
+  if ( scalar(@_) ) {
+    my $date = shift || '01-2000';
+    if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
+      ( $m, $y ) = ( $2, $1 );
+    } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+      ( $m, $y ) = ( $1, $3 );
+    } else {
+      die "unrecognized expiration date format: $date";
+    }
+  }
+
+  my $return = qq!<SELECT NAME="$prefix!. qq!_month" SIZE="1">!;
+  for ( 1 .. 12 ) {
+    $return .= "<OPTION";
+    $return .= " SELECTED" if $_ == $m;
+    $return .= ">$_";
+  }
+  $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
+  for ( 2001 .. 2037 ) {
+    $return .= "<OPTION";
+    $return .= " SELECTED" if $_ == $y;
+    $return .= ">$_";
+  }
+  $return .= "</SELECT>";
+
+  $return;
+}
+
+print "<BR>Billing information", &itable("#cccccc"),
+      qq!<TR><TD><INPUT TYPE="checkbox" NAME="tax" VALUE="Y"!;
+print qq! CHECKED! if $cust_main->tax eq "Y";
+print qq!>Tax Exempt</TD></TR>!;
+print qq!<TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
+@invoicing_list = $cust_main->invoicing_list;
+print qq! CHECKED!
+  if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
+print qq!>Postal mail invoice</TD></TR>!;
+$invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
+print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
+
+print "<TR><TD>Billing type</TD></TR>",
+      "</TABLE>",
+      &table("#cccccc"), "<TR>";
+
+($payinfo, $payname)=(
+  $cust_main->payinfo,
+  $cust_main->payname,
+);
+
+%payby = (
+  'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
+  'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
+);
+%paybychecked = (
+  'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+  'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
+);
+for (qw(CARD BILL COMP)) {
+  print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+  if ($cust_main->payby eq "$_") {
+    print qq! CHECKED> $paybychecked{$_}</TD>!;
+  } else {
+    print qq!> $payby{$_}</TD>!;
+  }
+}
+
+print "</TR></TABLE>$r required fields for each billing type";
+
+unless ( $custnum ) {
+  # pry the wrong place for this logic.  also pretty expensive
+  #use FS::part_pkg;
+
+  #false laziness, copied from FS::cust_pkg::order
+  my $pkgpart;
+  if ( scalar(@agents) == 1 ) {
+    # $pkgpart->{PKGPART} is true iff $custnum may purchase $pkgpart
+    my($agent)=qsearchs('agent',{'agentnum'=> $agentnum });
+    $pkgpart = $agent->pkgpart_hashref;
+  } else {
+    #can't know (agent not chosen), so, allow all
+    my %typenum;
+    foreach my $agent ( @agents ) {
+      next if $typenum{$agent->typenum}++;
+      #fixed in 5.004_05 #$pkgpart->{$_}++ foreach keys %{ $agent->pkgpart_hashref }
+      foreach ( keys %{ $agent->pkgpart_hashref } ) { $pkgpart->{$_}++; } #5.004_04 workaround
+    }
+  }
+  #eslaf
+
+  my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
+    qsearch( 'part_pkg', {} );
+
+  if ( @part_pkg ) {
+
+    print "<BR><BR>First package", &itable("#cccccc"),
+          qq!<TR><TD COLSPAN=2><SELECT NAME="pkgpart_svcpart">!;
+
+    print qq!<OPTION VALUE="">(none)!;
+
+    foreach my $part_pkg ( @part_pkg ) {
+      print qq!<OPTION VALUE="!,
+#              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"';
+              $part_pkg->pkgpart. "_". $part_pkg->svcpart, '"';
+      print " SELECTED" if $pkgpart && ( $part_pkg->pkgpart == $pkgpart );
+      print ">", $part_pkg->pkg, " - ", $part_pkg->comment;
+    }
+    print "</SELECT></TD></TR>";
+
+    #false laziness: (mostly) copied from edit/svc_acct.cgi
+    #$ulen = $svc_acct->dbdef_table->column('username')->length;
+    $ulen = dbdef->table('svc_acct')->column('username')->length;
+    $ulen2 = $ulen+2;
+    print <<END;
+<TR><TD ALIGN="right">Username</TD>
+<TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
+<TR><TD ALIGN="right">Password</TD>
+<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8>
+(blank to generate)</TD></TR>
+END
+    print qq!<TR><TD ALIGN="right">POP</TD><TD><SELECT NAME="popnum" SIZE=1><OPTION> !;
+    my($svc_acct_pop);
+    foreach $svc_acct_pop ( qsearch ('svc_acct_pop',{} ) ) {
+    print qq!<OPTION VALUE="!, $svc_acct_pop->popnum, '"',
+          ( $popnum && $svc_acct_pop->popnum == $popnum ) ? ' SELECTED' : '', ">", 
+          $svc_acct_pop->popnum, ": ", 
+          $svc_acct_pop->city, ", ",
+          $svc_acct_pop->state,
+          " (", $svc_acct_pop->ac, ")/",
+          $svc_acct_pop->exch, "\n"
+        ;
+    }
+    print "</SELECT></TD></TR></TABLE>";
+  }
+}
+
+$otaker = $cust_main->otaker;
+print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
+      qq!<BR><BR><INPUT TYPE="submit" VALUE="!,
+      $custnum ?  "Apply Changes" : "Add Customer", qq!">!,
+      "</FORM></BODY></HTML>",
+;
+
+%>
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
new file mode 100755
index 000000000..a7b0998df
--- /dev/null
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -0,0 +1,92 @@
+<%
+#
+# $Id: cust_main_county-expand.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 97-dec-16
+#
+# Changes to allow page to work at a relative position in server
+#	bmccane@maxbaud.net	98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: cust_main_county-expand.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/01/25 12:09:54  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:35  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:25  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 06:17:01  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/18 09:01:38  ivan
+# i18n! i18n!
+#
+
+use strict;
+use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar popurl);
+use FS::cust_main_county;
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  $taxnum = $cgi->param('taxnum');
+  $delim = $cgi->param('delim');
+  $expansion = $cgi->param('expansion');
+} else {
+  my ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/
+    or die "Illegal taxnum!";
+  $taxnum = $1;
+  $delim = 'n';
+  $expansion = '';
+}
+
+$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum});
+die "Can't expand entry!" if $cust_main_county->getfield('county');
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Tax Rate (expand)", menubar(
+  'Main Menu' => popurl(2),
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print <<END;
+    <FORM ACTION="${p1}process/cust_main_county-expand.cgi" METHOD=POST>
+      <INPUT TYPE="hidden" NAME="taxnum" VALUE="$taxnum">
+      Separate by
+END
+print '<INPUT TYPE="radio" NAME="delim" VALUE="n"';
+print ' CHECKED' if $delim eq 'n';
+print '>line (rumor has it broken on some browsers) or',
+      '<INPUT TYPE="radio" NAME="delim" VALUE="s"';
+print ' CHECKED' if $delim eq 's';
+print '>whitespace.';
+print <<END;
+      <BR><INPUT TYPE="submit" VALUE="Submit">
+      <BR><TEXTAREA NAME="expansion" ROWS=100>$expansion</TEXTAREA>
+    </FORM>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
new file mode 100755
index 000000000..38e6d6877
--- /dev/null
+++ b/httemplate/edit/cust_main_county.cgi
@@ -0,0 +1,104 @@
+<%
+#
+# $Id: cust_main_county.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 97-dec-13-16
+#
+# Changes to allow page to work at a relative position in server
+# Changed tax field to accept 6 chars (MO uses 6.1%)
+#	bmccane@maxbaud.net	98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+# 
+# $Log: cust_main_county.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# 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/25 12:09:55  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:36  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:41:26  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 06:17:02  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/18 09:01:39  ivan
+# i18n! i18n!
+#
+
+use strict;
+use vars qw( $cgi $cust_main_county );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header menubar popurl table);
+use FS::cust_main_county;
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+print $cgi->header( '-expires' => 'now' ), header("Edit tax rates", menubar(
+  'Main Menu' => popurl(2),
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="!, popurl(1),
+    qq!process/cust_main_county.cgi" METHOD=POST>!, &table(), <<END;
+      <TR>
+        <TH><FONT SIZE=-1>Country</FONT></TH>
+        <TH><FONT SIZE=-1>State</FONT></TH>
+        <TH>County</TH>
+        <TH><FONT SIZE=-1>Tax</FONT></TH>
+      </TR>
+END
+
+foreach $cust_main_county ( qsearch('cust_main_county',{}) ) {
+  my($hashref)=$cust_main_county->hashref;
+  print <<END;
+      <TR>
+        <TD>$hashref->{country}</TD>
+END
+
+  print "<TD>", $hashref->{state}
+      ? $hashref->{state}
+      : '(ALL)'
+    , "</TD>";
+
+  print "<TD>", $hashref->{county}
+      ? $hashref->{county}
+      : '(ALL)'
+    , "</TD>";
+
+  print qq!<TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
+        qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD></TR>!;
+END
+
+}
+
+print <<END;
+    </TABLE>
+    <INPUT TYPE="submit" VALUE="Apply changes">
+    </FORM>
+    </CENTER>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
new file mode 100755
index 000000000..33320648c
--- /dev/null
+++ b/httemplate/edit/cust_pay.cgi
@@ -0,0 +1,101 @@
+<%
+#
+# $Id: cust_pay.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: cust_pay.cgi invnum
+#        http://server.name/path/cust_pay.cgi?invnum
+#
+# some hooks for modifications as well as additions, but needs work.
+#
+# ivan@voicenet.com 96-dec-11
+#
+# rewrite ivan@sisd.com 98-mar-16
+#
+# $Log: cust_pay.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/02/28 00:03:35  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/01/25 12:09:56  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.4  1999/01/19 05:13:37  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 09:41:27  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.2  1998/12/17 06:17:03  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+
+use strict;
+use vars qw( $cgi $invnum $p1 $_date $payby $payinfo $paid );
+use Date::Format;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  $invnum = $cgi->param('invnum');
+  $paid = $cgi->param('paid');
+  $payby = $cgi->param('payby');
+  $payinfo = $cgi->param('payinfo');
+} else {
+  my ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $invnum = $1;
+  $paid = '';
+  $payby = "BILL";
+  $payinfo = "";
+}
+$_date = time;
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Enter payment", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print <<END;
+    <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
+    <HR><PRE>
+END
+
+print qq!Invoice #<B>$invnum</B><INPUT TYPE="hidden" NAME="invnum" VALUE="$invnum">!;
+
+print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
+
+print qq!<BR>Amount \$<INPUT TYPE="text" NAME="paid" VALUE="$paid" SIZE=8 MAXLENGTH=8>!;
+
+print qq!<BR>Payby: <B>$payby</B><INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
+
+#payinfo (check # now as payby="BILL" hardcoded.. what to do later?)
+print qq!<BR>Check #<INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo">!;
+
+#paybatch
+print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
+
+print <<END;
+</PRE>
+<BR>
+<INPUT TYPE="submit" VALUE="Post payment">
+END
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
new file mode 100755
index 000000000..637023703
--- /dev/null
+++ b/httemplate/edit/cust_pkg.cgi
@@ -0,0 +1,171 @@
+<%
+#
+# $Id: cust_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# this is for changing packages around, not editing things within the package
+#
+# Usage: cust_pkg.cgi custnum
+#        http://server.name/path/cust_pkg.cgi?custnum
+#
+# started with /sales/add/cust_pkg.cgi, which added packages
+# ivan@voicenet.com 97-jan-5, 97-mar-21
+#
+# Rewrote for new API
+# ivan@voicenet.com 97-jul-7
+#
+# FS::Search is no more, &cgisuidsetup needs $cgi, ivan@sisd.com 98-mar-7 
+#
+# Changes to allow page to work at a relative position in server
+# Changed to display packages 2-wide in a table
+#       bmccane@maxbaud.net     98-apr-3
+#
+# fixed a pretty cool bug from above which caused a visual glitch ivan@sisd.com
+# 98-jun-1
+#
+# $Log: cust_pkg.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.8  1999/07/21 07:34:13  ivan
+# links to package browse and agent type edit if there aren't any packages to
+# order.  thanks to "Tech Account" <techy@orac.hq.org>
+#
+# Revision 1.7  1999/04/14 01:03:01  ivan
+# oops, in 1.2 tree, can't do searches until [cgi|admin]suidsetup,
+# bug is hidden by mod_perl persistance
+#
+# Revision 1.6  1999/02/28 00:03:36  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:18  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:13:38  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 09:41:28  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.2  1998/12/17 06:17:04  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+
+use strict;
+use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
+             $cust_main $agent $type_pkgs $count %remove_pkg $pkgparts );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(header popurl);
+use FS::part_pkg;
+use FS::type_pkgs;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+%pkg = ();
+%comment = ();
+foreach (qsearch('part_pkg', {})) {
+  $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
+  $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
+}
+
+if ( $cgi->param('error') ) {
+  $custnum = $cgi->param('custnum');
+  %remove_pkg = map { $_ => 1 } $cgi->param('remove_pkg');
+} else {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $custnum = $1;
+  undef %remove_pkg;
+}
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Add/Edit Packages", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/cust_pkg.cgi" METHOD=POST>!;
+
+print qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
+
+#current packages
+@cust_pkg = qsearch('cust_pkg',{ 'custnum' => $custnum, 'cancel' => '' } );
+
+if (@cust_pkg) {
+  print <<END;
+Current packages - select to remove (services are moved to a new package below)
+<BR><BR>
+END
+
+  my ($count) = 0 ;
+  print qq!<TABLE>! ;
+  foreach (@cust_pkg) {
+    print '<TR>' if $count == 0;
+    my($pkgnum,$pkgpart)=( $_->getfield('pkgnum'), $_->getfield('pkgpart') );
+    print qq!<TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="$pkgnum"!;
+    print " CHECKED" if $remove_pkg{$pkgnum};
+    print qq!>$pkgnum: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n!;
+    $count ++ ;
+    if ($count == 2)
+    {
+      $count = 0 ;
+      print qq!</TR>\n! ;
+    }
+  }
+  print qq!</TABLE><BR><BR>!;
+}
+
+print <<END;
+Order new packages<BR><BR>
+END
+
+$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+$agent = qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
+
+$count = 0;
+$pkgparts = 0;
+print qq!<TABLE>!;
+foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+  $pkgparts++;
+  my($pkgpart)=$type_pkgs->pkgpart;
+  print qq!<TR>! if ( $count == 0 );
+  my $value = $cgi->param("pkg$pkgpart") || 0;
+  print <<END;
+  <TD>
+  <INPUT TYPE="text" NAME="pkg$pkgpart" VALUE="$value" SIZE="2" MAXLENGTH="2">
+  $pkgpart: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n
+END
+  $count ++ ;
+  if ( $count == 2 ) {
+    print qq!</TR>\n! ;
+    $count = 0;
+  }
+}
+print qq!</TABLE>!;
+
+unless ( $pkgparts ) {
+  my $p2 = popurl(2);
+  my $typenum = $agent->typenum;
+  my $agent_type = qsearchs( 'agent_type', { 'typenum' => $typenum } );
+  my $atype = $agent_type->atype;
+  print <<END;
+(No <a href="${p2}browse/part_pkg.cgi">package definitions</a>, or agent type
+<a href="${p2}edit/agent_type.cgi?$typenum">$atype</a> not allowed to purchase
+any packages.)
+END
+}
+
+#submit
+print <<END;
+<P><INPUT TYPE="submit" VALUE="Order">
+    </FORM>
+  </BODY>
+</HTML>
+END
+%>
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
new file mode 100755
index 000000000..002d54139
--- /dev/null
+++ b/httemplate/edit/part_pkg.cgi
@@ -0,0 +1,180 @@
+<%
+#
+# $Id: part_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# part_pkg.cgi: Add/Edit package (output form)
+#
+# ivan@sisd.com 97-dec-10
+#
+# Changes to allow page to work at a relative position in server
+# Changed to display services 2-wide in table
+#       bmccane@maxbaud.net     98-apr-3
+#
+# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
+#
+# $Log: part_pkg.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.9  1999/02/07 09:59:19  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.8  1999/01/19 05:13:39  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.7  1999/01/18 09:41:29  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.6  1998/12/17 06:17:05  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.5  1998/11/21 07:12:26  ivan
+# *** empty log message ***
+#
+# Revision 1.4  1998/11/21 07:11:08  ivan
+# *** empty log message ***
+#
+# Revision 1.3  1998/11/21 07:07:40  ivan
+# popurl, bugfix
+#
+# Revision 1.2  1998/11/15 13:14:55  ivan
+# first pass as per-user custom pricing
+#
+
+use strict;
+use vars qw( $cgi $part_pkg $action $query $hashref $part_svc $count );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::part_pkg;
+use FS::part_svc;
+use FS::pkg_svc;
+use FS::CGI qw(header menubar popurl);
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
+  $cgi->param('clone', $1);
+} else {
+  $cgi->param('clone', '');
+}
+if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
+  $cgi->param('pkgnum', $1);
+} else {
+  $cgi->param('pkgnum', '');
+}
+
+($query) = $cgi->keywords;
+$action = '';
+$part_pkg = '';
+if ( $cgi->param('error') ) {
+  $part_pkg = new FS::part_pkg ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_pkg')
+  } );
+}
+if ( $cgi->param('clone') ) {
+  $action='Custom Pricing';
+  my $old_part_pkg =
+    qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
+  $part_pkg ||= $old_part_pkg->clone;
+} elsif ( $query && $query =~ /^(\d+)$/ ) {
+  $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
+} else {
+  $part_pkg ||= new FS::part_pkg {};
+}
+$action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
+$hashref = $part_pkg->hashref;
+
+print $cgi->header( '-expires' => 'now' ), header("$action Package Definition", menubar(
+  'Main Menu' => popurl(2),
+  'View all packages' => popurl(2). 'browse/part_pkg.cgi',
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
+
+if ( $cgi->param('clone') ) {
+  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
+}
+if ( $cgi->param('pkgnum') ) {
+  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
+}
+
+print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
+      "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
+
+print <<END;
+<PRE>
+Package (customer-visable)          <INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}">
+Comment (customer-hidden)           <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}">
+Setup fee for this package          <INPUT TYPE="text" NAME="setup" VALUE="$hashref->{setup}">
+Recurring fee for this package      <INPUT TYPE="text" NAME="recur" VALUE="$hashref->{recur}">
+Frequency (months) of recurring fee <INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}">
+
+</PRE>
+
+END
+
+unless ( $cgi->param('clone') ) {
+  print <<END;
+Enter the quantity of each service this package includes.<BR><BR>
+<TABLE BORDER><TR><TH><FONT SIZE=-1>Quan.</FONT></TH><TH>Service</TH>
+		  <TH><FONT SIZE=-1>Quan.</FONT></TH><TH>Service</TH></TR>
+END
+}
+
+$count = 0;
+foreach $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
+  my $svcpart = $part_svc->svcpart;
+  my $pkg_svc = qsearchs( 'pkg_svc', {
+    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
+    'svcpart'  => $svcpart,
+  } ) || new FS::pkg_svc ( {
+    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
+    'svcpart'  => $svcpart,
+    'quantity' => 0,
+  });
+  #? #next unless $pkg_svc;
+
+  unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
+    print '<TR>' if $count == 0 ;
+    print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=3 VALUE="!,
+          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0,
+          qq!"></TD><TD><A HREF="part_svc.cgi?!,$part_svc->svcpart,
+          qq!">!, $part_svc->getfield('svc'), "</A></TD>";
+    $count++;
+    if ($count == 2)
+    {
+      print '</TR>';
+      $count = 0;
+    }
+  } else {
+    print qq!<INPUT TYPE="hidden" NAME="pkg_svc$svcpart" VALUE="!,
+          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0, qq!">\n!;
+  }
+}
+
+unless ( $cgi->param('clone') ) {
+  print qq!</TR>! if ($count != 0) ;
+  print "</TABLE>";
+}
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{pkgpart} ? "Apply changes" : "Add package",
+      qq!">!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
new file mode 100755
index 000000000..e7d76f7e4
--- /dev/null
+++ b/httemplate/edit/part_referral.cgi
@@ -0,0 +1,94 @@
+<%
+#
+# $Id: part_referral.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 98-feb-23
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# confisuing typo on submit button ivan@sisd.com 98-jun-14
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_referral.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/04/07 11:43:23  ivan
+# pick up errors right away, leave input
+#
+# Revision 1.5  1999/02/07 09:59:20  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:13:41  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 09:41:30  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.2  1998/12/17 06:17:06  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+
+use strict;
+use vars qw( $cgi $part_referral $action $hashref $p1 $query );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::part_referral;
+use FS::CGI qw(header menubar popurl);
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  $part_referral = new FS::part_referral ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_referral')
+  } );
+} elsif ( $cgi->keywords ) {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $part_referral = qsearchs( 'part_referral', { 'refnum' => $1 } );
+} else { #adding
+  $part_referral = new FS::part_referral {};
+}
+$action = $part_referral->refnum ? 'Edit' : 'Add';
+$hashref = $part_referral->hashref;
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("$action Referral", menubar(
+  'Main Menu' => popurl(2),
+  'View all referrals' => popurl(2). "browse/part_referral.cgi",
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/part_referral.cgi" METHOD=POST>!;
+
+print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$hashref->{refnum}">!,
+      "Referral #", $hashref->{refnum} ? $hashref->{refnum} : "(NEW)";
+
+print <<END;
+<PRE>
+Referral   <INPUT TYPE="text" NAME="referral" SIZE=32 VALUE="$hashref->{referral}">
+</PRE>
+END
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{refnum} ? "Apply changes" : "Add referral",
+      qq!">!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
new file mode 100755
index 000000000..cc0ee6fd0
--- /dev/null
+++ b/httemplate/edit/part_svc.cgi
@@ -0,0 +1,218 @@
+<!-- $Id: part_svc.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $ -->
+<% 
+   my $part_svc;
+   if ( $cgi->param('error') ) { #error
+     $part_svc = new FS::part_svc ( {
+       map { $_, scalar($cgi->param($_)) } fields('part_svc')
+     } );
+   } elsif ( $cgi->keywords ) { #edit
+     my $query = $cgi->keywords;
+     $query =~ /^(\d+)$/;
+     $part_svc=qsearchs('part_svc',{'svcpart'=>$1});
+   } else { #adding
+     $part_svc = new FS::part_svc {};
+   }
+   my $action = $part_svc->svcpart ? 'Edit' : 'Add';
+   my $hashref = $part_svc->hashref;
+   my $p_svcdb = $part_svc->svcdb || 'svc_acct';
+
+%>
+
+<SCRIPT>
+function visualize(what) {
+  if (document.getElementById) {
+    document.getElementById('d<%= $p_svcdb %>').style.visibility = "visible";
+  } else {
+    document.l<%= $p_svcdb %>.visibility = "visible";
+  }
+}
+</SCRIPT>
+
+<%= header("$action Service Definition",
+           menubar( 'Main Menu'         => $p,
+                    'View all services' => "${p}browse/part_svc.cgi"
+                  ),
+           " onLoad=\"visualize()\""
+           )
+%>
+
+<% if ( $cgi->param('error') ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
+
+<FORM NAME="dummy">
+
+      Service Part #<%= $part_svc->svcpart ? $part_svc->svcpart : "(NEW)" %>
+
+<PRE>
+Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>">
+</PRE>
+Services are items you offer to your customers.
+<UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
+    <LI>svc_domain - Virtual domains
+    <LI>svc_acct_sm - Virtual domain mail aliasing
+    <LI>svc_www - Virtual domain website
+<!--   <LI>svc_charge - One-time charges (Partially unimplemented)
+       <LI>svc_wo - Work orders (Partially unimplemented)
+-->
+</UL>
+For the selected table, you can give fields default or fixed (unchangable)
+values.  For example, a SLIP/PPP account may have a default (or perhaps fixed)
+<B>slipip</B> of <B>0.0.0.0</B>, while a POP mailbox will probably have a fixed
+blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
+<B>/usr/bin/passwd</B>.
+<BR><BR>
+<SCRIPT>
+var svcdb = null;
+var something = null;
+function changed(what) {
+  svcdb = what.options[what.selectedIndex].value;
+<% foreach my $svcdb ( qw( svc_acct svc_domain svc_acct_sm svc_www ) ) { %>
+  if (svcdb == "<%= $svcdb %>" ) {
+    <% foreach my $not ( grep { $_ ne $svcdb } (
+                           qw(svc_acct svc_domain svc_acct_sm svc_www) ) ) { %>
+      if (document.getElementById) {
+        document.getElementById('d<%= $not %>').style.visibility = "hidden";
+      } else {
+        document.l<%= $not %>.visibility = "hidden";
+      }
+    <% } %>
+    if (document.getElementById) {
+      document.getElementById('d<%= $svcdb %>').style.visibility = "visible";
+    } else {
+      document.l<%= $svcdb %>.visibility = "visible";
+    }
+  }
+<% } %>
+}
+</SCRIPT>
+Table<SELECT NAME="svcdb" SIZE=1 onChange="changed(this)">
+<% foreach my $svcdb (qw( svc_acct svc_domain svc_acct_sm svc_www )) { %>
+<OPTION VALUE="<%= $svcdb %>" <%= ' SELECTED'x($svcdb eq $hashref->{svcdb}) %>><%= $svcdb %>
+<% } %>
+</SELECT>
+
+<%
+#these might belong somewhere else for other user interfaces 
+#pry need to eventually create stuff that's shared amount UIs
+my %defs = (
+  'svc_acct' => {
+    'dir'       => 'Home directory',
+    'uid'       => 'UID (set to fixed and blank for dial-only)',
+    'slipip'    => 'IP address (set to fixed and blank to disable dialin)',
+    'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
+    'username'  => 'Username',
+    'quota'     => '(unimplemented)',
+    '_password' => 'Password',
+    'gid'       => 'GID (when blank, defaults to UID)',
+    'shell'     => 'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
+    'finger'    => 'GECOS',
+  },
+  'svc_domain' => {
+    'domain'    => 'Domain',
+  },
+  'svc_acct_sm' => {
+    'domuser'   => 'domuser@virtualdomain.com',
+    'domuid'    => 'UID where domuser@virtualdomain.com mail is forwarded',
+    'domsvc'    => 'svcnum from svc_domain for virtualdomain.com',
+  },
+  'svc_charge' => {
+    'amount'    => 'amount',
+  },
+  'svc_wo' => {
+    'worker'    => 'Worker',
+    '_date'      => 'Date',
+  },
+  'svc_www' => {
+    #'recnum' => '',
+    #'usersvc' => '',
+  },
+);
+
+#  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
+foreach my $svcdb ( qw(
+  konq_kludge svc_acct svc_domain svc_acct_sm svc_www
+) ) {
+
+  my(@rows)=map { /^${svcdb}__(.*)$/; $1 }
+    grep ! /_flag$/,
+      grep /^${svcdb}__/,
+        fields('part_svc');
+  #my($rowspan)=scalar(@rows);
+
+  #my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>";
+#  $visibility = $svcdb eq $part_svc->svcdb ? "SHOW" : "HIDDEN";
+#  $visibility = $svcdb eq $p_svcdb ? "visible" : "hidden";
+  my $visibility = "hidden";
+%>
+<SCRIPT>
+if (document.getElementById) {
+    document.write("<DIV ID=\"d<%= $svcdb %>\" STYLE=\"visibility: <%= $visibility %>; position: absolute\">");
+} else {
+<% $visibility="show" if $visibility eq "visible"; %>
+    document.write("<LAYER ID=\"l<%= $svcdb %>\" VISIBILITY=\"<%= $visibility %>\">");
+}
+
+function fixup(what) {
+  what.svc.value = document.dummy.svc.value;
+  what.svcdb.value = document.dummy.svcdb.options[document.dummy.svcdb.selectedIndex].value
+}
+</SCRIPT>
+<FORM NAME="<%= $svcdb %>" ACTION="process/part_svc.cgi" METHOD=POST onSubmit="fixup(this)">
+<INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
+<INPUT TYPE="hidden" NAME="svc" VALUE="<%= $hashref->{svc} %>">
+<INPUT TYPE="hidden" NAME="svcdb" VALUE="<%= $svcdb %>">
+<%
+  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};
+    print "</TD>";
+    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE=""!.
+      ' CHECKED'x($flag eq ''). ">Off</TD>";
+    print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="D"!.
+      ' CHECKED'x($flag eq 'D'). ">Default ";
+    print qq!<INPUT TYPE="radio" NAME="${svcdb}__${row}_flag" VALUE="F"!.
+      ' CHECKED'x($flag eq 'F'). ">Fixed ";
+    print qq!<INPUT TYPE="text" NAME="${svcdb}__${row}" VALUE="$value">!,
+      "</TD></TR>\n";
+    #$ptmp='';
+  }
+  print "</TABLE>" unless $svcdb eq 'konq_kludge';
+
+print qq!\n<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{svcpart} ? "Apply changes" : "Add service",
+      qq!">! unless $svcdb eq 'konq_kludge';
+
+  print "</FORM>";
+  print <<END;
+    <SCRIPT>
+    if (document.getElementById) {
+      document.write("</DIV>");
+    } else {
+      document.write("</LAYER>");
+    }
+    </SCRIPT>
+END
+}
+#print "</TABLE>";
+%>
+
+<TAG onLoad="
+    if (document.getElementById) {
+      document.getElementById('d<%= $p_svcdb %>').style.visibility = 'visible';
+    } else {
+      document.l<%= $p_svcdb %>.visibility = 'visible';
+    }
+">
+
+  </BODY>
+</HTML>
+
diff --git a/httemplate/edit/process/agent.cgi b/httemplate/edit/process/agent.cgi
new file mode 100755
index 000000000..2b4991363
--- /dev/null
+++ b/httemplate/edit/process/agent.cgi
@@ -0,0 +1,73 @@
+<%
+#
+# $Id: agent.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 97-dec-12
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: agent.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/01/25 12:09:57  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.6  1999/01/19 05:13:47  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 22:47:49  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.4  1998/12/30 23:03:26  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.3  1998/12/17 08:40:16  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/23 07:52:29  ivan
+# *** empty log message ***
+#
+
+use strict;
+use vars qw ( $cgi $agentnum $old $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::agent;
+use FS::CGI qw(popurl);
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+$agentnum = $cgi->param('agentnum');
+
+$old = qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
+
+$new = new FS::agent ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('agent')
+} );
+
+if ( $agentnum ) {
+  $error=$new->replace($old);
+} else {
+  $error=$new->insert;
+  $agentnum=$new->getfield('agentnum');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "agent.cgi?". $cgi->query_string );
+} else { 
+  print $cgi->redirect(popurl(3). "browse/agent.cgi");
+}
+
+%>
diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
new file mode 100755
index 000000000..5c6b2b8e0
--- /dev/null
+++ b/httemplate/edit/process/agent_type.cgi
@@ -0,0 +1,100 @@
+<%
+#
+# $Id: agent_type.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 97-dec-11
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: agent_type.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/01/25 12:09:58  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.6  1999/01/19 05:13:48  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 22:47:50  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.4  1998/12/30 23:03:27  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.3  1998/12/17 08:40:17  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/21 07:49:20  ivan
+# s/CGI::Request/CGI.pm/
+#
+
+use strict;
+use vars qw ( $cgi $typenum $old $new $error $part_pkg );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::CGI qw( popurl);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::agent_type;
+use FS::type_pkgs;
+use FS::part_pkg;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$typenum = $cgi->param('typenum');
+$old = qsearchs('agent_type',{'typenum'=>$typenum}) if $typenum;
+
+$new = new FS::agent_type ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('agent_type')
+} );
+
+if ( $typenum ) {
+  $error=$new->replace($old);
+} else {
+  $error=$new->insert;
+  $typenum=$new->getfield('typenum');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "agent_type.cgi?". $cgi->query_string );
+  exit;
+}
+
+foreach $part_pkg (qsearch('part_pkg',{})) {
+  my($pkgpart)=$part_pkg->getfield('pkgpart');
+
+  my($type_pkgs)=qsearchs('type_pkgs',{
+      'typenum' => $typenum,
+      'pkgpart' => $pkgpart,
+  });
+  if ( $type_pkgs && ! $cgi->param("pkgpart$pkgpart") ) {
+    my($d_type_pkgs)=$type_pkgs; #need to save $type_pkgs for below.
+    $error=$d_type_pkgs->delete;
+    die $error if $error;
+
+  } elsif ( $cgi->param("pkgpart$pkgpart")
+            && ! $type_pkgs
+  ) {
+    #ok to clobber it now (but bad form nonetheless?)
+    $type_pkgs=new FS::type_pkgs ({
+      'typenum' => $typenum,
+      'pkgpart' => $pkgpart,
+    });
+    $error= $type_pkgs->insert;
+    die $error if $error;
+  }
+
+}
+
+print $cgi->redirect(popurl(3). "browse/agent_type.cgi");
+
+%>
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
new file mode 100755
index 000000000..3cacab26e
--- /dev/null
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -0,0 +1,80 @@
+<%
+#
+# $Id: cust_credit.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/cust_credit.cgi
+#
+# ivan@voicenet.com 96-dec-05 -> 96-dec-08
+#
+# post a refund if $new_paybatch
+# ivan@voicenet.com 96-dec-08
+#
+# refunds are no longer applied against a specific payment (paybatch)
+# paybatch field removed
+# ivan@voicenet.com 97-apr-22
+#
+# rewrite ivan@sisd.com 98-mar-16
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_credit.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/04/07 15:23:05  ivan
+# don't use anchor in redirect
+#
+# Revision 1.6  1999/02/28 00:03:41  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/01/25 12:09:59  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.4  1999/01/19 05:13:49  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 22:47:51  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.2  1998/12/17 08:40:18  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $custnum $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(popurl);
+use FS::Record qw(fields);
+use FS::cust_credit;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
+$custnum = $1;
+
+$cgi->param('otaker',getotaker);
+
+$new = new FS::cust_credit ( {
+  map {
+    $_, scalar($cgi->param($_));
+  #} qw(custnum _date amount otaker reason)
+  } fields('cust_credit')
+} );
+
+$error=$new->insert;
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_credit.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+}
+
+
+%>
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
new file mode 100755
index 000000000..6c52113ba
--- /dev/null
+++ b/httemplate/edit/process/cust_main.cgi
@@ -0,0 +1,196 @@
+<%
+#
+# $Id: cust_main.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/cust_main.cgi
+#
+# ivan@voicenet.com 96-dec-04
+#
+# added referral check
+# ivan@voicenet.com 97-jun-4
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-28
+#
+# same as above (again) and clean up some stuff ivan@sisd.com 98-feb-23
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'day' to 'daytime' because Pg6.3 reserves the day word
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_main.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.11  1999/08/10 12:54:06  ivan
+# use FS::cust_pkg::pkgpart_href
+#
+# Revision 1.10  1999/04/14 07:47:53  ivan
+# i18n fixes
+#
+# Revision 1.9  1999/04/07 15:22:19  ivan
+# don't use anchor in redirect
+#
+# Revision 1.8  1999/03/25 13:55:10  ivan
+# one-screen new customer entry (including package and service) for simple
+# packages with one svc_acct service
+#
+# Revision 1.7  1999/02/28 00:03:42  ivan
+# removed misleading comments
+#
+# Revision 1.6  1999/01/25 12:10:00  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:50  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 09:22:32  ivan
+# changes to track email addresses for email invoicing
+#
+# Revision 1.3  1998/12/17 08:40:19  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/18 08:57:36  ivan
+# i18n, s/CGI-modules/CGI.pm/, FS::CGI::idiot instead of inline, FS::CGI::popurl
+#
+
+use strict;
+use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
+use vars qw( $cust_pkg $cust_svc $svc_acct );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw( popurl );
+use FS::Record qw( qsearch qsearchs fields );
+use FS::cust_main;
+use FS::type_pkgs;
+use FS::agent;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+#unmunge stuff
+
+$cgi->param('tax','') unless defined($cgi->param('tax'));
+
+$cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
+
+$cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
+  or die "Oops, illegal \"state\" param: ". $cgi->param('state');
+$cgi->param('state', $1);
+$cgi->param('county', $3 || '');
+$cgi->param('country', $4);
+
+if ( $payby = $cgi->param('payby') ) {
+  $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
+  $cgi->param('paydate',
+  $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
+  $cgi->param('payname', $cgi->param( $payby. '_payname' ) );
+}
+
+$cgi->param('otaker', &getotaker );
+
+@invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
+push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
+
+#create new record object
+
+$new = new FS::cust_main ( {
+  map {
+    $_, scalar($cgi->param($_))
+#  } qw(custnum agentnum last first ss company address1 address2 city county
+#       state zip daytime night fax payby payinfo paydate payname tax
+#       otaker refnum)
+  } fields('cust_main')
+} );
+
+#perhaps the invocing_list magic should move to cust_main.pm?
+$error = $new->check_invoicing_list( \@invoicing_list );
+
+#perhaps this stuff should go to cust_main.pm as well
+$cust_pkg = '';
+$svc_acct = '';
+if ( $new->custnum eq '' ) {
+
+  if ( $cgi->param('pkgpart_svcpart') ) {
+    my $x = $cgi->param('pkgpart_svcpart');
+    $x =~ /^(\d+)_(\d+)$/;
+    my($pkgpart, $svcpart) = ($1, $2);
+    #false laziness: copied from FS::cust_pkg::order (which should become a
+    #FS::cust_main method)
+    my(%part_pkg);
+    # generate %part_pkg
+    # $part_pkg{$pkgpart} is true iff $custnum may purchase $pkgpart
+    my $agent = qsearchs('agent',{'agentnum'=> $new->agentnum });
+    	#my($type_pkgs);
+    	#foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+    	#  my($pkgpart)=$type_pkgs->pkgpart;
+    	#  $part_pkg{$pkgpart}++;
+    	#}
+    # $pkgpart_href->{PKGPART} is true iff $custnum may purchase $pkgpart
+    my $pkgpart_href = $agent->pkgpart_hashref;
+    #eslaf
+
+    # this should wind up in FS::cust_pkg!
+    $error ||= "Agent ". $new->agentnum. " (type ". $agent->typenum. ") can't".
+               "purchase pkgpart ". $pkgpart
+      #unless $part_pkg{ $pkgpart };
+      unless $pkgpart_href->{ $pkgpart };
+
+    $cust_pkg = new FS::cust_pkg ( {
+      #later         'custnum' => $custnum,
+      'pkgpart' => $pkgpart,
+    } );
+    $error ||= $cust_pkg->check;
+
+    #$cust_svc = new FS::cust_svc ( { 'svcpart' => $svcpart } );
+
+    #$error ||= $cust_svc->check;
+
+    $svc_acct = new FS::svc_acct ( {
+                                     'svcpart'   => $svcpart,
+                                     'username'  => $cgi->param('username'),
+                                     '_password' => $cgi->param('_password'),
+                                     'popnum'    => $cgi->param('popnum'),
+                                   } );
+
+    my $y = $svc_acct->setdefault; # arguably should be in new method
+    $error ||= $y unless ref($y);
+    #and just in case you were silly
+    $svc_acct->svcpart($svcpart);
+    $svc_acct->username($cgi->param('username'));
+    $svc_acct->_password($cgi->param('_password'));
+    $svc_acct->popnum($cgi->param('popnum'));
+
+    $error ||= $svc_acct->check;
+
+  } elsif ( $cgi->param('username') ) { #good thing to catch
+    $error = "Can't assign username without a package!";
+  }
+
+  $error ||= $new->insert;
+  if ( $cust_pkg && ! $error ) {
+    $cust_pkg->custnum( $new->custnum );
+    $error ||= $cust_pkg->insert; 
+    warn "WARNING: $error on pre-checked cust_pkg record!" if $error;
+    $svc_acct->pkgnum( $cust_pkg->pkgnum );
+    $error ||= $svc_acct->insert;
+    warn "WARNING: $error on pre-checked svc_acct record!" if $error;
+  }
+} else { #create old record object
+  my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
+  $error ||= "Old record not found!" unless $old;
+  $error ||= $new->replace($old);
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_main.cgi?". $cgi->query_string );
+} else { 
+  $new->invoicing_list( \@invoicing_list );
+  $custnum = $new->custnum;
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+} 
+%>
diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
new file mode 100755
index 000000000..b7c4547f6
--- /dev/null
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -0,0 +1,104 @@
+<%
+#
+# $Id: cust_main_county-expand.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 97-dec-16
+#
+# Changes to allow page to work at a relative position in server
+# Added import of datasrc from UID.pm for Pg6.3
+# Default tax to 0.0 if using Pg6.3
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI
+# undo default tax to 0.0 if using Pg6.3: comes from pre-expanded record
+# for that state
+# ivan@sisd.com 98-sep-2
+#
+# $Log: cust_main_county-expand.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  2000/12/21 05:22:30  ivan
+# perldoc -f split
+#
+# Revision 1.6  1999/01/25 12:19:07  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:51  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 22:47:52  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.3  1998/12/17 08:40:20  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/18 09:01:40  ivan
+# i18n! i18n!
+#
+
+use strict;
+use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup datasrc);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(popurl);
+use FS::cust_main_county;
+use FS::cust_main;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
+$taxnum = $1;
+$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+  or die ("Unknown taxnum!");
+
+if ( $cgi->param('delim') eq 'n' ) {
+  @expansion=split(/\n/,$cgi->param('expansion'));
+} elsif ( $cgi->param('delim') eq 's' ) {
+  @expansion=split(' ',$cgi->param('expansion'));
+} else {
+  die "Illegal delim!";
+}
+
+@expansion=map {
+  unless ( /^\s*([\w\- ]+)\s*$/ ) {
+    $cgi->param('error', "Illegal item in expansion");
+    print $cgi->redirect(popurl(2). "cust_main_county-expand.cgi?". $cgi->query_string );
+    exit;
+  }
+  $1;
+} @expansion;
+
+foreach ( @expansion) {
+  my(%hash)=$cust_main_county->hash;
+  my($new)=new FS::cust_main_county \%hash;
+  $new->setfield('taxnum','');
+  if ( ! $cust_main_county->state ) {
+    $new->setfield('state',$_);
+  } else {
+    $new->setfield('county',$_);
+  }
+  #if (datasrc =~ m/Pg/)
+  #{
+  #    $new->setfield('tax',0.0);
+  #}
+  my($error)=$new->insert;
+  die $error if $error;
+}
+
+unless ( qsearch('cust_main',{
+  'state'  => $cust_main_county->getfield('state'),
+  'county' => $cust_main_county->getfield('county'),
+  'country' =>  $cust_main_county->getfield('country'),
+} ) ) {
+  my($error)=($cust_main_county->delete);
+  die $error if $error;
+}
+
+print $cgi->redirect(popurl(3). "edit/cust_main_county.cgi");
+
+%>
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
new file mode 100755
index 000000000..1ff2047f1
--- /dev/null
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -0,0 +1,64 @@
+<%
+#
+# $Id: cust_main_county.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 97-dec-16
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: cust_main_county.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/01/25 12:19:08  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:52  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 22:47:53  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.3  1998/12/17 08:40:21  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/18 09:01:41  ivan
+# i18n! i18n!
+#
+
+use strict;
+use vars qw( $cgi );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl);
+use FS::Record qw(qsearch qsearchs);
+use FS::cust_main_county;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+foreach ( $cgi->param ) {
+  /^tax(\d+)$/ or die "Illegal form $_!";
+  my($taxnum)=$1;
+  my($old)=qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+    or die "Couldn't find taxnum $taxnum!";
+  next unless $old->getfield('tax') ne $cgi->param("tax$taxnum");
+  my(%hash)=$old->hash;
+  $hash{tax}=$cgi->param("tax$taxnum");
+  my($new)=new FS::cust_main_county \%hash;
+  my($error)=$new->replace($old);
+  if ( $error ) {
+    $cgi->param('error', $error);
+    print $cgi->redirect(popurl(2). "cust_main_county.cgi?". $cgi->query_string );
+    exit;
+  }
+}
+
+print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
+
+%>
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
new file mode 100755
index 000000000..f21ff490a
--- /dev/null
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -0,0 +1,71 @@
+<%
+#
+# $Id: cust_pay.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/cust_pay.cgi
+#
+# ivan@voicenet.com 96-dec-11
+#
+# rewrite ivan@sisd.com 98-mar-16
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_pay.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/02/28 00:03:43  ivan
+# removed misleading comments
+#
+# Revision 1.6  1999/01/25 12:19:09  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:53  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 22:47:54  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.3  1998/12/30 23:03:28  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.2  1998/12/17 08:40:22  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $invnum $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl);
+use FS::Record qw(fields);
+use FS::cust_pay;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$cgi->param('invnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$invnum = $1;
+
+$new = new FS::cust_pay ( {
+  map {
+    $_, scalar($cgi->param($_));
+  #} qw(invnum paid _date payby payinfo paybatch)
+  } fields('cust_pay')
+} );
+
+$error=$new->insert;
+
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). 'cust_pay.cgi?'. $cgi->query_string );
+  exit;
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$invnum");
+}
+
+%>
diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
new file mode 100755
index 000000000..0074466c8
--- /dev/null
+++ b/httemplate/edit/process/cust_pkg.cgi
@@ -0,0 +1,84 @@
+<%
+#
+# $Id: cust_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# this is for changing packages around, not for editing things within the
+# package
+#
+# Usage: post form to:
+#        http://server.name/path/cust_pkg.cgi
+#
+# ivan@voicenet.com 97-mar-21 - 97-mar-24
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-7 - 15
+#
+# &cgisuidsetup($cgi) ivan@sisd.com 98-mar-7
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_pkg.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/04/07 15:24:06  ivan
+# don't use anchor in redirect
+#
+# Revision 1.6  1999/02/28 00:03:44  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:26  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.3  1999/01/19 05:13:54  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.2  1998/12/17 08:40:23  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $custnum @remove_pkgnums @pkgparts $pkgpart $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl);
+use FS::cust_pkg;
+
+$cgi = new CGI; # create form object
+&cgisuidsetup($cgi);
+$error = '';
+
+#untaint custnum
+$cgi->param('custnum') =~ /^(\d+)$/;
+$custnum = $1;
+
+@remove_pkgnums = map {
+  /^(\d+)$/ or die "Illegal remove_pkg value!";
+  $1;
+} $cgi->param('remove_pkg');
+
+foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
+  if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
+    my $num_pkgs = $1;
+    while ( $num_pkgs-- ) {
+      push @pkgparts,$pkgpart;
+    }
+  } else {
+    $error = "Illegal quantity";
+    last;
+  }
+}
+
+$error ||= FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
+
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_pkg.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+}
+
+%>
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
new file mode 100755
index 000000000..3e1c07d1e
--- /dev/null
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -0,0 +1,152 @@
+<%
+#
+# $Id: part_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# process/part_pkg.cgi: Edit package definitions (process form)
+#
+# ivan@sisd.com 97-dec-10
+#
+# don't update non-changing records in part_svc (causing harmless but annoying
+# "Records identical" errors). ivan@sisd.com 98-feb-19
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# Added `|| 0 ' when getting quantity off web page ivan@sisd.com 98-jun-4
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_pkg.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.9  2001/04/09 23:05:16  ivan
+# Transactions Part I!!!
+#
+# Revision 1.8  1999/02/07 09:59:27  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.7  1999/01/19 05:13:55  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 22:47:56  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.5  1998/12/30 23:03:29  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.4  1998/12/17 08:40:24  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.3  1998/11/21 07:17:58  ivan
+# bugfix to work for regular aswell as custom pricing
+#
+# Revision 1.2  1998/11/15 13:16:15  ivan
+# first pass as per-user custom pricing
+#
+
+use strict;
+use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::part_pkg;
+use FS::pkg_svc;
+use FS::cust_pkg;
+
+$cgi = new CGI;
+$dbh = &cgisuidsetup($cgi);
+
+$pkgpart = $cgi->param('pkgpart');
+
+$old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
+
+$new = new FS::part_pkg ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('part_pkg')
+} );
+
+#most of the stuff below should move to part_pkg.pm
+
+foreach $part_svc ( qsearch('part_svc', {} ) ) {
+  my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
+  unless ( $quantity =~ /^(\d+)$/ ) {
+    $cgi->param('error', "Illegal quantity" );
+    print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
+    exit;
+  }
+}
+
+local $SIG{HUP} = 'IGNORE';
+local $SIG{INT} = 'IGNORE';
+local $SIG{QUIT} = 'IGNORE';
+local $SIG{TERM} = 'IGNORE';
+local $SIG{TSTP} = 'IGNORE';
+local $SIG{PIPE} = 'IGNORE';
+
+local $FS::UID::AutoCommit = 0;
+
+if ( $pkgpart ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $pkgpart=$new->pkgpart;
+}
+if ( $error ) {
+  $dbh->rollback;
+  $cgi->param('error', $error );
+  print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
+  exit;
+}
+
+foreach $part_svc (qsearch('part_svc',{})) {
+  my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
+  my $old_pkg_svc = qsearchs('pkg_svc', {
+    'pkgpart' => $pkgpart,
+    'svcpart' => $part_svc->svcpart,
+  } );
+  my $old_quantity = $old_pkg_svc ? $old_pkg_svc->quantity : 0;
+  next unless $old_quantity != $quantity; #!here
+  my $new_pkg_svc = new FS::pkg_svc( {
+    'pkgpart'  => $pkgpart,
+    'svcpart'  => $part_svc->svcpart,
+    'quantity' => $quantity, 
+  } );
+  if ( $old_pkg_svc ) {
+    my $myerror = $new_pkg_svc->replace($old_pkg_svc);
+    if ( $myerror ) {
+      $dbh->rollback;
+      die $myerror;
+    }
+  } else {
+    my $myerror = $new_pkg_svc->insert;
+    if ( $myerror ) {
+      $dbh->rollback;
+      die $myerror;
+    }
+  }
+}
+
+unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
+  $dbh->commit or die $dbh->errstr;
+  print $cgi->redirect(popurl(3). "browse/part_pkg.cgi");
+} else {
+  my($old_cust_pkg) = qsearchs( 'cust_pkg', { 'pkgnum' => $1 } );
+  my %hash = $old_cust_pkg->hash;
+  $hash{'pkgpart'} = $pkgpart;
+  my($new_cust_pkg) = new FS::cust_pkg \%hash;
+  my $myerror = $new_cust_pkg->replace($old_cust_pkg);
+  if ( $myerror ) {
+    $dbh->rollback;
+    die "Error modifying cust_pkg record: $myerror\n";
+  }
+
+  $dbh->commit or die $dbh->errstr;
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new_cust_pkg->custnum);
+}
+
+%>
diff --git a/httemplate/edit/process/part_referral.cgi b/httemplate/edit/process/part_referral.cgi
new file mode 100755
index 000000000..c79ebb608
--- /dev/null
+++ b/httemplate/edit/process/part_referral.cgi
@@ -0,0 +1,69 @@
+<%
+#
+# $Id: part_referral.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 98-feb-23
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_referral.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/02/07 09:59:28  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.5  1999/01/19 05:13:56  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 22:47:57  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.3  1998/12/30 23:03:30  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.2  1998/12/17 08:40:25  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $refnum $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs fields);
+use FS::part_referral;
+use FS::CGI qw(popurl);
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$refnum = $cgi->param('refnum');
+
+$new = new FS::part_referral ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('part_referral')
+} );
+
+if ( $refnum ) {
+  my $old = qsearchs( 'part_referral', { 'refnum' =>$ refnum } );
+  die "(Old) Record not found!" unless $old;
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+}
+$refnum=$new->refnum;
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "part_referral.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "browse/part_referral.cgi");
+}
+
+%>
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
new file mode 100755
index 000000000..4c972e4d7
--- /dev/null
+++ b/httemplate/edit/process/part_svc.cgi
@@ -0,0 +1,30 @@
+<%
+
+my $svcpart = $cgi->param('svcpart');
+
+my $old = qsearchs('part_svc',{'svcpart'=>$svcpart}) if $svcpart;
+
+my $new = new FS::part_svc ( {
+  map {
+    $_, scalar($cgi->param($_));
+#  } qw(svcpart svc svcdb)
+  } fields('part_svc')
+} );
+
+my $error;
+if ( $svcpart ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcpart=$new->getfield('svcpart');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  $Response->Redirect(popurl(2). "part_svc.cgi?". $cgi->query_string );
+} else {
+  warn "redirecting to ". popurl(3)."browse/part_svc.cgi via $Response";
+  $Response->Redirect(popurl(3)."browse/part_svc.cgi");
+}
+
+%>
diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
new file mode 100755
index 000000000..e895e5ddf
--- /dev/null
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -0,0 +1,100 @@
+<%
+#
+# $Id: svc_acct.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/svc_acct.cgi
+#
+# ivan@voicenet.com 96-dec-18
+#
+# Changed /u to /u2
+# ivan@voicenet.com 97-may-6
+#
+# rewrote for new API
+# ivan@voicenet.com 97-jul-17 - 21
+#
+# no FS::Search, FS::svc_acct creates FS::cust_svc record, used for adding
+# and editing ivan@sisd.com 98-mar-8
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'password' to '_password' because Pg6.3 reserves the password word
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_acct.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  1999/08/27 00:26:33  ivan
+# better error messages
+#
+# Revision 1.6  1999/02/28 00:03:45  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:30  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:13:58  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 22:47:59  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.2  1998/12/17 08:40:27  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $svcnum $old $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl);
+use FS::Record qw(qsearchs fields);
+use FS::svc_acct;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$svcnum = $1;
+
+if ( $svcnum ) {
+  $old = qsearchs('svc_acct', { 'svcnum' => $svcnum } )
+    or die "fatal: can't find account (svcnum $svcnum)!";
+} else {
+  $old = '';
+}
+
+#unmunge popnum
+$cgi->param('popnum', (split(/:/, $cgi->param('popnum') ))[0] );
+
+#unmunge passwd
+if ( $cgi->param('_password') eq '*HIDDEN*' ) {
+  die "fatal: no previous account to recall hidden password from!" unless $old;
+  $cgi->param('_password',$old->getfield('_password'));
+}
+
+$new = new FS::svc_acct ( {
+  map {
+    $_, scalar($cgi->param($_));
+  #} qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
+  #  shell quota slipip)
+  } ( fields('svc_acct'), qw( pkgnum svcpart ) )
+} );
+
+if ( $svcnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcnum = $new->svcnum;
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_acct.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_acct.cgi?" . $svcnum );
+}
+
+%>
diff --git a/httemplate/edit/process/svc_acct_pop.cgi b/httemplate/edit/process/svc_acct_pop.cgi
new file mode 100755
index 000000000..95415f201
--- /dev/null
+++ b/httemplate/edit/process/svc_acct_pop.cgi
@@ -0,0 +1,70 @@
+<%
+#
+# $Id: svc_acct_pop.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 98-mar-8
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: svc_acct_pop.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/02/07 09:59:31  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.5  1999/01/19 05:13:59  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.4  1999/01/18 22:48:00  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.3  1998/12/30 23:03:32  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.2  1998/12/17 08:40:28  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $popnum $old $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_acct_pop;
+use FS::CGI qw(popurl);
+
+$cgi = new CGI; # create form object
+
+&cgisuidsetup($cgi);
+
+$popnum = $cgi->param('popnum');
+
+$old = qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
+
+$new = new FS::svc_acct_pop ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('svc_acct_pop')
+} );
+
+if ( $popnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $popnum=$new->getfield('popnum');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_acct_pop.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "browse/svc_acct_pop.cgi");
+}
+
+%>
diff --git a/httemplate/edit/process/svc_acct_sm.cgi b/httemplate/edit/process/svc_acct_sm.cgi
new file mode 100755
index 000000000..a68478898
--- /dev/null
+++ b/httemplate/edit/process/svc_acct_sm.cgi
@@ -0,0 +1,87 @@
+<%
+#
+# $Id: svc_acct_sm.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/svc_acct_sm.cgi
+#
+# lots of crufty stuff from svc_acct still in here, and modifications are (unelegantly) disabled.
+#
+# ivan@voicenet.com 97-jan-6
+#
+# enabled modifications
+# 
+# ivan@voicenet.com 97-may-7
+#
+# fixed removal of cust_svc record on modifications!
+# ivan@voicenet.com 97-jun-5
+#
+# rewrite ivan@sisd.com 98-mar-15
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_acct_sm.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.6  1999/02/28 00:03:46  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:32  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:14:00  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 22:48:01  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.2  1998/12/17 08:40:29  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $svcnum $old $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs fields);
+use FS::svc_acct_sm;
+use FS::CGI qw(popurl);
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$svcnum =$1;
+
+$old = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
+
+#unmunge domsvc and domuid
+#$cgi->param('domsvc',(split(/:/, $cgi->param('domsvc') ))[0] );
+#$cgi->param('domuid',(split(/:/, $cgi->param('domuid') ))[0] );
+
+$new = new FS::svc_acct_sm ( {
+  map {
+    ($_, scalar($cgi->param($_)));
+  #} qw(svcnum pkgnum svcpart domuser domuid domsvc)
+  } ( fields('svc_acct_sm'), qw( pkgnum svcpart ) )
+} );
+
+if ( $svcnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcnum = $new->getfield('svcnum');
+} 
+
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_acct_sm.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_acct_sm.cgi?$svcnum");
+}
+
+%>
diff --git a/httemplate/edit/process/svc_domain.cgi b/httemplate/edit/process/svc_domain.cgi
new file mode 100755
index 000000000..59a0c078f
--- /dev/null
+++ b/httemplate/edit/process/svc_domain.cgi
@@ -0,0 +1,84 @@
+<%
+#
+# $Id: svc_domain.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/svc_domain.cgi
+#
+# lots of yucky stuff in this one... bleachlkjhui!
+#
+# ivan@voicenet.com 97-jan-6
+#
+# kludged for new domain template 3.5
+# ivan@voicenet.com 97-jul-24
+#
+# moved internic bits to svc_domain.pm ivan@sisd.com 98-mar-14
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_domain.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.7  2001/04/23 07:12:44  ivan
+# better error message (if kludgy) for no referral
+# remove outdated NSI foo from domain ordering.  also, fuck NSI.
+#
+# Revision 1.6  1999/02/28 00:03:47  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:33  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:14:01  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 22:48:02  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.2  1998/12/17 08:40:30  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+
+use strict;
+use vars qw( $cgi $svcnum $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs fields);
+use FS::svc_domain;
+use FS::CGI qw(popurl);
+
+#remove this to actually test the domains!
+$FS::svc_domain::whois_hack = 1;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$svcnum = $1;
+
+$new = new FS::svc_domain ( {
+  map {
+    $_, scalar($cgi->param($_));
+  #} qw(svcnum pkgnum svcpart domain action purpose)
+  } ( fields('svc_domain'), qw( pkgnum svcpart action purpose ) )
+} );
+
+if ($cgi->param('svcnum')) {
+  $error="Can't modify a domain!";
+} else {
+  $error=$new->insert;
+  $svcnum=$new->svcnum;
+}
+
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_domain.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
+}
+
+%>
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
new file mode 100755
index 000000000..7badfe696
--- /dev/null
+++ b/httemplate/edit/svc_acct.cgi
@@ -0,0 +1,232 @@
+<%
+#
+# $Id: svc_acct.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#
+# ivan@voicenet.com 96-dec-18
+#
+# rewrite ivan@sisd.com 98-mar-8
+#
+# Changes to allow page to work at a relative position in server
+# Changed 'password' to '_password' because Pg6.3 reserves the password word
+#       bmccane@maxbaud.net     98-apr-3
+#
+# use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
+#
+# $Log: svc_acct.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.10  1999/04/14 11:27:06  ivan
+# showpasswords config option to show passwords
+#
+# Revision 1.9  1999/02/28 00:03:37  ivan
+# removed misleading comments
+#
+# Revision 1.8  1999/02/23 08:09:22  ivan
+# beginnings of one-screen new customer entry and some other miscellania
+#
+# Revision 1.7  1999/02/07 09:59:22  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.6  1999/01/19 05:13:43  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:32  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/30 23:03:22  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.3  1998/12/17 06:17:08  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+
+use strict;
+use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
+             $part_svc $svc $otaker $username $password $ulen $ulen2 $p1
+             $popnum $uid $gid $finger $dir $shell $quota $slipip );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_acct;
+use FS::Conf;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+@shells = $conf->config('shells');
+
+if ( $cgi->param('error') ) {
+  $svc_acct = new FS::svc_acct ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_acct')
+  } );
+  $svcnum = $svc_acct->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_acct) svcnum!";
+
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
+
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+  } else { #adding
+
+    $svc_acct = new FS::svc_acct({}); 
+
+    foreach $_ (split(/-/,$query)) {
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+    $svcnum='';
+
+    #set gecos
+    my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+    if ($cust_pkg) {
+      my($cust_main)=qsearchs('cust_main',{'custnum'=> $cust_pkg->custnum } );
+      $svc_acct->setfield('finger',
+        $cust_main->getfield('first') . " " . $cust_main->getfield('last')
+      ) ;
+    }
+
+    #set fixed and default fields from part_svc
+    my($field);
+    foreach $field ( fields('svc_acct') ) {
+      if ( $part_svc->getfield('svc_acct__'. $field. '_flag') ne '' ) {
+        $svc_acct->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
+      }
+    }
+
+  }
+}
+$action = $svcnum ? 'Edit' : 'Add';
+
+$svc = $part_svc->getfield('svc');
+
+$otaker = getotaker;
+
+$username = $svc_acct->username;
+if ( $svc_acct->_password ) {
+  if ( $conf->exists('showpasswords') ) {
+    $password = $svc_acct->_password;
+  } else {
+    $password = "*HIDDEN*";
+  }
+} else {
+  $password = '';
+}
+
+$ulen = $svc_acct->dbdef_table->column('username')->length;
+$ulen2 = $ulen+2;
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("$action $svc account");
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print <<END;
+    <FORM ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
+      <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
+      <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+      <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
+Username: 
+<INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen>
+<BR>Password: 
+<INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8> 
+(blank to generate)
+END
+
+#pop
+$popnum = $svc_acct->popnum || 0;
+if ( $part_svc->svc_acct__popnum_flag eq "F" ) {
+  print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$popnum">!;
+} else { 
+  print qq!<BR>POP: <SELECT NAME="popnum" SIZE=1><OPTION>\n!;
+  my($svc_acct_pop);
+  foreach $svc_acct_pop ( qsearch ('svc_acct_pop',{} ) ) {
+  print "<OPTION", $svc_acct_pop->popnum == $popnum ? ' SELECTED' : '', ">", 
+        $svc_acct_pop->popnum, ": ", 
+        $svc_acct_pop->city, ", ",
+        $svc_acct_pop->state,
+        " (", $svc_acct_pop->ac, ")/",
+        $svc_acct_pop->exch, "\n"
+      ;
+  }
+  print "</SELECT>";
+}
+
+($uid,$gid,$finger,$dir)=(
+  $svc_acct->uid,
+  $svc_acct->gid,
+  $svc_acct->finger,
+  $svc_acct->dir,
+);
+
+print <<END;
+<INPUT TYPE="hidden" NAME="uid" VALUE="$uid">
+<INPUT TYPE="hidden" NAME="gid" VALUE="$gid">
+<BR>GECOS: <INPUT TYPE="text" NAME="finger" VALUE="$finger">
+<INPUT TYPE="hidden" NAME="dir" VALUE="$dir">
+END
+
+$shell = $svc_acct->shell;
+if ( $part_svc->svc_acct__shell_flag eq "F" ) {
+  print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
+} else {
+  print qq!<BR>Shell: <SELECT NAME="shell" SIZE=1>!;
+  my($etc_shell);
+  foreach $etc_shell (@shells) {
+    print "<OPTION", $etc_shell eq $shell ? ' SELECTED' : '', ">",
+          $etc_shell, "\n";
+  }
+  print "</SELECT>";
+}
+
+($quota,$slipip)=(
+  $svc_acct->quota,
+  $svc_acct->slipip,
+);
+
+print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
+
+if ( $part_svc->svc_acct__slipip_flag eq "F" ) {
+  print qq!<INPUT TYPE="hidden" NAME="slipip" VALUE="$slipip">!;
+} else {
+  print qq!<BR>IP: <INPUT TYPE="text" NAME="slipip" VALUE="$slipip">!;
+}
+
+#submit
+print qq!<P><INPUT TYPE="submit" VALUE="Submit">!; 
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+
+%>
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
new file mode 100755
index 000000000..016031f83
--- /dev/null
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -0,0 +1,106 @@
+<%
+#
+# $Id: svc_acct_pop.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# ivan@sisd.com 98-mar-8 
+#
+# Changes to allow page to work at a relative position in server
+#       bmccane@maxbaud.net     98-apr-3
+#
+# lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: svc_acct_pop.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.9  2000/01/28 23:02:48  ivan
+# track full phone number
+#
+# Revision 1.8  1999/02/23 08:09:23  ivan
+# beginnings of one-screen new customer entry and some other miscellania
+#
+# Revision 1.7  1999/02/07 09:59:23  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.6  1999/01/19 05:13:44  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:33  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/23 02:57:45  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 06:17:10  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/13 09:56:47  ivan
+# change configuration file layout to support multiple distinct databases (with
+# own set of config files, export, etc.)
+#
+
+use strict;
+use vars qw( $cgi $svc_acct_pop $action $query $hashref $p1 );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::CGI qw(header menubar popurl);
+use FS::svc_acct_pop;
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  $svc_acct_pop = new FS::svc_acct_pop ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_acct_pop')
+  } );
+} elsif ( $cgi->keywords ) { #editing
+  my($query)=$cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $svc_acct_pop=qsearchs('svc_acct_pop',{'popnum'=>$1});
+} else { #adding
+  $svc_acct_pop = new FS::svc_acct_pop {};
+}
+$action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
+$hashref = $svc_acct_pop->hashref;
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("$action POP", menubar(
+  'Main Menu' => popurl(2),
+  'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/svc_acct_pop.cgi" METHOD=POST>!;
+
+#display
+
+print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$hashref->{popnum}">!,
+      "POP #", $hashref->{popnum} ? $hashref->{popnum} : "(NEW)";
+
+print <<END;
+<PRE>
+City      <INPUT TYPE="text" NAME="city" SIZE=32 VALUE="$hashref->{city}">
+State     <INPUT TYPE="text" NAME="state" SIZE=16 MAXLENGTH=16 VALUE="$hashref->{state}">
+Area Code <INPUT TYPE="text" NAME="ac" SIZE=4 MAXLENGTH=3 VALUE="$hashref->{ac}">
+Exchange  <INPUT TYPE="text" NAME="exch" SIZE=4 MAXLENGTH=3 VALUE="$hashref->{exch}">
+Local     <INPUT TYPE="text" NAME="loc" SIZE=5 MAXLENGTH=4 VALUE="$hashref->{loc}">
+</PRE>
+END
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{popnum} ? "Apply changes" : "Add POP",
+      qq!">!;
+
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
new file mode 100755
index 000000000..891c3e1f6
--- /dev/null
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -0,0 +1,251 @@
+<%
+#
+# $Id: svc_acct_sm.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#
+# use {svcnum} for edit, pkgnum{pkgnum}-svcpart{svcpart} for add
+#
+# should error out in a more CGI-friendly way, and should have more error checking (sigh).
+#
+# ivan@voicenet.com 97-jan-5
+#
+# added debugging code; fixed CPU-sucking problem with trying to edit an (unaudited) mail alias (no pkgnum)
+#
+# ivan@voicenet.com 97-may-7
+#
+# fixed uid selection
+# ivan@voicenet.com 97-jun-4
+#
+# uid selection across _CUSTOMER_, not just _PACKAGE_
+#
+# ( i need to be rewritten with fast searches)
+#
+# ivan@voicenet.com 97-oct-3
+#
+# added fast searches in some of the places where it is sorely needed...
+# I see DBI::mysql in your future...
+# ivan@voicenet.com 97-oct-23
+#
+# rewrite ivan@sisd.com 98-mar-15
+#
+# /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
+#
+# $Log: svc_acct_sm.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.9  1999/02/28 00:03:38  ivan
+# removed misleading comments
+#
+# Revision 1.8  1999/02/07 09:59:24  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.7  1999/01/19 05:13:45  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 09:41:34  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1998/12/30 23:03:24  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.4  1998/12/23 02:58:45  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 06:17:11  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/12/16 05:19:15  ivan
+# use FS::Conf
+#
+
+use strict;
+use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
+             $part_svc $query %username %domain $p1 $domuser $domsvc $domuid );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_acct_sm;
+use FS::Conf;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+$mydomain = $conf->config('domain');
+
+if ( $cgi->param('error') ) {
+  $svc_acct_sm = new FS::svc_acct_sm ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_acct_sm')
+  } );
+  $svcnum = $svc_acct_sm->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_acct_sm=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_acct_sm) svcnum!";
+
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
+
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+  
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+  } else { #adding
+
+    $svc_acct_sm = new FS::svc_acct_sm({});
+
+    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+    $svcnum='';
+
+    #set fixed and default fields from part_svc
+    my($field);
+    foreach $field ( fields('svc_acct_sm') ) {
+      if ( $part_svc->getfield('svc_acct_sm__'. $field. '_flag') ne '' ) {
+        $svc_acct_sm->setfield($field,$part_svc->getfield('svc_acct_sm__'. $field) );
+      }
+    }
+
+  }
+}
+$action = $svc_acct_sm->svcnum ? 'Edit' : 'Add';
+
+if ($pkgnum) {
+
+  #find all possible uids (and usernames)
+
+  my($u_part_svc,@u_acct_svcparts);
+  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
+    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
+  }
+
+  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  my($custnum)=$cust_pkg->getfield('custnum');
+  my($i_cust_pkg);
+  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
+    my($acct_svcpart);
+    foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
+                                              #record(s) in cust_svc ( for this
+                                              #pkgnum ! )
+      my($i_cust_svc);
+      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
+        my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+        $username{$svc_acct->getfield('uid')}=$svc_acct->getfield('username');
+      }  
+    }
+  }
+
+  #find all possible domains (and domsvc's)
+
+  my($d_part_svc,@d_acct_svcparts);
+  foreach $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
+    push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
+  }
+
+  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
+    my($acct_svcpart);
+    foreach $acct_svcpart (@d_acct_svcparts) {
+      my($i_cust_svc);
+      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
+        my($svc_domain)=qsearch('svc_domain',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+        $domain{$svc_domain->getfield('svcnum')}=$svc_domain->getfield('domain');
+      }
+    }
+  }
+
+} elsif ( $action eq 'Edit' ) {
+
+  my($svc_acct)=qsearchs('svc_acct',{'uid'=>$svc_acct_sm->domuid});
+  $username{$svc_acct_sm->uid} = $svc_acct->username;
+
+  my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$svc_acct_sm->domsvc});
+  $domain{$svc_acct_sm->domsvc} = $svc_domain->domain;
+
+} else {
+  die "\$action eq Add, but \$pkgnum is null!\n";
+}
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Mail Alias $action", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/svc_acct_sm.cgi" METHOD=POST>!;
+
+#display
+
+	#formatting
+	print "<PRE>";
+
+#svcnum
+print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
+print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
+
+#pkgnum
+print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+ 
+#svcpart
+print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
+
+($domuser,$domsvc,$domuid)=(
+  $svc_acct_sm->domuser,
+  $svc_acct_sm->domsvc,
+  $svc_acct_sm->domuid,
+);
+
+#domuser
+print qq!\n\nMail to <INPUT TYPE="text" NAME="domuser" VALUE="$domuser"> <I>( * for anything )</I>!;
+
+#domsvc
+print qq! \@ <SELECT NAME="domsvc" SIZE=1>!;
+foreach $_ (keys %domain) {
+  print "<OPTION", $_ eq $domsvc ? " SELECTED" : "",
+        qq! VALUE="$_">$domain{$_}!;
+}
+print "</SELECT>";
+
+#uid
+print qq!\nforwards to <SELECT NAME="domuid" SIZE=1>!;
+foreach $_ (keys %username) {
+  print "<OPTION", ($_ eq $domuid) ? " SELECTED" : "",
+        qq! VALUE="$_">$username{$_}!;
+}
+print "</SELECT>\@$mydomain mailbox.";
+
+	#formatting
+	print "</PRE>\n";
+
+print qq!<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>!;
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
new file mode 100755
index 000000000..dd8ad8532
--- /dev/null
+++ b/httemplate/edit/svc_domain.cgi
@@ -0,0 +1,168 @@
+<%
+#
+# $Id: svc_domain.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+#
+# Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
+#        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
+#
+# ivan@voicenet.com 97-jan-5 -> 97-jan-6
+#
+# changes for domain template 3.5
+# ivan@voicenet.com 97-jul-24
+#
+# rewrite ivan@sisd.com 98-mar-14
+#
+# no GOV in instructions ivan@sisd.com 98-jul-17
+#
+# $Log: svc_domain.cgi,v $
+# Revision 1.1  2001-07-30 07:36:04  ivan
+# templates!!!
+#
+# Revision 1.10  2001/04/23 07:12:44  ivan
+# better error message (if kludgy) for no referral
+# remove outdated NSI foo from domain ordering.  also, fuck NSI.
+#
+# Revision 1.9  1999/02/28 00:03:39  ivan
+# removed misleading comments
+#
+# Revision 1.8  1999/02/07 09:59:25  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.7  1999/01/19 05:13:46  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 09:41:35  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1998/12/30 23:03:25  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.4  1998/12/23 03:00:16  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 06:17:12  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.2  1998/11/13 09:56:48  ivan
+# change configuration file layout to support multiple distinct databases (with
+# own set of config files, export, etc.)
+#
+
+use strict;
+use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
+             $svc $otaker $domain $p1 $kludge_action $purpose );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_domain;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  $svc_domain = new FS::svc_domain ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_domain')
+  } );
+  $svcnum = $svc_domain->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $kludge_action = $cgi->param('action');
+  $purpose = $cgi->param('purpose');
+  $part_svc = qsearchs('part_svc', { 'svcpart' => $svcpart } );
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  $kludge_action = '';
+  $purpose = '';
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_domain=qsearchs('svc_domain',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_domain) svcnum!";
+
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
+
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+  } else { #adding
+
+    $svc_domain = new FS::svc_domain({});
+  
+    foreach $_ (split(/-/,$query)) {
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+    $svcnum='';
+
+    #set fixed and default fields from part_svc
+    my($field);
+    foreach $field ( fields('svc_domain') ) {
+      if ( $part_svc->getfield('svc_domain__'. $field. '_flag') ne '' ) {
+        $svc_domain->setfield($field,$part_svc->getfield('svc_domain__'. $field) );
+      }
+    }
+
+  }
+}
+$action = $svcnum ? 'Edit' : 'Add';
+
+$svc = $part_svc->getfield('svc');
+
+$otaker = getotaker;
+
+$domain = $svc_domain->domain;
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("$action $svc", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print <<END;
+    <FORM ACTION="${p1}process/svc_domain.cgi" METHOD=POST>
+      <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
+      <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+      <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
+END
+
+print qq!<INPUT TYPE="radio" NAME="action" VALUE="N"!;
+print ' CHECKED' if $kludge_action eq 'N';
+print qq!>New!;
+print qq!<BR><INPUT TYPE="radio" NAME="action" VALUE="M"!;
+print ' CHECKED' if $kludge_action eq 'M';
+print qq!>Transfer!;
+
+print <<END;
+<P>Domain <INPUT TYPE="text" NAME="domain" VALUE="$domain" SIZE=28 MAXLENGTH=26>
+<BR>Purpose/Description: <INPUT TYPE="text" NAME="purpose" VALUE="$purpose" SIZE=64>
+<P><CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>
+<UL>
+  <LI>COM is for commercial, for-profit organziations
+  <LI>ORG is for miscellaneous, usually, non-profit organizations
+  <LI>NET is for network infrastructure machines and organizations
+  <LI>EDU is for 4-year, degree granting institutions
+<!--  <LI>GOV is for United States federal government agencies
+!-->
+</UL>
+US state and local government agencies, schools, libraries, museums, and individuals should register under the US domain.  See RFC 1480 for a complete description of the US domain
+and registration procedures.
+<!--  <P>GOV registrations are limited to top-level US Federal Government agencies (see RFC 1816).
+!-->
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
-- 
cgit v1.2.1


From 30d1e222f793498b0704de73b9d66edf3e1a6fb9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Aug 2001 04:55:03 +0000
Subject: don't have any other choices in svcdb dropdown for existing services,
 since you can't change it anyway

---
 httemplate/edit/part_svc.cgi | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index cc0ee6fd0..6617d25ed 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.2 2001-08-11 04:55:03 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -86,8 +86,11 @@ function changed(what) {
 <% } %>
 }
 </SCRIPT>
+<% my @dbs = $hashref->{svcdb}
+             ? ( $hashref->{svcdb} )
+             : qw( svc_acct svc_domain svc_acct_sm svc_www ); %>
 Table<SELECT NAME="svcdb" SIZE=1 onChange="changed(this)">
-<% foreach my $svcdb (qw( svc_acct svc_domain svc_acct_sm svc_www )) { %>
+<% foreach my $svcdb (@dbs) { %>
 <OPTION VALUE="<%= $svcdb %>" <%= ' SELECTED'x($svcdb eq $hashref->{svcdb}) %>><%= $svcdb %>
 <% } %>
 </SELECT>
-- 
cgit v1.2.1


From 3dddb60bd783aaf5fa1fda90a351f1e877b7e19b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Aug 2001 05:52:56 +0000
Subject: add customer comments fields

---
 httemplate/edit/cust_main.cgi | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 8902e3dce..2941acdf3 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.2 2001-08-11 05:52:56 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -355,6 +355,13 @@ for (qw(CARD BILL COMP)) {
 
 print "</TR></TABLE>$r required fields for each billing type";
 
+if ( defined $cust_main->dbdef_table->column('comments') ) {
+    print "<BR><BR>Comments", &itable("#cccccc"),
+          qq!<TR><TD><TEXTAREA COLS=80 ROWS=5 WRAP="HARD" NAME="comments">!,
+          $cust_main->comments, "</TEXTAREA>",
+          "</TD></TR></TABLE>";
+}
+
 unless ( $custnum ) {
   # pry the wrong place for this logic.  also pretty expensive
   #use FS::part_pkg;
-- 
cgit v1.2.1


From 3d726debcb197b4304208eb758dc9ede7f619f86 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Aug 2001 23:19:09 +0000
Subject: better error checking, fix scalar context to $cgi->keywords

---
 httemplate/edit/part_svc.cgi | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 6617d25ed..7fadf000f 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.2 2001-08-11 04:55:03 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.3 2001-08-11 23:19:09 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -6,9 +6,10 @@
        map { $_, scalar($cgi->param($_)) } fields('part_svc')
      } );
    } elsif ( $cgi->keywords ) { #edit
-     my $query = $cgi->keywords;
-     $query =~ /^(\d+)$/;
-     $part_svc=qsearchs('part_svc',{'svcpart'=>$1});
+     my($query) = $cgi->keywords;
+     $query =~ /^(\d+)$/ or die "malformed query: $query";
+     $part_svc=qsearchs('part_svc', { 'svcpart'=>$1 } )
+       or die "unknown svcpart: $1";
    } else { #adding
      $part_svc = new FS::part_svc {};
    }
-- 
cgit v1.2.1


From 77def6c1c51fc6f7273b7c23221f13850d6be1dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 12 Aug 2001 00:07:55 +0000
Subject: use transactional invoice_list setting & eliminate non-sticky "first
 package"!

---
 httemplate/edit/cust_main.cgi         | 31 +++++++------
 httemplate/edit/process/cust_main.cgi | 85 +++++++----------------------------
 2 files changed, 32 insertions(+), 84 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 2941acdf3..f331e5321 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,11 +1,12 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.2 2001-08-11 05:52:56 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.3 2001-08-12 00:07:55 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
              $daytime $night $fax @invoicing_list $invoicing_list $payinfo
              $payname %payby %paybychecked $refnum $otaker $r );
-use vars qw ( $conf $pkgpart $username $password $popnum $ulen $ulen2 );
+use vars qw ( $conf $saved_pkgpart $username $password $popnum $ulen $ulen2 );
+use vars qw ( $error );
 #use CGI::Switch;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
@@ -32,16 +33,18 @@ $conf = new FS::Conf;
 
 #get record
 
+$error = '';
 if ( $cgi->param('error') ) {
+  $error = $cgi->param('error');
   $cust_main = new FS::cust_main ( {
     map { $_, scalar($cgi->param($_)) } fields('cust_main')
   } );
   $custnum = $cust_main->custnum;
-  $pkgpart = $cgi->param('pkgpart_svcpart') || '';
-  if ( $pkgpart =~ /^(\d+)_/ ) {
-    $pkgpart = $1;
+  $saved_pkgpart = $cgi->param('pkgpart_svcpart') || '';
+  if ( $saved_pkgpart =~ /^(\d+)_/ ) {
+    $saved_pkgpart = $1;
   } else {
-    $pkgpart = '';
+    $saved_pkgpart = '';
   }
   $username = $cgi->param('username');
   $password = $cgi->param('_password');
@@ -51,7 +54,7 @@ if ( $cgi->param('error') ) {
   $query =~ /^(\d+)$/;
   $custnum=$1;
   $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
-  $pkgpart = 0;
+  $saved_pkgpart = 0;
   $username = '';
   $password = '';
   $popnum = 0;
@@ -59,20 +62,20 @@ if ( $cgi->param('error') ) {
   $custnum='';
   $cust_main = new FS::cust_main ( {} );
   $cust_main->setfield('otaker',&getotaker);
-  $pkgpart = 0;
+  $saved_pkgpart = 0;
   $username = '';
   $password = '';
   $popnum = 0;
 }
+$cgi->delete_all();
 $action = $custnum ? 'Edit' : 'Add';
 
 # top
 
 $p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("Customer $action", '');
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
+  if $error;
 
 print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
       qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
@@ -210,7 +213,7 @@ print <<END;
 END
 
   print '<BR>Service address ',
-        '(<INPUT TYPE="checkbox" NAME="same" onClick="samechanged(this)"';
+        '(<INPUT TYPE="checkbox" NAME="same" VALUE="Y" onClick="samechanged(this)"';
   unless ( $cust_main->ship_last ) {
     print ' CHECKED';
     foreach (
@@ -369,7 +372,7 @@ unless ( $custnum ) {
   #false laziness, copied from FS::cust_pkg::order
   my $pkgpart;
   if ( scalar(@agents) == 1 ) {
-    # $pkgpart->{PKGPART} is true iff $custnum may purchase $pkgpart
+    # $pkgpart->{PKGPART} is true iff $custnum may purchase PKGPART
     my($agent)=qsearchs('agent',{'agentnum'=> $agentnum });
     $pkgpart = $agent->pkgpart_hashref;
   } else {
@@ -397,7 +400,7 @@ unless ( $custnum ) {
       print qq!<OPTION VALUE="!,
 #              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"';
               $part_pkg->pkgpart. "_". $part_pkg->svcpart, '"';
-      print " SELECTED" if $pkgpart && ( $part_pkg->pkgpart == $pkgpart );
+      print " SELECTED" if $saved_pkgpart && ( $part_pkg->pkgpart == $saved_pkgpart );
       print ">", $part_pkg->pkg, " - ", $part_pkg->comment;
     }
     print "</SELECT></TD></TR>";
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 6c52113ba..1b916b00b 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,60 +1,5 @@
 <%
-#
-# $Id: cust_main.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/cust_main.cgi
-#
-# ivan@voicenet.com 96-dec-04
-#
-# added referral check
-# ivan@voicenet.com 97-jun-4
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-28
-#
-# same as above (again) and clean up some stuff ivan@sisd.com 98-feb-23
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'day' to 'daytime' because Pg6.3 reserves the day word
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cust_main.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.11  1999/08/10 12:54:06  ivan
-# use FS::cust_pkg::pkgpart_href
-#
-# Revision 1.10  1999/04/14 07:47:53  ivan
-# i18n fixes
-#
-# Revision 1.9  1999/04/07 15:22:19  ivan
-# don't use anchor in redirect
-#
-# Revision 1.8  1999/03/25 13:55:10  ivan
-# one-screen new customer entry (including package and service) for simple
-# packages with one svc_acct service
-#
-# Revision 1.7  1999/02/28 00:03:42  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/01/25 12:10:00  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:50  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:22:32  ivan
-# changes to track email addresses for email invoicing
-#
-# Revision 1.3  1998/12/17 08:40:19  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/18 08:57:36  ivan
-# i18n, s/CGI-modules/CGI.pm/, FS::CGI::idiot instead of inline, FS::CGI::popurl
-#
+# $Id: cust_main.cgi,v 1.2 2001-08-12 00:07:55 ivan Exp $
 
 use strict;
 use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
@@ -71,6 +16,8 @@ use FS::agent;
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
+$error = '';
+
 #unmunge stuff
 
 $cgi->param('tax','') unless defined($cgi->param('tax'));
@@ -106,10 +53,14 @@ $new = new FS::cust_main ( {
   } fields('cust_main')
 } );
 
-#perhaps the invocing_list magic should move to cust_main.pm?
-$error = $new->check_invoicing_list( \@invoicing_list );
+if ( defined($cgi->param('same')) && $cgi->param('same') eq "Y" ) {
+  $new->setfield("ship_$_", '') foreach qw(
+    last first company address1 address2 city county state zip
+    country daytime night fax
+  );
+}
 
-#perhaps this stuff should go to cust_main.pm as well
+#perhaps this stuff should go to cust_main.pm
 $cust_pkg = '';
 $svc_acct = '';
 if ( $new->custnum eq '' ) {
@@ -170,26 +121,20 @@ if ( $new->custnum eq '' ) {
     $error = "Can't assign username without a package!";
   }
 
-  $error ||= $new->insert;
-  if ( $cust_pkg && ! $error ) {
-    $cust_pkg->custnum( $new->custnum );
-    $error ||= $cust_pkg->insert; 
-    warn "WARNING: $error on pre-checked cust_pkg record!" if $error;
-    $svc_acct->pkgnum( $cust_pkg->pkgnum );
-    $error ||= $svc_acct->insert;
-    warn "WARNING: $error on pre-checked svc_acct record!" if $error;
-  }
+  use Tie::RefHash;
+  tie my %hash, 'Tie::RefHash';
+  %hash = ( $cust_pkg => [ $svc_acct ] );
+  $error ||= $new->insert( \%hash, \@invoicing_list );
 } else { #create old record object
   my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
   $error ||= "Old record not found!" unless $old;
-  $error ||= $new->replace($old);
+  $error ||= $new->replace($old, \@invoicing_list);
 }
 
 if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "cust_main.cgi?". $cgi->query_string );
 } else { 
-  $new->invoicing_list( \@invoicing_list );
   $custnum = $new->custnum;
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 } 
-- 
cgit v1.2.1


From 67e59b7ab85227889ca127b875b4138f018c844d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 12 Aug 2001 08:56:42 +0000
Subject: don't use Apache::ASP-specific $Redirect object

---
 httemplate/edit/process/part_svc.cgi | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 4c972e4d7..093d86a75 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -21,10 +21,9 @@ if ( $svcpart ) {
 
 if ( $error ) {
   $cgi->param('error', $error);
-  $Response->Redirect(popurl(2). "part_svc.cgi?". $cgi->query_string );
+  print $cgi->redirect(popurl(2), "part_svc.cgi?". $cgi->query_string );
 } else {
-  warn "redirecting to ". popurl(3)."browse/part_svc.cgi via $Response";
-  $Response->Redirect(popurl(3)."browse/part_svc.cgi");
+  print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
 }
 
 %>
-- 
cgit v1.2.1


From 092cdf2ba5fbd1c94305688dd7f7821d4dbf06d3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Aug 2001 23:10:34 +0000
Subject: properly massage ship_state & work okay when no initial pkg is
 selected

---
 httemplate/edit/process/cust_main.cgi | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 1b916b00b..86e6abef6 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-# $Id: cust_main.cgi,v 1.2 2001-08-12 00:07:55 ivan Exp $
+# $Id: cust_main.cgi,v 1.3 2001-08-13 23:10:34 ivan Exp $
 
 use strict;
 use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
@@ -30,6 +30,12 @@ $cgi->param('state', $1);
 $cgi->param('county', $3 || '');
 $cgi->param('country', $4);
 
+$cgi->param('ship_state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
+  or die "Oops, illegal \"ship_state\" param: ". $cgi->param('ship_state');
+$cgi->param('ship_state', $1);
+$cgi->param('ship_county', $3 || '');
+$cgi->param('ship_country', $4);
+
 if ( $payby = $cgi->param('payby') ) {
   $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
   $cgi->param('paydate',
@@ -123,7 +129,7 @@ if ( $new->custnum eq '' ) {
 
   use Tie::RefHash;
   tie my %hash, 'Tie::RefHash';
-  %hash = ( $cust_pkg => [ $svc_acct ] );
+  %hash = ( $cust_pkg => [ $svc_acct ] ) if $cust_pkg;
   $error ||= $new->insert( \%hash, \@invoicing_list );
 } else { #create old record object
   my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
-- 
cgit v1.2.1


From 94d7e3f0d3431fc1a16afea163367a79ccc78d95 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Aug 2001 11:05:31 +0000
Subject: clean up tax rate editing:   sort by country->state->county,   add
 "collapse state" if the tax rates are the same statewide,   redirect "expand
 state" to the browse, not edit screen

---
 httemplate/edit/cust_main_county.cgi               | 15 +++++--
 .../edit/process/cust_main_county-collapse.cgi     | 49 ++++++++++++++++++++++
 .../edit/process/cust_main_county-expand.cgi       | 41 +-----------------
 3 files changed, 63 insertions(+), 42 deletions(-)
 create mode 100755 httemplate/edit/process/cust_main_county-collapse.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index 38e6d6877..1b8e76fc7 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,6 +1,6 @@
 <%
 #
-# $Id: cust_main_county.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.2 2001-08-17 11:05:31 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13-16
 #
@@ -11,7 +11,13 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 # 
 # $Log: cust_main_county.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
+# Revision 1.2  2001-08-17 11:05:31  ivan
+# clean up tax rate editing:
+#   sort by country->state->county,
+#   add "collapse state" if the tax rates are the same statewide,
+#   redirect "expand state" to the browse, not edit screen
+#
+# Revision 1.1  2001/07/30 07:36:04  ivan
 # templates!!!
 #
 # Revision 1.8  1999/04/09 04:22:34  ivan
@@ -69,7 +75,10 @@ print qq!<FORM ACTION="!, popurl(1),
       </TR>
 END
 
-foreach $cust_main_county ( qsearch('cust_main_county',{}) ) {
+foreach $cust_main_county ( sort {    $a->country cmp $b->country
+                                   or $a->state   cmp $b->state
+                                   or $a->county  cmp $b->county
+                                 } qsearch('cust_main_county',{}) ) {
   my($hashref)=$cust_main_county->hashref;
   print <<END;
       <TR>
diff --git a/httemplate/edit/process/cust_main_county-collapse.cgi b/httemplate/edit/process/cust_main_county-collapse.cgi
new file mode 100755
index 000000000..62c2ba753
--- /dev/null
+++ b/httemplate/edit/process/cust_main_county-collapse.cgi
@@ -0,0 +1,49 @@
+<%
+# <!-- $Id: cust_main_county-collapse.cgi,v 1.1 2001-08-17 11:05:31 ivan Exp $ -->
+
+use strict;
+use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup datasrc);
+use FS::Record qw(qsearch qsearchs);
+use FS::CGI qw(popurl);
+use FS::cust_main_county;
+use FS::cust_main;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ or die "Illegal taxnum!";
+$taxnum = $1;
+$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+  or die ("Unknown taxnum!");
+
+#really should do this in a .pm & start transaction
+
+foreach my $delete ( qsearch('cust_main_county', {
+                    'country' => $cust_main_county->country,
+                    'state' => $cust_main_county->state  
+                 } ) ) {
+#  unless ( qsearch('cust_main',{
+#    'state'  => $cust_main_county->getfield('state'),
+#    'county' => $cust_main_county->getfield('county'),
+#    'country' =>  $cust_main_county->getfield('country'),
+#  } ) ) {
+    my $error = $delete->delete;
+    die $error if $error;
+#  } else {
+    #should really fix the $cust_main record
+#  }
+
+}
+
+$cust_main_county->taxnum('');
+$cust_main_county->county('');
+my $error = $cust_main_county->insert;
+die $error if $error;
+
+print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
+
+%>
diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index b7c4547f6..a0231b076 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,42 +1,5 @@
 <%
-#
-# $Id: cust_main_county-expand.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 97-dec-16
-#
-# Changes to allow page to work at a relative position in server
-# Added import of datasrc from UID.pm for Pg6.3
-# Default tax to 0.0 if using Pg6.3
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI
-# undo default tax to 0.0 if using Pg6.3: comes from pre-expanded record
-# for that state
-# ivan@sisd.com 98-sep-2
-#
-# $Log: cust_main_county-expand.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  2000/12/21 05:22:30  ivan
-# perldoc -f split
-#
-# Revision 1.6  1999/01/25 12:19:07  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:51  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:47:52  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/17 08:40:20  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/18 09:01:40  ivan
-# i18n! i18n!
-#
+# <!-- $Id: cust_main_county-expand.cgi,v 1.2 2001-08-17 11:05:31 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
@@ -99,6 +62,6 @@ unless ( qsearch('cust_main',{
   die $error if $error;
 }
 
-print $cgi->redirect(popurl(3). "edit/cust_main_county.cgi");
+print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
 
 %>
-- 
cgit v1.2.1


From 8a8c9386cbd3383b0134aae8e32b5995f8886fb2 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sun, 19 Aug 2001 15:53:36 +0000
Subject: added user interface for svc_forward and vpopmail support

---
 httemplate/edit/part_svc.cgi            |  18 ++-
 httemplate/edit/process/svc_forward.cgi |  51 +++++++
 httemplate/edit/svc_acct.cgi            |  27 +++-
 httemplate/edit/svc_forward.cgi         | 242 ++++++++++++++++++++++++++++++++
 4 files changed, 329 insertions(+), 9 deletions(-)
 create mode 100755 httemplate/edit/process/svc_forward.cgi
 create mode 100755 httemplate/edit/svc_forward.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 7fadf000f..b8715fb49 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.3 2001-08-11 23:19:09 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.4 2001-08-19 15:53:35 jeff Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -51,7 +51,8 @@ Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>">
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
     <LI>svc_domain - Virtual domains
-    <LI>svc_acct_sm - Virtual domain mail aliasing
+    <LI>svc_acct_sm - Virtual domain mail aliasing (*depreciated*)
+    <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
        <LI>svc_wo - Work orders (Partially unimplemented)
@@ -68,10 +69,10 @@ var svcdb = null;
 var something = null;
 function changed(what) {
   svcdb = what.options[what.selectedIndex].value;
-<% foreach my $svcdb ( qw( svc_acct svc_domain svc_acct_sm svc_www ) ) { %>
+<% foreach my $svcdb ( qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ) ) { %>
   if (svcdb == "<%= $svcdb %>" ) {
     <% foreach my $not ( grep { $_ ne $svcdb } (
-                           qw(svc_acct svc_domain svc_acct_sm svc_www) ) ) { %>
+                           qw(svc_acct svc_domain svc_acct_sm svc_forward svc_www) ) ) { %>
       if (document.getElementById) {
         document.getElementById('d<%= $not %>').style.visibility = "hidden";
       } else {
@@ -89,7 +90,7 @@ function changed(what) {
 </SCRIPT>
 <% my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
-             : qw( svc_acct svc_domain svc_acct_sm svc_www ); %>
+             : qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ); %>
 Table<SELECT NAME="svcdb" SIZE=1 onChange="changed(this)">
 <% foreach my $svcdb (@dbs) { %>
 <OPTION VALUE="<%= $svcdb %>" <%= ' SELECTED'x($svcdb eq $hashref->{svcdb}) %>><%= $svcdb %>
@@ -120,6 +121,11 @@ my %defs = (
     'domuid'    => 'UID where domuser@virtualdomain.com mail is forwarded',
     'domsvc'    => 'svcnum from svc_domain for virtualdomain.com',
   },
+  'svc_forward' => {
+    'srcsvc'    => 'service from which mail is to be forwarded',
+    'dstsvc'    => 'service to which mail is to be forwarded',
+    'dst'       => 'someone@another.domain.com to use when dstsvc is 0',
+  },
   'svc_charge' => {
     'amount'    => 'amount',
   },
@@ -135,7 +141,7 @@ my %defs = (
 
 #  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
 foreach my $svcdb ( qw(
-  konq_kludge svc_acct svc_domain svc_acct_sm svc_www
+  konq_kludge svc_acct svc_domain svc_acct_sm svc_forward svc_www
 ) ) {
 
   my(@rows)=map { /^${svcdb}__(.*)$/; $1 }
diff --git a/httemplate/edit/process/svc_forward.cgi b/httemplate/edit/process/svc_forward.cgi
new file mode 100755
index 000000000..bce70a140
--- /dev/null
+++ b/httemplate/edit/process/svc_forward.cgi
@@ -0,0 +1,51 @@
+<%
+#
+# $Id: svc_forward.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
+#
+# Usage: post form to:
+#        http://server.name/path/svc_forward.cgi
+#
+# $Log: svc_forward.cgi,v $
+# Revision 1.1  2001-08-19 15:53:35  jeff
+# added user interface for svc_forward and vpopmail support
+#
+#
+
+use strict;
+use vars qw( $cgi $svcnum $old $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearchs fields);
+use FS::svc_forward;
+use FS::CGI qw(popurl);
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$svcnum =$1;
+
+$old = qsearchs('svc_forward',{'svcnum'=>$svcnum}) if $svcnum;
+
+$new = new FS::svc_forward ( {
+  map {
+    ($_, scalar($cgi->param($_)));
+  } ( fields('svc_forward'), qw( pkgnum svcpart ) )
+} );
+
+if ( $svcnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcnum = $new->getfield('svcnum');
+} 
+
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_forward.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_forward.cgi?$svcnum");
+}
+
+%>
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 7badfe696..063c41fa1 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,6 +1,6 @@
 <%
 #
-# $Id: svc_acct.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
+# $Id: svc_acct.cgi,v 1.2 2001-08-19 15:53:35 jeff Exp $
 #
 # Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -16,7 +16,10 @@
 # use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
+# Revision 1.2  2001-08-19 15:53:35  jeff
+# added user interface for svc_forward and vpopmail support
+#
+# Revision 1.1  2001/07/30 07:36:04  ivan
 # templates!!!
 #
 # Revision 1.10  1999/04/14 11:27:06  ivan
@@ -49,7 +52,7 @@
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
              $part_svc $svc $otaker $username $password $ulen $ulen2 $p1
-             $popnum $uid $gid $finger $dir $shell $quota $slipip );
+             $popnum $domsvc $uid $gid $finger $dir $shell $quota $slipip );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
@@ -160,6 +163,24 @@ Username:
 (blank to generate)
 END
 
+#domain
+$domsvc = $svc_acct->domsvc || 0;
+if ( $part_svc->svc_acct__domsvc_flag eq "F" ) {
+  print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
+} else { 
+  print qq!<BR>Domain: <SELECT NAME="domsvc" SIZE=1>\n!;
+  my($svc_domain);
+  foreach $svc_domain
+    ( sort {$a->domain cmp $b->domain} (qsearch ('svc_domain',{} ) ) ) 
+  {
+    print qq!<OPTION VALUE="!, $svc_domain->svcnum, qq!"!,
+          $svc_domain->svcnum == $domsvc ? ' SELECTED' : '',
+          ">", $svc_domain->domain, "\n"
+      ;
+  }
+  print "</SELECT>";
+}
+
 #pop
 $popnum = $svc_acct->popnum || 0;
 if ( $part_svc->svc_acct__popnum_flag eq "F" ) {
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
new file mode 100755
index 000000000..f1aa1c628
--- /dev/null
+++ b/httemplate/edit/svc_forward.cgi
@@ -0,0 +1,242 @@
+<%
+#
+# $Id: svc_forward.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
+#
+# Usage: svc_forward.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#        http://server.name/path/svc_forward.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
+#
+# use {svcnum} for edit, pkgnum{pkgnum}-svcpart{svcpart} for add
+#
+# should error out in a more CGI-friendly way, and should have more error checking (sigh).
+#
+# $Log: svc_forward.cgi,v $
+# Revision 1.1  2001-08-19 15:53:35  jeff
+# added user interface for svc_forward and vpopmail support
+#
+#
+
+use strict;
+use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
+             $part_svc $query %email $p1 $srcsvc $dstsvc $dst );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_forward;
+use FS::Conf;
+
+$cgi = new CGI;
+&cgisuidsetup($cgi);
+
+$conf = new FS::Conf;
+$mydomain = $conf->config('domain');
+
+if ( $cgi->param('error') ) {
+  $svc_forward = new FS::svc_forward ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_forward')
+  } );
+  $svcnum = $svc_forward->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_forward=qsearchs('svc_forward',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_forward) svcnum!";
+
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
+
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+  
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+  } else { #adding
+
+    $svc_forward = new FS::svc_forward({});
+
+    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+    $svcnum='';
+
+    #set fixed and default fields from part_svc
+    my($field);
+    foreach $field ( fields('svc_forward') ) {
+      if ( $part_svc->getfield('svc_forward__'. $field. '_flag') ne '' ) {
+        $svc_forward->setfield($field,$part_svc->getfield('svc_forward__'. $field) );
+      }
+    }
+
+  }
+}
+$action = $svc_forward->svcnum ? 'Edit' : 'Add';
+
+if ($pkgnum) {
+
+  #find all possible user svcnums (and emails)
+
+  #starting with those currently attached
+  my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_forward->srcsvc});
+  $email{$svc_forward->srcsvc} = $svc_acct->email;
+
+  if ($svc_forward->dstsvc) {
+    $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svc_forward->dstsvc});
+    $email{$svc_forward->dstsvc} = $svc_acct->email;
+  }
+
+  #and including the rest for this customer
+  my($u_part_svc,@u_acct_svcparts);
+  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
+    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
+  }
+
+  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  my($custnum)=$cust_pkg->getfield('custnum');
+  my($i_cust_pkg);
+  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
+    my($acct_svcpart);
+    foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
+                                              #record(s) in cust_svc ( for this
+                                              #pkgnum ! )
+      my($i_cust_svc);
+      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
+        $svc_acct=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+        $email{$svc_acct->getfield('svcnum')}=$svc_acct->email;
+      }  
+    }
+  }
+
+} elsif ( $action eq 'Edit' ) {
+
+  my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_forward->srcsvc});
+  $email{$svc_forward->srcsvc} = $svc_acct->email;
+
+  $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svc_forward->dstsvc});
+  $email{$svc_forward->dstsvc} = $svc_acct->email;
+
+} else {
+  die "\$action eq Add, but \$pkgnum is null!\n";
+}
+
+($srcsvc,$dstsvc,$dst)=(
+  $svc_forward->srcsvc,
+  $svc_forward->dstsvc,
+  $svc_forward->dst,
+);
+
+#display
+
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Mail Forward $action", '',
+      " onLoad=\"visualize()\"");
+
+%>
+
+<SCRIPT>
+function visualize(what){
+    if (document.getElementById) {
+      document.getElementById('dother').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
+    }
+}
+function fixup(what){
+    if (document.getElementById) {
+      if (document.getElementById('dother').style.visibility == 'hidden') {
+        what.dst.value='';
+      }
+    }
+}
+</SCRIPT>
+
+<%
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/svc_forward.cgi" onSubmit="fixup(this)" METHOD=POST>!;
+
+#svcnum
+print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
+print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
+print qq!<BR>!;
+
+#pkgnum
+print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+ 
+#svcpart
+print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
+
+#srcsvc
+print qq!\n\nMail to <SELECT NAME="srcsvc" SIZE=1>!;
+foreach $_ (keys %email) {
+  print "<OPTION", $_ eq $srcsvc ? " SELECTED" : "",
+        qq! VALUE="$_">$email{$_}!;
+}
+print "</SELECT>";
+
+#dstsvc
+print qq! forwards to <SELECT NAME="dstsvc" SIZE=1 onChange="changed(this)">!;
+foreach $_ (keys %email) {
+  print "<OPTION", $_ eq $dstsvc ? " SELECTED" : "",
+        qq! VALUE="$_">$email{$_}!;
+}
+print "<OPTION", 0 eq $dstsvc ? " SELECTED" : "",
+      qq! VALUE="0">(other)!;
+print "</SELECT> mailbox.";
+
+%>
+
+<SCRIPT>
+var selectchoice = null;
+function changed(what) {
+  selectchoice = what.options[what.selectedIndex].value;
+  if (selectchoice == "0") {
+    if (document.getElementById) {
+      document.getElementById('dother').style.visibility = "visible";
+    }
+  }else{
+    if (document.getElementById) {
+      document.getElementById('dother').style.visibility = "hidden";
+    }
+  }
+}
+if (document.getElementById) {
+    document.write("<DIV ID=\"dother\" STYLE=\"visibility: hidden\">");
+}
+</SCRIPT>
+
+<%
+print qq! Other destination: <INPUT TYPE="text" NAME="dst" VALUE="$dst">!;
+%>
+
+<SCRIPT>
+if (document.getElementById) {
+    document.write("</DIV>");
+}
+</SCRIPT>
+
+<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>
+</FORM>
+
+<TAG onLoad="
+    if (document.getElementById) {
+      document.getElementById('dother').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
+      document.getElementById('dlabel').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
+    }
+">
+
+
+  </BODY>
+</HTML>
-- 
cgit v1.2.1


From eb75efa2c03350afff1fa29f8d4c8c6b3827900a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Aug 2001 12:13:09 +0000
Subject: only show domains associated with this customer.

---
 httemplate/edit/svc_acct.cgi | 72 +++++++++++---------------------------------
 1 file changed, 17 insertions(+), 55 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 063c41fa1..584727001 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,58 +1,11 @@
 <%
-#
-# $Id: svc_acct.cgi,v 1.2 2001-08-19 15:53:35 jeff Exp $
-#
-# Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#
-# ivan@voicenet.com 96-dec-18
-#
-# rewrite ivan@sisd.com 98-mar-8
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'password' to '_password' because Pg6.3 reserves the password word
-#       bmccane@maxbaud.net     98-apr-3
-#
-# use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
-#
-# $Log: svc_acct.cgi,v $
-# Revision 1.2  2001-08-19 15:53:35  jeff
-# added user interface for svc_forward and vpopmail support
-#
-# Revision 1.1  2001/07/30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.10  1999/04/14 11:27:06  ivan
-# showpasswords config option to show passwords
-#
-# Revision 1.9  1999/02/28 00:03:37  ivan
-# removed misleading comments
-#
-# Revision 1.8  1999/02/23 08:09:22  ivan
-# beginnings of one-screen new customer entry and some other miscellania
-#
-# Revision 1.7  1999/02/07 09:59:22  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.6  1999/01/19 05:13:43  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:32  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/30 23:03:22  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.3  1998/12/17 06:17:08  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
+<!-- $Id: svc_acct.cgi,v 1.3 2001-08-20 12:13:09 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
              $part_svc $svc $otaker $username $password $ulen $ulen2 $p1
-             $popnum $domsvc $uid $gid $finger $dir $shell $quota $slipip );
+             $popnum $domsvc $uid $gid $finger $dir $shell $quota $slipip
+             @svc_domain );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
@@ -168,11 +121,21 @@ $domsvc = $svc_acct->domsvc || 0;
 if ( $part_svc->svc_acct__domsvc_flag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
 } else { 
+  my @svc_domain = ();
+  my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
+  if ($cust_pkg) {
+    my @cust_svc =
+      map { qsearch('cust_svc', { 'pkgnum' => $_->pkgnum } ) }
+          qsearch('cust_pkg', { 'custnum' => $cust_pkg->custnum } );
+    foreach my $cust_svc ( @cust_svc ) {
+      $svc_domain = qsearchs('svc_domain', { 'svcnum' => $_->svcnum } );
+      push @svc_domain, $svc_domain if $svc_domain;
+    }
+  } else {
+    @svc_domain = qsearch('svc_domain', {} );
+  }
   print qq!<BR>Domain: <SELECT NAME="domsvc" SIZE=1>\n!;
-  my($svc_domain);
-  foreach $svc_domain
-    ( sort {$a->domain cmp $b->domain} (qsearch ('svc_domain',{} ) ) ) 
-  {
+  foreach my $svc_domain ( sort { $a->domain cmp $b->domain } @svc_domain ) {
     print qq!<OPTION VALUE="!, $svc_domain->svcnum, qq!"!,
           $svc_domain->svcnum == $domsvc ? ' SELECTED' : '',
           ">", $svc_domain->domain, "\n"
@@ -249,5 +212,4 @@ print <<END;
 </HTML>
 END
 
-
 %>
-- 
cgit v1.2.1


From c0806ebf17ec0c4647915d5be09e35034171e2bf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Aug 2001 12:15:05 +0000
Subject: #

---
 httemplate/edit/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 584727001..26266957d 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-<!-- $Id: svc_acct.cgi,v 1.3 2001-08-20 12:13:09 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.4 2001-08-20 12:15:05 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
-- 
cgit v1.2.1


From 3d671921441ba8422650b54435a1959ad1d4c71d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Aug 2001 02:31:57 +0000
Subject: remove $Log$ messages.  whew.

---
 httemplate/edit/agent.cgi                    | 36 +---------------
 httemplate/edit/agent_type.cgi               | 51 +---------------------
 httemplate/edit/cust_credit.cgi              | 48 +--------------------
 httemplate/edit/cust_main_county-expand.cgi  | 32 +-------------
 httemplate/edit/cust_main_county.cgi         | 45 +------------------
 httemplate/edit/cust_pay.cgi                 | 34 +--------------
 httemplate/edit/cust_pkg.cgi                 | 53 +----------------------
 httemplate/edit/part_pkg.cgi                 | 44 +------------------
 httemplate/edit/part_referral.cgi            | 34 +--------------
 httemplate/edit/process/agent.cgi            | 34 +--------------
 httemplate/edit/process/agent_type.cgi       | 34 +--------------
 httemplate/edit/process/cust_credit.cgi      | 44 +------------------
 httemplate/edit/process/cust_main_county.cgi | 31 +-------------
 httemplate/edit/process/cust_pay.cgi         | 37 +---------------
 httemplate/edit/process/cust_pkg.cgi         | 40 +----------------
 httemplate/edit/process/part_pkg.cgi         | 47 +-------------------
 httemplate/edit/process/part_referral.cgi    | 31 +-------------
 httemplate/edit/process/svc_acct.cgi         | 45 +------------------
 httemplate/edit/process/svc_acct_pop.cgi     | 31 +-------------
 httemplate/edit/process/svc_acct_sm.cgi      | 43 +------------------
 httemplate/edit/process/svc_domain.cgi       | 43 +------------------
 httemplate/edit/process/svc_forward.cgi      | 12 +-----
 httemplate/edit/svc_acct_pop.cgi             | 42 +-----------------
 httemplate/edit/svc_acct_sm.cgi              | 64 +---------------------------
 httemplate/edit/svc_domain.cgi               | 51 +---------------------
 httemplate/edit/svc_forward.cgi              | 16 +------
 26 files changed, 26 insertions(+), 996 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index b4508da81..701715fe5 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,39 +1,5 @@
 <%
-#
-# $Id: agent.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 97-dec-12
-#
-# 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.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/04/07 11:27:50  ivan
-# avoid perl's silly arguement not numeric error
-#
-# Revision 1.6  1999/01/25 12:09:50  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:31  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:21  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 06:16:57  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/11/23 07:52:08  ivan
-# *** empty log message ***
-#
+#<!-- $Id: agent.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $agent $action $hashref $p $agent_type );
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 317fd60bc..4f1ad8b20 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,54 +1,5 @@
 <%
-#
-# $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.)
-#
+#<!-- $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 );
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index d3d0dc15f..a95636662 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,51 +1,5 @@
 <%
-#
-# $Id: cust_credit.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: cust_credit.cgi custnum [ -paybatch ]
-#        http://server.name/path/cust_credit?custnum [ -paybatch ]
-#
-# some hooks in here for modifications as well as additions, but needs (lots) more work.
-# also see process/cust_credit.cgi, the script that processes the form.
-#
-# ivan@voicenet.com 96-dec-05
-#
-# paybatch field, differentiates between credits & credits+refunds by commandline
-# ivan@voicenet.com 96-dec-08
-#
-# added (but commented out) sprintf("%.2f" in amount field.  Hmm.
-# ivan@voicenet.com 97-jan-3
-#
-# paybatch stuff thrown out - has checkbox now instead.  
-# (well, sort of.  still passed around for backward compatability and possible editing hook)
-# ivan@voicenet.com 97-apr-21
-#
-# rewrite ivan@sisd.com 98-mar-16
-#
-# $Log: cust_credit.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/02/28 00:03:33  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/01/25 12:09:52  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:33  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:23  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/23 02:26:06  ivan
-# *** empty log message ***
-#
-# Revision 1.2  1998/12/17 06:16:59  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
+#<!-- $Id: cust_credit.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index a7b0998df..6b422cca6 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,35 +1,5 @@
 <%
-#
-# $Id: cust_main_county-expand.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 97-dec-16
-#
-# Changes to allow page to work at a relative position in server
-#	bmccane@maxbaud.net	98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: cust_main_county-expand.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/01/25 12:09:54  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:35  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:25  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 06:17:01  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/11/18 09:01:38  ivan
-# i18n! i18n!
-#
+#<!-- $Id: cust_main_county-expand.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index 1b8e76fc7..6be349bc4 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,48 +1,5 @@
 <%
-#
-# $Id: cust_main_county.cgi,v 1.2 2001-08-17 11:05:31 ivan Exp $
-#
-# ivan@sisd.com 97-dec-13-16
-#
-# Changes to allow page to work at a relative position in server
-# Changed tax field to accept 6 chars (MO uses 6.1%)
-#	bmccane@maxbaud.net	98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-# 
-# $Log: cust_main_county.cgi,v $
-# Revision 1.2  2001-08-17 11:05:31  ivan
-# clean up tax rate editing:
-#   sort by country->state->county,
-#   add "collapse state" if the tax rates are the same statewide,
-#   redirect "expand state" to the browse, not edit screen
-#
-# Revision 1.1  2001/07/30 07:36:04  ivan
-# templates!!!
-#
-# 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/25 12:09:55  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:36  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 09:41:26  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.3  1998/12/17 06:17:02  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/11/18 09:01:39  ivan
-# i18n! i18n!
-#
+#<!-- $Id: cust_main_county.cgi,v 1.3 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $cust_main_county );
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 33320648c..d1823d4b3 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,37 +1,5 @@
 <%
-#
-# $Id: cust_pay.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: cust_pay.cgi invnum
-#        http://server.name/path/cust_pay.cgi?invnum
-#
-# some hooks for modifications as well as additions, but needs work.
-#
-# ivan@voicenet.com 96-dec-11
-#
-# rewrite ivan@sisd.com 98-mar-16
-#
-# $Log: cust_pay.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/02/28 00:03:35  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/01/25 12:09:56  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.4  1999/01/19 05:13:37  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 09:41:27  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.2  1998/12/17 06:17:03  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
+#<!-- $Id: cust_pay.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $invnum $p1 $_date $payby $payinfo $paid );
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index 637023703..729fc7c98 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,56 +1,5 @@
 <%
-#
-# $Id: cust_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# this is for changing packages around, not editing things within the package
-#
-# Usage: cust_pkg.cgi custnum
-#        http://server.name/path/cust_pkg.cgi?custnum
-#
-# started with /sales/add/cust_pkg.cgi, which added packages
-# ivan@voicenet.com 97-jan-5, 97-mar-21
-#
-# Rewrote for new API
-# ivan@voicenet.com 97-jul-7
-#
-# FS::Search is no more, &cgisuidsetup needs $cgi, ivan@sisd.com 98-mar-7 
-#
-# Changes to allow page to work at a relative position in server
-# Changed to display packages 2-wide in a table
-#       bmccane@maxbaud.net     98-apr-3
-#
-# fixed a pretty cool bug from above which caused a visual glitch ivan@sisd.com
-# 98-jun-1
-#
-# $Log: cust_pkg.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.8  1999/07/21 07:34:13  ivan
-# links to package browse and agent type edit if there aren't any packages to
-# order.  thanks to "Tech Account" <techy@orac.hq.org>
-#
-# Revision 1.7  1999/04/14 01:03:01  ivan
-# oops, in 1.2 tree, can't do searches until [cgi|admin]suidsetup,
-# bug is hidden by mod_perl persistance
-#
-# Revision 1.6  1999/02/28 00:03:36  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:18  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:13:38  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 09:41:28  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.2  1998/12/17 06:17:04  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
+#<!-- $Id: cust_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 002d54139..4813fdf8b 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,47 +1,5 @@
 <%
-#
-# $Id: part_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# part_pkg.cgi: Add/Edit package (output form)
-#
-# ivan@sisd.com 97-dec-10
-#
-# Changes to allow page to work at a relative position in server
-# Changed to display services 2-wide in table
-#       bmccane@maxbaud.net     98-apr-3
-#
-# use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
-#
-# $Log: part_pkg.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.9  1999/02/07 09:59:19  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.8  1999/01/19 05:13:39  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.7  1999/01/18 09:41:29  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.6  1998/12/17 06:17:05  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.5  1998/11/21 07:12:26  ivan
-# *** empty log message ***
-#
-# Revision 1.4  1998/11/21 07:11:08  ivan
-# *** empty log message ***
-#
-# Revision 1.3  1998/11/21 07:07:40  ivan
-# popurl, bugfix
-#
-# Revision 1.2  1998/11/15 13:14:55  ivan
-# first pass as per-user custom pricing
-#
+#<!-- $Id: part_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $part_pkg $action $query $hashref $part_svc $count );
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index e7d76f7e4..9ed8977cd 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -1,37 +1,5 @@
 <%
-#
-# $Id: part_referral.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 98-feb-23
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# confisuing typo on submit button ivan@sisd.com 98-jun-14
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: part_referral.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/04/07 11:43:23  ivan
-# pick up errors right away, leave input
-#
-# Revision 1.5  1999/02/07 09:59:20  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:13:41  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 09:41:30  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.2  1998/12/17 06:17:06  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
+#<!-- $Id: part_referral.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $part_referral $action $hashref $p1 $query );
diff --git a/httemplate/edit/process/agent.cgi b/httemplate/edit/process/agent.cgi
index 2b4991363..b93df48d1 100755
--- a/httemplate/edit/process/agent.cgi
+++ b/httemplate/edit/process/agent.cgi
@@ -1,37 +1,5 @@
 <%
-#
-# $Id: agent.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 97-dec-12
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: agent.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/01/25 12:09:57  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.6  1999/01/19 05:13:47  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 22:47:49  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.4  1998/12/30 23:03:26  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.3  1998/12/17 08:40:16  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/23 07:52:29  ivan
-# *** empty log message ***
-#
+#<!-- $Id: agent.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $agentnum $old $new $error );
diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
index 5c6b2b8e0..37a382e62 100755
--- a/httemplate/edit/process/agent_type.cgi
+++ b/httemplate/edit/process/agent_type.cgi
@@ -1,37 +1,5 @@
 <%
-#
-# $Id: agent_type.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 97-dec-11
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: agent_type.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/01/25 12:09:58  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.6  1999/01/19 05:13:48  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 22:47:50  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.4  1998/12/30 23:03:27  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.3  1998/12/17 08:40:17  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/21 07:49:20  ivan
-# s/CGI::Request/CGI.pm/
-#
+#<!-- $Id: agent_type.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $typenum $old $new $error $part_pkg );
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index 3cacab26e..b52d0bd46 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -1,47 +1,5 @@
 <%
-#
-# $Id: cust_credit.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/cust_credit.cgi
-#
-# ivan@voicenet.com 96-dec-05 -> 96-dec-08
-#
-# post a refund if $new_paybatch
-# ivan@voicenet.com 96-dec-08
-#
-# refunds are no longer applied against a specific payment (paybatch)
-# paybatch field removed
-# ivan@voicenet.com 97-apr-22
-#
-# rewrite ivan@sisd.com 98-mar-16
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cust_credit.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/04/07 15:23:05  ivan
-# don't use anchor in redirect
-#
-# Revision 1.6  1999/02/28 00:03:41  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/01/25 12:09:59  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.4  1999/01/19 05:13:49  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 22:47:51  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.2  1998/12/17 08:40:18  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: cust_credit.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum $new $error );
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index 1ff2047f1..158a0d09e 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -1,34 +1,5 @@
 <%
-#
-# $Id: cust_main_county.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 97-dec-16
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: cust_main_county.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/01/25 12:19:08  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:52  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:47:53  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/17 08:40:21  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/18 09:01:41  ivan
-# i18n! i18n!
-#
+#<!-- $Id: cust_main_county.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi );
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index f21ff490a..fcdc233b9 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,40 +1,5 @@
 <%
-#
-# $Id: cust_pay.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/cust_pay.cgi
-#
-# ivan@voicenet.com 96-dec-11
-#
-# rewrite ivan@sisd.com 98-mar-16
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cust_pay.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/02/28 00:03:43  ivan
-# removed misleading comments
-#
-# Revision 1.6  1999/01/25 12:19:09  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:53  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:47:54  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/30 23:03:28  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.2  1998/12/17 08:40:22  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: cust_pay.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $invnum $new $error );
diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
index 0074466c8..ecaec9bcb 100755
--- a/httemplate/edit/process/cust_pkg.cgi
+++ b/httemplate/edit/process/cust_pkg.cgi
@@ -1,43 +1,5 @@
 <%
-#
-# $Id: cust_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# this is for changing packages around, not for editing things within the
-# package
-#
-# Usage: post form to:
-#        http://server.name/path/cust_pkg.cgi
-#
-# ivan@voicenet.com 97-mar-21 - 97-mar-24
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-7 - 15
-#
-# &cgisuidsetup($cgi) ivan@sisd.com 98-mar-7
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cust_pkg.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/04/07 15:24:06  ivan
-# don't use anchor in redirect
-#
-# Revision 1.6  1999/02/28 00:03:44  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:26  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.3  1999/01/19 05:13:54  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.2  1998/12/17 08:40:23  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: cust_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum @remove_pkgnums @pkgparts $pkgpart $error );
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 3e1c07d1e..5850599c8 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,50 +1,5 @@
 <%
-#
-# $Id: part_pkg.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# process/part_pkg.cgi: Edit package definitions (process form)
-#
-# ivan@sisd.com 97-dec-10
-#
-# don't update non-changing records in part_svc (causing harmless but annoying
-# "Records identical" errors). ivan@sisd.com 98-feb-19
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# Added `|| 0 ' when getting quantity off web page ivan@sisd.com 98-jun-4
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: part_pkg.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.9  2001/04/09 23:05:16  ivan
-# Transactions Part I!!!
-#
-# Revision 1.8  1999/02/07 09:59:27  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.7  1999/01/19 05:13:55  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 22:47:56  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.5  1998/12/30 23:03:29  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.4  1998/12/17 08:40:24  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.3  1998/11/21 07:17:58  ivan
-# bugfix to work for regular aswell as custom pricing
-#
-# Revision 1.2  1998/11/15 13:16:15  ivan
-# first pass as per-user custom pricing
-#
+#<!-- $Id: part_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
diff --git a/httemplate/edit/process/part_referral.cgi b/httemplate/edit/process/part_referral.cgi
index c79ebb608..ff94e3955 100755
--- a/httemplate/edit/process/part_referral.cgi
+++ b/httemplate/edit/process/part_referral.cgi
@@ -1,34 +1,5 @@
 <%
-#
-# $Id: part_referral.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 98-feb-23
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: part_referral.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/02/07 09:59:28  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.5  1999/01/19 05:13:56  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:47:57  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/30 23:03:30  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.2  1998/12/17 08:40:25  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: part_referral.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $refnum $new $error );
diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
index e895e5ddf..c500016e2 100755
--- a/httemplate/edit/process/svc_acct.cgi
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -1,48 +1,5 @@
 <%
-#
-# $Id: svc_acct.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_acct.cgi
-#
-# ivan@voicenet.com 96-dec-18
-#
-# Changed /u to /u2
-# ivan@voicenet.com 97-may-6
-#
-# rewrote for new API
-# ivan@voicenet.com 97-jul-17 - 21
-#
-# no FS::Search, FS::svc_acct creates FS::cust_svc record, used for adding
-# and editing ivan@sisd.com 98-mar-8
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'password' to '_password' because Pg6.3 reserves the password word
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: svc_acct.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  1999/08/27 00:26:33  ivan
-# better error messages
-#
-# Revision 1.6  1999/02/28 00:03:45  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:30  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:13:58  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 22:47:59  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.2  1998/12/17 08:40:27  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: svc_acct.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svcnum $old $new $error );
diff --git a/httemplate/edit/process/svc_acct_pop.cgi b/httemplate/edit/process/svc_acct_pop.cgi
index 95415f201..2b870dc48 100755
--- a/httemplate/edit/process/svc_acct_pop.cgi
+++ b/httemplate/edit/process/svc_acct_pop.cgi
@@ -1,34 +1,5 @@
 <%
-#
-# $Id: svc_acct_pop.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 98-mar-8
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: svc_acct_pop.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/02/07 09:59:31  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.5  1999/01/19 05:13:59  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:48:00  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/30 23:03:32  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.2  1998/12/17 08:40:28  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: svc_acct_pop.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $popnum $old $new $error );
diff --git a/httemplate/edit/process/svc_acct_sm.cgi b/httemplate/edit/process/svc_acct_sm.cgi
index a68478898..10afcc1f9 100755
--- a/httemplate/edit/process/svc_acct_sm.cgi
+++ b/httemplate/edit/process/svc_acct_sm.cgi
@@ -1,46 +1,5 @@
 <%
-#
-# $Id: svc_acct_sm.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_acct_sm.cgi
-#
-# lots of crufty stuff from svc_acct still in here, and modifications are (unelegantly) disabled.
-#
-# ivan@voicenet.com 97-jan-6
-#
-# enabled modifications
-# 
-# ivan@voicenet.com 97-may-7
-#
-# fixed removal of cust_svc record on modifications!
-# ivan@voicenet.com 97-jun-5
-#
-# rewrite ivan@sisd.com 98-mar-15
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: svc_acct_sm.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/02/28 00:03:46  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:32  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:14:00  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 22:48:01  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.2  1998/12/17 08:40:29  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: svc_acct_sm.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svcnum $old $new $error );
diff --git a/httemplate/edit/process/svc_domain.cgi b/httemplate/edit/process/svc_domain.cgi
index 59a0c078f..e52b68a15 100755
--- a/httemplate/edit/process/svc_domain.cgi
+++ b/httemplate/edit/process/svc_domain.cgi
@@ -1,46 +1,5 @@
 <%
-#
-# $Id: svc_domain.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_domain.cgi
-#
-# lots of yucky stuff in this one... bleachlkjhui!
-#
-# ivan@voicenet.com 97-jan-6
-#
-# kludged for new domain template 3.5
-# ivan@voicenet.com 97-jul-24
-#
-# moved internic bits to svc_domain.pm ivan@sisd.com 98-mar-14
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: svc_domain.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.7  2001/04/23 07:12:44  ivan
-# better error message (if kludgy) for no referral
-# remove outdated NSI foo from domain ordering.  also, fuck NSI.
-#
-# Revision 1.6  1999/02/28 00:03:47  ivan
-# removed misleading comments
-#
-# Revision 1.5  1999/02/07 09:59:33  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.4  1999/01/19 05:14:01  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.3  1999/01/18 22:48:02  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.2  1998/12/17 08:40:30  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
+#<!-- $Id: svc_domain.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svcnum $new $error );
diff --git a/httemplate/edit/process/svc_forward.cgi b/httemplate/edit/process/svc_forward.cgi
index bce70a140..b013bd15f 100755
--- a/httemplate/edit/process/svc_forward.cgi
+++ b/httemplate/edit/process/svc_forward.cgi
@@ -1,15 +1,5 @@
 <%
-#
-# $Id: svc_forward.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/svc_forward.cgi
-#
-# $Log: svc_forward.cgi,v $
-# Revision 1.1  2001-08-19 15:53:35  jeff
-# added user interface for svc_forward and vpopmail support
-#
-#
+#<!-- $Id: svc_forward.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svcnum $old $new $error );
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index 016031f83..5f1d15e26 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -1,45 +1,5 @@
 <%
-#
-# $Id: svc_acct_pop.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 98-mar-8 
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: svc_acct_pop.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.9  2000/01/28 23:02:48  ivan
-# track full phone number
-#
-# Revision 1.8  1999/02/23 08:09:23  ivan
-# beginnings of one-screen new customer entry and some other miscellania
-#
-# Revision 1.7  1999/02/07 09:59:23  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.6  1999/01/19 05:13:44  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:33  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/23 02:57:45  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.3  1998/12/17 06:17:10  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/11/13 09:56:47  ivan
-# change configuration file layout to support multiple distinct databases (with
-# own set of config files, export, etc.)
-#
+#<!-- $Id: svc_acct_pop.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svc_acct_pop $action $query $hashref $p1 );
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 891c3e1f6..34846f9f3 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,67 +1,5 @@
 <%
-#
-# $Id: svc_acct_sm.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#
-# use {svcnum} for edit, pkgnum{pkgnum}-svcpart{svcpart} for add
-#
-# should error out in a more CGI-friendly way, and should have more error checking (sigh).
-#
-# ivan@voicenet.com 97-jan-5
-#
-# added debugging code; fixed CPU-sucking problem with trying to edit an (unaudited) mail alias (no pkgnum)
-#
-# ivan@voicenet.com 97-may-7
-#
-# fixed uid selection
-# ivan@voicenet.com 97-jun-4
-#
-# uid selection across _CUSTOMER_, not just _PACKAGE_
-#
-# ( i need to be rewritten with fast searches)
-#
-# ivan@voicenet.com 97-oct-3
-#
-# added fast searches in some of the places where it is sorely needed...
-# I see DBI::mysql in your future...
-# ivan@voicenet.com 97-oct-23
-#
-# rewrite ivan@sisd.com 98-mar-15
-#
-# /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
-#
-# $Log: svc_acct_sm.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.9  1999/02/28 00:03:38  ivan
-# removed misleading comments
-#
-# Revision 1.8  1999/02/07 09:59:24  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.7  1999/01/19 05:13:45  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 09:41:34  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.5  1998/12/30 23:03:24  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.4  1998/12/23 02:58:45  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.3  1998/12/17 06:17:11  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/12/16 05:19:15  ivan
-# use FS::Conf
-#
+#<!-- $Id: svc_acct_sm.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index dd8ad8532..8ffc9d789 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,54 +1,5 @@
 <%
-#
-# $Id: svc_domain.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
-#        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
-#
-# ivan@voicenet.com 97-jan-5 -> 97-jan-6
-#
-# changes for domain template 3.5
-# ivan@voicenet.com 97-jul-24
-#
-# rewrite ivan@sisd.com 98-mar-14
-#
-# no GOV in instructions ivan@sisd.com 98-jul-17
-#
-# $Log: svc_domain.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.10  2001/04/23 07:12:44  ivan
-# better error message (if kludgy) for no referral
-# remove outdated NSI foo from domain ordering.  also, fuck NSI.
-#
-# Revision 1.9  1999/02/28 00:03:39  ivan
-# removed misleading comments
-#
-# Revision 1.8  1999/02/07 09:59:25  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.7  1999/01/19 05:13:46  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.6  1999/01/18 09:41:35  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.5  1998/12/30 23:03:25  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.4  1998/12/23 03:00:16  ivan
-# $cgi->keywords instead of $cgi->query_string
-#
-# Revision 1.3  1998/12/17 06:17:12  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-# Revision 1.2  1998/11/13 09:56:48  ivan
-# change configuration file layout to support multiple distinct databases (with
-# own set of config files, export, etc.)
-#
+#<!-- $Id: svc_domain.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index f1aa1c628..86e2e9547 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,19 +1,5 @@
 <%
-#
-# $Id: svc_forward.cgi,v 1.1 2001-08-19 15:53:35 jeff Exp $
-#
-# Usage: svc_forward.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#        http://server.name/path/svc_forward.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#
-# use {svcnum} for edit, pkgnum{pkgnum}-svcpart{svcpart} for add
-#
-# should error out in a more CGI-friendly way, and should have more error checking (sigh).
-#
-# $Log: svc_forward.cgi,v $
-# Revision 1.1  2001-08-19 15:53:35  jeff
-# added user interface for svc_forward and vpopmail support
-#
-#
+# <!-- $Id: svc_forward.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
-- 
cgit v1.2.1


From 06d6c58f29564e0cbf92c6df01c7c0409a5c3097 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Aug 2001 10:27:11 +0000
Subject: fix these up, most everything is working svc_forward-wise now

---
 httemplate/edit/svc_acct.cgi    |  5 +++--
 httemplate/edit/svc_forward.cgi | 13 +++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 26266957d..2154bf22c 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.4 2001-08-20 12:15:05 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.5 2001-08-21 10:27:11 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
@@ -128,7 +128,8 @@ if ( $part_svc->svc_acct__domsvc_flag eq "F" ) {
       map { qsearch('cust_svc', { 'pkgnum' => $_->pkgnum } ) }
           qsearch('cust_pkg', { 'custnum' => $cust_pkg->custnum } );
     foreach my $cust_svc ( @cust_svc ) {
-      $svc_domain = qsearchs('svc_domain', { 'svcnum' => $_->svcnum } );
+      my $svc_domain =
+        qsearchs('svc_domain', { 'svcnum' => $cust_svc->svcnum } );
       push @svc_domain, $svc_domain if $svc_domain;
     }
   } else {
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 86e2e9547..de4c8cbc9 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_forward.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+# <!-- $Id: svc_forward.cgi,v 1.3 2001-08-21 10:27:11 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
@@ -73,11 +73,12 @@ if ($pkgnum) {
   #find all possible user svcnums (and emails)
 
   #starting with those currently attached
-  my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_forward->srcsvc});
-  $email{$svc_forward->srcsvc} = $svc_acct->email;
-
-  if ($svc_forward->dstsvc) {
-    $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svc_forward->dstsvc});
+  if ( $svc_forward->srcsvc ) {
+    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_forward->srcsvc } );
+    $email{$svc_forward->srcsvc} = $svc_acct->email;
+  }
+  if ( $svc_forward->dstsvc ) {
+    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_forward->dstsvc } );
     $email{$svc_forward->dstsvc} = $svc_acct->email;
   }
 
-- 
cgit v1.2.1


From aa7b51c0794f6a61e522fbba978f6c64446d8696 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 28 Aug 2001 14:34:14 +0000
Subject: customer-to-customer referrals!

---
 httemplate/edit/cust_main.cgi | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index f331e5321..47e18d789 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.3 2001-08-12 00:07:55 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.4 2001-08-28 14:34:14 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -61,7 +61,8 @@ if ( $cgi->param('error') ) {
 } else {
   $custnum='';
   $cust_main = new FS::cust_main ( {} );
-  $cust_main->setfield('otaker',&getotaker);
+  $cust_main->otaker( &getotaker );
+  $cust_main->referral_custnum( $cgi->param('referral_custnum') );
   $saved_pkgpart = 0;
   $username = '';
   $password = '';
@@ -130,6 +131,22 @@ if ( $custnum && ! $conf->exists('editreferrals') ) {
   }
 }
 
+#referring customer
+
+print qq!<BR><BR>Referring Customer: !;
+if ( $cust_main->referral_custnum ) {
+  my $referring_cust_main =
+    qsearchs('cust_main', { custnum => $cust_main->referral_custnum } );
+  print '<A HREF="'. popurl(1). '/cust_main.cgi?'.
+        $cust_main->referral_custnum. '">'.
+        $cust_main->referral_custnum. ': '.
+        ( $referring_cust_main->company
+          || $referring_cust_main->last. ', '. $referring_cust_main->first ).
+        '</A><INPUT TYPE="hidden" NAME="referral_custnum" VALUE="'.
+        $cust_main->referral_custnum. '">';
+} else {
+  print '(none)<INPUT TYPE="hidden" NAME="referral_custnum" VALUE="">';
+}
 
 # contact info
 
-- 
cgit v1.2.1


From cad67501e450c3216e403e645951fd3bec282c20 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 29 Aug 2001 09:11:30 +0000
Subject: ui

---
 httemplate/edit/agent.cgi | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index 701715fe5..236d05001 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,12 +1,12 @@
 <%
-#<!-- $Id: agent.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: agent.cgi,v 1.3 2001-08-29 09:11:30 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $agent $action $hashref $p $agent_type );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header menubar popurl);
+use FS::CGI qw(header menubar popurl ntable);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::agent;
 use FS::agent_type;
@@ -44,10 +44,14 @@ print '<FORM ACTION="', popurl(1), 'process/agent.cgi" METHOD=POST>',
       qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$hashref->{agentnum}">!,
       "Agent #", $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)";
 
-print <<END;
-<PRE>
-Agent                     <INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="$hashref->{agent}">
-Agent type                <SELECT NAME="typenum" SIZE=1>
+print &ntable("#cccccc", 2, ''), <<END;
+<TR>
+  <TH ALIGN="right">Agent</TH>
+  <TD><INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="$hashref->{agent}"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right">Agent type</TH>
+  <TD><SELECT NAME="typenum" SIZE=1>
 END
 
 foreach $agent_type (qsearch('agent_type',{})) {
@@ -59,10 +63,17 @@ foreach $agent_type (qsearch('agent_type',{})) {
 }
 
 print <<END;
-</SELECT>
-Frequency (unimplemented) <INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}">
-Program (unimplemented)   <INPUT TYPE="text" NAME="prog" VALUE="$hashref->{prog}">
-</PRE>
+</SELECT></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Frequency (unimplemented)</TD>
+  <TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Program (unimplemented)</TD>
+  <TD><INPUT TYPE="text" NAME="prog" VALUE="$hashref->{prog}"></TD>
+</TR>
+</TABLE>
 END
 
 print qq!<BR><INPUT TYPE="submit" VALUE="!,
-- 
cgit v1.2.1


From b752b1bede0539c9822b999e08e994f63036320d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 30 Aug 2001 15:30:26 +0000
Subject: slighly more docu

---
 httemplate/edit/part_svc.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index b8715fb49..5696e43f8 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.4 2001-08-19 15:53:35 jeff Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.5 2001-08-30 15:30:26 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -104,7 +104,7 @@ my %defs = (
   'svc_acct' => {
     'dir'       => 'Home directory',
     'uid'       => 'UID (set to fixed and blank for dial-only)',
-    'slipip'    => 'IP address (set to fixed and blank to disable dialin)',
+    'slipip'    => 'IP address (Set to fixed and blank to disable dialin, or, set a value to be exported to RADIUS Framed-IP-Address.  Use the special value <code>0e0</code> [zero e zero] to enable export to RADIUS without a Framed-IP-Address.)',
     'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
     'username'  => 'Username',
     'quota'     => '(unimplemented)',
@@ -112,6 +112,7 @@ my %defs = (
     'gid'       => 'GID (when blank, defaults to UID)',
     'shell'     => 'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
     'finger'    => 'GECOS',
+    'domsvc'    => 'svcnum from svc_domain',
   },
   'svc_domain' => {
     'domain'    => 'Domain',
-- 
cgit v1.2.1


From 237bea175ad19676bda76c3ac756a4c0b5bd899a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 31 Aug 2001 07:17:33 +0000
Subject: fixes: > US UT expand state > Submit (no data entered) > US UT is
 gone frome the list.

---
 httemplate/edit/process/cust_main_county-expand.cgi | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index a0231b076..5adffc62f 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_main_county-expand.cgi,v 1.2 2001-08-17 11:05:31 ivan Exp $ -->
+# <!-- $Id: cust_main_county-expand.cgi,v 1.3 2001-08-31 07:17:33 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
@@ -53,11 +53,13 @@ foreach ( @expansion) {
   die $error if $error;
 }
 
-unless ( qsearch('cust_main',{
-  'state'  => $cust_main_county->getfield('state'),
-  'county' => $cust_main_county->getfield('county'),
-  'country' =>  $cust_main_county->getfield('country'),
-} ) ) {
+unless ( qsearch( 'cust_main', {
+                                 'state'  => $cust_main_county->state,
+                                 'county' => $cust_main_county->county,
+                                 'country' =>  $cust_main_county->country,
+                               } )
+         || ! @expansion
+) {
   my($error)=($cust_main_county->delete);
   die $error if $error;
 }
-- 
cgit v1.2.1


From 7c49a7040bddba0f89d74e9166d38279a3c85b05 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 31 Aug 2001 07:28:00 +0000
Subject: better error message for nonexistant cust_main_county records

---
 httemplate/edit/cust_main_county-expand.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index 6b422cca6..4460ee8ad 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main_county-expand.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_main_county-expand.cgi,v 1.3 2001-08-31 07:28:00 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
@@ -27,7 +27,8 @@ if ( $cgi->param('error') ) {
   $expansion = '';
 }
 
-$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum});
+$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+  or die "cust_main_county.taxnum $taxnum not found";
 die "Can't expand entry!" if $cust_main_county->getfield('county');
 
 $p1 = popurl(1);
-- 
cgit v1.2.1


From 6412f71a3557249225abf5eb2096ebad1729c585 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sat, 1 Sep 2001 21:52:20 +0000
Subject: add cust_credit_bill relating multiple invoices to credits

---
 httemplate/edit/cust_credit_bill.cgi         | 81 ++++++++++++++++++++++++++++
 httemplate/edit/process/cust_credit_bill.cgi | 56 +++++++++++++++++++
 2 files changed, 137 insertions(+)
 create mode 100755 httemplate/edit/cust_credit_bill.cgi
 create mode 100755 httemplate/edit/process/cust_credit_bill.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
new file mode 100755
index 000000000..df495a668
--- /dev/null
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -0,0 +1,81 @@
+<%
+#<!-- $Id: cust_credit_bill.cgi,v 1.1 2001-09-01 21:52:20 jeff Exp $ -->
+
+use strict;
+use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $_date $amount $reason $cust_credit );
+use Date::Format;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch fields);
+use FS::cust_credit;
+use FS::cust_bill;
+
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  #$cust_credit_bill = new FS::cust_credit_bill ( {
+  #  map { $_, scalar($cgi->param($_)) } fields('cust_credit_bill')
+  #} );
+  $crednum = $cgi->param('crednum');
+  $amount = $cgi->param('amount');
+  #$refund = $cgi->param('refund');
+  $invnum = $cgi->param('invnum');
+} else {
+  ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $crednum = $1;
+  $amount = '';
+  #$refund = 'yes';
+  $invnum = '';
+}
+$_date = time;
+
+$otaker = getotaker;
+
+$p1 = popurl(1);
+
+print $cgi->header( '-expires' => 'now' ), header("Apply Credit", '');
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+print <<END;
+    <FORM ACTION="${p1}process/cust_credit_bill.cgi" METHOD=POST>
+    <PRE>
+END
+
+die unless $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
+
+print qq!Credit #<B>!, $crednum, qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
+
+print qq!\nInvoice # <SELECT NAME="invnum" SIZE=1>!;
+foreach $_ (grep $_->owed, qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } ) ) {
+  print "<OPTION", (($_->invnum eq $invnum) ? " SELECTED" : ""),
+    qq! VALUE="! .$_->invnum. qq!">!. $_->invnum. qq! (! . $_->owed . qq!)!;
+}
+print qq!<OPTION VALUE="Refund">Refund!;
+print "</SELECT>";
+
+print qq!\nDate: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
+
+print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+
+#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
+
+print <<END;
+</PRE>
+<BR>
+<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
+END
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
new file mode 100755
index 000000000..f838dff10
--- /dev/null
+++ b/httemplate/edit/process/cust_credit_bill.cgi
@@ -0,0 +1,56 @@
+<%
+#<!-- $Id: cust_credit_bill.cgi,v 1.1 2001-09-01 21:52:20 jeff Exp $ -->
+
+use strict;
+use vars qw( $cgi $custnum $crednum $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(popurl);
+use FS::Record qw(qsearchs fields);
+use FS::cust_credit;
+use FS::cust_credit_bill;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$cgi->param('crednum') =~ /^(\d*)$/ or die "Illegal crednum!";
+$crednum = $1;
+
+my $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } )
+  or die "No such crednum";
+
+my $cust_main = qsearchs('cust_main', { 'custnum' => $cust_credit->custnum } )
+  or die "Bogus credit:  not attached to customer";
+
+my $custnum = $cust_main->custnum;
+
+if ($cgi->param('invnum') =~ /^Refund$/) {
+  $new = new FS::cust_refund ( {
+    'reason'  => $cust_credit->reason,
+    'refund'  => $cgi->param('amount'),
+    'payby'   => 'BILL',
+    '_date'   => $cgi->param('_date'),
+    'payinfo' => 'Cash',
+    'crednum' => $crednum,
+  } );
+}else{
+  $new = new FS::cust_credit_bill ( {
+    map {
+      $_, scalar($cgi->param($_));
+    #} qw(custnum _date amount invnum)
+    } fields('cust_credit_bill')
+  } );
+}
+
+$error=$new->insert;
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_credit_bill.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+}
+
+
+%>
-- 
cgit v1.2.1


From dbfb0ae501d5acba37f9348476d94b99a4c92450 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Sep 2001 07:49:52 +0000
Subject: things are starting to work again, sorta.

---
 httemplate/edit/cust_credit_bill.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index df495a668..c4cd34eab 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.1 2001-09-01 21:52:20 jeff Exp $ -->
+#<!-- $Id: cust_credit_bill.cgi,v 1.2 2001-09-02 07:49:52 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $_date $amount $reason $cust_credit );
@@ -40,7 +40,7 @@ $p1 = popurl(1);
 
 print $cgi->header( '-expires' => 'now' ), header("Apply Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
+      "</FONT><BR><BR>"
   if $cgi->param('error');
 print <<END;
     <FORM ACTION="${p1}process/cust_credit_bill.cgi" METHOD=POST>
@@ -52,7 +52,7 @@ die unless $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
 print qq!Credit #<B>!, $crednum, qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
 
 print qq!\nInvoice # <SELECT NAME="invnum" SIZE=1>!;
-foreach $_ (grep $_->owed, qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } ) ) {
+foreach $_ (grep $_->owed != 0, qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } ) ) {
   print "<OPTION", (($_->invnum eq $invnum) ? " SELECTED" : ""),
     qq! VALUE="! .$_->invnum. qq!">!. $_->invnum. qq! (! . $_->owed . qq!)!;
 }
-- 
cgit v1.2.1


From fbcb45dfe5a1bce7981fe4527176b9fdf2ec54b7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Sep 2001 22:07:39 +0000
Subject: fix more bugs

---
 httemplate/edit/cust_credit.cgi      | 14 ++++----
 httemplate/edit/cust_credit_bill.cgi | 66 +++++++++++++++++++++++++++---------
 httemplate/edit/cust_pay.cgi         | 33 +++++++++++++-----
 httemplate/edit/process/cust_pay.cgi | 26 +++++++++-----
 4 files changed, 97 insertions(+), 42 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index a95636662..9b215389a 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
@@ -42,31 +42,29 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
   if $cgi->param('error');
 print <<END;
     <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
-    <PRE>
 END
 
 $crednum = "";
 print qq!Credit #<B>!, $crednum ? $crednum : " <I>(NEW)</I>", qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
 
-print qq!\nCustomer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
+print qq!<BR>Customer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
 
 print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
 
-print qq!\nDate: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
+print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
 
-print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
 print qq!<INPUT TYPE="hidden" NAME="credited" VALUE="">!;
 
 #print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
 
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!;
 
-print qq!\nReason <INPUT TYPE="text" NAME="reason" VALUE="$reason" SIZE=72>!;
+print qq!<BR>Reason <INPUT TYPE="text" NAME="reason" VALUE="$reason">!;
 
 print <<END;
-</PRE>
 <BR>
-<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
+<INPUT TYPE="submit" VALUE="Post">
 END
 
 print <<END;
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index c4cd34eab..13bad1852 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,11 +1,12 @@
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.2 2001-09-02 07:49:52 ivan Exp $ -->
+#<!-- $Id: cust_credit_bill.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $_date $amount $reason $cust_credit );
+use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $amount $reason $cust_credit );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
+use Date::Format;
 use FS::UID qw(cgisuidsetup getotaker);
 use FS::CGI qw(header popurl);
 use FS::Record qw(qsearch fields);
@@ -32,7 +33,6 @@ if ( $cgi->param('error') ) {
   #$refund = 'yes';
   $invnum = '';
 }
-$_date = time;
 
 $otaker = getotaker;
 
@@ -44,31 +44,65 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
   if $cgi->param('error');
 print <<END;
     <FORM ACTION="${p1}process/cust_credit_bill.cgi" METHOD=POST>
-    <PRE>
 END
 
 die unless $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
 
-print qq!Credit #<B>!, $crednum, qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
+my $credited = $cust_credit->credited;
+
+print "Credit # <B>$crednum</B>".
+      qq!<INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!.
+      '<BR>Date: <B>'. time2str("%D", $cust_credit->_date). '</B>'.
+      '<BR>Amount: $<B>'. $cust_credit->amount. '</B>'.
+      "<BR>Unapplied amount: \$<B>$credited</B>".
+      '<BR>Reason: <B>'. $cust_credit->reason. '</B>'
+      ;
+
+my @cust_bill = grep $_->owed != 0,
+                qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } );
+
+print <<END;
+<SCRIPT>
+function changed(what) {
+  cust_bill = what.options[what.selectedIndex].value;
+END
 
-print qq!\nInvoice # <SELECT NAME="invnum" SIZE=1>!;
-foreach $_ (grep $_->owed != 0, qsearch('cust_bill', { 'custnum' => $cust_credit->custnum } ) ) {
-  print "<OPTION", (($_->invnum eq $invnum) ? " SELECTED" : ""),
-    qq! VALUE="! .$_->invnum. qq!">!. $_->invnum. qq! (! . $_->owed . qq!)!;
+foreach my $cust_bill ( @cust_bill ) {
+  my $invnum = $cust_bill->invnum;
+  my $changeto = $cust_bill->owed < $cust_credit->credited
+                   ? $cust_bill->owed 
+                   : $cust_credit->credited;
+  print <<END;
+  if ( cust_bill == $invnum ) {
+    what.form.amount.value = "$changeto";
+  }
+END
 }
-print qq!<OPTION VALUE="Refund">Refund!;
-print "</SELECT>";
 
-print qq!\nDate: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
+print <<END;
+  if ( cust_bill == "Refund" ) {
+    what.form.amount.value = "$credited";
+  }
+}
+</SCRIPT>
+END
 
-print qq!\nAmount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+print qq!<BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">!,
+      '<OPTION VALUE="">';
+foreach my $cust_bill ( @cust_bill ) {
+  print '<OPTION'. ( $cust_bill->invnum eq $invnum ? ' SELECTED' : '' ).
+        ' VALUE="'. $cust_bill->invnum. '">'. $cust_bill->invnum.
+        ' -  '. time2str("%D",$cust_bill->_date).
+        ' - $'. $cust_bill->owed;
+}
+print qq!<OPTION VALUE="Refund">Refund!;
+print "</SELECT>";
 
-#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
+print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
 
 print <<END;
-</PRE>
 <BR>
-<CENTER><INPUT TYPE="submit" VALUE="Post"></CENTER>
+<INPUT TYPE="submit" VALUE="Apply">
 END
 
 print <<END;
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index d1823d4b3..c83f585d1 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,8 +1,8 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi $invnum $p1 $_date $payby $payinfo $paid );
+use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
@@ -13,17 +13,27 @@ $cgi = new CGI;
 cgisuidsetup($cgi);
 
 if ( $cgi->param('error') ) {
-  $invnum = $cgi->param('invnum');
+  $link = $cgi->param('link');
+  $linknum = $cgi->param('linknum');
   $paid = $cgi->param('paid');
   $payby = $cgi->param('payby');
   $payinfo = $cgi->param('payinfo');
-} else {
-  my ($query) = $cgi->keywords;
+} elsif ($cgi->keywords) {
+  my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
-  $invnum = $1;
+  $link = 'invnum';
+  $linknum = $1;
   $paid = '';
-  $payby = "BILL";
+  $payby = 'BILL';
   $payinfo = "";
+} elsif ( $cgi->param('custnum')  =~ /^(\d+)$/ ) {
+  $link = 'custnum';
+  $linknum = $1;
+  $paid = '';
+  $payby = 'BILL';
+  $payinfo = '';
+} else {
+  die "illegal query ". $cgi->keywords;
 }
 $_date = time;
 
@@ -36,10 +46,15 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 
 print <<END;
     <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
-    <HR><PRE>
+    <INPUT TYPE="hidden" NAME="link" VALUE="$link">
+    <INPUT TYPE="hidden" NAME="linknum" VALUE="$linknum">
 END
 
-print qq!Invoice #<B>$invnum</B><INPUT TYPE="hidden" NAME="invnum" VALUE="$invnum">!;
+if ( $link eq 'invnum' ) {
+  print "Invoice #<B>$linknum</B>";
+} elsif ( $link eq 'custnum' ) {
+  print "Customer #<B>$linknum</B>";
+}
 
 print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
 
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index fcdc233b9..9be96505d 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,8 +1,8 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi $invnum $new $error );
+use vars qw( $cgi $link $linknum $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -13,24 +13,32 @@ use FS::cust_pay;
 $cgi = new CGI;
 &cgisuidsetup($cgi);
 
-$cgi->param('invnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$invnum = $1;
+$cgi->param('linknum') =~ /^(\d+)$/
+  or die "Illegal linknum: ". $cgi->param('linknum');
+$linknum = $1;
+
+$cgi->param('link') =~ /^(custnum|invnum)$/
+  or die "Illegal link: ". $cgi->param('link');
+$link = $1;
 
 $new = new FS::cust_pay ( {
+  $link => $linknum,
   map {
     $_, scalar($cgi->param($_));
-  #} qw(invnum paid _date payby payinfo paybatch)
-  } fields('cust_pay')
+  } qw(paid _date payby payinfo paybatch)
+  #} fields('cust_pay')
 } );
 
-$error=$new->insert;
+$error = $new->insert;
 
 if ($error) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). 'cust_pay.cgi?'. $cgi->query_string );
   exit;
-} else {
-  print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$invnum");
+} elsif ( $link eq 'invnum' ) {
+  print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$linknum");
+} elsif ( $link eq 'custnum' ) {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$linknum");
 }
 
 %>
-- 
cgit v1.2.1


From 1e4aa8069f25e1b4101da20bb9e0d3f60357ea52 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Sep 2001 14:44:07 +0000
Subject: new admin documentation, quick one-pkg order

---
 httemplate/edit/part_svc.cgi               |  8 +++----
 httemplate/edit/process/quick-cust_pkg.cgi | 34 ++++++++++++++++++++++++++++++
 httemplate/edit/svc_acct.cgi               | 14 ++++++++++--
 3 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 httemplate/edit/process/quick-cust_pkg.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 5696e43f8..01574e992 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.5 2001-08-30 15:30:26 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.6 2001-09-04 14:44:06 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -31,7 +31,7 @@ function visualize(what) {
 
 <%= header("$action Service Definition",
            menubar( 'Main Menu'         => $p,
-                    'View all services' => "${p}browse/part_svc.cgi"
+                    'View all service definitions' => "${p}browse/part_svc.cgi"
                   ),
            " onLoad=\"visualize()\""
            )
@@ -50,8 +50,8 @@ Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>">
 </PRE>
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
-    <LI>svc_domain - Virtual domains
-    <LI>svc_acct_sm - Virtual domain mail aliasing (*depreciated*)
+    <LI>svc_domain - Domains
+    <LI>svc_acct_sm - <B>depreciated</B> (use svc_forward for new installations) Virtual domain mail aliasing.
     <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
new file mode 100644
index 000000000..5ac315d87
--- /dev/null
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -0,0 +1,34 @@
+<%
+#<!-- $Id: quick-cust_pkg.cgi,v 1.1 2001-09-04 14:44:07 ivan Exp $ -->
+
+use strict;
+use vars qw( $cgi $custnum $pkgpart $error ); #@remove_pkgnums @pkgparts
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(popurl);
+use FS::cust_pkg;
+
+$cgi = new CGI; # create form object
+&cgisuidsetup($cgi);
+$error = '';
+
+#untaint custnum
+$cgi->param('custnum') =~ /^(\d+)$/
+  or die 'illegal custnum '. $cgi->param('custnum');
+$custnum = $1;
+$cgi->param('pkgpart') =~ /^(\d+)$/
+  or die 'illegal pkgpart '. $cgi->param('pkgpart');
+$pkgpart = $1;
+
+my @cust_pkg = ();
+$error ||= FS::cust_pkg::order($custnum, [ $pkgpart ], [], \@cust_pkg, );
+
+if ($error) {
+  eidiot($error);
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?". $cust_pkg[0]->pkgnum );
+}
+
+%>
+
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 2154bf22c..8a2cb802e 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.5 2001-08-21 10:27:11 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.6 2001-09-04 14:44:06 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
@@ -118,10 +118,20 @@ END
 
 #domain
 $domsvc = $svc_acct->domsvc || 0;
-if ( $part_svc->svc_acct__domsvc_flag eq "F" ) {
+if ( $part_svc->svc_acct__domsvc_flag eq 'F' ) {
   print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
 } else { 
   my @svc_domain = ();
+  if ( $part_svc->svc_acct__domsvc_flag eq 'D' ) {
+    my $svc_domain =
+      qsearchs('svc_domain', { 'svcnum' => $part_svc->svc_acct__domsvc } );
+    if ( $svc_domain ) {
+      push @svc_domain, $svc_domain;
+    } else {
+      warn "unknown svc_domain.svcnum for part_svc.svc_acct__domsvc: ".
+           $part_svc->svc_acct__domsvc;
+    }
+  }
   my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
   if ($cust_pkg) {
     my @cust_svc =
-- 
cgit v1.2.1


From f0915e1efec95afa1be6100c8d7e919fa0babc71 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Sep 2001 15:06:03 +0000
Subject: oops indeed

---
 httemplate/edit/agent_type.cgi        | 4 ++--
 httemplate/edit/process/cust_main.cgi | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 4f1ad8b20..ac41eec5c 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent_type.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: agent_type.cgi,v 1.3 2001-09-04 15:06:03 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
@@ -66,7 +66,7 @@ foreach $part_pkg ( qsearch('part_pkg',{}) ) {
   ;
 }
 
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
+print qq!<BR><BR><INPUT TYPE="submit" VALUE="!,
       $hashref->{typenum} ? "Apply changes" : "Add agent type",
       qq!">!;
 
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 86e6abef6..cc5efd6b1 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-# $Id: cust_main.cgi,v 1.3 2001-08-13 23:10:34 ivan Exp $
+# $Id: cust_main.cgi,v 1.4 2001-09-04 15:06:03 ivan Exp $
 
 use strict;
 use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
@@ -31,6 +31,7 @@ $cgi->param('county', $3 || '');
 $cgi->param('country', $4);
 
 $cgi->param('ship_state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
+  or $cgi->param('ship_state') =~ /^(((())))$/
   or die "Oops, illegal \"ship_state\" param: ". $cgi->param('ship_state');
 $cgi->param('ship_state', $1);
 $cgi->param('ship_county', $3 || '');
-- 
cgit v1.2.1


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


From f5266a4d07d116efd732f433d0f4f3a47b143a7d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 00:08:18 +0000
Subject: faster (cached) fuzzy searches prelim. job queues! fixed part_svc
 editing

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

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index c0d632fa5..c0a789667 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.7 2001-09-06 20:42:00 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.8 2001-09-11 00:08:18 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -147,7 +147,7 @@ foreach my $svcdb ( qw(
 
   my(@fields) = $svcdb eq 'konq_kludge'
                   ? ()
-                  : grep { $_ ne 'svcnum' } fields($svcdb) );
+                  : grep { $_ ne 'svcnum' } fields($svcdb);
   #my($rowspan)=scalar(@rows);
 
   #my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>";
@@ -180,7 +180,7 @@ function fixup(what) {
     my $part_svc_column = $part_svc->part_svc_column($field);
     my $value = $cgi->param('error')
                   ? $cgi->param("${svcdb}__${field}")
-                  : $$part_svc_column->columnvalue;
+                  : $part_svc_column->columnvalue;
     my $flag = $cgi->param('error')
                  ? $cgi->param("${svcdb}__${field}_flag")
                  : $part_svc_column->columnflag;
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 5652c5805..937f7fb4c 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -17,7 +17,7 @@ my $new = new FS::part_svc ( {
 
 my $error;
 if ( $svcpart ) {
-  $error = $new->replace($old);
+  $error = $new->replace($old, '1.3-COMPAT');
 } else {
   $error = $new->insert;
   $svcpart=$new->getfield('svcpart');
-- 
cgit v1.2.1


From 842df85f746a2e1b961d6c9e3a8c5cc3678ae6dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 03:15:58 +0000
Subject: cyrus support

---
 httemplate/edit/part_svc.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index c0a789667..0deed7b99 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.8 2001-09-11 00:08:18 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.9 2001-09-11 03:15:58 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -107,7 +107,7 @@ my %defs = (
     'slipip'    => 'IP address (Set to fixed and blank to disable dialin, or, set a value to be exported to RADIUS Framed-IP-Address.  Use the special value <code>0e0</code> [zero e zero] to enable export to RADIUS without a Framed-IP-Address.)',
     'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
     'username'  => 'Username',
-    'quota'     => '(unimplemented)',
+    'quota'     => '',
     '_password' => 'Password',
     'gid'       => 'GID (when blank, defaults to UID)',
     'shell'     => 'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
-- 
cgit v1.2.1


From 89301379ac6f1e2ebab203e458849001d3f8fb49 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 09:56:27 +0000
Subject: fix quick order

---
 httemplate/edit/process/quick-cust_pkg.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 5ac315d87..ff0c5b229 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -1,12 +1,12 @@
 <%
-#<!-- $Id: quick-cust_pkg.cgi,v 1.1 2001-09-04 14:44:07 ivan Exp $ -->
+#<!-- $Id: quick-cust_pkg.cgi,v 1.2 2001-09-11 09:56:27 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum $pkgpart $error ); #@remove_pkgnums @pkgparts
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
+use FS::CGI qw(popurl eidiot);
 use FS::cust_pkg;
 
 $cgi = new CGI; # create form object
-- 
cgit v1.2.1


From 34678d474a3710a38e42fd681607fe98edb56658 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 10:05:30 +0000
Subject: s/die/ediot/

---
 httemplate/edit/process/quick-cust_pkg.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index ff0c5b229..c4f5172ad 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: quick-cust_pkg.cgi,v 1.2 2001-09-11 09:56:27 ivan Exp $ -->
+#<!-- $Id: quick-cust_pkg.cgi,v 1.3 2001-09-11 10:05:30 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum $pkgpart $error ); #@remove_pkgnums @pkgparts
@@ -15,10 +15,10 @@ $error = '';
 
 #untaint custnum
 $cgi->param('custnum') =~ /^(\d+)$/
-  or die 'illegal custnum '. $cgi->param('custnum');
+  or eidiot 'illegal custnum '. $cgi->param('custnum');
 $custnum = $1;
 $cgi->param('pkgpart') =~ /^(\d+)$/
-  or die 'illegal pkgpart '. $cgi->param('pkgpart');
+  or eidiot 'illegal pkgpart '. $cgi->param('pkgpart');
 $pkgpart = $1;
 
 my @cust_pkg = ();
-- 
cgit v1.2.1


From a97f85810afbd1db0ffa0cf581d074f51ca13ef8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 12:42:54 +0000
Subject: fix service editing

---
 httemplate/edit/part_svc.cgi | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 0deed7b99..e16f48e3a 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.9 2001-09-11 03:15:58 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.10 2001-09-11 12:42:54 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -145,9 +145,13 @@ foreach my $svcdb ( qw(
   konq_kludge svc_acct svc_domain svc_acct_sm svc_forward svc_www
 ) ) {
 
-  my(@fields) = $svcdb eq 'konq_kludge'
-                  ? ()
-                  : grep { $_ ne 'svcnum' } fields($svcdb);
+#  my(@fields) = $svcdb eq 'konq_kludge'
+#                  ? ()
+#                  : grep { $_ ne 'svcnum' } fields($svcdb);
+  #yucky kludge
+  my(@fields) = defined( $FS::Record::dbdef->table($svcdb) )
+                  ? grep { $_ ne 'svcnum' } fields($svcdb)
+                  : ();
   #my($rowspan)=scalar(@rows);
 
   #my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>";
-- 
cgit v1.2.1


From 17765dcdb928bbe90f7f4166950b5e61c678af36 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 12:46:17 +0000
Subject: more service edit fix

---
 httemplate/edit/process/part_svc.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 937f7fb4c..97477d645 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -12,7 +12,9 @@ my $new = new FS::part_svc ( {
       map { my $svcdb = $_;
             map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  }
               fields($svcdb)
-          } qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ) )
+          } grep defined( $FS::Record::dbdef->table($_) ),
+                 qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www )
+    )
 } );
 
 my $error;
-- 
cgit v1.2.1


From 58747692435f28de1c13496525af679659511b05 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 19:16:41 +0000
Subject: forgot closing form tag, breaks ie, others?

---
 httemplate/edit/part_svc.cgi | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index e16f48e3a..7797230e8 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.10 2001-09-11 12:42:54 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.11 2001-09-11 19:16:41 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -44,10 +44,9 @@ function visualize(what) {
 <FORM NAME="dummy">
 
       Service Part #<%= $part_svc->svcpart ? $part_svc->svcpart : "(NEW)" %>
-
-<PRE>
+<BR><BR>
 Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>">
-</PRE>
+<BR><BR>
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
     <LI>svc_domain - Domains
@@ -95,7 +94,7 @@ Table<SELECT NAME="svcdb" SIZE=1 onChange="changed(this)">
 <% foreach my $svcdb (@dbs) { %>
 <OPTION VALUE="<%= $svcdb %>" <%= ' SELECTED'x($svcdb eq $hashref->{svcdb}) %>><%= $svcdb %>
 <% } %>
-</SELECT>
+</SELECT></FORM>
 
 <%
 #these might belong somewhere else for other user interfaces 
-- 
cgit v1.2.1


From c464a78c64f8a55eff61c205dc368482cdeba01d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 20:59:32 +0000
Subject: persistance problem not clearing variables between runs

---
 httemplate/edit/svc_acct_sm.cgi | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 34846f9f3..4eb3d8333 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_sm.cgi,v 1.3 2001-09-11 20:59:32 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
@@ -72,15 +72,15 @@ if ($pkgnum) {
 
   #find all possible uids (and usernames)
 
-  my($u_part_svc,@u_acct_svcparts);
-  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
+  my @u_acct_svcparts = ();
+  foreach my $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
     push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
   }
 
   my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
   my($custnum)=$cust_pkg->getfield('custnum');
-  my($i_cust_pkg);
-  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+  %username = ();
+  foreach my $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
     my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
     my($acct_svcpart);
     foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
@@ -96,11 +96,12 @@ if ($pkgnum) {
 
   #find all possible domains (and domsvc's)
 
-  my($d_part_svc,@d_acct_svcparts);
-  foreach $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
+  my @d_acct_svcparts = ();
+  foreach my $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
     push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
   }
 
+  %domain = ();
   foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
     my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
     my($acct_svcpart);
-- 
cgit v1.2.1


From 844855ae401bc5a7167b5fa8898275f89719ed71 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 23:44:01 +0000
Subject: radius attributes & default/fixed values should work again now

---
 httemplate/edit/svc_acct.cgi    | 45 +++++++++++++++++++++++++++--------------
 httemplate/edit/svc_acct_sm.cgi | 13 ++++++------
 httemplate/edit/svc_domain.cgi  | 14 +++++++------
 httemplate/edit/svc_forward.cgi | 14 +++++++------
 4 files changed, 53 insertions(+), 33 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 8a2cb802e..f594bd255 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.6 2001-09-04 14:44:06 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.7 2001-09-11 23:44:01 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
@@ -13,6 +13,7 @@ use FS::CGI qw(header popurl);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::svc_acct;
 use FS::Conf;
+use FS::raddb;
 
 $cgi = new CGI;
 &cgisuidsetup($cgi);
@@ -68,11 +69,12 @@ if ( $cgi->param('error') ) {
     }
 
     #set fixed and default fields from part_svc
-    my($field);
-    foreach $field ( fields('svc_acct') ) {
-      if ( $part_svc->getfield('svc_acct__'. $field. '_flag') ne '' ) {
-        $svc_acct->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
-      }
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      $svc_acct->setfield( $part_svc_column->columnname,
+                           $part_svc_column->columnvalue,
+                         );
     }
 
   }
@@ -118,18 +120,19 @@ END
 
 #domain
 $domsvc = $svc_acct->domsvc || 0;
-if ( $part_svc->svc_acct__domsvc_flag eq 'F' ) {
+if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
   print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
 } else { 
   my @svc_domain = ();
-  if ( $part_svc->svc_acct__domsvc_flag eq 'D' ) {
-    my $svc_domain =
-      qsearchs('svc_domain', { 'svcnum' => $part_svc->svc_acct__domsvc } );
+  if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'D' ) {
+    my $svc_domain = qsearchs('svc_domain', {
+      'svcnum' => $part_svc->part_svc_column('domsvc')->columnvalue,
+    } );
     if ( $svc_domain ) {
       push @svc_domain, $svc_domain;
     } else {
-      warn "unknown svc_domain.svcnum for part_svc.svc_acct__domsvc: ".
-           $part_svc->svc_acct__domsvc;
+      warn "unknown svc_domain.svcnum for part_svc_column domsvc: ".
+           $part_svc->part_svc_column('domsvc')->columnvalue;
     }
   }
   my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
@@ -157,7 +160,7 @@ if ( $part_svc->svc_acct__domsvc_flag eq 'F' ) {
 
 #pop
 $popnum = $svc_acct->popnum || 0;
-if ( $part_svc->svc_acct__popnum_flag eq "F" ) {
+if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$popnum">!;
 } else { 
   print qq!<BR>POP: <SELECT NAME="popnum" SIZE=1><OPTION>\n!;
@@ -189,7 +192,7 @@ print <<END;
 END
 
 $shell = $svc_acct->shell;
-if ( $part_svc->svc_acct__shell_flag eq "F" ) {
+if ( $part_svc->part_svc_column('shell')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
 } else {
   print qq!<BR>Shell: <SELECT NAME="shell" SIZE=1>!;
@@ -208,12 +211,24 @@ if ( $part_svc->svc_acct__shell_flag eq "F" ) {
 
 print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
 
-if ( $part_svc->svc_acct__slipip_flag eq "F" ) {
+if ( $part_svc->part_svc_column('slipip')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="slipip" VALUE="$slipip">!;
 } else {
   print qq!<BR>IP: <INPUT TYPE="text" NAME="slipip" VALUE="$slipip">!;
 }
 
+foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
+  $r =~ /^^r(adius|[cr])_(.+)$/ or next; #?
+  my $a = $2;
+  if ( $part_svc->part_svc_column($r)->columnflag eq 'F' ) {
+    print qq!<INPUT TYPE="hidden" NAME="$r" VALUE="!.
+          $svc_acct->getfield($r). '">';
+  } else {
+    print qq!<BR>$FS::raddb::attrib{$a}: <INPUT TYPE="text" NAME="$r" VALUE="!.
+          $svc_acct->getfield($r). '">';
+  }
+}
+
 #submit
 print qq!<P><INPUT TYPE="submit" VALUE="Submit">!; 
 
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 4eb3d8333..21bd6a9ee 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.3 2001-09-11 20:59:32 ivan Exp $ -->
+#<!-- $Id: svc_acct_sm.cgi,v 1.4 2001-09-11 23:44:01 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
@@ -57,11 +57,12 @@ if ( $cgi->param('error') ) {
     $svcnum='';
 
     #set fixed and default fields from part_svc
-    my($field);
-    foreach $field ( fields('svc_acct_sm') ) {
-      if ( $part_svc->getfield('svc_acct_sm__'. $field. '_flag') ne '' ) {
-        $svc_acct_sm->setfield($field,$part_svc->getfield('svc_acct_sm__'. $field) );
-      }
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      $svc_acct_sm->setfield( $part_svc_column->columnname,
+                              $part_svc_column->columnvalue,
+                            );
     }
 
   }
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 8ffc9d789..7033c11f7 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_domain.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: svc_domain.cgi,v 1.3 2001-09-11 23:44:01 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
@@ -57,13 +57,15 @@ if ( $cgi->param('error') ) {
     $svcnum='';
 
     #set fixed and default fields from part_svc
-    my($field);
-    foreach $field ( fields('svc_domain') ) {
-      if ( $part_svc->getfield('svc_domain__'. $field. '_flag') ne '' ) {
-        $svc_domain->setfield($field,$part_svc->getfield('svc_domain__'. $field) );
-      }
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      $svc_domain->setfield( $part_svc_column->columnname,
+                             $part_svc_column->columnvalue,
+                           );
     }
 
+
   }
 }
 $action = $svcnum ? 'Edit' : 'Add';
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index de4c8cbc9..287833e53 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_forward.cgi,v 1.3 2001-08-21 10:27:11 ivan Exp $ -->
+# <!-- $Id: svc_forward.cgi,v 1.4 2001-09-11 23:44:01 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
@@ -57,13 +57,15 @@ if ( $cgi->param('error') ) {
     $svcnum='';
 
     #set fixed and default fields from part_svc
-    my($field);
-    foreach $field ( fields('svc_forward') ) {
-      if ( $part_svc->getfield('svc_forward__'. $field. '_flag') ne '' ) {
-        $svc_forward->setfield($field,$part_svc->getfield('svc_forward__'. $field) );
-      }
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      $svc_forward->setfield( $part_svc_column->columnname,
+                              $part_svc_column->columnvalue,
+                            );
     }
 
+
   }
 }
 $action = $svc_forward->svcnum ? 'Edit' : 'Add';
-- 
cgit v1.2.1


From 3eb749fd79fec377d4975f69b077b14e5aaf94dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Sep 2001 20:41:37 +0000
Subject: pop selector!

---
 httemplate/edit/cust_main.cgi | 27 ++++++++------------
 httemplate/edit/svc_acct.cgi  | 59 +++++++++++++++++++++----------------------
 2 files changed, 39 insertions(+), 47 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 47e18d789..d5b0d0f41 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.4 2001-08-28 14:34:14 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.5 2001-09-27 20:41:36 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -22,7 +22,7 @@ use FS::cust_main_county;
   #for misplaced logic below
   use FS::part_pkg;
 
-  #for false laziness below
+  #for false laziness below (now more properly lazy)
   use FS::svc_acct_pop;
 
   #for (other) false laziness below
@@ -80,7 +80,7 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
 
 print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
       qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
-      qq!Customer # !, ( $custnum ? $custnum : " (NEW)" ),
+      qq!Customer # !, ( $custnum ? "<B>$custnum</B>" : " (NEW)" ),
       
 ;
 
@@ -408,7 +408,7 @@ unless ( $custnum ) {
 
   if ( @part_pkg ) {
 
-    print "<BR><BR>First package", &itable("#cccccc"),
+    print "<BR><BR>First package", &itable("#cccccc", "0 ALIGN=LEFT"), #apiabuse
           qq!<TR><TD COLSPAN=2><SELECT NAME="pkgpart_svcpart">!;
 
     print qq!<OPTION VALUE="">(none)!;
@@ -433,19 +433,12 @@ unless ( $custnum ) {
 <TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8>
 (blank to generate)</TD></TR>
 END
-    print qq!<TR><TD ALIGN="right">POP</TD><TD><SELECT NAME="popnum" SIZE=1><OPTION> !;
-    my($svc_acct_pop);
-    foreach $svc_acct_pop ( qsearch ('svc_acct_pop',{} ) ) {
-    print qq!<OPTION VALUE="!, $svc_acct_pop->popnum, '"',
-          ( $popnum && $svc_acct_pop->popnum == $popnum ) ? ' SELECTED' : '', ">", 
-          $svc_acct_pop->popnum, ": ", 
-          $svc_acct_pop->city, ", ",
-          $svc_acct_pop->state,
-          " (", $svc_acct_pop->ac, ")/",
-          $svc_acct_pop->exch, "\n"
-        ;
-    }
-    print "</SELECT></TD></TR></TABLE>";
+
+    print '<TR><TD ALIGN="right">POP</TD><TD WIDTH="100%">'
+          .
+          &FS::svc_acct_pop::popselector($popnum).
+          '</TD></TR></TABLE>'
+          ;
   }
 }
 
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index f594bd255..16b2957b0 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.7 2001-09-11 23:44:01 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.8 2001-09-27 20:41:36 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
@@ -9,9 +9,10 @@ use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl);
+use FS::CGI qw(header popurl itable);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::svc_acct;
+use FS::svc_acct_pop qw(popselector);
 use FS::Conf;
 use FS::raddb;
 
@@ -103,19 +104,26 @@ $p1 = popurl(1);
 print $cgi->header( '-expires' => 'now' ), header("$action $svc account");
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
+      "</FONT><BR><BR>"
   if $cgi->param('error');
 
-print <<END;
+print 'Service # '. ( $svcnum ? "<B>$svcnum</B>" : " (NEW)" ). '<BR>'.
+      'Service: <B>'. $part_svc->svc. '</B><BR><BR>'.
+      <<END;
     <FORM ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
       <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
       <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
-Username: 
-<INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen>
-<BR>Password: 
-<INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8> 
-(blank to generate)
+END
+
+print &itable("#cccccc"), <<END;
+<TR><TD>
+<TR><TD ALIGN="right">Username</TD>
+<TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
+<TR><TD ALIGN="right">Password</TD>
+<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8>
+(blank to generate)</TD>
+</TR>
 END
 
 #domain
@@ -148,14 +156,15 @@ if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
   } else {
     @svc_domain = qsearch('svc_domain', {} );
   }
-  print qq!<BR>Domain: <SELECT NAME="domsvc" SIZE=1>\n!;
+  print qq!<TR><TD ALIGN="right">Domain</TD>!.
+        qq!<TD><SELECT NAME="domsvc" SIZE=1>\n!;
   foreach my $svc_domain ( sort { $a->domain cmp $b->domain } @svc_domain ) {
     print qq!<OPTION VALUE="!, $svc_domain->svcnum, qq!"!,
           $svc_domain->svcnum == $domsvc ? ' SELECTED' : '',
           ">", $svc_domain->domain, "\n"
       ;
   }
-  print "</SELECT>";
+  print "</SELECT></TD><TR>";
 }
 
 #pop
@@ -163,18 +172,8 @@ $popnum = $svc_acct->popnum || 0;
 if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$popnum">!;
 } else { 
-  print qq!<BR>POP: <SELECT NAME="popnum" SIZE=1><OPTION>\n!;
-  my($svc_acct_pop);
-  foreach $svc_acct_pop ( qsearch ('svc_acct_pop',{} ) ) {
-  print "<OPTION", $svc_acct_pop->popnum == $popnum ? ' SELECTED' : '', ">", 
-        $svc_acct_pop->popnum, ": ", 
-        $svc_acct_pop->city, ", ",
-        $svc_acct_pop->state,
-        " (", $svc_acct_pop->ac, ")/",
-        $svc_acct_pop->exch, "\n"
-      ;
-  }
-  print "</SELECT>";
+  print qq!<TR><TD ALIGN="right">Access number</TD>!.
+        qq!<TD>!. FS::svc_acct_pop::popselector($popnum). '</TD></TR>';
 }
 
 ($uid,$gid,$finger,$dir)=(
@@ -187,7 +186,7 @@ if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
 print <<END;
 <INPUT TYPE="hidden" NAME="uid" VALUE="$uid">
 <INPUT TYPE="hidden" NAME="gid" VALUE="$gid">
-<BR>GECOS: <INPUT TYPE="text" NAME="finger" VALUE="$finger">
+<TR><TD ALIGN="right">GECOS</TD><TD><INPUT TYPE="text" NAME="finger" VALUE="$finger"></TD></TR>
 <INPUT TYPE="hidden" NAME="dir" VALUE="$dir">
 END
 
@@ -195,13 +194,13 @@ $shell = $svc_acct->shell;
 if ( $part_svc->part_svc_column('shell')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
 } else {
-  print qq!<BR>Shell: <SELECT NAME="shell" SIZE=1>!;
+  print qq!<TR><TD ALIGN="right">Shell</TD><TD><SELECT NAME="shell" SIZE=1>!;
   my($etc_shell);
   foreach $etc_shell (@shells) {
     print "<OPTION", $etc_shell eq $shell ? ' SELECTED' : '', ">",
           $etc_shell, "\n";
   }
-  print "</SELECT>";
+  print "</SELECT></TD></TR>";
 }
 
 ($quota,$slipip)=(
@@ -214,7 +213,7 @@ print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
 if ( $part_svc->part_svc_column('slipip')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="slipip" VALUE="$slipip">!;
 } else {
-  print qq!<BR>IP: <INPUT TYPE="text" NAME="slipip" VALUE="$slipip">!;
+  print qq!<TR><TD ALIGN="right">IP</TD><TD><INPUT TYPE="text" NAME="slipip" VALUE="$slipip"></TD></TR>!;
 }
 
 foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
@@ -224,13 +223,13 @@ foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
     print qq!<INPUT TYPE="hidden" NAME="$r" VALUE="!.
           $svc_acct->getfield($r). '">';
   } else {
-    print qq!<BR>$FS::raddb::attrib{$a}: <INPUT TYPE="text" NAME="$r" VALUE="!.
-          $svc_acct->getfield($r). '">';
+    print qq!<TR><TD ALIGN="right">$FS::raddb::attrib{$a}</TD><TD><INPUT TYPE="text" NAME="$r" VALUE="!.
+          $svc_acct->getfield($r). '"></TD></TR>';
   }
 }
 
 #submit
-print qq!<P><INPUT TYPE="submit" VALUE="Submit">!; 
+print qq!</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">!; 
 
 print <<END;
     </FORM>
-- 
cgit v1.2.1


From bc8a035db564658a7d9abdf3e141651c2de8082b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Sep 2001 21:12:15 +0000
Subject: popSELECTOR

---
 httemplate/edit/cust_main.cgi |  4 ++--
 httemplate/edit/svc_acct.cgi  | 38 ++++++++++++++++++++++++++------------
 2 files changed, 28 insertions(+), 14 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index d5b0d0f41..4711cf587 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.5 2001-09-27 20:41:36 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.6 2001-09-27 21:12:15 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -434,7 +434,7 @@ unless ( $custnum ) {
 (blank to generate)</TD></TR>
 END
 
-    print '<TR><TD ALIGN="right">POP</TD><TD WIDTH="100%">'
+    print '<TR><TD ALIGN="right">Access number</TD><TD WIDTH="100%">'
           .
           &FS::svc_acct_pop::popselector($popnum).
           '</TD></TR></TABLE>'
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 16b2957b0..8646bb707 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,11 +1,11 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.8 2001-09-27 20:41:36 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.9 2001-09-27 21:12:15 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
              $part_svc $svc $otaker $username $password $ulen $ulen2 $p1
              $popnum $domsvc $uid $gid $finger $dir $shell $quota $slipip
-             @svc_domain );
+             %svc_domain );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
@@ -131,18 +131,29 @@ $domsvc = $svc_acct->domsvc || 0;
 if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
   print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
 } else { 
-  my @svc_domain = ();
+  my %svc_domain = ();
+
+  if ( $domsvc ) {
+    my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $domsvc, } );
+    if ( $svc_domain ) {
+      $svc_domain{$svc_domain->svcnum} = $svc_domain;
+    } else {
+      warn "unknown svc_domain.svcnum for svc_acct.domsvc: $domsvc";
+    }
+  }
+
   if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'D' ) {
     my $svc_domain = qsearchs('svc_domain', {
       'svcnum' => $part_svc->part_svc_column('domsvc')->columnvalue,
     } );
     if ( $svc_domain ) {
-      push @svc_domain, $svc_domain;
+      $svc_domain{$svc_domain->svcnum} = $svc_domain;
     } else {
       warn "unknown svc_domain.svcnum for part_svc_column domsvc: ".
            $part_svc->part_svc_column('domsvc')->columnvalue;
     }
   }
+
   my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
   if ($cust_pkg) {
     my @cust_svc =
@@ -151,20 +162,23 @@ if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
     foreach my $cust_svc ( @cust_svc ) {
       my $svc_domain =
         qsearchs('svc_domain', { 'svcnum' => $cust_svc->svcnum } );
-      push @svc_domain, $svc_domain if $svc_domain;
+     $svc_domain{$svc_domain->svcnum} = $svc_domain if $svc_domain;
     }
   } else {
-    @svc_domain = qsearch('svc_domain', {} );
+    %svc_domain = map { $_->svcnum => $_ } qsearch('svc_domain', {} );
   }
   print qq!<TR><TD ALIGN="right">Domain</TD>!.
         qq!<TD><SELECT NAME="domsvc" SIZE=1>\n!;
-  foreach my $svc_domain ( sort { $a->domain cmp $b->domain } @svc_domain ) {
-    print qq!<OPTION VALUE="!, $svc_domain->svcnum, qq!"!,
-          $svc_domain->svcnum == $domsvc ? ' SELECTED' : '',
-          ">", $svc_domain->domain, "\n"
-      ;
+  foreach my $svcnum (
+    sort { $svc_domain{$a}->domain cmp $svc_domain{$b}->domain }
+      keys %svc_domain
+  ) {
+    my $svc_domain = $svc_domain{$svcnum};
+    print qq!<OPTION VALUE="!. $svc_domain->svcnum. qq!"!.
+          ( $svc_domain->svcnum == $domsvc ? ' SELECTED' : '' ).
+          '>'. $svc_domain->domain. "\n" ;
   }
-  print "</SELECT></TD><TR>";
+  print "</SELECT></TD></TR>";
 }
 
 #pop
-- 
cgit v1.2.1


From ebd1e74bc715300de23cbd64ac076beee2209f0b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 9 Oct 2001 07:16:57 +0000
Subject: that was a confusing bug to fix

---
 httemplate/edit/process/part_svc.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 97477d645..423db93b5 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -27,7 +27,7 @@ if ( $svcpart ) {
 
 if ( $error ) {
   $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2), "part_svc.cgi?". $cgi->query_string );
+  print $cgi->redirect(popurl(2). "part_svc.cgi?". $cgi->query_string );
 } else {
   print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
 }
-- 
cgit v1.2.1


From 5820f3d7ca493e3e6318efe6e8e677b71b01c1ad Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Oct 2001 17:44:33 +0000
Subject: "price plans" UP support.CVS:
 ----------------------------------------------------------------------

---
 httemplate/edit/part_pkg.cgi | 218 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 181 insertions(+), 37 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 4813fdf8b..b7707f3e8 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,16 +1,18 @@
+<!-- $Id: part_pkg.cgi,v 1.3 2001-10-11 17:44:33 ivan Exp $ -->
+
+<% my $plan = 'flat'; %>
+
+<SCRIPT>
+function visualize(what) {
+  if (document.getElementById) {
+    document.getElementById('d<%= $plan %>').style.visibility = "visible";
+  } else {
+    document.l<%= $plan %>.visibility = "visible";
+  }
+}
+</SCRIPT>
+
 <%
-#<!-- $Id: part_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $part_pkg $action $query $hashref $part_svc $count );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::part_pkg;
-use FS::part_svc;
-use FS::pkg_svc;
-use FS::CGI qw(header menubar popurl);
 
 $cgi = new CGI;
 
@@ -27,9 +29,9 @@ if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
   $cgi->param('pkgnum', '');
 }
 
-($query) = $cgi->keywords;
-$action = '';
-$part_pkg = '';
+my ($query) = $cgi->keywords;
+my $action = '';
+my $part_pkg = '';
 if ( $cgi->param('error') ) {
   $part_pkg = new FS::part_pkg ( {
     map { $_, scalar($cgi->param($_)) } fields('part_pkg')
@@ -46,9 +48,9 @@ if ( $cgi->param('clone') ) {
   $part_pkg ||= new FS::part_pkg {};
 }
 $action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
-$hashref = $part_pkg->hashref;
+my $hashref = $part_pkg->hashref;
 
-print $cgi->header( '-expires' => 'now' ), header("$action Package Definition", menubar(
+print header("$action Package Definition", menubar(
   'Main Menu' => popurl(2),
   'View all packages' => popurl(2). 'browse/part_pkg.cgi',
 ));
@@ -57,24 +59,24 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
   if $cgi->param('error');
 
-print '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
-
-if ( $cgi->param('clone') ) {
-  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
-}
-if ( $cgi->param('pkgnum') ) {
-  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
-}
+#print '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
+print '<FORM NAME="dummy">';
 
-print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
-      "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
+#if ( $cgi->param('clone') ) {
+#  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
+#}
+#if ( $cgi->param('pkgnum') ) {
+#  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
+#}
+#
+#print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
+print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 
 print <<END;
 <PRE>
 Package (customer-visable)          <INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}">
 Comment (customer-hidden)           <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}">
-Setup fee for this package          <INPUT TYPE="text" NAME="setup" VALUE="$hashref->{setup}">
-Recurring fee for this package      <INPUT TYPE="text" NAME="recur" VALUE="$hashref->{recur}">
+
 Frequency (months) of recurring fee <INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}">
 
 </PRE>
@@ -89,8 +91,9 @@ Enter the quantity of each service this package includes.<BR><BR>
 END
 }
 
-$count = 0;
-foreach $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
+my $count = 0;
+my @fixups = ();
+foreach my $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
   my $svcpart = $part_svc->svcpart;
   my $pkg_svc = qsearchs( 'pkg_svc', {
     'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
@@ -102,6 +105,8 @@ foreach $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
   });
   #? #next unless $pkg_svc;
 
+  push @fixups, "pkg_svc$svcpart";
+
   unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
     print '<TR>' if $count == 0 ;
     print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=3 VALUE="!,
@@ -125,14 +130,153 @@ unless ( $cgi->param('clone') ) {
   print "</TABLE>";
 }
 
+# prolly should be in database
+my %plans = (
+
+  'flat' => {
+    'name' => 'Flat rate',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package' },
+      'recur_fee' => { 'name' => 'Recurring fee for this package' },
+    },
+    'setup' => 'what.setup_fee.value',
+    'recur' => 'what.recur_fee.value',
+  },
+
+  'flat_comission' => {
+    'name' => 'Flat rate with recurring referral comission as credit',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package' },
+      'recur_fee' => { 'name' => 'Recurring fee for this package' },
+      'comission_amount' => { 'name' => 'Comission amount' },
+      'comission_depth' => { 'name' => 'Number of layers' },
+    },
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'$cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ) ; \' + what.recur_fee.value + \';\'',
+  },
+
+);
+
+%>
+
+<SCRIPT>
+var svcdb = null;
+var something = null;
+
+function changed(what) {
+  layer = what.options[what.selectedIndex].value;
+<% foreach my $layer ( keys %plans ) { %>
+  if (layer == "<%= $layer %>" ) {
+    <% foreach my $not ( grep { $_ ne $layer } keys %plans ) { %>
+      if (document.getElementById) {
+        document.getElementById('d<%= $not %>').style.visibility = "hidden";
+      } else {
+        document.l<%= $not %>.visibility = "hidden";
+      }
+    <% } %>
+    if (document.getElementById) {
+      document.getElementById('d<%= $layer %>').style.visibility = "visible";
+    } else {
+      document.l<%= $layer %>.visibility = "visible";
+    }
+  }
+<% } %>
+}
+
+</SCRIPT>
+<BR>
+Price plan <SELECT NAME="plan" SIZE=1 onChange="changed(this)">
+<% foreach my $layer (keys %plans ) { %>
+<OPTION VALUE="<%= $layer %>"<%= ' SELECTED'x($layer eq $plan) %>><%= $plans{$layer}->{'name'} %>
+<% } %>
+</SELECT></FORM>
+
+<SCRIPT>
+function fchanged(what) {
+  fixup(what.form);
+}
+
+function fixup(what) {
+<% foreach my $f ( qw( pkg comment freq ), @fixups ) { %>
+  what.<%= $f %>.value = document.dummy.<%= $f %>.value;
+<% } %>
+  what.plan.value = document.dummy.plan.options[document.dummy.plan.selectedIndex].value;
+<% foreach my $p ( keys %plans ) { %>
+  if ( what.plan.value == "<%= $p %>" ) {
+    what.setup.value = <%= $plans{$p}->{setup} %>;
+    what.recur.value = <%= $plans{$p}->{recur} %>;
+  }
+<% } %>
+}
+</SCRIPT>
+
+<% #foreach my $layer ( 'konq_kludge', keys %plans ) { 
+   foreach my $layer ( 'konq_kludge', keys %plans ) {
+     my $visibility = "hidden";
+%>
+<SCRIPT>
+if (document.getElementById) {
+    document.write("<DIV ID=\"d<%= $layer %>\" STYLE=\"visibility: <%= $visibility %>; position: absolute\">");
+} else {
+<% $visibility="show" if $visibility eq "visible"; %>
+    document.write("<LAYER ID=\"l<%= $layer %>\" VISIBILITY=\"<%= $visibility %>\">");
+}
+</SCRIPT>
+
+<FORM NAME="<%= $layer %>" ACTION="process/part_pkg.cgi" METHOD=POST onSubmit="fixup(this)">
+<INPUT TYPE="hidden" NAME="plan" VALUE="<%= $plan %>">
+<INPUT TYPE="hidden" NAME="pkg" VALUE="<%= $hashref->{pkg} %>">
+<INPUT TYPE="hidden" NAME="comment" VALUE="$<%= hashref->{comment} %>">
+<INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>">
+<% foreach my $f ( @fixups ) { %>
+<INPUT TYPE="hidden" NAME="<%= $f %>" VALUE="">
+<% } %>
+
+<%
+if ( $cgi->param('clone') ) {
+  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
+}
+if ( $cgi->param('pkgnum') ) {
+  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
+}
+print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
+%>
+
+<% my $href = $plans{$layer}->{'fields'};
+   foreach my $field ( keys %{ $href } ) { %>
+<%= $href->{$field}{'name'} %>: 
+<INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= $ref->{$field}{'default'} %>" onChange="fchanged(this)"><BR>
+<% } %>
+
+<FONT SIZE="-2">
+Setup expression                    <INPUT TYPE="text" NAME="setup" SIZE="100%" VALUE="<%= $hashref->{setup} %>"><BR>
+Recurring espression                <INPUT TYPE="text" NAME="recur" SIZE="100%" VALUE="<%= $hashref->{recur} %>"><BR>
+</FONT>
+
+<%
 print qq!<BR><INPUT TYPE="submit" VALUE="!,
       $hashref->{pkgpart} ? "Apply changes" : "Add package",
-      qq!">!;
+      qq!" onClick="fchanged(this)">!;
+%>
 
-print <<END;
-    </FORM>
+</FORM>
+
+<SCRIPT>
+if (document.getElementById) {
+  document.write("</DIV>");
+} else {
+  document.write("</LAYER>");
+}
+</SCRIPT>
+
+<% } %>
+
+<TAG onLoad="
+    if (document.getElementById) {
+      document.getElementById('d<%= $plan %>').style.visibility = 'visible';
+    } else {
+      document.l<%= $plan %>.visibility = 'visible';
+    }
+">
   </BODY>
 </HTML>
-END
-
-%>
-- 
cgit v1.2.1


From a6d3e4dc73803cffad96fd4b6270b2fb5f4b0568 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Oct 2001 10:42:29 +0000
Subject: price plans web gui 1st pass, oh my

---
 httemplate/edit/part_pkg.cgi         | 96 ++++++++++++++++++++++--------------
 httemplate/edit/part_svc.cgi         |  3 +-
 httemplate/edit/process/part_pkg.cgi |  9 +++-
 3 files changed, 67 insertions(+), 41 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index b7707f3e8..a4123e137 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,23 +1,7 @@
-<!-- $Id: part_pkg.cgi,v 1.3 2001-10-11 17:44:33 ivan Exp $ -->
-
-<% my $plan = 'flat'; %>
-
-<SCRIPT>
-function visualize(what) {
-  if (document.getElementById) {
-    document.getElementById('d<%= $plan %>').style.visibility = "visible";
-  } else {
-    document.l<%= $plan %>.visibility = "visible";
-  }
-}
-</SCRIPT>
+<!-- $Id: part_pkg.cgi,v 1.4 2001-10-15 10:42:29 ivan Exp $ -->
 
 <%
 
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
 if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
   $cgi->param('clone', $1);
 } else {
@@ -44,16 +28,36 @@ if ( $cgi->param('clone') ) {
   $part_pkg ||= $old_part_pkg->clone;
 } elsif ( $query && $query =~ /^(\d+)$/ ) {
   $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
+  unless ( $part_pkg->plan ) {
+    $part_pkg->plan('flat');
+    $part_pkg->plandata("setup=". $part_pkg->setup. "\n".
+                        "recur=". $part_pkg->recur. "\n");
+  }
 } else {
   $part_pkg ||= new FS::part_pkg {};
+  $part_pkg->plan('flat');
 }
 $action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
 my $hashref = $part_pkg->hashref;
 
+%>
+
+<SCRIPT>
+function visualize(what) {
+  if (document.getElementById) {
+    document.getElementById('d<%= $part_pkg->plan %>').style.visibility = "visible";
+  } else {
+    document.l<%= $part_pkg->plan %>.visibility = "visible";
+  }
+}
+</SCRIPT>
+
+<% 
+
 print header("$action Package Definition", menubar(
   'Main Menu' => popurl(2),
   'View all packages' => popurl(2). 'browse/part_pkg.cgi',
-));
+), ' onLoad="visualize()"');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
@@ -136,8 +140,12 @@ my %plans = (
   'flat' => {
     'name' => 'Flat rate',
     'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package' },
-      'recur_fee' => { 'name' => 'Recurring fee for this package' },
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                      },
     },
     'setup' => 'what.setup_fee.value',
     'recur' => 'what.recur_fee.value',
@@ -146,13 +154,21 @@ my %plans = (
   'flat_comission' => {
     'name' => 'Flat rate with recurring referral comission as credit',
     'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package' },
-      'recur_fee' => { 'name' => 'Recurring fee for this package' },
-      'comission_amount' => { 'name' => 'Comission amount' },
-      'comission_depth' => { 'name' => 'Number of layers' },
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                     },
+      'comission_amount' => { 'name' => 'Comission amount',
+                              'default' => 0,
+                            },
+      'comission_depth'  => { 'name' => 'Number of layers',
+                              'default' => 1,
+                            },
     },
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'$cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ) ; \' + what.recur_fee.value + \';\'',
+    'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
   },
 
 );
@@ -160,8 +176,7 @@ my %plans = (
 %>
 
 <SCRIPT>
-var svcdb = null;
-var something = null;
+var layer = null;
 
 function changed(what) {
   layer = what.options[what.selectedIndex].value;
@@ -185,9 +200,10 @@ function changed(what) {
 
 </SCRIPT>
 <BR>
-Price plan <SELECT NAME="plan" SIZE=1 onChange="changed(this)">
+Price plan <SELECT NAME="plan" SIZE=1 onChange="changed(this);">
+<OPTION>
 <% foreach my $layer (keys %plans ) { %>
-<OPTION VALUE="<%= $layer %>"<%= ' SELECTED'x($layer eq $plan) %>><%= $plans{$layer}->{'name'} %>
+<OPTION VALUE="<%= $layer %>"<%= ' SELECTED'x($layer eq $part_pkg->plan) %>><%= $plans{$layer}->{'name'} %>
 <% } %>
 </SELECT></FORM>
 
@@ -197,6 +213,7 @@ function fchanged(what) {
 }
 
 function fixup(what) {
+alert(what);
 <% foreach my $f ( qw( pkg comment freq ), @fixups ) { %>
   what.<%= $f %>.value = document.dummy.<%= $f %>.value;
 <% } %>
@@ -210,7 +227,9 @@ function fixup(what) {
 }
 </SCRIPT>
 
-<% #foreach my $layer ( 'konq_kludge', keys %plans ) { 
+<% my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
+                    split("\n", $part_pkg->plandata );
+   #foreach my $layer ( 'konq_kludge', keys %plans ) { 
    foreach my $layer ( 'konq_kludge', keys %plans ) {
      my $visibility = "hidden";
 %>
@@ -224,9 +243,9 @@ if (document.getElementById) {
 </SCRIPT>
 
 <FORM NAME="<%= $layer %>" ACTION="process/part_pkg.cgi" METHOD=POST onSubmit="fixup(this)">
-<INPUT TYPE="hidden" NAME="plan" VALUE="<%= $plan %>">
+<INPUT TYPE="hidden" NAME="plan" VALUE="<%= $part_pkg->plan %>">
 <INPUT TYPE="hidden" NAME="pkg" VALUE="<%= $hashref->{pkg} %>">
-<INPUT TYPE="hidden" NAME="comment" VALUE="$<%= hashref->{comment} %>">
+<INPUT TYPE="hidden" NAME="comment" VALUE="$<%= $hashref->{comment} %>">
 <INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>">
 <% foreach my $f ( @fixups ) { %>
 <INPUT TYPE="hidden" NAME="<%= $f %>" VALUE="">
@@ -245,12 +264,13 @@ print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
 <% my $href = $plans{$layer}->{'fields'};
    foreach my $field ( keys %{ $href } ) { %>
 <%= $href->{$field}{'name'} %>: 
-<INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= $ref->{$field}{'default'} %>" onChange="fchanged(this)"><BR>
+<INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)"><BR>
 <% } %>
+<INPUT TYPE="hidden" NAME="plandata" VALUE="<%= join(',', keys %{ $href } ) %>">
 
-<FONT SIZE="-2">
-Setup expression                    <INPUT TYPE="text" NAME="setup" SIZE="100%" VALUE="<%= $hashref->{setup} %>"><BR>
-Recurring espression                <INPUT TYPE="text" NAME="recur" SIZE="100%" VALUE="<%= $hashref->{recur} %>"><BR>
+<FONT SIZE="1">
+Setup expression<BR><INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="<%= $hashref->{setup} %>" onLoad="fchanged(this)"><BR>
+Recurring espression<BR><INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="<%= $hashref->{recur} %>" onLoad="fchanged(this)"><BR>
 </FONT>
 
 <%
@@ -273,9 +293,9 @@ if (document.getElementById) {
 
 <TAG onLoad="
     if (document.getElementById) {
-      document.getElementById('d<%= $plan %>').style.visibility = 'visible';
+      document.getElementById('d<%= $part_pkg->plan %>').style.visibility = 'visible';
     } else {
-      document.l<%= $plan %>.visibility = 'visible';
+      document.l<%= $part_pkg->plan %>.visibility = 'visible';
     }
 ">
   </BODY>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 7797230e8..29778567e 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.11 2001-09-11 19:16:41 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.12 2001-10-15 10:42:29 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -65,7 +65,6 @@ blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
 <BR><BR>
 <SCRIPT>
 var svcdb = null;
-var something = null;
 function changed(what) {
   svcdb = what.options[what.selectedIndex].value;
 <% foreach my $svcdb ( qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ) ) { %>
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 5850599c8..6cfaa122e 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.3 2001-10-15 10:42:29 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
@@ -19,6 +19,13 @@ $pkgpart = $cgi->param('pkgpart');
 
 $old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
 
+#fixup plandata
+my $plandata = $cgi->param('plandata');
+my @plandata = split(',', $plandata);
+$cgi->param('plandata', 
+  join('', map { "$_=". $cgi->param($_). "\n" } @plandata )
+);
+
 $new = new FS::part_pkg ( {
   map {
     $_, scalar($cgi->param($_));
-- 
cgit v1.2.1


From 847206208c6ef5c4eb612f26d3b5c8c2c7716545 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Oct 2001 11:35:28 +0000
Subject: visual fix

---
 httemplate/edit/cust_main.cgi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 4711cf587..d271dad46 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.6 2001-09-27 21:12:15 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.7 2001-10-15 11:35:28 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -408,7 +408,9 @@ unless ( $custnum ) {
 
   if ( @part_pkg ) {
 
-    print "<BR><BR>First package", &itable("#cccccc", "0 ALIGN=LEFT"), #apiabuse
+#    print "<BR><BR>First package", &itable("#cccccc", "0 ALIGN=LEFT"),
+#apiabuse & undesirable wrapping
+    print "<BR><BR>First package", &itable("#cccccc"),
           qq!<TR><TD COLSPAN=2><SELECT NAME="pkgpart_svcpart">!;
 
     print qq!<OPTION VALUE="">(none)!;
@@ -444,7 +446,7 @@ END
 
 $otaker = $cust_main->otaker;
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
-      qq!<BR><BR><INPUT TYPE="submit" VALUE="!,
+      qq!<BR><INPUT TYPE="submit" VALUE="!,
       $custnum ?  "Apply Changes" : "Add Customer", qq!">!,
       "</FORM></BODY></HTML>",
 ;
-- 
cgit v1.2.1


From 05eafa5ab3ded207d716685b32edf6946187514a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Oct 2001 11:39:29 +0000
Subject: remove errant javascript alert() plan ||= 'flat' for custom pricing
 9clone) package definitions too

---
 httemplate/edit/part_pkg.cgi | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index a4123e137..5eccc1e1e 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.4 2001-10-15 10:42:29 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.5 2001-10-15 11:39:29 ivan Exp $ -->
 
 <%
 
@@ -28,15 +28,15 @@ if ( $cgi->param('clone') ) {
   $part_pkg ||= $old_part_pkg->clone;
 } elsif ( $query && $query =~ /^(\d+)$/ ) {
   $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
-  unless ( $part_pkg->plan ) {
-    $part_pkg->plan('flat');
-    $part_pkg->plandata("setup=". $part_pkg->setup. "\n".
-                        "recur=". $part_pkg->recur. "\n");
-  }
 } else {
   $part_pkg ||= new FS::part_pkg {};
   $part_pkg->plan('flat');
 }
+unless ( $part_pkg->plan ) { #backwards-compat
+  $part_pkg->plan('flat');
+  $part_pkg->plandata("setup=". $part_pkg->setup. "\n".
+                      "recur=". $part_pkg->recur. "\n");
+}
 $action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
 my $hashref = $part_pkg->hashref;
 
@@ -213,7 +213,6 @@ function fchanged(what) {
 }
 
 function fixup(what) {
-alert(what);
 <% foreach my $f ( qw( pkg comment freq ), @fixups ) { %>
   what.<%= $f %>.value = document.dummy.<%= $f %>.value;
 <% } %>
-- 
cgit v1.2.1


From 9410e9f656b950a9d4b383a3992fa50bb7a270db Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 15 Oct 2001 14:58:03 +0000
Subject: date editing

---
 httemplate/edit/REAL_cust_pkg.cgi         | 81 +++++++++++++++++++++++++++++++
 httemplate/edit/process/REAL_cust_pkg.cgi | 20 ++++++++
 2 files changed, 101 insertions(+)
 create mode 100755 httemplate/edit/REAL_cust_pkg.cgi
 create mode 100755 httemplate/edit/process/REAL_cust_pkg.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
new file mode 100755
index 000000000..8ea0e084d
--- /dev/null
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -0,0 +1,81 @@
+<%
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.1 2001-10-15 14:58:03 ivan Exp $ -->
+
+my $error ='';
+my $pkgnum = '';
+if ( $cgi->param('error') ) {
+  $error = $cgi->param('error');
+  $pkgnum = $cgi->param('pkgnum');
+} else {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/ or die "no pkgnum";
+  $pkgnum = $1;
+}
+
+#get package record
+my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+die "No package!" unless $cust_pkg;
+my $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
+
+if ( $error ) {
+  #$cust_pkg->$_(str2time($cgi->param($_)) foreach qw(setup bill);
+  $cust_pkg->setup(str2time($cgi->param('setup')));
+  $cust_pkg->bill(str2time($cgi->param('bill')));
+}
+
+#my $custnum = $cust_pkg->getfield('custnum');
+print header('Package Edit'); #, menubar(
+#  "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
+#  'Main Menu' => popurl(2)
+#));
+
+#print info
+my($susp,$cancel,$expire)=(
+  $cust_pkg->getfield('susp'),
+  $cust_pkg->getfield('cancel'),
+  $cust_pkg->getfield('expire'),
+);
+my($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
+my($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
+my $otaker = $cust_pkg->getfield('otaker');
+
+print '<FORM NAME="formname" ACTION="process/REAL_cust_pkg.cgi" METHOD="POST">',      qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>!
+  if $error;
+
+print &ntable("#cccccc"), '<TR><TD>', &ntable("#cccccc",2),
+      '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
+      $pkgnum, '</TD></TR>',
+      '<TR><TD ALIGN="right">Package</TD><TD BGCOLOR="#ffffff">',
+      $pkg,  '</TD></TR>',
+      '<TR><TD ALIGN="right">Comment</TD><TD BGCOLOR="#ffffff">',
+      $comment,  '</TD></TR>',
+      '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
+      $otaker,  '</TD></TR>',
+      '<TR><TD ALIGN="right">Setup date</TD><TD>'.
+      '<INPUT TYPE="text" NAME="setup" SIZE=32 VALUE="',
+      ( $setup ? time2str("%c %z (%Z)",$setup) : "" ), '"></TD></TR>',
+      '<TR><TD ALIGN="right">Next bill date</TD><TD>',
+      '<INPUT TYPE="text" NAME="bill" SIZE=32 VALUE="',
+      ( $bill ? time2str("%c %z (%Z)",$bill) : "" ), '"></TD></TR>',
+;
+
+print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
+       time2str("%D",$susp), '</TD></TR>'
+  if $susp;
+
+print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
+       time2str("%D",$expire), '</TD></TR>'
+  if $expire;
+
+print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
+       time2str("%D",$cancel), '</TD></TR>'
+  if $cancel;
+
+%>
+</TABLE></TD></TR></TABLE>'.
+<BR><INPUT TYPE="submit" VALUE="Apply Changes">
+</FORM>
+</BODY>
+</HTML>
diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi
new file mode 100755
index 000000000..4f33f6b38
--- /dev/null
+++ b/httemplate/edit/process/REAL_cust_pkg.cgi
@@ -0,0 +1,20 @@
+<%
+#<!-- $Id: REAL_cust_pkg.cgi,v 1.1 2001-10-15 14:58:03 ivan Exp $ -->
+
+my $pkgnum = $cgi->param('pkgnum') or die;
+my $old = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+my %hash = $old->hash;
+$hash{'setup'} = $cgi->param('setup') ? str2time($cgi->param('setup')) : '';
+$hash{'bill'} = $cgi->param('bill') ? str2time($cgi->param('bill')) : '';
+my $new = new FS::cust_pkg \%hash;
+
+my $error = $new->replace($old);
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "REAL_cust_pkg.cgi?". $cgi->query_string );
+} else { 
+  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?". $pkgnum);
+}
+
+%>
-- 
cgit v1.2.1


From 60c837e0aaf454dfa0b0c0283dc36928782d1b6c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 20 Oct 2001 12:18:00 +0000
Subject: setup and recurring fee tax exempt flags, UI to edit rework part_pkg
 editing UI some more

---
 httemplate/edit/part_pkg.cgi          | 83 +++++++++++++++++++++++------------
 httemplate/edit/process/cust_main.cgi |  4 +-
 httemplate/edit/process/part_pkg.cgi  |  8 +++-
 httemplate/edit/svc_acct.cgi          |  4 +-
 4 files changed, 66 insertions(+), 33 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 5eccc1e1e..fee0b411e 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.5 2001-10-15 11:39:29 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.6 2001-10-20 12:17:59 ivan Exp $ -->
 
 <%
 
@@ -34,8 +34,8 @@ if ( $cgi->param('clone') ) {
 }
 unless ( $part_pkg->plan ) { #backwards-compat
   $part_pkg->plan('flat');
-  $part_pkg->plandata("setup=". $part_pkg->setup. "\n".
-                      "recur=". $part_pkg->recur. "\n");
+  $part_pkg->plandata("setup_fee=". $part_pkg->setup. "\n".
+                      "recur_fee=". $part_pkg->recur. "\n");
 }
 $action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
 my $hashref = $part_pkg->hashref;
@@ -76,28 +76,44 @@ print '<FORM NAME="dummy">';
 #print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
 print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 
+print itable("#cccccc",2), <<END;
+<TR><TD ALIGN="right">Package (customer-visable)</TD><TD><INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}"></TD></TR>
+<TR><TD ALIGN="right">Comment (customer-hidden)</TD><TD><INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}"></TD></TR>
+<TR><TD ALIGN="right">Frequency (months) of recurring fee</TD><TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}" SIZE=3></TD></TR>
+<TR><TD ALIGN="right">Setup fee tax exempt</TD><TD>
+END
+
+print '<INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y"';
+print ' CHECKED' if $hashref->{setuptax} eq "Y";
+print '>';
+
 print <<END;
-<PRE>
-Package (customer-visable)          <INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}">
-Comment (customer-hidden)           <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}">
+</TD></TR>
+<TR><TD ALIGN="right">Recurring fee tax exempt</TD><TD>
+END
 
-Frequency (months) of recurring fee <INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}">
+print '<INPUT TYPE="checkbox" NAME="recurtax" VALUE="Y"';
+print ' CHECKED' if $hashref->{recurtax} eq "Y";
+print '>';
 
-</PRE>
+print '</TD></TR></TABLE>';
 
+my $thead =  "\n\n". ntable('#cccccc', 2). <<END;
+<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH><TH BGCOLOR="#dcdcdc">Service</TH></TR>
 END
 
 unless ( $cgi->param('clone') ) {
-  print <<END;
-Enter the quantity of each service this package includes.<BR><BR>
-<TABLE BORDER><TR><TH><FONT SIZE=-1>Quan.</FONT></TH><TH>Service</TH>
-		  <TH><FONT SIZE=-1>Quan.</FONT></TH><TH>Service</TH></TR>
+  #print <<END, $thead;
+  print <<END, itable(), '<TR><TD VALIGN="top">', $thead;
+<BR><BR>Enter the quantity of each service this package includes.<BR><BR>
 END
 }
 
-my $count = 0;
 my @fixups = ();
-foreach my $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
+my $count = 0;
+my $columns = 3;
+my @part_svc = qsearch( 'part_svc', {} );
+foreach my $part_svc ( @part_svc ) {
   my $svcpart = $part_svc->svcpart;
   my $pkg_svc = qsearchs( 'pkg_svc', {
     'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
@@ -112,16 +128,16 @@ foreach my $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
   push @fixups, "pkg_svc$svcpart";
 
   unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
-    print '<TR>' if $count == 0 ;
-    print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=3 VALUE="!,
+    print '<TR>'; # if $count == 0 ;
+    print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=4 MAXLENGTH=3 VALUE="!,
           $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0,
           qq!"></TD><TD><A HREF="part_svc.cgi?!,$part_svc->svcpart,
-          qq!">!, $part_svc->getfield('svc'), "</A></TD>";
-    $count++;
-    if ($count == 2)
-    {
-      print '</TR>';
-      $count = 0;
+          qq!">!, $part_svc->getfield('svc'), "</A></TD></TR>";
+#    print "</TABLE></TD><TD>$thead" if ++$count == int(scalar(@part_svc) / 2);
+    $count+=1;
+    foreach ( 1 .. $columns-1 ) {
+      print "</TABLE></TD><TD VALIGN=\"top\">$thead"
+        if $count == int( $_ * scalar(@part_svc) / $columns );
     }
   } else {
     print qq!<INPUT TYPE="hidden" NAME="pkg_svc$svcpart" VALUE="!,
@@ -130,8 +146,8 @@ foreach my $part_svc ( ( qsearch( 'part_svc', {} ) ) ) {
 }
 
 unless ( $cgi->param('clone') ) {
-  print qq!</TR>! if ($count != 0) ;
-  print "</TABLE>";
+  print "</TR></TABLE></TD></TR></TABLE>";
+  #print "</TR></TABLE>";
 }
 
 # prolly should be in database
@@ -215,6 +231,12 @@ function fchanged(what) {
 function fixup(what) {
 <% foreach my $f ( qw( pkg comment freq ), @fixups ) { %>
   what.<%= $f %>.value = document.dummy.<%= $f %>.value;
+<% } %>
+<% foreach my $f ( qw( setuptax recurtax ) ) { %>
+  if (document.dummy.<%= $f %>.checked)
+    what.<%= $f %>.value = 'Y';
+  else
+    what.<%= $f %>.value = '';
 <% } %>
   what.plan.value = document.dummy.plan.options[document.dummy.plan.selectedIndex].value;
 <% foreach my $p ( keys %plans ) { %>
@@ -246,6 +268,8 @@ if (document.getElementById) {
 <INPUT TYPE="hidden" NAME="pkg" VALUE="<%= $hashref->{pkg} %>">
 <INPUT TYPE="hidden" NAME="comment" VALUE="$<%= $hashref->{comment} %>">
 <INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>">
+<INPUT TYPE="hidden" NAME="setuptax" VALUE="<%= $hashref->{setuptax} %>">
+<INPUT TYPE="hidden" NAME="recurtax" VALUE="<%= $hashref->{recurtax} %>">
 <% foreach my $f ( @fixups ) { %>
 <INPUT TYPE="hidden" NAME="<%= $f %>" VALUE="">
 <% } %>
@@ -257,17 +281,20 @@ if ( $cgi->param('clone') ) {
 if ( $cgi->param('pkgnum') ) {
   print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
 }
-print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
 %>
 
+<INPUT TYPE="hidden" NAME="pkgpart" VALUE="<%= $hashref->{pkgpart} %>">
+<%= itable("#cccccc",2) %>
+
 <% my $href = $plans{$layer}->{'fields'};
    foreach my $field ( keys %{ $href } ) { %>
-<%= $href->{$field}{'name'} %>: 
-<INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)"><BR>
+<TR><TD ALIGN="right"><%= $href->{$field}{'name'} %></TD>
+<TD><INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)"></TD></TR>
 <% } %>
+</TABLE>
 <INPUT TYPE="hidden" NAME="plandata" VALUE="<%= join(',', keys %{ $href } ) %>">
-
 <FONT SIZE="1">
+<BR><BR>
 Setup expression<BR><INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="<%= $hashref->{setup} %>" onLoad="fchanged(this)"><BR>
 Recurring espression<BR><INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="<%= $hashref->{recur} %>" onLoad="fchanged(this)"><BR>
 </FONT>
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index cc5efd6b1..625a85052 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-# $Id: cust_main.cgi,v 1.4 2001-09-04 15:06:03 ivan Exp $
+# $Id: cust_main.cgi,v 1.5 2001-10-20 12:18:00 ivan Exp $
 
 use strict;
 use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
@@ -20,7 +20,7 @@ $error = '';
 
 #unmunge stuff
 
-$cgi->param('tax','') unless defined($cgi->param('tax'));
+$cgi->param('tax','') unless defined $cgi->param('tax');
 
 $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
 
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 6cfaa122e..cd799b5b9 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.3 2001-10-15 10:42:29 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.4 2001-10-20 12:18:00 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
@@ -26,12 +26,18 @@ $cgi->param('plandata',
   join('', map { "$_=". $cgi->param($_). "\n" } @plandata )
 );
 
+$cgi->param('setuptax','') unless defined $cgi->param('setuptax');
+$cgi->param('recurtax','') unless defined $cgi->param('recurtax');
+
 $new = new FS::part_pkg ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('part_pkg')
 } );
 
+warn "setuptax: ". $new->setuptax;
+warn "recurtax: ". $new->recurtax;
+
 #most of the stuff below should move to part_pkg.pm
 
 foreach $part_svc ( qsearch('part_svc', {} ) ) {
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 8646bb707..3d0bb0134 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.9 2001-09-27 21:12:15 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.10 2001-10-20 12:18:00 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
@@ -116,7 +116,7 @@ print 'Service # '. ( $svcnum ? "<B>$svcnum</B>" : " (NEW)" ). '<BR>'.
       <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
 END
 
-print &itable("#cccccc"), <<END;
+print &itable("#cccccc",2), <<END;
 <TR><TD>
 <TR><TD ALIGN="right">Username</TD>
 <TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
-- 
cgit v1.2.1


From 8426653cbe5dfb78ad9b06b6d1e91bcdb4e7dae3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Oct 2001 21:24:12 +0000
Subject: remove ancient tld cruft

---
 httemplate/edit/svc_domain.cgi | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 7033c11f7..a1a61723d 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_domain.cgi,v 1.3 2001-09-11 23:44:01 ivan Exp $ -->
+#<!-- $Id: svc_domain.cgi,v 1.4 2001-10-25 21:24:12 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
@@ -100,19 +100,7 @@ print qq!>Transfer!;
 print <<END;
 <P>Domain <INPUT TYPE="text" NAME="domain" VALUE="$domain" SIZE=28 MAXLENGTH=26>
 <BR>Purpose/Description: <INPUT TYPE="text" NAME="purpose" VALUE="$purpose" SIZE=64>
-<P><CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>
-<UL>
-  <LI>COM is for commercial, for-profit organziations
-  <LI>ORG is for miscellaneous, usually, non-profit organizations
-  <LI>NET is for network infrastructure machines and organizations
-  <LI>EDU is for 4-year, degree granting institutions
-<!--  <LI>GOV is for United States federal government agencies
-!-->
-</UL>
-US state and local government agencies, schools, libraries, museums, and individuals should register under the US domain.  See RFC 1480 for a complete description of the US domain
-and registration procedures.
-<!--  <P>GOV registrations are limited to top-level US Federal Government agencies (see RFC 1816).
-!-->
+<P><INPUT TYPE="submit" VALUE="Submit">
     </FORM>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From 91387f8f489e561deaf1de052d80ef800a4970a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Oct 2001 10:24:56 +0000
Subject: cache foo *sigh*

---
 httemplate/edit/agent.cgi                   | 4 ++--
 httemplate/edit/agent_type.cgi              | 4 ++--
 httemplate/edit/cust_credit.cgi             | 4 ++--
 httemplate/edit/cust_credit_bill.cgi        | 4 ++--
 httemplate/edit/cust_main.cgi               | 4 ++--
 httemplate/edit/cust_main_county-expand.cgi | 4 ++--
 httemplate/edit/cust_main_county.cgi        | 4 ++--
 httemplate/edit/cust_pay.cgi                | 4 ++--
 httemplate/edit/cust_pkg.cgi                | 4 ++--
 httemplate/edit/part_referral.cgi           | 4 ++--
 httemplate/edit/svc_acct.cgi                | 4 ++--
 httemplate/edit/svc_acct_pop.cgi            | 4 ++--
 httemplate/edit/svc_acct_sm.cgi             | 4 ++--
 httemplate/edit/svc_domain.cgi              | 4 ++--
 httemplate/edit/svc_forward.cgi             | 4 ++--
 15 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index 236d05001..ea68b4768 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent.cgi,v 1.3 2001-08-29 09:11:30 ivan Exp $ -->
+#<!-- $Id: agent.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $agent $action $hashref $p $agent_type );
@@ -31,7 +31,7 @@ $hashref = $agent->hashref;
 
 $p = popurl(2);
 
-print $cgi->header( '-expires' => 'now' ), header("$action Agent", menubar(
+print $cgi->header( @FS::CGI::header ), header("$action Agent", menubar(
   'Main Menu' => $p,
   'View all agents' => $p. 'browse/agent.cgi',
 ));
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index ac41eec5c..eba2c2305 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent_type.cgi,v 1.3 2001-09-04 15:06:03 ivan Exp $ -->
+#<!-- $Id: agent_type.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
@@ -32,7 +32,7 @@ $action = $agent_type->typenum ? 'Edit' : 'Add';
 $hashref = $agent_type->hashref;
 
 $p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header("$action Agent Type", menubar(
+print $cgi->header( @FS::CGI::header ), header("$action Agent Type", menubar(
   'Main Menu' => "$p",
   'View all agent types' => "${p}browse/agent_type.cgi",
 ));
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 9b215389a..3bfbfc8c4 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
@@ -36,7 +36,7 @@ $otaker = getotaker;
 
 $p1 = popurl(1);
 
-print $cgi->header( '-expires' => 'now' ), header("Post Credit", '');
+print $cgi->header( @FS::CGI::header ), header("Post Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
   if $cgi->param('error');
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index 13bad1852..d2d50cbf6 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
+#<!-- $Id: cust_credit_bill.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $amount $reason $cust_credit );
@@ -38,7 +38,7 @@ $otaker = getotaker;
 
 $p1 = popurl(1);
 
-print $cgi->header( '-expires' => 'now' ), header("Apply Credit", '');
+print $cgi->header( @FS::CGI::header ), header("Apply Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT><BR><BR>"
   if $cgi->param('error');
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index d271dad46..f5662fd87 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.7 2001-10-15 11:35:28 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.8 2001-10-26 10:24:56 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -74,7 +74,7 @@ $action = $custnum ? 'Edit' : 'Add';
 # top
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Customer $action", '');
+print $cgi->header( @FS::CGI::header ), header("Customer $action", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
   if $error;
 
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index 4460ee8ad..c344e91ae 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main_county-expand.cgi,v 1.3 2001-08-31 07:28:00 ivan Exp $ -->
+#<!-- $Id: cust_main_county-expand.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
@@ -32,7 +32,7 @@ $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
 die "Can't expand entry!" if $cust_main_county->getfield('county');
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Tax Rate (expand)", menubar(
+print $cgi->header( @FS::CGI::header ), header("Tax Rate (expand)", menubar(
   'Main Menu' => popurl(2),
 ));
 
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index 6be349bc4..c25b6edd0 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.3 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_main_county.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $cust_main_county );
@@ -14,7 +14,7 @@ $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-print $cgi->header( '-expires' => 'now' ), header("Edit tax rates", menubar(
+print $cgi->header( @FS::CGI::header ), header("Edit tax rates", menubar(
   'Main Menu' => popurl(2),
 ));
 
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index c83f585d1..a9506c8ed 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
@@ -38,7 +38,7 @@ if ( $cgi->param('error') ) {
 $_date = time;
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Enter payment", '');
+print $cgi->header( @FS::CGI::header ), header("Enter payment", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index 729fc7c98..ea92ac05e 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_pkg.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
@@ -33,7 +33,7 @@ if ( $cgi->param('error') ) {
 }
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Add/Edit Packages", '');
+print $cgi->header( @FS::CGI::header ), header("Add/Edit Packages", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 9ed8977cd..06f416903 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_referral.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: part_referral.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $part_referral $action $hashref $p1 $query );
@@ -29,7 +29,7 @@ $action = $part_referral->refnum ? 'Edit' : 'Add';
 $hashref = $part_referral->hashref;
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("$action Referral", menubar(
+print $cgi->header( @FS::CGI::header ), header("$action Referral", menubar(
   'Main Menu' => popurl(2),
   'View all referrals' => popurl(2). "browse/part_referral.cgi",
 ));
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 3d0bb0134..8a558613e 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.10 2001-10-20 12:18:00 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.11 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
@@ -101,7 +101,7 @@ $ulen = $svc_acct->dbdef_table->column('username')->length;
 $ulen2 = $ulen+2;
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("$action $svc account");
+print $cgi->header( @FS::CGI::header ), header("$action $svc account");
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT><BR><BR>"
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index 5f1d15e26..3ba0f1439 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_pop.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svc_acct_pop $action $query $hashref $p1 );
@@ -27,7 +27,7 @@ $action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
 $hashref = $svc_acct_pop->hashref;
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("$action POP", menubar(
+print $cgi->header( @FS::CGI::header ), header("$action POP", menubar(
   'Main Menu' => popurl(2),
   'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
 ));
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 21bd6a9ee..4497b5f59 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.4 2001-09-11 23:44:01 ivan Exp $ -->
+#<!-- $Id: svc_acct_sm.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
@@ -128,7 +128,7 @@ if ($pkgnum) {
 }
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Mail Alias $action", '');
+print $cgi->header( @FS::CGI::header ), header("Mail Alias $action", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index a1a61723d..971088d21 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_domain.cgi,v 1.4 2001-10-25 21:24:12 ivan Exp $ -->
+#<!-- $Id: svc_domain.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
@@ -77,7 +77,7 @@ $otaker = getotaker;
 $domain = $svc_domain->domain;
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("$action $svc", '');
+print $cgi->header( @FS::CGI::header ), header("$action $svc", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 287833e53..0529c2b86 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_forward.cgi,v 1.4 2001-09-11 23:44:01 ivan Exp $ -->
+# <!-- $Id: svc_forward.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
@@ -128,7 +128,7 @@ if ($pkgnum) {
 #display
 
 $p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Mail Forward $action", '',
+print $cgi->header( @FS::CGI::header ), header("Mail Forward $action", '',
       " onLoad=\"visualize()\"");
 
 %>
-- 
cgit v1.2.1


From c14a267229fc0d6f2d2afdebab3bd34d825df2ef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 14:54:07 +0000
Subject: get rid of header foo in individual templates

---
 httemplate/edit/agent.cgi                   | 4 ++--
 httemplate/edit/agent_type.cgi              | 4 ++--
 httemplate/edit/cust_credit.cgi             | 4 ++--
 httemplate/edit/cust_credit_bill.cgi        | 4 ++--
 httemplate/edit/cust_main.cgi               | 4 ++--
 httemplate/edit/cust_main_county-expand.cgi | 4 ++--
 httemplate/edit/cust_main_county.cgi        | 4 ++--
 httemplate/edit/cust_pay.cgi                | 4 ++--
 httemplate/edit/cust_pkg.cgi                | 4 ++--
 httemplate/edit/part_referral.cgi           | 4 ++--
 httemplate/edit/svc_acct.cgi                | 4 ++--
 httemplate/edit/svc_acct_pop.cgi            | 4 ++--
 httemplate/edit/svc_acct_sm.cgi             | 4 ++--
 httemplate/edit/svc_domain.cgi              | 4 ++--
 httemplate/edit/svc_forward.cgi             | 4 ++--
 15 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index ea68b4768..a4dcda5e3 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: agent.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $agent $action $hashref $p $agent_type );
@@ -31,7 +31,7 @@ $hashref = $agent->hashref;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header("$action Agent", menubar(
+print header("$action Agent", menubar(
   'Main Menu' => $p,
   'View all agents' => $p. 'browse/agent.cgi',
 ));
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index eba2c2305..849da8113 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent_type.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: agent_type.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
@@ -32,7 +32,7 @@ $action = $agent_type->typenum ? 'Edit' : 'Add';
 $hashref = $agent_type->hashref;
 
 $p = popurl(2);
-print $cgi->header( @FS::CGI::header ), header("$action Agent Type", menubar(
+print header("$action Agent Type", menubar(
   'Main Menu' => "$p",
   'View all agent types' => "${p}browse/agent_type.cgi",
 ));
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 3bfbfc8c4..5d5f5b296 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
@@ -36,7 +36,7 @@ $otaker = getotaker;
 
 $p1 = popurl(1);
 
-print $cgi->header( @FS::CGI::header ), header("Post Credit", '');
+print header("Post Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
   if $cgi->param('error');
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index d2d50cbf6..2b41cc216 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_credit_bill.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $amount $reason $cust_credit );
@@ -38,7 +38,7 @@ $otaker = getotaker;
 
 $p1 = popurl(1);
 
-print $cgi->header( @FS::CGI::header ), header("Apply Credit", '');
+print header("Apply Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT><BR><BR>"
   if $cgi->param('error');
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index f5662fd87..d8191c7d6 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.8 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.9 2001-10-30 14:54:07 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -74,7 +74,7 @@ $action = $custnum ? 'Edit' : 'Add';
 # top
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Customer $action", '');
+print header("Customer $action", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
   if $error;
 
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index c344e91ae..f5dc32372 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main_county-expand.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_main_county-expand.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
@@ -32,7 +32,7 @@ $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
 die "Can't expand entry!" if $cust_main_county->getfield('county');
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Tax Rate (expand)", menubar(
+print header("Tax Rate (expand)", menubar(
   'Main Menu' => popurl(2),
 ));
 
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index c25b6edd0..f88601281 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_main_county.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $cust_main_county );
@@ -14,7 +14,7 @@ $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-print $cgi->header( @FS::CGI::header ), header("Edit tax rates", menubar(
+print header("Edit tax rates", menubar(
   'Main Menu' => popurl(2),
 ));
 
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index a9506c8ed..3c0dbb2fe 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
@@ -38,7 +38,7 @@ if ( $cgi->param('error') ) {
 $_date = time;
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Enter payment", '');
+print header("Enter payment", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index ea92ac05e..7d5bb3fd3 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pkg.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_pkg.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
@@ -33,7 +33,7 @@ if ( $cgi->param('error') ) {
 }
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Add/Edit Packages", '');
+print header("Add/Edit Packages", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 06f416903..09344b956 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_referral.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: part_referral.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $part_referral $action $hashref $p1 $query );
@@ -29,7 +29,7 @@ $action = $part_referral->refnum ? 'Edit' : 'Add';
 $hashref = $part_referral->hashref;
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("$action Referral", menubar(
+print header("$action Referral", menubar(
   'Main Menu' => popurl(2),
   'View all referrals' => popurl(2). "browse/part_referral.cgi",
 ));
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 8a558613e..4911e0ffd 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.11 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.12 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
@@ -101,7 +101,7 @@ $ulen = $svc_acct->dbdef_table->column('username')->length;
 $ulen2 = $ulen+2;
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("$action $svc account");
+print header("$action $svc account");
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT><BR><BR>"
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index 3ba0f1439..23caa794b 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_pop.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svc_acct_pop $action $query $hashref $p1 );
@@ -27,7 +27,7 @@ $action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
 $hashref = $svc_acct_pop->hashref;
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("$action POP", menubar(
+print header("$action POP", menubar(
   'Main Menu' => popurl(2),
   'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
 ));
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 4497b5f59..baf0a7eb2 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_sm.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
@@ -128,7 +128,7 @@ if ($pkgnum) {
 }
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Mail Alias $action", '');
+print header("Mail Alias $action", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 971088d21..713b2ccd7 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_domain.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_domain.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
@@ -77,7 +77,7 @@ $otaker = getotaker;
 $domain = $svc_domain->domain;
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("$action $svc", '');
+print header("$action $svc", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 0529c2b86..caf6ee76d 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_forward.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: svc_forward.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
@@ -128,7 +128,7 @@ if ($pkgnum) {
 #display
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Mail Forward $action", '',
+print header("Mail Forward $action", '',
       " onLoad=\"visualize()\"");
 
 %>
-- 
cgit v1.2.1


From 14655eb7b88692104732988ee9aab14a855ff752 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 15:39:27 +0000
Subject: better ordering of state selection on new customer screen

---
 httemplate/edit/cust_main.cgi | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index d8191c7d6..cc692dd88 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.9 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.10 2001-10-30 15:39:27 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -178,11 +178,16 @@ print <<END;
 <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
 END
 
-$cust_main->country( $conf->config('countrydefault') || 'US' )
-  unless $cust_main->country;
+my $countrydefault = $conf->config('countrydefault') || 'US';
+$cust_main->country( $countrydefault ) unless $cust_main->country;
 $cust_main->state( $conf->config('statedefault') || 'CA' )
   unless $cust_main->state || $cust_main->country ne 'US';
-foreach ( qsearch('cust_main_county',{}) ) {
+foreach ( sort {
+     $a->country eq $countrydefault <=> $b->country eq $countrydefault
+  or $a->country                    cmp $b->country
+  or $a->state                      cmp $b->state
+  or $a->county                     cmp $b->county
+} qsearch('cust_main_county',{}) ) {
   print "<OPTION";
   print " SELECTED" if ( $cust_main->state eq $_->state
                          && $cust_main->county eq $_->county 
-- 
cgit v1.2.1


From ef2e9712fbb5b4b1c5a681530c202498204220d8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 15:41:00 +0000
Subject: precedence oops

---
 httemplate/edit/cust_main.cgi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index cc692dd88..0a10c7ce1 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.10 2001-10-30 15:39:27 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.11 2001-10-30 15:41:00 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -183,10 +183,10 @@ $cust_main->country( $countrydefault ) unless $cust_main->country;
 $cust_main->state( $conf->config('statedefault') || 'CA' )
   unless $cust_main->state || $cust_main->country ne 'US';
 foreach ( sort {
-     $a->country eq $countrydefault <=> $b->country eq $countrydefault
-  or $a->country                    cmp $b->country
-  or $a->state                      cmp $b->state
-  or $a->county                     cmp $b->county
+     ( $a->country eq $countrydefault ) <=> ( $b->country eq $countrydefault )
+  or $a->country                        cmp $b->country
+  or $a->state                          cmp $b->state
+  or $a->county                         cmp $b->county
 } qsearch('cust_main_county',{}) ) {
   print "<OPTION";
   print " SELECTED" if ( $cust_main->state eq $_->state
-- 
cgit v1.2.1


From 57a1412bb70af3fdd7e3acd9e487c66260105776 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 15:42:33 +0000
Subject: put default country up top

---
 httemplate/edit/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 0a10c7ce1..cfd99c824 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.11 2001-10-30 15:41:00 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.12 2001-10-30 15:42:33 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -183,7 +183,7 @@ $cust_main->country( $countrydefault ) unless $cust_main->country;
 $cust_main->state( $conf->config('statedefault') || 'CA' )
   unless $cust_main->state || $cust_main->country ne 'US';
 foreach ( sort {
-     ( $a->country eq $countrydefault ) <=> ( $b->country eq $countrydefault )
+     ( $b->country eq $countrydefault ) <=> ( $a->country eq $countrydefault )
   or $a->country                        cmp $b->country
   or $a->state                          cmp $b->state
   or $a->county                         cmp $b->county
-- 
cgit v1.2.1


From 9a0b074f2b3fb4d819a6e10435ca1484929a81e2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Nov 2001 18:45:46 +0000
Subject: remove gratuitous warnings

---
 httemplate/edit/process/part_pkg.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index cd799b5b9..c64d49219 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.4 2001-10-20 12:18:00 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.5 2001-11-06 18:45:46 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
@@ -35,8 +35,8 @@ $new = new FS::part_pkg ( {
   } fields('part_pkg')
 } );
 
-warn "setuptax: ". $new->setuptax;
-warn "recurtax: ". $new->recurtax;
+#warn "setuptax: ". $new->setuptax;
+#warn "recurtax: ". $new->recurtax;
 
 #most of the stuff below should move to part_pkg.pm
 
-- 
cgit v1.2.1


From 685e4c619cadadba55590b04c44f563a925b6baa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Nov 2001 03:40:03 +0000
Subject: postalinvoicedefault config file

---
 httemplate/edit/cust_main.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index cfd99c824..68765ca67 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.12 2001-10-30 15:42:33 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.13 2001-11-21 03:40:03 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -345,7 +345,8 @@ print qq!>Tax Exempt</TD></TR>!;
 print qq!<TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
 @invoicing_list = $cust_main->invoicing_list;
 print qq! CHECKED!
-  if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
+  if ( ! @invoicing_list && ! $conf->exists('postalinvoicedefault') )
+     || grep { $_ eq 'POST' } @invoicing_list;
 print qq!>Postal mail invoice</TD></TR>!;
 $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
 print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
-- 
cgit v1.2.1


From 09655ec6f1761d464a928f6aab88bb936999df25 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Nov 2001 03:42:13 +0000
Subject: a more reasonalbe name (!)

---
 httemplate/edit/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 68765ca67..260d77e6c 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.13 2001-11-21 03:40:03 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.14 2001-11-21 03:42:13 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -345,7 +345,7 @@ print qq!>Tax Exempt</TD></TR>!;
 print qq!<TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
 @invoicing_list = $cust_main->invoicing_list;
 print qq! CHECKED!
-  if ( ! @invoicing_list && ! $conf->exists('postalinvoicedefault') )
+  if ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
      || grep { $_ eq 'POST' } @invoicing_list;
 print qq!>Postal mail invoice</TD></TR>!;
 $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
-- 
cgit v1.2.1


From b97e635c30397464a0161feb9f2aa1b472710410 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Dec 2001 13:10:16 +0000
Subject: from Dave Burgess <burgess@neonramp.com>:

 I had to change line 104 in /edit/svc_forward.cgi and add 'my' as the
 qualifier on the LHS of the assignment.  This also solves the
 problem with a similar error on the RHS of line 105.  It also seems to make
 the routine work fairly reliably (it has been problematic for me in the
 past).
---
 httemplate/edit/svc_forward.cgi | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index caf6ee76d..75cd9fc7f 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_forward.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
+# <!-- $Id: svc_forward.cgi,v 1.7 2001-12-04 13:10:16 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
@@ -99,10 +99,13 @@ if ($pkgnum) {
     foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
                                               #record(s) in cust_svc ( for this
                                               #pkgnum ! )
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        $svc_acct=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        $email{$svc_acct->getfield('svcnum')}=$svc_acct->email;
+      foreach my $i_cust_svc (
+        qsearch( 'cust_svc', { 'pkgnum'  => $cust_pkgnum,
+                               'svcpart' => $acct_svcpart } )
+      ) {
+        my $svc_acct =
+          qsearchs( 'svc_acct', { 'svcnum' => $i_cust_svc->svcnum } );
+        $email{$svc_acct->svcnum} = $svc_acct->email;
       }  
     }
   }
-- 
cgit v1.2.1


From aa0a7b4128ed5cf56684378c9cb6ebc1c3ec8c1a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Dec 2001 19:42:21 +0000
Subject: allow >8 character passwords in web interface

---
 httemplate/edit/cust_main.cgi |  6 ++++--
 httemplate/edit/svc_acct.cgi  | 10 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 260d77e6c..3a29e2579 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.14 2001-11-21 03:42:13 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.15 2001-12-12 19:42:21 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -434,11 +434,13 @@ unless ( $custnum ) {
     #$ulen = $svc_acct->dbdef_table->column('username')->length;
     $ulen = dbdef->table('svc_acct')->column('username')->length;
     $ulen2 = $ulen+2;
+    my $passwordmax = $conf->config('passwordmax') || 8;
+    my $pmax2 = $passwordmax + 2;
     print <<END;
 <TR><TD ALIGN="right">Username</TD>
 <TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
 <TR><TD ALIGN="right">Password</TD>
-<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8>
+<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=$pmax2 MAXLENGTH=$passwordmax>
 (blank to generate)</TD></TR>
 END
 
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 4911e0ffd..ec4f66e20 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,9 +1,10 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.12 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.13 2001-12-12 19:42:21 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
-             $part_svc $svc $otaker $username $password $ulen $ulen2 $p1
+             $part_svc $svc $otaker $username $password $ulen $ulen2 
+             $pmax $pmax2 $p1
              $popnum $domsvc $uid $gid $finger $dir $shell $quota $slipip
              %svc_domain );
 use CGI;
@@ -100,6 +101,9 @@ if ( $svc_acct->_password ) {
 $ulen = $svc_acct->dbdef_table->column('username')->length;
 $ulen2 = $ulen+2;
 
+$pmax = $conf->config('passwordmax') || 8;
+$pmax2 = $pmax+2;
+
 $p1 = popurl(1);
 print header("$action $svc account");
 
@@ -121,7 +125,7 @@ print &itable("#cccccc",2), <<END;
 <TR><TD ALIGN="right">Username</TD>
 <TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
 <TR><TD ALIGN="right">Password</TD>
-<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8>
+<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=$pmax2 MAXLENGTH=$pmax>
 (blank to generate)</TD>
 </TR>
 END
-- 
cgit v1.2.1


From abb18df8aeb27dc49817045e217c61ba6c990ad6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Dec 2001 22:47:24 +0000
Subject: allow entering of referral customer by number as well as by link off
 the view page, courtesy of Dave Burgess <burgess@www.cynjut.net>

---
 httemplate/edit/cust_main.cgi | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 3a29e2579..6967a1e1b 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.15 2001-12-12 19:42:21 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.16 2001-12-15 22:47:24 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -133,19 +133,21 @@ if ( $custnum && ! $conf->exists('editreferrals') ) {
 
 #referring customer
 
-print qq!<BR><BR>Referring Customer: !;
+#print qq!<BR><BR>Referring Customer: !;
 if ( $cust_main->referral_custnum ) {
   my $referring_cust_main =
     qsearchs('cust_main', { custnum => $cust_main->referral_custnum } );
-  print '<A HREF="'. popurl(1). '/cust_main.cgi?'.
+  print '<BR><BR>Referring Customer: <A HREF="'. popurl(1). '/cust_main.cgi?'.
         $cust_main->referral_custnum. '">'.
         $cust_main->referral_custnum. ': '.
         ( $referring_cust_main->company
           || $referring_cust_main->last. ', '. $referring_cust_main->first ).
         '</A><INPUT TYPE="hidden" NAME="referral_custnum" VALUE="'.
         $cust_main->referral_custnum. '">';
+} elsif ( ! $conf->exists('disable_customer_referrals') ) {
+  print '<BR><BR>Referring customer number: <INPUT TYPE="text" NAME="referral_custnum" VALUE="">';
 } else {
-  print '(none)<INPUT TYPE="hidden" NAME="referral_custnum" VALUE="">';
+  print '<INPUT TYPE="hidden" NAME="referral_custnum" VALUE="">';
 }
 
 # contact info
-- 
cgit v1.2.1


From 91135a208282b03644cc766ed917b64fe24f374c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Dec 2001 19:30:31 +0000
Subject: apply payment webinterface

---
 httemplate/edit/cust_bill_pay.cgi            | 109 +++++++++++++++++++++++++++
 httemplate/edit/cust_credit_bill.cgi         |   3 +-
 httemplate/edit/process/cust_bill_pay.cgi    |  46 +++++++++++
 httemplate/edit/process/cust_credit_bill.cgi |   6 +-
 4 files changed, 160 insertions(+), 4 deletions(-)
 create mode 100755 httemplate/edit/cust_bill_pay.cgi
 create mode 100755 httemplate/edit/process/cust_bill_pay.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
new file mode 100755
index 000000000..a4ed94462
--- /dev/null
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -0,0 +1,109 @@
+<%
+#<!-- $Id: cust_bill_pay.cgi,v 1.1 2001-12-18 19:30:31 ivan Exp $ -->
+
+use strict;
+use vars qw( $cgi $query $custnum $paynum $amount $invnum $p1 $otaker ); # $reason $cust_credit );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use Date::Format;
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(header popurl);
+use FS::Record qw(qsearch fields);
+use FS::cust_pay;
+use FS::cust_bill;
+
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+if ( $cgi->param('error') ) {
+  $paynum = $cgi->param('paynum');
+  $amount = $cgi->param('amount');
+  $invnum = $cgi->param('invnum');
+} else {
+  ($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $paynum = $1;
+  $amount = '';
+  $invnum = '';
+}
+
+$otaker = getotaker;
+
+$p1 = popurl(1);
+
+print header("Apply Payment", '');
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT><BR><BR>"
+  if $cgi->param('error');
+print <<END;
+    <FORM ACTION="${p1}process/cust_bill_pay.cgi" METHOD=POST>
+END
+
+die unless $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } );
+
+my $unapplied = $cust_pay->unapplied;
+
+print "Payment # <B>$paynum</B>".
+      qq!<INPUT TYPE="hidden" NAME="paynum" VALUE="$paynum">!.
+      '<BR>Date: <B>'. time2str("%D", $cust_pay->_date). '</B>'.
+      '<BR>Amount: $<B>'. $cust_pay->paid. '</B>'.
+      "<BR>Unapplied amount: \$<B>$unapplied</B>".
+      ;
+
+my @cust_bill = grep $_->owed != 0,
+                qsearch('cust_bill', { 'custnum' => $cust_pay->custnum } );
+
+print <<END;
+<SCRIPT>
+function changed(what) {
+  cust_bill = what.options[what.selectedIndex].value;
+END
+
+foreach my $cust_bill ( @cust_bill ) {
+  my $invnum = $cust_bill->invnum;
+  my $changeto = $cust_bill->owed < $unapplied
+                   ? $cust_bill->owed 
+                   : $unapplied
+  print <<END;
+  if ( cust_bill == $invnum ) {
+    what.form.amount.value = "$changeto";
+  }
+END
+}
+
+#print <<END;
+#  if ( cust_bill == "Refund" ) {
+#    what.form.amount.value = "$credited";
+#  }
+#}
+#</SCRIPT>
+#END
+print "</SCRIPT>\n";
+
+print qq!<BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">!,
+      '<OPTION VALUE="">';
+foreach my $cust_bill ( @cust_bill ) {
+  print '<OPTION'. ( $cust_bill->invnum eq $invnum ? ' SELECTED' : '' ).
+        ' VALUE="'. $cust_bill->invnum. '">'. $cust_bill->invnum.
+        ' -  '. time2str("%D",$cust_bill->_date).
+        ' - $'. $cust_bill->owed;
+}
+#print qq!<OPTION VALUE="Refund">Refund!;
+print "</SELECT>";
+
+print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
+
+print <<END;
+<BR>
+<INPUT TYPE="submit" VALUE="Apply">
+END
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index 2b41cc216..a00734949 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,9 +1,8 @@
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: cust_credit_bill.cgi,v 1.6 2001-12-18 19:30:31 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $amount $reason $cust_credit );
-use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
diff --git a/httemplate/edit/process/cust_bill_pay.cgi b/httemplate/edit/process/cust_bill_pay.cgi
new file mode 100755
index 000000000..f0d403331
--- /dev/null
+++ b/httemplate/edit/process/cust_bill_pay.cgi
@@ -0,0 +1,46 @@
+<%
+#<!-- $Id: cust_bill_pay.cgi,v 1.1 2001-12-18 19:30:31 ivan Exp $ -->
+
+use strict;
+use vars qw( $cgi $custnum $paynum $new $error );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(popurl);
+use FS::Record qw(qsearchs fields);
+use FS::cust_pay;
+use FS::cust_bill_pay;
+use FS::cust_main;
+
+$cgi = new CGI;
+cgisuidsetup($cgi);
+
+$cgi->param('paynum') =~ /^(\d*)$/ or die "Illegal paynum!";
+$paynum = $1;
+
+my $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } )
+  or die "No such paynum";
+
+my $cust_main = qsearchs('cust_main', { 'custnum' => $cust_pay->custnum } )
+  or die "Bogus credit:  not attached to customer";
+
+my $custnum = $cust_main->custnum;
+
+$new = new FS::cust_bill_pay ( {
+  map {
+    $_, scalar($cgi->param($_));
+  #} qw(custnum _date amount invnum)
+  } fields('cust_bill_pay')
+} );
+
+$error=$new->insert;
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_bill_pay.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+}
+
+
+%>
diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
index f838dff10..e84894b04 100755
--- a/httemplate/edit/process/cust_credit_bill.cgi
+++ b/httemplate/edit/process/cust_credit_bill.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.1 2001-09-01 21:52:20 jeff Exp $ -->
+#<!-- $Id: cust_credit_bill.cgi,v 1.2 2001-12-18 19:30:31 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum $crednum $new $error );
@@ -10,6 +10,8 @@ use FS::CGI qw(popurl);
 use FS::Record qw(qsearchs fields);
 use FS::cust_credit;
 use FS::cust_credit_bill;
+use FS::cust_refund;
+use FS::cust_main;
 
 $cgi = new CGI;
 cgisuidsetup($cgi);
@@ -34,7 +36,7 @@ if ($cgi->param('invnum') =~ /^Refund$/) {
     'payinfo' => 'Cash',
     'crednum' => $crednum,
   } );
-}else{
+} else {
   $new = new FS::cust_credit_bill ( {
     map {
       $_, scalar($cgi->param($_));
-- 
cgit v1.2.1


From 355fe2160a24311e5d1faab56376c9a0781c6479 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Dec 2001 19:32:56 +0000
Subject: declar vars

---
 httemplate/edit/cust_bill_pay.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index a4ed94462..46ca51e82 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -1,8 +1,8 @@
 <%
-#<!-- $Id: cust_bill_pay.cgi,v 1.1 2001-12-18 19:30:31 ivan Exp $ -->
+#<!-- $Id: cust_bill_pay.cgi,v 1.2 2001-12-18 19:32:56 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi $query $custnum $paynum $amount $invnum $p1 $otaker ); # $reason $cust_credit );
+use vars qw( $cgi $query $custnum $paynum $amount $invnum $p1 $otaker $cust_pay );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
-- 
cgit v1.2.1


From 2d53ea6d86d638d65f0d14ef5921daf46981269e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Dec 2001 19:34:08 +0000
Subject: typo

---
 httemplate/edit/cust_bill_pay.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index 46ca51e82..61c8a1785 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_bill_pay.cgi,v 1.2 2001-12-18 19:32:56 ivan Exp $ -->
+#<!-- $Id: cust_bill_pay.cgi,v 1.3 2001-12-18 19:34:08 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $paynum $amount $invnum $p1 $otaker $cust_pay );
@@ -64,7 +64,7 @@ foreach my $cust_bill ( @cust_bill ) {
   my $invnum = $cust_bill->invnum;
   my $changeto = $cust_bill->owed < $unapplied
                    ? $cust_bill->owed 
-                   : $unapplied
+                   : $unapplied;
   print <<END;
   if ( cust_bill == $invnum ) {
     what.form.amount.value = "$changeto";
-- 
cgit v1.2.1


From c980083d90ee8796d8241686390048aee6d4fff9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Dec 2001 19:36:21 +0000
Subject: another dum tyop

---
 httemplate/edit/cust_bill_pay.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index 61c8a1785..793ed1009 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_bill_pay.cgi,v 1.3 2001-12-18 19:34:08 ivan Exp $ -->
+#<!-- $Id: cust_bill_pay.cgi,v 1.4 2001-12-18 19:36:21 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $paynum $amount $invnum $p1 $otaker $cust_pay );
@@ -48,7 +48,7 @@ print "Payment # <B>$paynum</B>".
       qq!<INPUT TYPE="hidden" NAME="paynum" VALUE="$paynum">!.
       '<BR>Date: <B>'. time2str("%D", $cust_pay->_date). '</B>'.
       '<BR>Amount: $<B>'. $cust_pay->paid. '</B>'.
-      "<BR>Unapplied amount: \$<B>$unapplied</B>".
+      "<BR>Unapplied amount: \$<B>$unapplied</B>"
       ;
 
 my @cust_bill = grep $_->owed != 0,
-- 
cgit v1.2.1


From c00273147a2d400779fcdaf34f171b2180faa453 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Dec 2001 21:40:24 +0000
Subject: add name/address to post payment screen

get rid of some $-0.00  yay for ieee fp
---
 httemplate/edit/cust_pay.cgi | 105 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 95 insertions(+), 10 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 3c0dbb2fe..6669b9de4 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,13 +1,18 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.6 2001-12-21 21:40:24 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
+use FS::Conf;
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl);
+use FS::CGI qw(header popurl ntable);
+
+my $conf = new FS::Conf;
+
+my $countrydefault = $conf->config('countrydefault') || 'US';
 
 $cgi = new CGI;
 cgisuidsetup($cgi);
@@ -44,32 +49,112 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
   if $cgi->param('error');
 
-print <<END;
+print <<END, ntable("#cccccc",2);
     <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
     <INPUT TYPE="hidden" NAME="link" VALUE="$link">
     <INPUT TYPE="hidden" NAME="linknum" VALUE="$linknum">
 END
 
+my $custnum;
 if ( $link eq 'invnum' ) {
-  print "Invoice #<B>$linknum</B>";
+
+  my $cust_bill = qsearchs('cust_bill', { 'invnum' => $linknum } )
+    or die "unknown invnum $linknum";
+  print "Invoice #<B>$linknum</B>". ntable("#cccccc",2).
+        '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
+        time2str("%D", $cust_bill->_date). '</TD></TR>'.
+        '<TR><TD ALIGN="right" VALIGN="top">Items</TD><TD BGCOLOR="#ffffff">';
+  foreach ( $cust_bill->cust_bill_pkg ) { #false laziness with FS::cust_bill
+    if ( $_->pkgnum ) {
+
+      my($cust_pkg)=qsearchs('cust_pkg', { 'pkgnum', $_->pkgnum } );
+      my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart});
+      my($pkg)=$part_pkg->pkg;
+
+      if ( $_->setup != 0 ) {
+        print "$pkg Setup<BR>"; # $money_char. sprintf("%10.2f",$_->setup);
+        print join('<BR>',
+          map { "  ". $_->[0]. ": ". $_->[1] } $cust_pkg->labels
+        ). '<BR>';
+      }
+
+      if ( $_->recur != 0 ) {
+        print
+          "$pkg (" . time2str("%x",$_->sdate) . " - " .
+                                time2str("%x",$_->edate) . ")<BR>";
+          #$money_char. sprintf("%10.2f",$_->recur)
+        print join('<BR>',
+          map { '--->'. $_->[0]. ": ". $_->[1] } $cust_pkg->labels
+        ). '<BR>';
+      }
+
+    } else { #pkgnum Tax
+      print "Tax<BR>" # $money_char. sprintf("%10.2f",$_->setup)
+        if $_->setup != 0;
+    }
+
+  }
+  print '</TD></TR></TABLE>';
+
+  $custnum = $cust_bill->custnum;
+
 } elsif ( $link eq 'custnum' ) {
-  print "Customer #<B>$linknum</B>";
+  $custnum = $linknum;
 }
 
-print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
+print "<BR><BR>Customer #<B>$custnum</B>". ntable('#e8e8e8');
+my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+  or die "unknown custnum $custnum";
+
+print '<TR><TD>'. ntable("#cccccc",2).
+      '<TR><TD ALIGN="right" VALIGN="top">Billing</TD><TD BGCOLOR="#ffffff">'.
+      $cust_main->getfield('last'). ', '. $cust_main->first. '<BR>';
+print $cust_main->company. '<BR>' if $cust_main->company;
+print $cust_main->address1. '<BR>';
+print $cust_main->address2. '<BR>' if $cust_main->address2;
+print $cust_main->city. ', '. $cust_main->state. '  '. $cust_main->zip. '<BR>';
+print $cust_main->country. '<BR>' if $cust_main->country
+                                     && $cust_main->country ne $countrydefault;
+
+print '</TD>'.
+      '</TR></TABLE></TD>';
+
+if ( defined $cust_main->dbdef_table->column('ship_last') ) {
+
+  print '<TD>'. ntable("#cccccc",2).
+        '<TR><TD ALIGN="right" VALIGN="top">Service</TD><TD BGCOLOR="#ffffff">'.
+        $cust_main->getfield('ship_last'). ', '. $cust_main->ship_first. '<BR>';
+  print $cust_main->ship_company. '<BR>' if $cust_main->ship_company;
+  print $cust_main->ship_address1. '<BR>';
+  print $cust_main->ship_address2. '<BR>' if $cust_main->ship_address2;
+  print $cust_main->ship_city. ', '. $cust_main->ship_state. '  '. $cust_main->ship_zip. '<BR>';
+  print $cust_main->ship_country. '<BR>'
+    if $cust_main->ship_country && $cust_main->ship_country ne $countrydefault;
+
+  print '</TD>'.
+        '</TR></TABLE></TD>';
+}
+
+print '</TR></TABLE>';
+
+
+print '<BR><BR>Payment'. ntable("#cccccc", 2).
+      '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
+      time2str("%D",$_date).  '</TD></TR>'.
+      qq!<INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
 
-print qq!<BR>Amount \$<INPUT TYPE="text" NAME="paid" VALUE="$paid" SIZE=8 MAXLENGTH=8>!;
+print qq!<TR><TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">\$<INPUT TYPE="text" NAME="paid" VALUE="$paid" SIZE=8 MAXLENGTH=8></TD></TR>!;
 
-print qq!<BR>Payby: <B>$payby</B><INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
+print qq!<TR><TD ALIGN="right">Payby</TD><TD BGCOLOR="#ffffff">$payby</TD></TR><INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
 
 #payinfo (check # now as payby="BILL" hardcoded.. what to do later?)
-print qq!<BR>Check #<INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo">!;
+print qq!<TR><TD ALIGN="right">Check #</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo"></TD></TR>!;
 
 #paybatch
 print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
 
 print <<END;
-</PRE>
+</TABLE>
 <BR>
 <INPUT TYPE="submit" VALUE="Post payment">
 END
-- 
cgit v1.2.1


From c6b853b4f0516450b3e27acd281f667eadaec9f4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 02:33:30 +0000
Subject: fix service display for duplicates

---
 httemplate/edit/cust_pay.cgi | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 6669b9de4..dfef3c542 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.6 2001-12-21 21:40:24 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.7 2001-12-26 02:33:30 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
@@ -121,15 +121,23 @@ print '</TD>'.
 
 if ( defined $cust_main->dbdef_table->column('ship_last') ) {
 
+  my $pre = $cust_main->ship_last ? 'ship_' : '';
+
   print '<TD>'. ntable("#cccccc",2).
         '<TR><TD ALIGN="right" VALIGN="top">Service</TD><TD BGCOLOR="#ffffff">'.
-        $cust_main->getfield('ship_last'). ', '. $cust_main->ship_first. '<BR>';
-  print $cust_main->ship_company. '<BR>' if $cust_main->ship_company;
-  print $cust_main->ship_address1. '<BR>';
-  print $cust_main->ship_address2. '<BR>' if $cust_main->ship_address2;
-  print $cust_main->ship_city. ', '. $cust_main->ship_state. '  '. $cust_main->ship_zip. '<BR>';
-  print $cust_main->ship_country. '<BR>'
-    if $cust_main->ship_country && $cust_main->ship_country ne $countrydefault;
+        $cust_main->get("${pre}last"). ', '.
+        $cust_main->get("${pre}first"). '<BR>';
+  print $cust_main->get("${pre}company"). '<BR>'
+    if $cust_main->get("${pre}company");
+  print $cust_main->get("${pre}address1"). '<BR>';
+  print $cust_main->get("${pre}address2"). '<BR>'
+    if $cust_main->get("${pre}address2");
+  print $cust_main->get("${pre}city"). ', '.
+        $cust_main->get("${pre}state"). '  '.
+        $cust_main->get("${pre}ship_zip"). '<BR>';
+  print $cust_main->get("${pre}country"). '<BR>'
+    if $cust_main->get("${pre}country")
+       && $cust_main->get("${pre}country") ne $countrydefault;
 
   print '</TD>'.
         '</TR></TABLE></TD>';
-- 
cgit v1.2.1


From d0f483f47168e01eb6c28e8fc99a62050b245132 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 04:25:04 +0000
Subject: auto-apply payments and credits, post credit UI overhaul

---
 httemplate/edit/cust_credit.cgi         | 40 ++++++++++----------
 httemplate/edit/cust_pay.cgi            | 66 ++++++---------------------------
 httemplate/edit/process/cust_credit.cgi |  7 +++-
 httemplate/edit/process/cust_pay.cgi    |  7 +++-
 4 files changed, 42 insertions(+), 78 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 5d5f5b296..63732f86c 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,16 +1,18 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.6 2001-12-26 04:25:04 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
+use vars qw( $cgi $query $custnum $otaker $p1 $_date $amount $reason );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl);
+use FS::CGI qw(header popurl small_custview);
 use FS::Record qw(fields);
 #use FS::cust_credit;
 
+my $conf = new FS::Conf;
+
 $cgi = new CGI;
 cgisuidsetup($cgi);
 
@@ -40,35 +42,31 @@ print header("Post Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
   if $cgi->param('error');
-print <<END;
+print <<END, small_custview($custnum, $conf->config('countrydefault'));
     <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
+    <INPUT TYPE="hidden" NAME="crednum" VALUE="">
+    <INPUT TYPE="hidden" NAME="paybatch" VALUE="">
+    <INPUT TYPE="hidden" NAME="_date" VALUE="$_date">
+    <INPUT TYPE="hidden" NAME="credited" VALUE="">
+    <INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">
 END
 
-$crednum = "";
-print qq!Credit #<B>!, $crednum ? $crednum : " <I>(NEW)</I>", qq!</B><INPUT TYPE="hidden" NAME="crednum" VALUE="$crednum">!;
-
-print qq!<BR>Customer #<B>$custnum</B><INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
-
-print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
-
-print qq!<BR>Date: <B>!, time2str("%D",$_date), qq!</B><INPUT TYPE="hidden" NAME="_date" VALUE="">!;
+print '<BR><BR>Credit'. ntable("#cccccc", 2).
+      '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
+      time2str("%D",$_date).  '</TD></TR>';
 
-print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
-print qq!<INPUT TYPE="hidden" NAME="credited" VALUE="">!;
+print qq!<TR><TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">\$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8></TD></TR>!;
 
 #print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
 
-print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!;
+print qq!<TR><TD ALIGN="right">Reason</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="reason" VALUE="$reason"></TD></TR>!;
 
-print qq!<BR>Reason <INPUT TYPE="text" NAME="reason" VALUE="$reason">!;
+print qq!<TR><TD ALIGN="right">Auto-apply<BR>to invoices</TD><TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>!;
 
 print <<END;
+</TABLE>
 <BR>
-<INPUT TYPE="submit" VALUE="Post">
-END
-
-print <<END;
-
+<INPUT TYPE="submit" VALUE="Post credit">
     </FORM>
   </BODY>
 </HTML>
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index dfef3c542..7f70802c3 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.7 2001-12-26 02:33:30 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.8 2001-12-26 04:25:04 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
@@ -8,12 +8,10 @@ use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::Conf;
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl ntable);
+use FS::CGI qw(header popurl ntable small_custview);
 
 my $conf = new FS::Conf;
 
-my $countrydefault = $conf->config('countrydefault') || 'US';
-
 $cgi = new CGI;
 cgisuidsetup($cgi);
 
@@ -43,10 +41,10 @@ if ( $cgi->param('error') ) {
 $_date = time;
 
 $p1 = popurl(1);
-print header("Enter payment", '');
+print header("Post payment", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
+      "</FONT><BR><BR>"
   if $cgi->param('error');
 
 print <<END, ntable("#cccccc",2);
@@ -102,62 +100,24 @@ if ( $link eq 'invnum' ) {
   $custnum = $linknum;
 }
 
-print "<BR><BR>Customer #<B>$custnum</B>". ntable('#e8e8e8');
-my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
-  or die "unknown custnum $custnum";
-
-print '<TR><TD>'. ntable("#cccccc",2).
-      '<TR><TD ALIGN="right" VALIGN="top">Billing</TD><TD BGCOLOR="#ffffff">'.
-      $cust_main->getfield('last'). ', '. $cust_main->first. '<BR>';
-print $cust_main->company. '<BR>' if $cust_main->company;
-print $cust_main->address1. '<BR>';
-print $cust_main->address2. '<BR>' if $cust_main->address2;
-print $cust_main->city. ', '. $cust_main->state. '  '. $cust_main->zip. '<BR>';
-print $cust_main->country. '<BR>' if $cust_main->country
-                                     && $cust_main->country ne $countrydefault;
-
-print '</TD>'.
-      '</TR></TABLE></TD>';
-
-if ( defined $cust_main->dbdef_table->column('ship_last') ) {
-
-  my $pre = $cust_main->ship_last ? 'ship_' : '';
-
-  print '<TD>'. ntable("#cccccc",2).
-        '<TR><TD ALIGN="right" VALIGN="top">Service</TD><TD BGCOLOR="#ffffff">'.
-        $cust_main->get("${pre}last"). ', '.
-        $cust_main->get("${pre}first"). '<BR>';
-  print $cust_main->get("${pre}company"). '<BR>'
-    if $cust_main->get("${pre}company");
-  print $cust_main->get("${pre}address1"). '<BR>';
-  print $cust_main->get("${pre}address2"). '<BR>'
-    if $cust_main->get("${pre}address2");
-  print $cust_main->get("${pre}city"). ', '.
-        $cust_main->get("${pre}state"). '  '.
-        $cust_main->get("${pre}ship_zip"). '<BR>';
-  print $cust_main->get("${pre}country"). '<BR>'
-    if $cust_main->get("${pre}country")
-       && $cust_main->get("${pre}country") ne $countrydefault;
-
-  print '</TD>'.
-        '</TR></TABLE></TD>';
-}
-
-print '</TR></TABLE>';
+print small_custview($custnum, $conf->config('countrydefault'));
 
+print qq!<INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
+print qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
 
 print '<BR><BR>Payment'. ntable("#cccccc", 2).
       '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
-      time2str("%D",$_date).  '</TD></TR>'.
-      qq!<INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
+      time2str("%D",$_date).  '</TD></TR>';
 
 print qq!<TR><TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">\$<INPUT TYPE="text" NAME="paid" VALUE="$paid" SIZE=8 MAXLENGTH=8></TD></TR>!;
 
-print qq!<TR><TD ALIGN="right">Payby</TD><TD BGCOLOR="#ffffff">$payby</TD></TR><INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
+print qq!<TR><TD ALIGN="right">Payby</TD><TD BGCOLOR="#ffffff">$payby</TD></TR>!;
 
 #payinfo (check # now as payby="BILL" hardcoded.. what to do later?)
 print qq!<TR><TD ALIGN="right">Check #</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo"></TD></TR>!;
 
+print qq!<TR><TD ALIGN="right">Auto-apply<BR>to invoices</TD><TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>!;
+
 #paybatch
 print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
 
@@ -165,10 +125,6 @@ print <<END;
 </TABLE>
 <BR>
 <INPUT TYPE="submit" VALUE="Post payment">
-END
-
-print <<END;
-
     </FORM>
   </BODY>
 </HTML>
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index b52d0bd46..2eb431bcc 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.3 2001-12-26 04:25:04 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum $new $error );
@@ -31,6 +31,11 @@ if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "cust_credit.cgi?". $cgi->query_string );
 } else {
+  if ( $cgi->param('apply') eq 'yes' ) {
+    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum })
+      or die "unknown custnum $linknum";
+    $cust_main->apply_payments;
+  }
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 }
 
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index 9be96505d..b2b3602db 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.4 2001-12-26 04:25:04 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $new $error );
@@ -38,6 +38,11 @@ if ($error) {
 } elsif ( $link eq 'invnum' ) {
   print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$linknum");
 } elsif ( $link eq 'custnum' ) {
+  if ( $cgi->param('apply') eq 'yes' ) {
+    my $cust_main = qsearchs('cust_main', { 'custnum' => $linknum })
+      or die "unknown custnum $linknum";
+    $cust_main->apply_payments;
+  }
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?$linknum");
 }
 
-- 
cgit v1.2.1


From f91771606ce8a2bb4f2fa44e7bf54c9b7c945db6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 05:19:01 +0000
Subject: expedited check entry

---
 httemplate/edit/cust_pay.cgi         | 8 ++++++--
 httemplate/edit/process/cust_pay.cgi | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 7f70802c3..38654e98d 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,8 +1,8 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.8 2001-12-26 04:25:04 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.9 2001-12-26 05:19:01 ivan Exp $ -->
 
 use strict;
-use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
+use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid $quickpay );
 use Date::Format;
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
@@ -21,6 +21,7 @@ if ( $cgi->param('error') ) {
   $paid = $cgi->param('paid');
   $payby = $cgi->param('payby');
   $payinfo = $cgi->param('payinfo');
+  $quickpay = $cgi->param('quickpay');
 } elsif ($cgi->keywords) {
   my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
@@ -29,12 +30,14 @@ if ( $cgi->param('error') ) {
   $paid = '';
   $payby = 'BILL';
   $payinfo = "";
+  $quickpay = '';
 } elsif ( $cgi->param('custnum')  =~ /^(\d+)$/ ) {
   $link = 'custnum';
   $linknum = $1;
   $paid = '';
   $payby = 'BILL';
   $payinfo = '';
+  $quickpay = $cgi->param('quickpay');
 } else {
   die "illegal query ". $cgi->keywords;
 }
@@ -51,6 +54,7 @@ print <<END, ntable("#cccccc",2);
     <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
     <INPUT TYPE="hidden" NAME="link" VALUE="$link">
     <INPUT TYPE="hidden" NAME="linknum" VALUE="$linknum">
+    <INPUT TYPE="hidden" NAME="quickpay" VALUE="$quickpay">
 END
 
 my $custnum;
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index b2b3602db..630e8fc1b 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.4 2001-12-26 04:25:04 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.5 2001-12-26 05:19:01 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $new $error );
@@ -43,7 +43,11 @@ if ($error) {
       or die "unknown custnum $linknum";
     $cust_main->apply_payments;
   }
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$linknum");
+  if ( $cgi->param('quickpay') eq 'yes' ) {
+    print $cgi->redirect(popurl(3). "search/cust_main-quickpay.html");
+  } else {
+    print $cgi->redirect(popurl(3). "view/cust_main.cgi?$linknum");
+  }
 }
 
 %>
-- 
cgit v1.2.1


From a34643588e65fc3272ec7bb2865aeb05a620dfc8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 06:02:48 +0000
Subject: UI

---
 httemplate/edit/cust_pay.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 38654e98d..83f3cb872 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.9 2001-12-26 05:19:01 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.10 2001-12-26 06:02:48 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid $quickpay );
@@ -96,7 +96,7 @@ if ( $link eq 'invnum' ) {
     }
 
   }
-  print '</TD></TR></TABLE>';
+  print '</TD></TR></TABLE><BR><BR>';
 
   $custnum = $cust_bill->custnum;
 
-- 
cgit v1.2.1


From 371e7a9c14b0feb83a802f624a8dceda5fecbcbf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 15:07:06 +0000
Subject: fix posting credit

---
 httemplate/edit/cust_credit.cgi         | 3 ++-
 httemplate/edit/process/cust_credit.cgi | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 63732f86c..e61463e07 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.6 2001-12-26 04:25:04 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.7 2001-12-26 15:07:06 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $otaker $p1 $_date $amount $reason );
@@ -45,6 +45,7 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 print <<END, small_custview($custnum, $conf->config('countrydefault'));
     <FORM ACTION="${p1}process/cust_credit.cgi" METHOD=POST>
     <INPUT TYPE="hidden" NAME="crednum" VALUE="">
+    <INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">
     <INPUT TYPE="hidden" NAME="paybatch" VALUE="">
     <INPUT TYPE="hidden" NAME="_date" VALUE="$_date">
     <INPUT TYPE="hidden" NAME="credited" VALUE="">
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index 2eb431bcc..415000f88 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.3 2001-12-26 04:25:04 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.4 2001-12-26 15:07:06 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum $new $error );
@@ -9,6 +9,7 @@ use FS::UID qw(cgisuidsetup getotaker);
 use FS::CGI qw(popurl);
 use FS::Record qw(fields);
 use FS::cust_credit;
+use FS::cust_main;
 
 $cgi = new CGI;
 cgisuidsetup($cgi);
@@ -33,7 +34,7 @@ if ( $error ) {
 } else {
   if ( $cgi->param('apply') eq 'yes' ) {
     my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum })
-      or die "unknown custnum $linknum";
+      or die "unknown custnum $custnum";
     $cust_main->apply_payments;
   }
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
-- 
cgit v1.2.1


From 85e18d1c25a16b3d37ff87484b36a9e17d17cbcf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Dec 2001 15:11:33 +0000
Subject: apply credits!!

---
 httemplate/edit/process/cust_credit.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index 415000f88..3bbd749ce 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.4 2001-12-26 15:07:06 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.5 2001-12-26 15:11:33 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $custnum $new $error );
@@ -35,7 +35,7 @@ if ( $error ) {
   if ( $cgi->param('apply') eq 'yes' ) {
     my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum })
       or die "unknown custnum $custnum";
-    $cust_main->apply_payments;
+    $cust_main->apply_credits;
   }
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 }
-- 
cgit v1.2.1


From cf16b23820da69e3c8d0156ae27e21c635bf1ec5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Dec 2001 09:26:14 +0000
Subject: service and package disable!

---
 httemplate/edit/agent_type.cgi       |  4 ++--
 httemplate/edit/cust_main.cgi        |  4 ++--
 httemplate/edit/cust_pkg.cgi         |  5 +++--
 httemplate/edit/part_pkg.cgi         | 17 ++++++++++++-----
 httemplate/edit/part_svc.cgi         | 14 ++++++++++----
 httemplate/edit/process/part_pkg.cgi |  7 ++++---
 6 files changed, 33 insertions(+), 18 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 849da8113..a2595bf41 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent_type.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: agent_type.cgi,v 1.6 2001-12-27 09:26:14 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
@@ -50,7 +50,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 $part_pkg ( qsearch('part_pkg',{ 'disabled' => '' }) ) {
   print qq!<BR><INPUT TYPE="checkbox" NAME="pkgpart!,
         $part_pkg->getfield('pkgpart'), qq!" !,
        # ( 'CHECKED 'x scalar(
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 6967a1e1b..9588dcb3a 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.16 2001-12-15 22:47:24 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.17 2001-12-27 09:26:14 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -412,7 +412,7 @@ unless ( $custnum ) {
   #eslaf
 
   my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
-    qsearch( 'part_pkg', {} );
+    qsearch( 'part_pkg', { 'disabled' => '' } );
 
   if ( @part_pkg ) {
 
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index 7d5bb3fd3..73b190786 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pkg.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: cust_pkg.cgi,v 1.5 2001-12-27 09:26:14 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
@@ -17,7 +17,7 @@ $cgi = new CGI;
 
 %pkg = ();
 %comment = ();
-foreach (qsearch('part_pkg', {})) {
+foreach (qsearch('part_pkg', { 'disabled' => '' })) {
   $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
   $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
 }
@@ -83,6 +83,7 @@ print qq!<TABLE>!;
 foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
   $pkgparts++;
   my($pkgpart)=$type_pkgs->pkgpart;
+  next unless exists $pkg{$pkgpart}; #skip disabled ones
   print qq!<TR>! if ( $count == 0 );
   my $value = $cgi->param("pkg$pkgpart") || 0;
   print <<END;
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index fee0b411e..1618c5a99 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.6 2001-10-20 12:17:59 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.7 2001-12-27 09:26:14 ivan Exp $ -->
 
 <%
 
@@ -76,7 +76,7 @@ print '<FORM NAME="dummy">';
 #print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
 print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 
-print itable("#cccccc",2), <<END;
+print ntable("#cccccc",2), <<END;
 <TR><TD ALIGN="right">Package (customer-visable)</TD><TD><INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}"></TD></TR>
 <TR><TD ALIGN="right">Comment (customer-hidden)</TD><TD><INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}"></TD></TR>
 <TR><TD ALIGN="right">Frequency (months) of recurring fee</TD><TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}" SIZE=3></TD></TR>
@@ -96,6 +96,12 @@ print '<INPUT TYPE="checkbox" NAME="recurtax" VALUE="Y"';
 print ' CHECKED' if $hashref->{recurtax} eq "Y";
 print '>';
 
+print '</TD></TR>';
+
+print '<TR><TD ALIGN="right">Disable new orders</TD><TD>';
+print '<INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"';
+print ' CHECKED' if $hashref->{disabled} eq "Y";
+print '>';
 print '</TD></TR></TABLE>';
 
 my $thead =  "\n\n". ntable('#cccccc', 2). <<END;
@@ -112,7 +118,7 @@ END
 my @fixups = ();
 my $count = 0;
 my $columns = 3;
-my @part_svc = qsearch( 'part_svc', {} );
+my @part_svc = qsearch( 'part_svc', { 'disabled' => '' } );
 foreach my $part_svc ( @part_svc ) {
   my $svcpart = $part_svc->svcpart;
   my $pkg_svc = qsearchs( 'pkg_svc', {
@@ -232,7 +238,7 @@ function fixup(what) {
 <% foreach my $f ( qw( pkg comment freq ), @fixups ) { %>
   what.<%= $f %>.value = document.dummy.<%= $f %>.value;
 <% } %>
-<% foreach my $f ( qw( setuptax recurtax ) ) { %>
+<% foreach my $f ( qw( setuptax recurtax disabled ) ) { %>
   if (document.dummy.<%= $f %>.checked)
     what.<%= $f %>.value = 'Y';
   else
@@ -270,6 +276,7 @@ if (document.getElementById) {
 <INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>">
 <INPUT TYPE="hidden" NAME="setuptax" VALUE="<%= $hashref->{setuptax} %>">
 <INPUT TYPE="hidden" NAME="recurtax" VALUE="<%= $hashref->{recurtax} %>">
+<INPUT TYPE="hidden" NAME="disabled" VALUE="<%= $hashref->{disabled} %>">
 <% foreach my $f ( @fixups ) { %>
 <INPUT TYPE="hidden" NAME="<%= $f %>" VALUE="">
 <% } %>
@@ -284,7 +291,7 @@ if ( $cgi->param('pkgnum') ) {
 %>
 
 <INPUT TYPE="hidden" NAME="pkgpart" VALUE="<%= $hashref->{pkgpart} %>">
-<%= itable("#cccccc",2) %>
+<%= ntable("#cccccc",2) %>
 
 <% my $href = $plans{$layer}->{'fields'};
    foreach my $field ( keys %{ $href } ) { %>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 29778567e..f2555a29f 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.12 2001-10-15 10:42:29 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.13 2001-12-27 09:26:14 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -45,8 +45,9 @@ function visualize(what) {
 
       Service Part #<%= $part_svc->svcpart ? $part_svc->svcpart : "(NEW)" %>
 <BR><BR>
-Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>">
-<BR><BR>
+Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>"><BR>
+Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>><BR>
+<BR>
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
     <LI>svc_domain - Domains
@@ -167,12 +168,17 @@ if (document.getElementById) {
 
 function fixup(what) {
   what.svc.value = document.dummy.svc.value;
-  what.svcdb.value = document.dummy.svcdb.options[document.dummy.svcdb.selectedIndex].value
+  what.svcdb.value = document.dummy.svcdb.options[document.dummy.svcdb.selectedIndex].value;
+  if (document.dummy.disabled.checked)
+    what.disabled.value = 'Y';
+  else
+    what.disabled.value = '';
 }
 </SCRIPT>
 <FORM NAME="<%= $svcdb %>" ACTION="process/part_svc.cgi" METHOD=POST onSubmit="fixup(this)">
 <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
 <INPUT TYPE="hidden" NAME="svc" VALUE="<%= $hashref->{svc} %>">
+<INPUT TYPE="hidden" NAME="disabled" VALUE="<%= $hashref->{disabled} %>">
 <INPUT TYPE="hidden" NAME="svcdb" VALUE="<%= $svcdb %>">
 <%
   print "$svcdb" unless $svcdb eq 'konq_kludge';
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index c64d49219..08bc9b723 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.5 2001-11-06 18:45:46 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.6 2001-12-27 09:26:14 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
@@ -26,8 +26,9 @@ $cgi->param('plandata',
   join('', map { "$_=". $cgi->param($_). "\n" } @plandata )
 );
 
-$cgi->param('setuptax','') unless defined $cgi->param('setuptax');
-$cgi->param('recurtax','') unless defined $cgi->param('recurtax');
+foreach (qw( setuptax recurtax disabled )) {
+  $cgi->param($_, '') unless defined $cgi->param($_);
+}
 
 $new = new FS::part_pkg ( {
   map {
-- 
cgit v1.2.1


From 5e25b996982d42eb2587ec54db0d5b39508aa730 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 28 Dec 2001 14:40:35 +0000
Subject: add more options to freeside-overdue

add charge method to FS::cust_main

one-off packages default to disabled

billing payname defaults to first and last, not "Accounts Payable"
---
 httemplate/edit/cust_main.cgi | 6 +++---
 httemplate/edit/part_pkg.cgi  | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 9588dcb3a..d3251c2b9 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.17 2001-12-27 09:26:14 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.18 2001-12-28 14:40:35 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -364,12 +364,12 @@ print "<TR><TD>Billing type</TD></TR>",
 
 %payby = (
   'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
+  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
   'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
 );
 %paybychecked = (
   'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>${r}Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
   'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
 );
 for (qw(CARD BILL COMP)) {
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 1618c5a99..735f4f269 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.7 2001-12-27 09:26:14 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.8 2001-12-28 14:40:35 ivan Exp $ -->
 
 <%
 
@@ -26,6 +26,7 @@ if ( $cgi->param('clone') ) {
   my $old_part_pkg =
     qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
   $part_pkg ||= $old_part_pkg->clone;
+  $part_pkg->disabled('Y');
 } elsif ( $query && $query =~ /^(\d+)$/ ) {
   $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
 } else {
-- 
cgit v1.2.1


From 6991d4986df7fb3a6c7c49b5ae1b3713e87a16c4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 29 Jan 2002 16:33:16 +0000
Subject: - web interface for hourly account charges!   (FS::cust_pkg,
 FS::cust_svc and FS::svc_acct seconds_since methods) - Makefile target to
 regenerate HTML manpages on install - FS.pm doc update - $FS::Record::Debug
 now dumps all SQL - new FS::cust_main methods: ->cancel,
 ->invoicing_list_addpost - start of a billing event web interface -
 cust_pay::upgrade_replace doesn't error out if history includes   overapplied
 payments

---
 httemplate/edit/part_bill_event.cgi         | 131 ++++++++++++++++++++++++++++
 httemplate/edit/part_pkg.cgi                |  71 ++++++++++++---
 httemplate/edit/process/part_bill_event.cgi |  32 +++++++
 3 files changed, 224 insertions(+), 10 deletions(-)
 create mode 100755 httemplate/edit/part_bill_event.cgi
 create mode 100755 httemplate/edit/process/part_bill_event.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
new file mode 100755
index 000000000..41d6666dc
--- /dev/null
+++ b/httemplate/edit/part_bill_event.cgi
@@ -0,0 +1,131 @@
+<!-- $Id: part_bill_event.cgi,v 1.1 2002-01-29 16:33:16 ivan Exp $ -->
+
+<%
+
+if ( $cgi->param('eventnum') && $cgi->param('eventnum') =~ /^(\d+)$/ ) {
+  $cgi->param('eventnum', $1);
+} else {
+  $cgi->param('eventnum', '');
+}
+
+my ($query) = $cgi->keywords;
+my $action = '';
+my $part_bill_event = '';
+if ( $cgi->param('error') ) {
+  $part_bill_event = new FS::part_bill_event ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_bill_event')
+  } );
+}
+if ( $query && $query =~ /^(\d+)$/ ) {
+  $part_bill_event ||= qsearchs('part_bill_event',{'eventpart'=>$1});
+} else {
+  $part_bill_event ||= new FS::part_bill_event {};
+}
+$action ||= $part_bill_event->pkgpart ? 'Edit' : 'Add';
+my $hashref = $part_bill_event->hashref;
+
+print header("$action Invoice Event Definition", menubar(
+  'Main Menu' => popurl(2),
+  'View all invoice events' => popurl(2). 'browse/part_bill_event.cgi',
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print '<FORM ACTION="', popurl(1), 'process/part_bill_event.cgi" METHOD=POST>';
+
+print "Invoice Event #", $hashref->{eventpart} ? $hashref->{eventpart} : "(NEW)";
+
+print ntable("#cccccc",2), <<END;
+<TR><TD ALIGN="right">Payby</TD><TD><SELECT NAME="payby">
+END
+
+for (qw(CARD BILL COMP)) {
+  print qq!<OPTION VALUE="$_"!;
+  if ($part_bill_event->payby eq $_) {
+    print " SELECTED> $_</OPTION>";
+  } else {
+    print ">$_</OPTION>";
+  }
+}
+
+my $days = $hashref->{seconds}/3600;
+
+print <<END;
+</SELECT></TD></TR>
+<TR><TD ALIGN="right">Event</TD><TD><INPUT TYPE="text" NAME="event" VALUE="$hashref->{event}"></TD></TR>
+<TR><TD ALIGN="right">After</TD><TD><INPUT TYPE="text" NAME="days" VALUE="$days"> days</TD></TR>
+END
+
+print '<TR><TD ALIGN="right">Disabled</TD><TD>';
+print '<INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"';
+print ' CHECKED' if $hashref->{disabled} eq "Y";
+print '>';
+print '</TD></TR>';
+
+print '<TR><TD ALIGN="right">Action</TD><TD>';
+
+#print ntable();
+
+#this is pretty kludgy right here.
+tie my %events, 'Tie::IxHash',
+
+  'Charge a fee' => {
+    'code' => '$cust_main->charge( %%%charge%%%, \'%%%reason%%%\' );',
+    'html' => 'Amount <INPUT TYPE="text" SIZE="7" NAME="charge"><BR>'.
+              'Reason <INPUT TYPE="text" NAME="reason">',
+  },
+  'Suspend accounts' => {
+    'code' => '$cust_main->suspend();',
+  },
+  'Cancel accounts' => {
+    'code' => '$cust_main->cancel();',
+  },
+
+  'Add postal invoicing' => {
+    'code' => '$cust_main->invoicing_list_addpost();',
+    'pad'  => 10,
+  },
+
+  'Generate invoices' => {
+    'code' => '$cust_main->bill();',
+    'pad'  => 20,
+  },
+
+  'Apply unapplied payments and credits' => {
+    'code' => '$cust_main->apply_payments; $cust_main->apply_credits;',
+    'pad'  => 30,
+  },
+
+  'Collect on invoices' => {
+    'code' => '$cust_main->collect();',
+    'pad'  => 40,
+  },
+
+;
+
+foreach my $event ( keys %events ) {
+  print ntable( "#cccccc", 2). qq!<TR><TD><INPUT TYPE="radio" NAME="eventcode" VALUE="!.
+        encode_entities($events{$event}{code}). qq!">$event</TD>!;
+  print '<TD>'. $events{$event}{html}. '</TD>' if exists $events{$event}{html};
+  print qq!</TR>!;
+  print '</TABLE>';
+}
+
+#print '</TABLE>';
+
+print <<END;
+</TD></TR>
+</TABLE>
+END
+
+print qq!<INPUT TYPE="submit" VALUE="!,
+      $hashref->{pkgpart} ? "Apply changes" : "Add invoice event",
+      qq!">!;
+%>
+
+    </FORM>
+  </BODY>
+</HTML>
+
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 735f4f269..ea3f62aa2 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.8 2001-12-28 14:40:35 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.9 2002-01-29 16:33:16 ivan Exp $ -->
 
 <%
 
@@ -158,8 +158,8 @@ unless ( $cgi->param('clone') ) {
 }
 
 # prolly should be in database
-my %plans = (
-
+use Tie::IxHash;
+tie my %plans, 'Tie::IxHash',
   'flat' => {
     'name' => 'Flat rate',
     'fields' => {
@@ -170,6 +170,7 @@ my %plans = (
                        'default' => 0,
                       },
     },
+    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
     'setup' => 'what.setup_fee.value',
     'recur' => 'what.recur_fee.value',
   },
@@ -190,11 +191,55 @@ my %plans = (
                               'default' => 1,
                             },
     },
+    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ],
     'setup' => 'what.setup_fee.value',
     'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
   },
 
-);
+  'sesmon_hour' => {
+    'name' => 'Base charge plus charge per-hour from the session monitor',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'recur_included_hours' => { 'name' => 'Hours included',
+                                  'default' => 0,
+                                },
+      'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
+                                 'default' => 0,
+                               },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_bkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+  },
+
+  'sesmon_minute' => {
+    'name' => 'Base charge plus charge per-minute from the session monitor',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'recur_included_min' => { 'name' => 'Minutes included',
+                                'default' => 0,
+                                },
+      'recur_minly_charge' => { 'name' => 'Additional charge per minute',
+                                'default' => 0,
+                              },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_min', 'recur_minly_charge' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'my $min = $cust_pkg->seconds_since($cust_bkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
+
+  },
+
+;
 
 %>
 
@@ -295,24 +340,30 @@ if ( $cgi->param('pkgnum') ) {
 <%= ntable("#cccccc",2) %>
 
 <% my $href = $plans{$layer}->{'fields'};
-   foreach my $field ( keys %{ $href } ) { %>
+   foreach my $field ( exists($plans{$layer}->{'fieldorder'})
+                         ? @{$plans{$layer}->{'fieldorder'}}
+                         : keys %{ $href }
+                     ) {
+%>
 <TR><TD ALIGN="right"><%= $href->{$field}{'name'} %></TD>
 <TD><INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)"></TD></TR>
 <% } %>
 </TABLE>
 <INPUT TYPE="hidden" NAME="plandata" VALUE="<%= join(',', keys %{ $href } ) %>">
-<FONT SIZE="1">
 <BR><BR>
-Setup expression<BR><INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="<%= $hashref->{setup} %>" onLoad="fchanged(this)"><BR>
-Recurring espression<BR><INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="<%= $hashref->{recur} %>" onLoad="fchanged(this)"><BR>
-</FONT>
 
 <%
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
+print qq!<INPUT TYPE="submit" VALUE="!,
       $hashref->{pkgpart} ? "Apply changes" : "Add package",
       qq!" onClick="fchanged(this)">!;
 %>
 
+<BR><BR>don't edit this unless you know what you're doing <INPUT TYPE="button" VALUE="refresh expressions" onClick="fchanged(this)"><%= ntable("#cccccc",2) %><TR><TD>
+<FONT SIZE="1">Setup expression<BR><INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="<%= $hashref->{setup} %>" onLoad="fchanged(this)"></FONT><BR>
+<FONT SIZE="1">Recurring espression<BR><INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="<%= $hashref->{recur} %>" onLoad="fchanged(this)"></FONT>
+</TR></TD>
+</TABLE>
+
 </FORM>
 
 <SCRIPT>
diff --git a/httemplate/edit/process/part_bill_event.cgi b/httemplate/edit/process/part_bill_event.cgi
new file mode 100755
index 000000000..eb7c53e5d
--- /dev/null
+++ b/httemplate/edit/process/part_bill_event.cgi
@@ -0,0 +1,32 @@
+<%
+
+my $eventpart = $cgi->param('eventpart');
+
+my $old = qsearchs('part_bill_event',{'eventpart'=>$eventpart}) if $eventpart;
+
+#s/days/seconds/
+$cgi->param('seconds', $cgi->param('days') * 3600 );
+
+my $new = new FS::part_bill_event ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('part_bill_event'),
+} );
+
+my $error;
+if ( $eventpart ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $eventpart = $new->getfield('eventpart');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "part_bill_event.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3)."browse/part_bill_event.cgi");
+}
+
+%>
+
-- 
cgit v1.2.1


From 1fd6d8cf5d7854860ef4fd10ed89828e0c04ec39 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 30 Jan 2002 14:18:09 +0000
Subject: remove   use Module; and   $cgi = new CGI;   &cgisuidsetup(); from
 all templates.  should work better under Mason.

---
 httemplate/edit/agent.cgi                          | 25 ++-------
 httemplate/edit/agent_type.cgi                     | 26 ++-------
 httemplate/edit/cust_bill_pay.cgi                  | 27 +++------
 httemplate/edit/cust_credit.cgi                    | 25 ++-------
 httemplate/edit/cust_credit_bill.cgi               | 27 +++------
 httemplate/edit/cust_main.cgi                      | 65 ++++++++--------------
 httemplate/edit/cust_main_county-expand.cgi        | 20 ++-----
 httemplate/edit/cust_main_county.cgi               | 23 ++------
 httemplate/edit/cust_pay.cgi                       | 19 ++-----
 httemplate/edit/cust_pkg.cgi                       | 39 +++++--------
 httemplate/edit/part_bill_event.cgi                | 45 ++++++++++-----
 httemplate/edit/part_referral.cgi                  | 22 ++------
 httemplate/edit/part_svc.cgi                       |  8 +--
 httemplate/edit/process/agent.cgi                  | 22 ++------
 httemplate/edit/process/agent_type.cgi             | 25 ++-------
 httemplate/edit/process/cust_bill_pay.cgi          | 22 ++------
 httemplate/edit/process/cust_credit.cgi            | 21 ++-----
 httemplate/edit/process/cust_credit_bill.cgi       | 22 ++------
 httemplate/edit/process/cust_main.cgi              | 33 +++--------
 .../edit/process/cust_main_county-collapse.cgi     | 19 +------
 .../edit/process/cust_main_county-expand.cgi       | 20 ++-----
 httemplate/edit/process/cust_main_county.cgi       | 14 +----
 httemplate/edit/process/cust_pay.cgi               | 22 ++------
 httemplate/edit/process/cust_pkg.cgi               | 21 ++-----
 httemplate/edit/process/part_pkg.cgi               | 25 +++------
 httemplate/edit/process/part_referral.cgi          | 19 ++-----
 httemplate/edit/process/quick-cust_pkg.cgi         | 20 ++-----
 httemplate/edit/process/svc_acct.cgi               | 20 ++-----
 httemplate/edit/process/svc_acct_pop.cgi           | 22 ++------
 httemplate/edit/process/svc_acct_sm.cgi            | 21 ++-----
 httemplate/edit/process/svc_domain.cgi             | 19 ++-----
 httemplate/edit/process/svc_forward.cgi            | 21 ++-----
 httemplate/edit/svc_acct.cgi                       | 57 +++++++------------
 httemplate/edit/svc_acct_pop.cgi                   | 20 ++-----
 httemplate/edit/svc_acct_sm.cgi                    | 41 +++++---------
 httemplate/edit/svc_domain.cgi                     | 29 +++-------
 httemplate/edit/svc_forward.cgi                    | 33 ++++-------
 37 files changed, 268 insertions(+), 691 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index a4dcda5e3..f3864e6c2 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,20 +1,7 @@
+<!-- $Id: agent.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: agent.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi $agent $action $hashref $p $agent_type );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header menubar popurl ntable);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::agent;
-use FS::agent_type;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
 
+my $agent;
 if ( $cgi->param('error') ) {
   $agent = new FS::agent ( {
     map { $_, scalar($cgi->param($_)) } fields('agent')
@@ -26,10 +13,8 @@ if ( $cgi->param('error') ) {
 } else { #adding
   $agent = new FS::agent {};
 }
-$action = $agent->agentnum ? 'Edit' : 'Add';
-$hashref = $agent->hashref;
-
-$p = popurl(2);
+my $action = $agent->agentnum ? 'Edit' : 'Add';
+my $hashref = $agent->hashref;
 
 print header("$action Agent", menubar(
   'Main Menu' => $p,
@@ -54,7 +39,7 @@ print &ntable("#cccccc", 2, ''), <<END;
   <TD><SELECT NAME="typenum" SIZE=1>
 END
 
-foreach $agent_type (qsearch('agent_type',{})) {
+foreach my $agent_type (qsearch('agent_type',{})) {
   print "<OPTION VALUE=". $agent_type->typenum;
   print " SELECTED"
     if $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum );
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index a2595bf41..c3ff30ff6 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,22 +1,7 @@
+<!-- $Id: agent_type.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: agent_type.cgi,v 1.6 2001-12-27 09:26:14 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,10 +13,9 @@ 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 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',{ 'disabled' => '' }) ) {
+foreach my $part_pkg ( qsearch('part_pkg',{ 'disabled' => '' }) ) {
   print qq!<BR><INPUT TYPE="checkbox" NAME="pkgpart!,
         $part_pkg->getfield('pkgpart'), qq!" !,
        # ( 'CHECKED 'x scalar(
diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index 793ed1009..fd56b328a 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -1,36 +1,22 @@
+<!-- $Id: cust_bill_pay.cgi,v 1.5 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_bill_pay.cgi,v 1.4 2001-12-18 19:36:21 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $query $custnum $paynum $amount $invnum $p1 $otaker $cust_pay );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch fields);
-use FS::cust_pay;
-use FS::cust_bill;
-
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
+my($paynum, $amount, $invnum);
 if ( $cgi->param('error') ) {
   $paynum = $cgi->param('paynum');
   $amount = $cgi->param('amount');
   $invnum = $cgi->param('invnum');
 } else {
-  ($query) = $cgi->keywords;
+  my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $paynum = $1;
   $amount = '';
   $invnum = '';
 }
 
-$otaker = getotaker;
+my $otaker = getotaker;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 
 print header("Apply Payment", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
@@ -40,7 +26,8 @@ print <<END;
     <FORM ACTION="${p1}process/cust_bill_pay.cgi" METHOD=POST>
 END
 
-die unless $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } );
+my $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } );
+die "payment $paynum not found!" unless $cust_pay;
 
 my $unapplied = $cust_pay->unapplied;
 
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index e61463e07..7c8a80c22 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,21 +1,8 @@
+<!-- $Id: cust_credit.cgi,v 1.8 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_credit.cgi,v 1.7 2001-12-26 15:07:06 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $query $custnum $otaker $p1 $_date $amount $reason );
-use Date::Format;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl small_custview);
-use FS::Record qw(fields);
-#use FS::cust_credit;
 
 my $conf = new FS::Conf;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
+my($custnum, $amount, $reason);
 if ( $cgi->param('error') ) {
   #$cust_credit = new FS::cust_credit ( {
   #  map { $_, scalar($cgi->param($_)) } fields('cust_credit')
@@ -25,18 +12,18 @@ if ( $cgi->param('error') ) {
   #$refund = $cgi->param('refund');
   $reason = $cgi->param('reason');
 } else {
-  ($query) = $cgi->keywords;
+  my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $custnum = $1;
   $amount = '';
   #$refund = 'yes';
   $reason = '';
 }
-$_date = time;
+my $_date = time;
 
-$otaker = getotaker;
+my $otaker = getotaker;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 
 print header("Post Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index a00734949..3748202a5 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,21 +1,7 @@
+<!-- $Id: cust_credit_bill.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.6 2001-12-18 19:30:31 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $amount $reason $cust_credit );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch fields);
-use FS::cust_credit;
-use FS::cust_bill;
-
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
+my($crednum, $amount, $invnum);
 if ( $cgi->param('error') ) {
   #$cust_credit_bill = new FS::cust_credit_bill ( {
   #  map { $_, scalar($cgi->param($_)) } fields('cust_credit_bill')
@@ -25,7 +11,7 @@ if ( $cgi->param('error') ) {
   #$refund = $cgi->param('refund');
   $invnum = $cgi->param('invnum');
 } else {
-  ($query) = $cgi->keywords;
+  my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $crednum = $1;
   $amount = '';
@@ -33,9 +19,9 @@ if ( $cgi->param('error') ) {
   $invnum = '';
 }
 
-$otaker = getotaker;
+my $otaker = getotaker;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 
 print header("Apply Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
@@ -45,7 +31,8 @@ print <<END;
     <FORM ACTION="${p1}process/cust_credit_bill.cgi" METHOD=POST>
 END
 
-die unless $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
+my $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } );
+die "credit $crednum not found!" unless $cust_credit;
 
 my $credited = $cust_credit->credited;
 
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index d3251c2b9..fad4d9e6d 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,39 +1,22 @@
+<!-- $Id: cust_main.cgi,v 1.19 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_main.cgi,v 1.18 2001-12-28 14:40:35 ivan Exp $ -->
-
-use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
-             $last $first $ss $company $address1 $address2 $city $zip 
-             $daytime $night $fax @invoicing_list $invoicing_list $payinfo
-             $payname %payby %paybychecked $refnum $otaker $r );
-use vars qw ( $conf $saved_pkgpart $username $password $popnum $ulen $ulen2 );
-use vars qw ( $error );
-#use CGI::Switch;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-#use FS::Record qw(qsearch qsearchs fields);
-use FS::Record qw(qsearch qsearchs fields dbdef);
-use FS::CGI qw(header popurl itable table);
-use FS::cust_main;
-use FS::agent;
-use FS::part_referral;
-use FS::cust_main_county;
 
   #for misplaced logic below
-  use FS::part_pkg;
+  #use FS::part_pkg;
 
   #for false laziness below (now more properly lazy)
-  use FS::svc_acct_pop;
+  #use FS::svc_acct_pop;
 
   #for (other) false laziness below
-  use FS::agent;
-  use FS::type_pkgs;
+  #use FS::agent;
+  #use FS::type_pkgs;
 
-$conf = new FS::Conf;
+my $conf = new FS::Conf;
 
 #get record
 
-$error = '';
+my $error = '';
+my($custnum, $username, $password, $popnum, $cust_main, $saved_pkgpart);
 if ( $cgi->param('error') ) {
   $error = $cgi->param('error');
   $cust_main = new FS::cust_main ( {
@@ -69,11 +52,11 @@ if ( $cgi->param('error') ) {
   $popnum = 0;
 }
 $cgi->delete_all();
-$action = $custnum ? 'Edit' : 'Add';
+my $action = $custnum ? 'Edit' : 'Add';
 
 # top
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("Customer $action", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
   if $error;
@@ -86,12 +69,12 @@ print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
 
 # agent
 
-$r = qq!<font color="#ff0000">*</font>!;
+my $r = qq!<font color="#ff0000">*</font>!;
 
-@agents = qsearch( 'agent', {} );
+my @agents = qsearch( 'agent', {} );
 #die "No agents created!" unless @agents;
 die "You have not created any agents.  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
-$agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
+my $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
 if ( scalar(@agents) == 1 ) {
   print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
 } else {
@@ -109,7 +92,7 @@ if ( scalar(@agents) == 1 ) {
 
 #referral
 
-$refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
+my $refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
 if ( $custnum && ! $conf->exists('editreferrals') ) {
   print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
 } else {
@@ -152,7 +135,7 @@ if ( $cust_main->referral_custnum ) {
 
 # contact info
 
-($last,$first,$ss,$company,$address1,$address2,$city,$zip)=(
+my($last,$first,$ss,$company,$address1,$address2,$city,$zip)=(
   $cust_main->last,
   $cust_main->first,
   $cust_main->ss,
@@ -201,7 +184,7 @@ foreach ( sort {
 }
 print qq!</SELECT></TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10></TD></TR>!;
 
-($daytime,$night,$fax)=(
+my($daytime,$night,$fax)=(
   $cust_main->daytime,
   $cust_main->night,
   $cust_main->fax,
@@ -345,29 +328,29 @@ print "<BR>Billing information", &itable("#cccccc"),
 print qq! CHECKED! if $cust_main->tax eq "Y";
 print qq!>Tax Exempt</TD></TR>!;
 print qq!<TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
-@invoicing_list = $cust_main->invoicing_list;
+my @invoicing_list = $cust_main->invoicing_list;
 print qq! CHECKED!
   if ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
      || grep { $_ eq 'POST' } @invoicing_list;
 print qq!>Postal mail invoice</TD></TR>!;
-$invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
+my $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
 print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
 
 print "<TR><TD>Billing type</TD></TR>",
       "</TABLE>",
       &table("#cccccc"), "<TR>";
 
-($payinfo, $payname)=(
+my($payinfo, $payname)=(
   $cust_main->payinfo,
   $cust_main->payname,
 );
 
-%payby = (
+my %payby = (
   'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
   'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
   'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
 );
-%paybychecked = (
+my %paybychecked = (
   'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
   'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
   'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
@@ -434,8 +417,8 @@ unless ( $custnum ) {
 
     #false laziness: (mostly) copied from edit/svc_acct.cgi
     #$ulen = $svc_acct->dbdef_table->column('username')->length;
-    $ulen = dbdef->table('svc_acct')->column('username')->length;
-    $ulen2 = $ulen+2;
+    my $ulen = dbdef->table('svc_acct')->column('username')->length;
+    my $ulen2 = $ulen+2;
     my $passwordmax = $conf->config('passwordmax') || 8;
     my $pmax2 = $passwordmax + 2;
     print <<END;
@@ -454,7 +437,7 @@ END
   }
 }
 
-$otaker = $cust_main->otaker;
+my $otaker = $cust_main->otaker;
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
       qq!<BR><INPUT TYPE="submit" VALUE="!,
       $custnum ?  "Apply Changes" : "Add Customer", qq!">!,
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index f5dc32372..092a2d068 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,19 +1,7 @@
+<!-- $Id: cust_main_county-expand.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_main_county-expand.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl);
-use FS::cust_main_county;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
 
+my($taxnum, $delim, $expansion );
 if ( $cgi->param('error') ) {
   $taxnum = $cgi->param('taxnum');
   $delim = $cgi->param('delim');
@@ -27,11 +15,11 @@ if ( $cgi->param('error') ) {
   $expansion = '';
 }
 
-$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
   or die "cust_main_county.taxnum $taxnum not found";
 die "Can't expand entry!" if $cust_main_county->getfield('county');
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("Tax Rate (expand)", menubar(
   'Main Menu' => popurl(2),
 ));
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index f88601281..69def0468 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,18 +1,5 @@
+<!-- $Id: cust_main_county.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $cust_main_county );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl table);
-use FS::cust_main_county;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
 
 print header("Edit tax rates", menubar(
   'Main Menu' => popurl(2),
@@ -32,10 +19,10 @@ print qq!<FORM ACTION="!, popurl(1),
       </TR>
 END
 
-foreach $cust_main_county ( sort {    $a->country cmp $b->country
-                                   or $a->state   cmp $b->state
-                                   or $a->county  cmp $b->county
-                                 } qsearch('cust_main_county',{}) ) {
+foreach my $cust_main_county ( sort {    $a->country cmp $b->country
+                                      or $a->state   cmp $b->state
+                                      or $a->county  cmp $b->county
+                                    } qsearch('cust_main_county',{}) ) {
   my($hashref)=$cust_main_county->hashref;
   print <<END;
       <TR>
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 83f3cb872..2794e2218 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,20 +1,9 @@
+<!-- $Id: cust_pay.cgi,v 1.11 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_pay.cgi,v 1.10 2001-12-26 06:02:48 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid $quickpay );
-use Date::Format;
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::Conf;
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl ntable small_custview);
 
 my $conf = new FS::Conf;
 
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
+my($link, $linknum, $paid, $payby, $payinfo, $quickpay); 
 if ( $cgi->param('error') ) {
   $link = $cgi->param('link');
   $linknum = $cgi->param('linknum');
@@ -41,9 +30,9 @@ if ( $cgi->param('error') ) {
 } else {
   die "illegal query ". $cgi->keywords;
 }
-$_date = time;
+my $_date = time;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("Post payment", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index 73b190786..c11a194b2 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,27 +1,14 @@
+<!-- $Id: cust_pkg.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_pkg.cgi,v 1.5 2001-12-27 09:26:14 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
-             $cust_main $agent $type_pkgs $count %remove_pkg $pkgparts );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header popurl);
-use FS::part_pkg;
-use FS::type_pkgs;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-%pkg = ();
-%comment = ();
+my %pkg = ();
+my %comment = ();
 foreach (qsearch('part_pkg', { 'disabled' => '' })) {
   $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
   $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
 }
 
+my($custnum, %remove_pkg);
 if ( $cgi->param('error') ) {
   $custnum = $cgi->param('custnum');
   %remove_pkg = map { $_ => 1 } $cgi->param('remove_pkg');
@@ -29,10 +16,10 @@ if ( $cgi->param('error') ) {
   my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $custnum = $1;
-  undef %remove_pkg;
+  %remove_pkg = ();
 }
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("Add/Edit Packages", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
@@ -44,7 +31,7 @@ print qq!<FORM ACTION="${p1}process/cust_pkg.cgi" METHOD=POST>!;
 print qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!;
 
 #current packages
-@cust_pkg = qsearch('cust_pkg',{ 'custnum' => $custnum, 'cancel' => '' } );
+my @cust_pkg = qsearch('cust_pkg',{ 'custnum' => $custnum, 'cancel' => '' } );
 
 if (@cust_pkg) {
   print <<END;
@@ -52,7 +39,7 @@ Current packages - select to remove (services are moved to a new package below)
 <BR><BR>
 END
 
-  my ($count) = 0 ;
+  my $count = 0 ;
   print qq!<TABLE>! ;
   foreach (@cust_pkg) {
     print '<TR>' if $count == 0;
@@ -74,13 +61,13 @@ print <<END;
 Order new packages<BR><BR>
 END
 
-$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
-$agent = qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
+my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+my $agent = qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
 
-$count = 0;
-$pkgparts = 0;
+my $count = 0;
+my $pkgparts = 0;
 print qq!<TABLE>!;
-foreach $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
   $pkgparts++;
   my($pkgpart)=$type_pkgs->pkgpart;
   next unless exists $pkg{$pkgpart}; #skip disabled ones
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 41d6666dc..939eff360 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_bill_event.cgi,v 1.1 2002-01-29 16:33:16 ivan Exp $ -->
+<!-- $Id: part_bill_event.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
 
 <%
 
@@ -71,42 +71,57 @@ print '<TR><TD ALIGN="right">Action</TD><TD>';
 #this is pretty kludgy right here.
 tie my %events, 'Tie::IxHash',
 
-  'Charge a fee' => {
-    'code' => '$cust_main->charge( %%%charge%%%, \'%%%reason%%%\' );',
-    'html' => 'Amount <INPUT TYPE="text" SIZE="7" NAME="charge"><BR>'.
+  'fee' => {
+    'name'   => 'Late fee',
+    'code'   => '$cust_main->charge( %%%charge%%%, \'%%%reason%%%\' );',
+    'html'   => 'Amount <INPUT TYPE="text" SIZE="7" NAME="charge"><BR>'.
               'Reason <INPUT TYPE="text" NAME="reason">',
+    'weight' => 10,
   },
-  'Suspend accounts' => {
-    'code' => '$cust_main->suspend();',
+  'suspend' => {
+    'name'   => 'Suspend',
+    'code'   => '$cust_main->suspend();',
+    'weight' => 10,
   },
-  'Cancel accounts' => {
-    'code' => '$cust_main->cancel();',
+  'cancel' => {
+    'name'   => 'Cancel',
+    'code'   => '$cust_main->cancel();',
+    'weight' => 10,
   },
 
-  'Add postal invoicing' => {
+  'addpost' => {
+    'name' => 'Add postal invoicing',
     'code' => '$cust_main->invoicing_list_addpost();',
-    'pad'  => 10,
+    'pad'  => 20,
+  },
+
+  'send' => {
+    'name' => 'Send invoice (email/print)',
+    'code' => '',
+    'weight' => 30
   },
 
   'Generate invoices' => {
     'code' => '$cust_main->bill();',
-    'pad'  => 20,
+    'pad'  => 40,
   },
 
   'Apply unapplied payments and credits' => {
     'code' => '$cust_main->apply_payments; $cust_main->apply_credits;',
-    'pad'  => 30,
+    'pad'  => 50,
   },
 
   'Collect on invoices' => {
     'code' => '$cust_main->collect();',
-    'pad'  => 40,
+    'pad'  => 60,
   },
 
 ;
 
 foreach my $event ( keys %events ) {
-  print ntable( "#cccccc", 2). qq!<TR><TD><INPUT TYPE="radio" NAME="eventcode" VALUE="!.
+  print ntable( "#cccccc", 2).
+        qq!<TR><TD><INPUT TYPE="radio" NAME="eventcode" VALUE="!.
+        $events{$event}{weight}. ":".
         encode_entities($events{$event}{code}). qq!">$event</TD>!;
   print '<TD>'. $events{$event}{html}. '</TD>' if exists $events{$event}{html};
   print qq!</TR>!;
@@ -121,7 +136,7 @@ print <<END;
 END
 
 print qq!<INPUT TYPE="submit" VALUE="!,
-      $hashref->{pkgpart} ? "Apply changes" : "Add invoice event",
+      $hashref->{eventpart} ? "Apply changes" : "Add invoice event",
       qq!">!;
 %>
 
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 09344b956..18f6aa938 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -1,19 +1,7 @@
+<!-- $Id: part_referral.cgi,v 1.5 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: part_referral.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $part_referral $action $hashref $p1 $query );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::part_referral;
-use FS::CGI qw(header menubar popurl);
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
 
+my $part_referral;
 if ( $cgi->param('error') ) {
   $part_referral = new FS::part_referral ( {
     map { $_, scalar($cgi->param($_)) } fields('part_referral')
@@ -25,10 +13,10 @@ if ( $cgi->param('error') ) {
 } else { #adding
   $part_referral = new FS::part_referral {};
 }
-$action = $part_referral->refnum ? 'Edit' : 'Add';
-$hashref = $part_referral->hashref;
+my $action = $part_referral->refnum ? 'Edit' : 'Add';
+my $hashref = $part_referral->hashref;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("$action Referral", menubar(
   'Main Menu' => popurl(2),
   'View all referrals' => popurl(2). "browse/part_referral.cgi",
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index f2555a29f..39f49e14c 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.13 2001-12-27 09:26:14 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.14 2002-01-30 14:18:08 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
@@ -51,7 +51,7 @@ Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref-
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
     <LI>svc_domain - Domains
-    <LI>svc_acct_sm - <B>depreciated</B> (use svc_forward for new installations) Virtual domain mail aliasing.
+    <LI>svc_acct_sm - <B>deprecated</B> (use svc_forward for new installations) Virtual domain mail aliasing.
     <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
@@ -181,8 +181,8 @@ function fixup(what) {
 <INPUT TYPE="hidden" NAME="disabled" VALUE="<%= $hashref->{disabled} %>">
 <INPUT TYPE="hidden" NAME="svcdb" VALUE="<%= $svcdb %>">
 <%
-  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';
+  #print "$svcdb<BR>" unless $svcdb eq 'konq_kludge';
+  print table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>" unless $svcdb eq 'konq_kludge';
 
   foreach my $field (@fields) {
     my $part_svc_column = $part_svc->part_svc_column($field);
diff --git a/httemplate/edit/process/agent.cgi b/httemplate/edit/process/agent.cgi
index b93df48d1..93ce4f9f2 100755
--- a/httemplate/edit/process/agent.cgi
+++ b/httemplate/edit/process/agent.cgi
@@ -1,29 +1,17 @@
+<!-- $Id: agent.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: agent.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw ( $cgi $agentnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::agent;
-use FS::CGI qw(popurl);
+my $agentnum = $cgi->param('agentnum');
 
-$cgi = new CGI;
+my $old = qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
 
-&cgisuidsetup($cgi);
-
-$agentnum = $cgi->param('agentnum');
-
-$old = qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
-
-$new = new FS::agent ( {
+my $new = new FS::agent ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('agent')
 } );
 
+my $error;
 if ( $agentnum ) {
   $error=$new->replace($old);
 } else {
diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
index 37a382e62..2d1159708 100755
--- a/httemplate/edit/process/agent_type.cgi
+++ b/httemplate/edit/process/agent_type.cgi
@@ -1,29 +1,16 @@
+<!-- $Id: agent_type.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: agent_type.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw ( $cgi $typenum $old $new $error $part_pkg );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::CGI qw( popurl);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::agent_type;
-use FS::type_pkgs;
-use FS::part_pkg;
+my $typenum = $cgi->param('typenum');
+my $old = qsearchs('agent_type',{'typenum'=>$typenum}) if $typenum;
 
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$typenum = $cgi->param('typenum');
-$old = qsearchs('agent_type',{'typenum'=>$typenum}) if $typenum;
-
-$new = new FS::agent_type ( {
+my $new = new FS::agent_type ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('agent_type')
 } );
 
+my $error;
 if ( $typenum ) {
   $error=$new->replace($old);
 } else {
@@ -37,7 +24,7 @@ if ( $error ) {
   exit;
 }
 
-foreach $part_pkg (qsearch('part_pkg',{})) {
+foreach my $part_pkg (qsearch('part_pkg',{})) {
   my($pkgpart)=$part_pkg->getfield('pkgpart');
 
   my($type_pkgs)=qsearchs('type_pkgs',{
diff --git a/httemplate/edit/process/cust_bill_pay.cgi b/httemplate/edit/process/cust_bill_pay.cgi
index f0d403331..16d30bd4c 100755
--- a/httemplate/edit/process/cust_bill_pay.cgi
+++ b/httemplate/edit/process/cust_bill_pay.cgi
@@ -1,22 +1,8 @@
+<!-- $Id: cust_bill_pay.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_bill_pay.cgi,v 1.1 2001-12-18 19:30:31 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $custnum $paynum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearchs fields);
-use FS::cust_pay;
-use FS::cust_bill_pay;
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('paynum') =~ /^(\d*)$/ or die "Illegal paynum!";
-$paynum = $1;
+my $paynum = $1;
 
 my $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } )
   or die "No such paynum";
@@ -26,14 +12,14 @@ my $cust_main = qsearchs('cust_main', { 'custnum' => $cust_pay->custnum } )
 
 my $custnum = $cust_main->custnum;
 
-$new = new FS::cust_bill_pay ( {
+my $new = new FS::cust_bill_pay ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(custnum _date amount invnum)
   } fields('cust_bill_pay')
 } );
 
-$error=$new->insert;
+my $error = $new->insert;
 
 if ( $error ) {
   $cgi->param('error', $error);
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index 3bbd749ce..51fca74e3 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -1,32 +1,19 @@
+<!-- $Id: cust_credit.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_credit.cgi,v 1.5 2001-12-26 15:11:33 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $custnum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(popurl);
-use FS::Record qw(fields);
-use FS::cust_credit;
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
-$custnum = $1;
+my $custnum = $1;
 
 $cgi->param('otaker',getotaker);
 
-$new = new FS::cust_credit ( {
+my $new = new FS::cust_credit ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(custnum _date amount otaker reason)
   } fields('cust_credit')
 } );
 
-$error=$new->insert;
+my $error = $new->insert;
 
 if ( $error ) {
   $cgi->param('error', $error);
diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
index e84894b04..afe297308 100755
--- a/httemplate/edit/process/cust_credit_bill.cgi
+++ b/httemplate/edit/process/cust_credit_bill.cgi
@@ -1,23 +1,8 @@
+<!-- $Id: cust_credit_bill.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.2 2001-12-18 19:30:31 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $custnum $crednum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearchs fields);
-use FS::cust_credit;
-use FS::cust_credit_bill;
-use FS::cust_refund;
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('crednum') =~ /^(\d*)$/ or die "Illegal crednum!";
-$crednum = $1;
+my $crednum = $1;
 
 my $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } )
   or die "No such crednum";
@@ -27,6 +12,7 @@ my $cust_main = qsearchs('cust_main', { 'custnum' => $cust_credit->custnum } )
 
 my $custnum = $cust_main->custnum;
 
+my $new;
 if ($cgi->param('invnum') =~ /^Refund$/) {
   $new = new FS::cust_refund ( {
     'reason'  => $cust_credit->reason,
@@ -45,7 +31,7 @@ if ($cgi->param('invnum') =~ /^Refund$/) {
   } );
 }
 
-$error=$new->insert;
+my $error = $new->insert;
 
 if ( $error ) {
   $cgi->param('error', $error);
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 625a85052..fa50dc626 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,22 +1,7 @@
+<!-- $Id: cust_main.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# $Id: cust_main.cgi,v 1.5 2001-10-20 12:18:00 ivan Exp $
 
-use strict;
-use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
-use vars qw( $cust_pkg $cust_svc $svc_acct );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw( popurl );
-use FS::Record qw( qsearch qsearchs fields );
-use FS::cust_main;
-use FS::type_pkgs;
-use FS::agent;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$error = '';
+my $error = '';
 
 #unmunge stuff
 
@@ -37,7 +22,8 @@ $cgi->param('ship_state', $1);
 $cgi->param('ship_county', $3 || '');
 $cgi->param('ship_country', $4);
 
-if ( $payby = $cgi->param('payby') ) {
+my $payby = $cgi->param('payby');
+if ( $payby ) {
   $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
   $cgi->param('paydate',
   $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
@@ -46,12 +32,12 @@ if ( $payby = $cgi->param('payby') ) {
 
 $cgi->param('otaker', &getotaker );
 
-@invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
+my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
 push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
 
 #create new record object
 
-$new = new FS::cust_main ( {
+my $new = new FS::cust_main ( {
   map {
     $_, scalar($cgi->param($_))
 #  } qw(custnum agentnum last first ss company address1 address2 city county
@@ -68,8 +54,8 @@ if ( defined($cgi->param('same')) && $cgi->param('same') eq "Y" ) {
 }
 
 #perhaps this stuff should go to cust_main.pm
-$cust_pkg = '';
-$svc_acct = '';
+my $cust_pkg = '';
+my $svc_acct = '';
 if ( $new->custnum eq '' ) {
 
   if ( $cgi->param('pkgpart_svcpart') ) {
@@ -142,7 +128,6 @@ if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "cust_main.cgi?". $cgi->query_string );
 } else { 
-  $custnum = $new->custnum;
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new->custnum);
 } 
 %>
diff --git a/httemplate/edit/process/cust_main_county-collapse.cgi b/httemplate/edit/process/cust_main_county-collapse.cgi
index 62c2ba753..4888b781f 100755
--- a/httemplate/edit/process/cust_main_county-collapse.cgi
+++ b/httemplate/edit/process/cust_main_county-collapse.cgi
@@ -1,23 +1,10 @@
+<!-- $Id: cust_main_county-collapse.cgi,v 1.2 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: cust_main_county-collapse.cgi,v 1.1 2001-08-17 11:05:31 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(popurl);
-use FS::cust_main_county;
-use FS::cust_main;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/ or die "Illegal taxnum!";
-$taxnum = $1;
-$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+my $taxnum = $1;
+my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
   or die ("Unknown taxnum!");
 
 #really should do this in a .pm & start transaction
diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index 5adffc62f..b16fab4fe 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,24 +1,12 @@
+<!-- $Id: cust_main_county-expand.cgi,v 1.4 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: cust_main_county-expand.cgi,v 1.3 2001-08-31 07:17:33 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(popurl);
-use FS::cust_main_county;
-use FS::cust_main;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 $cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
-$taxnum = $1;
-$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+my $taxnum = $1;
+my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
   or die ("Unknown taxnum!");
 
+my @expansion;
 if ( $cgi->param('delim') eq 'n' ) {
   @expansion=split(/\n/,$cgi->param('expansion'));
 } elsif ( $cgi->param('delim') eq 's' ) {
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index 158a0d09e..0f0246b73 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -1,17 +1,5 @@
+<!-- $Id: cust_main_county.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_main_county;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 foreach ( $cgi->param ) {
   /^tax(\d+)$/ or die "Illegal form $_!";
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index 630e8fc1b..c75e53280 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,27 +1,15 @@
+<!-- $Id: cust_pay.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: cust_pay.cgi,v 1.5 2001-12-26 05:19:01 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $link $linknum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(fields);
-use FS::cust_pay;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 $cgi->param('linknum') =~ /^(\d+)$/
   or die "Illegal linknum: ". $cgi->param('linknum');
-$linknum = $1;
+my $linknum = $1;
 
 $cgi->param('link') =~ /^(custnum|invnum)$/
   or die "Illegal link: ". $cgi->param('link');
-$link = $1;
+my $link = $1;
 
-$new = new FS::cust_pay ( {
+my $new = new FS::cust_pay ( {
   $link => $linknum,
   map {
     $_, scalar($cgi->param($_));
@@ -29,7 +17,7 @@ $new = new FS::cust_pay ( {
   #} fields('cust_pay')
 } );
 
-$error = $new->insert;
+my $error = $new->insert;
 
 if ($error) {
   $cgi->param('error', $error);
diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
index ecaec9bcb..25b320150 100755
--- a/httemplate/edit/process/cust_pkg.cgi
+++ b/httemplate/edit/process/cust_pkg.cgi
@@ -1,28 +1,19 @@
+<!-- $Id: cust_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: cust_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $custnum @remove_pkgnums @pkgparts $pkgpart $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::cust_pkg;
-
-$cgi = new CGI; # create form object
-&cgisuidsetup($cgi);
-$error = '';
+my $error = '';
 
 #untaint custnum
 $cgi->param('custnum') =~ /^(\d+)$/;
-$custnum = $1;
+my $custnum = $1;
 
-@remove_pkgnums = map {
+my @remove_pkgnums = map {
   /^(\d+)$/ or die "Illegal remove_pkg value!";
   $1;
 } $cgi->param('remove_pkg');
 
-foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
+my @pkgparts;
+foreach my $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
   if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
     my $num_pkgs = $1;
     while ( $num_pkgs-- ) {
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 08bc9b723..2ba1cbeb0 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,23 +1,11 @@
+<!-- $Id: part_pkg.cgi,v 1.7 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: part_pkg.cgi,v 1.6 2001-12-27 09:26:14 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::part_pkg;
-use FS::pkg_svc;
-use FS::cust_pkg;
+my $dbh = dbh;
 
-$cgi = new CGI;
-$dbh = &cgisuidsetup($cgi);
+my $pkgpart = $cgi->param('pkgpart');
 
-$pkgpart = $cgi->param('pkgpart');
-
-$old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
+my $old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
 
 #fixup plandata
 my $plandata = $cgi->param('plandata');
@@ -30,7 +18,7 @@ foreach (qw( setuptax recurtax disabled )) {
   $cgi->param($_, '') unless defined $cgi->param($_);
 }
 
-$new = new FS::part_pkg ( {
+my $new = new FS::part_pkg ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('part_pkg')
@@ -41,7 +29,7 @@ $new = new FS::part_pkg ( {
 
 #most of the stuff below should move to part_pkg.pm
 
-foreach $part_svc ( qsearch('part_svc', {} ) ) {
+foreach my $part_svc ( qsearch('part_svc', {} ) ) {
   my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
   unless ( $quantity =~ /^(\d+)$/ ) {
     $cgi->param('error', "Illegal quantity" );
@@ -59,6 +47,7 @@ local $SIG{PIPE} = 'IGNORE';
 
 local $FS::UID::AutoCommit = 0;
 
+my $error;
 if ( $pkgpart ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/edit/process/part_referral.cgi b/httemplate/edit/process/part_referral.cgi
index ff94e3955..7e37db855 100755
--- a/httemplate/edit/process/part_referral.cgi
+++ b/httemplate/edit/process/part_referral.cgi
@@ -1,26 +1,15 @@
+<!-- $Id: part_referral.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: part_referral.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $refnum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::part_referral;
-use FS::CGI qw(popurl);
+my $refnum = $cgi->param('refnum');
 
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$refnum = $cgi->param('refnum');
-
-$new = new FS::part_referral ( {
+my $new = new FS::part_referral ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('part_referral')
 } );
 
+my $error;
 if ( $refnum ) {
   my $old = qsearchs( 'part_referral', { 'refnum' =>$ refnum } );
   die "(Old) Record not found!" unless $old;
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index c4f5172ad..29a954cc9 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -1,28 +1,16 @@
+<!-- $Id: quick-cust_pkg.cgi,v 1.4 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: quick-cust_pkg.cgi,v 1.3 2001-09-11 10:05:30 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $custnum $pkgpart $error ); #@remove_pkgnums @pkgparts
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl eidiot);
-use FS::cust_pkg;
-
-$cgi = new CGI; # create form object
-&cgisuidsetup($cgi);
-$error = '';
 
 #untaint custnum
 $cgi->param('custnum') =~ /^(\d+)$/
   or eidiot 'illegal custnum '. $cgi->param('custnum');
-$custnum = $1;
+my $custnum = $1;
 $cgi->param('pkgpart') =~ /^(\d+)$/
   or eidiot 'illegal pkgpart '. $cgi->param('pkgpart');
-$pkgpart = $1;
+my $pkgpart = $1;
 
 my @cust_pkg = ();
-$error ||= FS::cust_pkg::order($custnum, [ $pkgpart ], [], \@cust_pkg, );
+my $error = FS::cust_pkg::order($custnum, [ $pkgpart ], [], \@cust_pkg, );
 
 if ($error) {
   eidiot($error);
diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
index c500016e2..178d7d85a 100755
--- a/httemplate/edit/process/svc_acct.cgi
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -1,21 +1,10 @@
+<!-- $Id: svc_acct.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $svcnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearchs fields);
-use FS::svc_acct;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum = $1;
+my $svcnum = $1;
 
+my $old;
 if ( $svcnum ) {
   $old = qsearchs('svc_acct', { 'svcnum' => $svcnum } )
     or die "fatal: can't find account (svcnum $svcnum)!";
@@ -32,7 +21,7 @@ if ( $cgi->param('_password') eq '*HIDDEN*' ) {
   $cgi->param('_password',$old->getfield('_password'));
 }
 
-$new = new FS::svc_acct ( {
+my $new = new FS::svc_acct ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
@@ -40,6 +29,7 @@ $new = new FS::svc_acct ( {
   } ( fields('svc_acct'), qw( pkgnum svcpart ) )
 } );
 
+my $error;
 if ( $svcnum ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/edit/process/svc_acct_pop.cgi b/httemplate/edit/process/svc_acct_pop.cgi
index 2b870dc48..5d699f2f5 100755
--- a/httemplate/edit/process/svc_acct_pop.cgi
+++ b/httemplate/edit/process/svc_acct_pop.cgi
@@ -1,29 +1,17 @@
+<!-- $Id: svc_acct_pop.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $popnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct_pop;
-use FS::CGI qw(popurl);
+my $popnum = $cgi->param('popnum');
 
-$cgi = new CGI; # create form object
+my $old = qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
 
-&cgisuidsetup($cgi);
-
-$popnum = $cgi->param('popnum');
-
-$old = qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
-
-$new = new FS::svc_acct_pop ( {
+my $new = new FS::svc_acct_pop ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('svc_acct_pop')
 } );
 
+my $error = '';
 if ( $popnum ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/edit/process/svc_acct_sm.cgi b/httemplate/edit/process/svc_acct_sm.cgi
index 10afcc1f9..25cd88d5a 100755
--- a/httemplate/edit/process/svc_acct_sm.cgi
+++ b/httemplate/edit/process/svc_acct_sm.cgi
@@ -1,34 +1,23 @@
+<!-- $Id: svc_acct_sm.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $svcnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::svc_acct_sm;
-use FS::CGI qw(popurl);
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum =$1;
+my $svcnum =$1;
 
-$old = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
+my $old = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
 
 #unmunge domsvc and domuid
 #$cgi->param('domsvc',(split(/:/, $cgi->param('domsvc') ))[0] );
 #$cgi->param('domuid',(split(/:/, $cgi->param('domuid') ))[0] );
 
-$new = new FS::svc_acct_sm ( {
+my $new = new FS::svc_acct_sm ( {
   map {
     ($_, scalar($cgi->param($_)));
   #} qw(svcnum pkgnum svcpart domuser domuid domsvc)
   } ( fields('svc_acct_sm'), qw( pkgnum svcpart ) )
 } );
 
+my $error = '';
 if ( $svcnum ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/edit/process/svc_domain.cgi b/httemplate/edit/process/svc_domain.cgi
index e52b68a15..0b7ec4928 100755
--- a/httemplate/edit/process/svc_domain.cgi
+++ b/httemplate/edit/process/svc_domain.cgi
@@ -1,31 +1,20 @@
+<!-- $Id: svc_domain.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_domain.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $svcnum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::svc_domain;
-use FS::CGI qw(popurl);
 
 #remove this to actually test the domains!
 $FS::svc_domain::whois_hack = 1;
 
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum = $1;
+my $svcnum = $1;
 
-$new = new FS::svc_domain ( {
+my $new = new FS::svc_domain ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(svcnum pkgnum svcpart domain action purpose)
   } ( fields('svc_domain'), qw( pkgnum svcpart action purpose ) )
 } );
 
+my $error = '';
 if ($cgi->param('svcnum')) {
   $error="Can't modify a domain!";
 } else {
diff --git a/httemplate/edit/process/svc_forward.cgi b/httemplate/edit/process/svc_forward.cgi
index b013bd15f..5f0247fe5 100755
--- a/httemplate/edit/process/svc_forward.cgi
+++ b/httemplate/edit/process/svc_forward.cgi
@@ -1,29 +1,18 @@
+<!-- $Id: svc_forward.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_forward.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $svcnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::svc_forward;
-use FS::CGI qw(popurl);
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum =$1;
+my $svcnum =$1;
 
-$old = qsearchs('svc_forward',{'svcnum'=>$svcnum}) if $svcnum;
+my $old = qsearchs('svc_forward',{'svcnum'=>$svcnum}) if $svcnum;
 
-$new = new FS::svc_forward ( {
+my $new = new FS::svc_forward ( {
   map {
     ($_, scalar($cgi->param($_)));
   } ( fields('svc_forward'), qw( pkgnum svcpart ) )
 } );
 
+my $error = '';
 if ( $svcnum ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index ec4f66e20..681d8b5d9 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,28 +1,10 @@
+<!-- $Id: svc_acct.cgi,v 1.14 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct.cgi,v 1.13 2001-12-12 19:42:21 ivan Exp $ -->
-
-use strict;
-use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
-             $part_svc $svc $otaker $username $password $ulen $ulen2 
-             $pmax $pmax2 $p1
-             $popnum $domsvc $uid $gid $finger $dir $shell $quota $slipip
-             %svc_domain );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl itable);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct;
-use FS::svc_acct_pop qw(popselector);
-use FS::Conf;
-use FS::raddb;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-@shells = $conf->config('shells');
 
+my $conf = new FS::Conf;
+my @shells = $conf->config('shells');
+
+my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct);
 if ( $cgi->param('error') ) {
   $svc_acct = new FS::svc_acct ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_acct')
@@ -81,13 +63,14 @@ if ( $cgi->param('error') ) {
 
   }
 }
-$action = $svcnum ? 'Edit' : 'Add';
+my $action = $svcnum ? 'Edit' : 'Add';
 
-$svc = $part_svc->getfield('svc');
+my $svc = $part_svc->getfield('svc');
 
-$otaker = getotaker;
+my $otaker = getotaker;
 
-$username = $svc_acct->username;
+my $username = $svc_acct->username;
+my $password;
 if ( $svc_acct->_password ) {
   if ( $conf->exists('showpasswords') ) {
     $password = $svc_acct->_password;
@@ -98,13 +81,13 @@ if ( $svc_acct->_password ) {
   $password = '';
 }
 
-$ulen = $svc_acct->dbdef_table->column('username')->length;
-$ulen2 = $ulen+2;
+my $ulen = $svc_acct->dbdef_table->column('username')->length;
+my $ulen2 = $ulen+2;
 
-$pmax = $conf->config('passwordmax') || 8;
-$pmax2 = $pmax+2;
+my $pmax = $conf->config('passwordmax') || 8;
+my $pmax2 = $pmax+2;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("$action $svc account");
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
@@ -131,7 +114,7 @@ print &itable("#cccccc",2), <<END;
 END
 
 #domain
-$domsvc = $svc_acct->domsvc || 0;
+my $domsvc = $svc_acct->domsvc || 0;
 if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
   print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
 } else { 
@@ -186,7 +169,7 @@ if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
 }
 
 #pop
-$popnum = $svc_acct->popnum || 0;
+my $popnum = $svc_acct->popnum || 0;
 if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$popnum">!;
 } else { 
@@ -194,7 +177,7 @@ if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
         qq!<TD>!. FS::svc_acct_pop::popselector($popnum). '</TD></TR>';
 }
 
-($uid,$gid,$finger,$dir)=(
+my($uid,$gid,$finger,$dir)=(
   $svc_acct->uid,
   $svc_acct->gid,
   $svc_acct->finger,
@@ -208,7 +191,7 @@ print <<END;
 <INPUT TYPE="hidden" NAME="dir" VALUE="$dir">
 END
 
-$shell = $svc_acct->shell;
+my $shell = $svc_acct->shell;
 if ( $part_svc->part_svc_column('shell')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
 } else {
@@ -221,7 +204,7 @@ if ( $part_svc->part_svc_column('shell')->columnflag eq "F" ) {
   print "</SELECT></TD></TR>";
 }
 
-($quota,$slipip)=(
+my($quota,$slipip)=(
   $svc_acct->quota,
   $svc_acct->slipip,
 );
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index 23caa794b..c984ef9e8 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -1,17 +1,7 @@
+<!-- $Id: svc_acct_pop.cgi,v 1.5 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $svc_acct_pop $action $query $hashref $p1 );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::CGI qw(header menubar popurl);
-use FS::svc_acct_pop;
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
+my $svc_acct_pop;
 if ( $cgi->param('error') ) {
   $svc_acct_pop = new FS::svc_acct_pop ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_acct_pop')
@@ -23,10 +13,10 @@ if ( $cgi->param('error') ) {
 } else { #adding
   $svc_acct_pop = new FS::svc_acct_pop {};
 }
-$action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
-$hashref = $svc_acct_pop->hashref;
+my $action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
+my $hashref = $svc_acct_pop->hashref;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("$action POP", menubar(
   'Main Menu' => popurl(2),
   'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index baf0a7eb2..62a041da9 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,23 +1,10 @@
+<!-- $Id: svc_acct_sm.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
-use strict;
-use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
-             $part_svc $query %username %domain $p1 $domuser $domsvc $domuid );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct_sm;
-use FS::Conf;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
+my $conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
+my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct_sm );
 if ( $cgi->param('error') ) {
   $svc_acct_sm = new FS::svc_acct_sm ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_acct_sm')
@@ -25,8 +12,8 @@ if ( $cgi->param('error') ) {
   $svcnum = $svc_acct_sm->svcnum;
   $pkgnum = $cgi->param('pkgnum');
   $svcpart = $cgi->param('svcpart');
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  die "No part_svc entry!" unless $part_svc;
+  #$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  #die "No part_svc entry!" unless $part_svc;
 } else {
   my($query) = $cgi->keywords;
   if ( $query =~ /^(\d+)$/ ) { #editing
@@ -40,8 +27,8 @@ if ( $cgi->param('error') ) {
     $pkgnum=$cust_svc->pkgnum;
     $svcpart=$cust_svc->svcpart;
   
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
+    #$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    #die "No part_svc entry!" unless $part_svc;
 
   } else { #adding
 
@@ -51,7 +38,7 @@ if ( $cgi->param('error') ) {
       $pkgnum=$1 if /^pkgnum(\d+)$/;
       $svcpart=$1 if /^svcpart(\d+)$/;
     }
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    my $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
     die "No part_svc entry!" unless $part_svc;
 
     $svcnum='';
@@ -67,8 +54,10 @@ if ( $cgi->param('error') ) {
 
   }
 }
-$action = $svc_acct_sm->svcnum ? 'Edit' : 'Add';
+my $action = $svc_acct_sm->svcnum ? 'Edit' : 'Add';
 
+my %username = ();
+my %domain = ();
 if ($pkgnum) {
 
   #find all possible uids (and usernames)
@@ -80,7 +69,6 @@ if ($pkgnum) {
 
   my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
   my($custnum)=$cust_pkg->getfield('custnum');
-  %username = ();
   foreach my $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
     my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
     my($acct_svcpart);
@@ -102,7 +90,6 @@ if ($pkgnum) {
     push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
   }
 
-  %domain = ();
   foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
     my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
     my($acct_svcpart);
@@ -127,7 +114,7 @@ if ($pkgnum) {
   die "\$action eq Add, but \$pkgnum is null!\n";
 }
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("Mail Alias $action", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
@@ -151,7 +138,7 @@ print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
 #svcpart
 print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
 
-($domuser,$domsvc,$domuid)=(
+my($domuser,$domsvc,$domuid)=(
   $svc_acct_sm->domuser,
   $svc_acct_sm->domsvc,
   $svc_acct_sm->domuid,
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 713b2ccd7..57ee941f9 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,19 +1,8 @@
+<!-- $Id: svc_domain.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: svc_domain.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
-             $svc $otaker $domain $p1 $kludge_action $purpose );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_domain;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
+my($svcnum, $pkgnum, $svcpart, $kludge_action, $purpose, $part_svc,
+   $svc_domain);
 if ( $cgi->param('error') ) {
   $svc_domain = new FS::svc_domain ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_domain')
@@ -65,18 +54,18 @@ if ( $cgi->param('error') ) {
                            );
     }
 
-
   }
+
 }
-$action = $svcnum ? 'Edit' : 'Add';
+my $action = $svcnum ? 'Edit' : 'Add';
 
-$svc = $part_svc->getfield('svc');
+my $svc = $part_svc->getfield('svc');
 
-$otaker = getotaker;
+my $otaker = getotaker;
 
-$domain = $svc_domain->domain;
+my $domain = $svc_domain->domain;
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("$action $svc", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 75cd9fc7f..cda577b76 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,23 +1,10 @@
+<!-- $Id: svc_forward.cgi,v 1.8 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-# <!-- $Id: svc_forward.cgi,v 1.7 2001-12-04 13:10:16 ivan Exp $ -->
 
-use strict;
-use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
-             $part_svc $query %email $p1 $srcsvc $dstsvc $dst );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_forward;
-use FS::Conf;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
+my $conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
+my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_forward);
 if ( $cgi->param('error') ) {
   $svc_forward = new FS::svc_forward ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_forward')
@@ -28,7 +15,9 @@ if ( $cgi->param('error') ) {
   $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
   die "No part_svc entry!" unless $part_svc;
 } else {
+
   my($query) = $cgi->keywords;
+
   if ( $query =~ /^(\d+)$/ ) { #editing
     $svcnum=$1;
     $svc_forward=qsearchs('svc_forward',{'svcnum'=>$svcnum})
@@ -64,12 +53,12 @@ if ( $cgi->param('error') ) {
                               $part_svc_column->columnvalue,
                             );
     }
-
-
   }
+
 }
-$action = $svc_forward->svcnum ? 'Edit' : 'Add';
+my $action = $svc_forward->svcnum ? 'Edit' : 'Add';
 
+my %email;
 if ($pkgnum) {
 
   #find all possible user svcnums (and emails)
@@ -122,7 +111,7 @@ if ($pkgnum) {
   die "\$action eq Add, but \$pkgnum is null!\n";
 }
 
-($srcsvc,$dstsvc,$dst)=(
+my($srcsvc,$dstsvc,$dst)=(
   $svc_forward->srcsvc,
   $svc_forward->dstsvc,
   $svc_forward->dst,
@@ -130,7 +119,7 @@ if ($pkgnum) {
 
 #display
 
-$p1 = popurl(1);
+my $p1 = popurl(1);
 print header("Mail Forward $action", '',
       " onLoad=\"visualize()\"");
 
-- 
cgit v1.2.1


From c7ff9a58360788ce776022606c4ec3496062013b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 30 Jan 2002 18:22:54 +0000
Subject: fully working invoice event web interface

---
 httemplate/edit/part_bill_event.cgi         | 53 ++++++++++++++++++-----------
 httemplate/edit/process/part_bill_event.cgi | 46 ++++++++++++++++++-------
 2 files changed, 68 insertions(+), 31 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 939eff360..c41cfe9cf 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -1,11 +1,11 @@
-<!-- $Id: part_bill_event.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
+<!-- $Id: part_bill_event.cgi,v 1.3 2002-01-30 18:22:54 ivan Exp $ -->
 
 <%
 
-if ( $cgi->param('eventnum') && $cgi->param('eventnum') =~ /^(\d+)$/ ) {
-  $cgi->param('eventnum', $1);
+if ( $cgi->param('eventpart') && $cgi->param('eventpart') =~ /^(\d+)$/ ) {
+  $cgi->param('eventpart', $1);
 } else {
-  $cgi->param('eventnum', '');
+  $cgi->param('eventpart', '');
 }
 
 my ($query) = $cgi->keywords;
@@ -33,8 +33,9 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
   if $cgi->param('error');
 
-print '<FORM ACTION="', popurl(1), 'process/part_bill_event.cgi" METHOD=POST>';
-
+print '<FORM ACTION="', popurl(1), 'process/part_bill_event.cgi" METHOD=POST>'.
+      '<INPUT TYPE="hidden" NAME="eventpart" VALUE="'.
+      $part_bill_event->eventpart  .'">';
 print "Invoice Event #", $hashref->{eventpart} ? $hashref->{eventpart} : "(NEW)";
 
 print ntable("#cccccc",2), <<END;
@@ -50,7 +51,7 @@ for (qw(CARD BILL COMP)) {
   }
 }
 
-my $days = $hashref->{seconds}/3600;
+my $days = $hashref->{seconds}/86400;
 
 print <<END;
 </SELECT></TD></TR>
@@ -74,8 +75,9 @@ tie my %events, 'Tie::IxHash',
   'fee' => {
     'name'   => 'Late fee',
     'code'   => '$cust_main->charge( %%%charge%%%, \'%%%reason%%%\' );',
-    'html'   => 'Amount <INPUT TYPE="text" SIZE="7" NAME="charge"><BR>'.
-              'Reason <INPUT TYPE="text" NAME="reason">',
+    'html'   => 
+      'Amount <INPUT TYPE="text" SIZE="7" NAME="charge" VALUE="%%%charge%%%">'.
+      '<BR>Reason <INPUT TYPE="text" NAME="reason" VALUE="%%%reason%%%">',
     'weight' => 10,
   },
   'suspend' => {
@@ -101,29 +103,42 @@ tie my %events, 'Tie::IxHash',
     'weight' => 30
   },
 
-  'Generate invoices' => {
+  'bill' => {
+    'name' => 'Generate invoices',
     'code' => '$cust_main->bill();',
-    'pad'  => 40,
+    'weight'  => 40,
   },
 
-  'Apply unapplied payments and credits' => {
+  'apply' => {
+    'name' => 'Apply unapplied payments and credits',
     'code' => '$cust_main->apply_payments; $cust_main->apply_credits;',
-    'pad'  => 50,
+    'weight'  => 50,
   },
 
-  'Collect on invoices' => {
+  'collect' => {
+    'name' => 'Collect on invoices',
     'code' => '$cust_main->collect();',
-    'pad'  => 60,
+    'weight'  => 60,
   },
 
 ;
 
 foreach my $event ( keys %events ) {
+  my %plandata = map { /^(\w+) (.*)$/; ($1, $2); }
+                   split(/\n/, $part_bill_event->plandata);
+  my $html = $events{$event}{html};
+  while ( $html =~ /%%%(\w+)%%%/ ) {
+    my $field = $1;
+    $html =~ s/%%%$field%%%/$plandata{$field}/;
+  }
+
   print ntable( "#cccccc", 2).
-        qq!<TR><TD><INPUT TYPE="radio" NAME="eventcode" VALUE="!.
-        $events{$event}{weight}. ":".
-        encode_entities($events{$event}{code}). qq!">$event</TD>!;
-  print '<TD>'. $events{$event}{html}. '</TD>' if exists $events{$event}{html};
+        qq!<TR><TD><INPUT TYPE="radio" NAME="plan_weight_eventcode" !;
+  print "CHECKED " if $event eq $part_bill_event->plan;
+  print qq!VALUE="!.  $event. ":". $events{$event}{weight}. ":".
+        encode_entities($events{$event}{code}).
+        qq!">$events{$event}{name}</TD>!;
+  print '<TD>'. $html. '</TD>' if $html;
   print qq!</TR>!;
   print '</TABLE>';
 }
diff --git a/httemplate/edit/process/part_bill_event.cgi b/httemplate/edit/process/part_bill_event.cgi
index eb7c53e5d..7c0b54d0d 100755
--- a/httemplate/edit/process/part_bill_event.cgi
+++ b/httemplate/edit/process/part_bill_event.cgi
@@ -5,21 +5,43 @@ my $eventpart = $cgi->param('eventpart');
 my $old = qsearchs('part_bill_event',{'eventpart'=>$eventpart}) if $eventpart;
 
 #s/days/seconds/
-$cgi->param('seconds', $cgi->param('days') * 3600 );
-
-my $new = new FS::part_bill_event ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('part_bill_event'),
-} );
+$cgi->param('seconds', $cgi->param('days') * 86400 );
 
 my $error;
-if ( $eventpart ) {
-  $error = $new->replace($old);
+if ( ! $cgi->param('plan_weight_eventcode') ) {
+  $error = "Must select an action";
 } else {
-  $error = $new->insert;
-  $eventpart = $new->getfield('eventpart');
-}
+
+  $cgi->param('plan_weight_eventcode') =~ /^(\w+):(\d+):(.*)$/
+    or die "illegal plan_weight_eventcode:".
+           $cgi->param('plan_weight_eventcode');
+  $cgi->param('plan', $1);
+  $cgi->param('weight', $2);
+  my $eventcode = $3;
+  my $plandata = '';
+  while ( $eventcode =~ /%%%(\w+)%%%/ ) {
+    my $field = $1;
+    my $value = $cgi->param($field);
+    $eventcode =~ s/%%%$field%%%/$value/;
+    $plandata .= "$field $value\n";
+  }
+  $cgi->param('eventcode', $eventcode);
+  $cgi->param('plandata', $plandata);
+
+  my $new = new FS::part_bill_event ( {
+    map {
+      $_, scalar($cgi->param($_));
+    } fields('part_bill_event'),
+  } );
+
+  my $error;
+  if ( $eventpart ) {
+    $error = $new->replace($old);
+  } else {
+    $error = $new->insert;
+    $eventpart = $new->getfield('eventpart');
+  }
+} 
 
 if ( $error ) {
   $cgi->param('error', $error);
-- 
cgit v1.2.1


From 8cbba53b09bb5b09355316b7ff8948500c3b4b76 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 4 Feb 2002 16:44:48 +0000
Subject: billing events!

---
 httemplate/edit/part_bill_event.cgi | 44 ++++++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 10 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index c41cfe9cf..70e953ca0 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_bill_event.cgi,v 1.3 2002-01-30 18:22:54 ivan Exp $ -->
+<!-- $Id: part_bill_event.cgi,v 1.4 2002-02-04 16:44:47 ivan Exp $ -->
 
 <%
 
@@ -93,32 +93,56 @@ tie my %events, 'Tie::IxHash',
 
   'addpost' => {
     'name' => 'Add postal invoicing',
-    'code' => '$cust_main->invoicing_list_addpost();',
+    'code' => '$cust_main->invoicing_list_addpost(); '';',
     'pad'  => 20,
   },
 
+  'comp' => {
+    'name' => 'Pay invoice with a complimentary "payment"',
+    'code' => '$cust_bill->comp();',
+    'weight' => 30,
+  },
+
+  'realtime-card' => {
+    'name' => 'Run card with a <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> realtime gateway',
+    'code' => '$cust_bill->realtime_card();',
+    'weight' => 30,
+  },
+
+  'realtime-card-cybercash' => {
+    'name' => '(<b>deprecated</b>) Run card with <a href="http://www.cybercash.com/cashregister">CyberCash CashRegister</a> realtime gateway',
+    'code' => '$cust_bill->realtime_card_cybercash();',
+    'weight => 30,
+  },
+
+  'batch-card' => {
+    'name' => 'Add card to the pending credit card batch',
+    'code' => '$cust_bill->batch_card();',
+    'weight' => 40,
+  },
+
   'send' => {
     'name' => 'Send invoice (email/print)',
-    'code' => '',
-    'weight' => 30
+    'code' => '$cust_bill->send();',
+    'weight' => 50,
   },
 
   'bill' => {
-    'name' => 'Generate invoices',
+    'name' => 'Generate invoices (normally only used with a <i>Late Fee</i> event)',
     'code' => '$cust_main->bill();',
-    'weight'  => 40,
+    'weight'  => 60,
   },
 
   'apply' => {
     'name' => 'Apply unapplied payments and credits',
-    'code' => '$cust_main->apply_payments; $cust_main->apply_credits;',
-    'weight'  => 50,
+    'code' => '$cust_main->apply_payments; $cust_main->apply_credits; '';',
+    'weight'  => 70,
   },
 
   'collect' => {
-    'name' => 'Collect on invoices',
+    'name' => 'Collect on invoices (normally only used with a <i>Late Fee</i> and <i>Generate Invoice</i> events)',
     'code' => '$cust_main->collect();',
-    'weight'  => 60,
+    'weight'  => 80,
   },
 
 ;
-- 
cgit v1.2.1


From 79f83ad93cc6f77a155528661a4681946fdd17a6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 4 Feb 2002 17:04:33 +0000
Subject: have fs-setup create the necessary "default" billing events
 documentation on necessary "default" billing events

---
 httemplate/edit/part_bill_event.cgi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 70e953ca0..580e46734 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_bill_event.cgi,v 1.4 2002-02-04 16:44:47 ivan Exp $ -->
+<!-- $Id: part_bill_event.cgi,v 1.5 2002-02-04 17:04:33 ivan Exp $ -->
 
 <%
 
@@ -45,7 +45,7 @@ END
 for (qw(CARD BILL COMP)) {
   print qq!<OPTION VALUE="$_"!;
   if ($part_bill_event->payby eq $_) {
-    print " SELECTED> $_</OPTION>";
+    print " SELECTED>$_</OPTION>";
   } else {
     print ">$_</OPTION>";
   }
@@ -93,7 +93,7 @@ tie my %events, 'Tie::IxHash',
 
   'addpost' => {
     'name' => 'Add postal invoicing',
-    'code' => '$cust_main->invoicing_list_addpost(); '';',
+    'code' => '$cust_main->invoicing_list_addpost(); "";',
     'pad'  => 20,
   },
 
@@ -112,7 +112,7 @@ tie my %events, 'Tie::IxHash',
   'realtime-card-cybercash' => {
     'name' => '(<b>deprecated</b>) Run card with <a href="http://www.cybercash.com/cashregister">CyberCash CashRegister</a> realtime gateway',
     'code' => '$cust_bill->realtime_card_cybercash();',
-    'weight => 30,
+    'weight' => 30,
   },
 
   'batch-card' => {
@@ -135,7 +135,7 @@ tie my %events, 'Tie::IxHash',
 
   'apply' => {
     'name' => 'Apply unapplied payments and credits',
-    'code' => '$cust_main->apply_payments; $cust_main->apply_credits; '';',
+    'code' => '$cust_main->apply_payments; $cust_main->apply_credits; "";',
     'weight'  => 70,
   },
 
-- 
cgit v1.2.1


From 0bdec843e4a9bb7f947c9ba980a40f7bf37020fb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 9 Feb 2002 18:24:02 +0000
Subject: no more exit() in templates

---
 httemplate/edit/process/agent_type.cgi             | 52 +++++++++++-----------
 .../edit/process/cust_main_county-expand.cgi       |  4 +-
 httemplate/edit/process/cust_main_county.cgi       |  4 +-
 httemplate/edit/process/cust_pay.cgi               |  3 +-
 httemplate/edit/process/part_pkg.cgi               |  6 +--
 5 files changed, 34 insertions(+), 35 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
index 2d1159708..4e98cf113 100755
--- a/httemplate/edit/process/agent_type.cgi
+++ b/httemplate/edit/process/agent_type.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: agent_type.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
+<!-- $Id: agent_type.cgi,v 1.4 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 my $typenum = $cgi->param('typenum');
@@ -21,35 +21,35 @@ if ( $typenum ) {
 if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "agent_type.cgi?". $cgi->query_string );
-  exit;
-}
+} else {
+
+  foreach my $part_pkg (qsearch('part_pkg',{})) {
+    my($pkgpart)=$part_pkg->getfield('pkgpart');
 
-foreach my $part_pkg (qsearch('part_pkg',{})) {
-  my($pkgpart)=$part_pkg->getfield('pkgpart');
-
-  my($type_pkgs)=qsearchs('type_pkgs',{
-      'typenum' => $typenum,
-      'pkgpart' => $pkgpart,
-  });
-  if ( $type_pkgs && ! $cgi->param("pkgpart$pkgpart") ) {
-    my($d_type_pkgs)=$type_pkgs; #need to save $type_pkgs for below.
-    $error=$d_type_pkgs->delete;
-    die $error if $error;
-
-  } elsif ( $cgi->param("pkgpart$pkgpart")
-            && ! $type_pkgs
-  ) {
-    #ok to clobber it now (but bad form nonetheless?)
-    $type_pkgs=new FS::type_pkgs ({
-      'typenum' => $typenum,
-      'pkgpart' => $pkgpart,
+    my($type_pkgs)=qsearchs('type_pkgs',{
+        'typenum' => $typenum,
+        'pkgpart' => $pkgpart,
     });
-    $error= $type_pkgs->insert;
-    die $error if $error;
+    if ( $type_pkgs && ! $cgi->param("pkgpart$pkgpart") ) {
+      my($d_type_pkgs)=$type_pkgs; #need to save $type_pkgs for below.
+      $error=$d_type_pkgs->delete;
+      die $error if $error;
+
+    } elsif ( $cgi->param("pkgpart$pkgpart")
+              && ! $type_pkgs
+    ) {
+      #ok to clobber it now (but bad form nonetheless?)
+      $type_pkgs=new FS::type_pkgs ({
+        'typenum' => $typenum,
+        'pkgpart' => $pkgpart,
+      });
+      $error= $type_pkgs->insert;
+      die $error if $error;
+    }
+
   }
 
+  print $cgi->redirect(popurl(3). "browse/agent_type.cgi");
 }
 
-print $cgi->redirect(popurl(3). "browse/agent_type.cgi");
-
 %>
diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index b16fab4fe..342779048 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: cust_main_county-expand.cgi,v 1.4 2002-01-30 14:18:09 ivan Exp $ -->
+<!-- $Id: cust_main_county-expand.cgi,v 1.5 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 $cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
@@ -19,7 +19,7 @@ if ( $cgi->param('delim') eq 'n' ) {
   unless ( /^\s*([\w\- ]+)\s*$/ ) {
     $cgi->param('error', "Illegal item in expansion");
     print $cgi->redirect(popurl(2). "cust_main_county-expand.cgi?". $cgi->query_string );
-    exit;
+    myexit();
   }
   $1;
 } @expansion;
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index 0f0246b73..e9d130897 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: cust_main_county.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
+<!-- $Id: cust_main_county.cgi,v 1.4 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 foreach ( $cgi->param ) {
@@ -14,7 +14,7 @@ foreach ( $cgi->param ) {
   if ( $error ) {
     $cgi->param('error', $error);
     print $cgi->redirect(popurl(2). "cust_main_county.cgi?". $cgi->query_string );
-    exit;
+    myexit();
   }
 }
 
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index c75e53280..953ff3edb 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: cust_pay.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
+<!-- $Id: cust_pay.cgi,v 1.7 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 $cgi->param('linknum') =~ /^(\d+)$/
@@ -22,7 +22,6 @@ my $error = $new->insert;
 if ($error) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). 'cust_pay.cgi?'. $cgi->query_string );
-  exit;
 } elsif ( $link eq 'invnum' ) {
   print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$linknum");
 } elsif ( $link eq 'custnum' ) {
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 2ba1cbeb0..5240d8cc2 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.7 2002-01-30 14:18:09 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.8 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 my $dbh = dbh;
@@ -34,7 +34,7 @@ foreach my $part_svc ( qsearch('part_svc', {} ) ) {
   unless ( $quantity =~ /^(\d+)$/ ) {
     $cgi->param('error', "Illegal quantity" );
     print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
-    exit;
+    myexit();
   }
 }
 
@@ -58,7 +58,7 @@ if ( $error ) {
   $dbh->rollback;
   $cgi->param('error', $error );
   print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
-  exit;
+  myexit();
 }
 
 foreach $part_svc (qsearch('part_svc',{})) {
-- 
cgit v1.2.1


From c828daa905491e65deb30a2ed34af609cdb96b99 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 02:16:47 +0000
Subject: pro-rating w/ web interface, tested (closes: Bug#313).

view/cust_bill.cgi invoice view shows invoice events!

fix bug where adding events with no name silently failed instead of giving
an error

add new comission plans
---
 httemplate/edit/part_pkg.cgi                | 88 +++++++++++++++++++++++++++--
 httemplate/edit/process/part_bill_event.cgi |  1 -
 httemplate/edit/process/part_pkg.cgi        |  4 +-
 3 files changed, 85 insertions(+), 8 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index ea3f62aa2..bead1410a 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.9 2002-01-29 16:33:16 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.10 2002-02-10 02:16:47 ivan Exp $ -->
 
 <%
 
@@ -175,8 +175,44 @@ tie my %plans, 'Tie::IxHash',
     'recur' => 'what.recur_fee.value',
   },
 
+  'prorate' => {
+    'name' => 'First month pro-rated, then flat-rate',
+    'fields' =>  {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                      },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'',
+  },
+
+  'flat_comission_cust' => {
+    'name' => 'Flat rate with recurring comission per active customer',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                     },
+      'comission_amount' => { 'name' => 'Comission amount per month (per active customer)',
+                              'default' => 0,
+                            },
+      'comission_depth'  => { 'name' => 'Number of layers',
+                              'default' => 1,
+                            },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_main_ncancelled(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
+  },
+
   'flat_comission' => {
-    'name' => 'Flat rate with recurring referral comission as credit',
+    'name' => 'Flat rate with recurring comission per active package',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -184,7 +220,7 @@ tie my %plans, 'Tie::IxHash',
       'recur_fee' => { 'name' => 'Recurring fee for this package',
                        'default' => 0,
                      },
-      'comission_amount' => { 'name' => 'Comission amount',
+      'comission_amount' => { 'name' => 'Comission amount per month (per active package)',
                               'default' => 0,
                             },
       'comission_depth'  => { 'name' => 'Number of layers',
@@ -196,6 +232,36 @@ tie my %plans, 'Tie::IxHash',
     'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
   },
 
+  'flat_comission_pkg' => {
+    'name' => 'Flat rate with recurring comission per active (selected) package',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                     },
+      'comission_amount' => { 'name' => 'Comission amount per month (per uncancelled package)',
+                              'default' => 0,
+                            },
+      'comission_depth'  => { 'name' => 'Number of layers',
+                              'default' => 1,
+                            },
+      'comission_pkgpart' => { 'name' => 'Applicable packages<BR><FONT SIZE="-1">(hold <b>ctrl</b> to select multiple packages)</FONT>',
+                               'type' => 'select_multiple',
+                               'select_table' => 'part_pkg',
+                               'select_hash'  => { 'disabled' => '' } ,
+                               'select_key'   => 'pkgpart',
+                               'select_label' => 'pkg',
+                             },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount', 'comission_pkgpart' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '""; var pkgparts = ""; for ( var c=0; c < document.flat_comission_pkg.comission_pkgpart.options.length; c++ ) { if (document.flat_comission_pkg.comission_pkgpart.options[c].selected) { pkgparts = pkgparts + document.flat_comission_pkg.comission_pkgpart.options[c].value + \', \'; } } what.recur.value = \'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar( grep { my $pkgpart = $_->pkgpart; grep { $_ == $pkgpart } ( \' + pkgparts + \'  ) } $cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
+  },
+
+
+
   'sesmon_hour' => {
     'name' => 'Base charge plus charge per-hour from the session monitor',
     'fields' => {
@@ -345,9 +411,21 @@ if ( $cgi->param('pkgnum') ) {
                          : keys %{ $href }
                      ) {
 %>
-<TR><TD ALIGN="right"><%= $href->{$field}{'name'} %></TD>
-<TD><INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)"></TD></TR>
+  <TR><TD ALIGN="right"><%= $href->{$field}{'name'} %></TD>
+  <TD>
+  <% if ( ! exists($href->{$field}{'type'}) ) { %>
+       <INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)">
+  <% } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) { %>
+       <SELECT MULTIPLE NAME="<%= $field %>" onChange="fchanged(this)">
+       <% foreach $record ( qsearch( $href->{$field}{'select_table'}, $href->{$field}{'select_hash'} ) ) {
+          my $value = $record->getfield($href->{$field}{'select_key'}); %>
+         <OPTION VALUE="<%= $value %>"<%= $plandata{$field} =~ /(^|, *)$value *(,|$)/ ? ' SELECTED' : '' %>><%= $record->getfield($href->{$field}{'select_label'}) %>
+       <% } %>
+       </SELECT>
+  <% } %>
+  </TD></TR>
 <% } %>
+
 </TABLE>
 <INPUT TYPE="hidden" NAME="plandata" VALUE="<%= join(',', keys %{ $href } ) %>">
 <BR><BR>
diff --git a/httemplate/edit/process/part_bill_event.cgi b/httemplate/edit/process/part_bill_event.cgi
index 7c0b54d0d..1716c71b9 100755
--- a/httemplate/edit/process/part_bill_event.cgi
+++ b/httemplate/edit/process/part_bill_event.cgi
@@ -34,7 +34,6 @@ if ( ! $cgi->param('plan_weight_eventcode') ) {
     } fields('part_bill_event'),
   } );
 
-  my $error;
   if ( $eventpart ) {
     $error = $new->replace($old);
   } else {
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 5240d8cc2..9ad1527a1 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_pkg.cgi,v 1.8 2002-02-09 18:24:01 ivan Exp $ -->
+<!-- $Id: part_pkg.cgi,v 1.9 2002-02-10 02:16:47 ivan Exp $ -->
 <%
 
 my $dbh = dbh;
@@ -11,7 +11,7 @@ my $old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
 my $plandata = $cgi->param('plandata');
 my @plandata = split(',', $plandata);
 $cgi->param('plandata', 
-  join('', map { "$_=". $cgi->param($_). "\n" } @plandata )
+  join('', map { "$_=". join(', ', $cgi->param($_)). "\n" } @plandata )
 );
 
 foreach (qw( setuptax recurtax disabled )) {
-- 
cgit v1.2.1


From b4bce0bf487b4ee3620e13f1fdf56ecc1d001a42 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 02:28:28 +0000
Subject: hide SS# unless you turn it on via config file

---
 httemplate/edit/cust_main.cgi | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index fad4d9e6d..5be6a3579 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: cust_main.cgi,v 1.19 2002-01-30 14:18:08 ivan Exp $ -->
+<!-- $Id: cust_main.cgi,v 1.20 2002-02-10 02:28:27 ivan Exp $ -->
 <%
 
   #for misplaced logic below
@@ -153,10 +153,17 @@ END
 print <<END;
 <INPUT TYPE="text" NAME="last" VALUE="$last"> , 
 <INPUT TYPE="text" NAME="first" VALUE="$first">
+</TD>
 END
 
+if ( $conf->exists('show_ss') ) {
+  print qq!<TD ALIGN="right">SS#</TD><TD><INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11></TD>!;
+} else {
+  print qq!<TD><INPUT TYPE="hidden" NAME="ss" VALUE="$ss"></TD>!;
+}
+
 print <<END;
-</TD><TD ALIGN="right">SS#</TD><TD><INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11></TD></TR>
+</TR>
 <TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70></TD></TR>
 <TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TD></TR>
 <TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70></TD></TR>
-- 
cgit v1.2.1


From 22a35047ecdffff80110e06cc08fc84f9ddba9b0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 13:21:31 +0000
Subject: removed <!-- $Id$ --> from all files to fix any redirects, whew

Mason handler.pl overrides CGI::redirect

fixed strict; problems in edit/part_pkg.cgi & edit/process/part_pkg.cgi
---
 httemplate/edit/agent.cgi                             | 1 -
 httemplate/edit/agent_type.cgi                        | 1 -
 httemplate/edit/cust_bill_pay.cgi                     | 1 -
 httemplate/edit/cust_credit.cgi                       | 1 -
 httemplate/edit/cust_credit_bill.cgi                  | 1 -
 httemplate/edit/cust_main.cgi                         | 1 -
 httemplate/edit/cust_main_county-expand.cgi           | 1 -
 httemplate/edit/cust_main_county.cgi                  | 1 -
 httemplate/edit/cust_pay.cgi                          | 1 -
 httemplate/edit/cust_pkg.cgi                          | 1 -
 httemplate/edit/part_bill_event.cgi                   | 2 --
 httemplate/edit/part_pkg.cgi                          | 4 +---
 httemplate/edit/part_referral.cgi                     | 1 -
 httemplate/edit/part_svc.cgi                          | 1 -
 httemplate/edit/process/REAL_cust_pkg.cgi             | 1 -
 httemplate/edit/process/agent.cgi                     | 1 -
 httemplate/edit/process/agent_type.cgi                | 1 -
 httemplate/edit/process/cust_bill_pay.cgi             | 1 -
 httemplate/edit/process/cust_credit.cgi               | 1 -
 httemplate/edit/process/cust_credit_bill.cgi          | 1 -
 httemplate/edit/process/cust_main.cgi                 | 1 -
 httemplate/edit/process/cust_main_county-collapse.cgi | 1 -
 httemplate/edit/process/cust_main_county-expand.cgi   | 1 -
 httemplate/edit/process/cust_main_county.cgi          | 1 -
 httemplate/edit/process/cust_pay.cgi                  | 1 -
 httemplate/edit/process/cust_pkg.cgi                  | 1 -
 httemplate/edit/process/part_pkg.cgi                  | 3 +--
 httemplate/edit/process/part_referral.cgi             | 1 -
 httemplate/edit/process/quick-cust_pkg.cgi            | 1 -
 httemplate/edit/process/svc_acct.cgi                  | 1 -
 httemplate/edit/process/svc_acct_pop.cgi              | 1 -
 httemplate/edit/process/svc_acct_sm.cgi               | 1 -
 httemplate/edit/process/svc_domain.cgi                | 1 -
 httemplate/edit/process/svc_forward.cgi               | 1 -
 httemplate/edit/svc_acct.cgi                          | 1 -
 httemplate/edit/svc_acct_pop.cgi                      | 1 -
 httemplate/edit/svc_acct_sm.cgi                       | 1 -
 httemplate/edit/svc_domain.cgi                        | 1 -
 httemplate/edit/svc_forward.cgi                       | 1 -
 39 files changed, 2 insertions(+), 43 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index f3864e6c2..25e4765ba 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $agent;
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index c3ff30ff6..8b729201d 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent_type.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my($agent_type);
diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index fd56b328a..bfa2b3baf 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_bill_pay.cgi,v 1.5 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my($paynum, $amount, $invnum);
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 7c8a80c22..316226500 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_credit.cgi,v 1.8 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index 3748202a5..7528d85fc 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_credit_bill.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my($crednum, $amount, $invnum);
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 5be6a3579..a0472bdf5 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main.cgi,v 1.20 2002-02-10 02:28:27 ivan Exp $ -->
 <%
 
   #for misplaced logic below
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index 092a2d068..05bfa6f0e 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county-expand.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my($taxnum, $delim, $expansion );
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index 69def0468..19368857c 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 print header("Edit tax rates", menubar(
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 2794e2218..6738dcd38 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pay.cgi,v 1.11 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index c11a194b2..7fb88c3ce 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pkg.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my %pkg = ();
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 580e46734..25d9bc0ff 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -1,5 +1,3 @@
-<!-- $Id: part_bill_event.cgi,v 1.5 2002-02-04 17:04:33 ivan Exp $ -->
-
 <%
 
 if ( $cgi->param('eventpart') && $cgi->param('eventpart') =~ /^(\d+)$/ ) {
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index bead1410a..a98179e12 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,5 +1,3 @@
-<!-- $Id: part_pkg.cgi,v 1.10 2002-02-10 02:16:47 ivan Exp $ -->
-
 <%
 
 if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
@@ -417,7 +415,7 @@ if ( $cgi->param('pkgnum') ) {
        <INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)">
   <% } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) { %>
        <SELECT MULTIPLE NAME="<%= $field %>" onChange="fchanged(this)">
-       <% foreach $record ( qsearch( $href->{$field}{'select_table'}, $href->{$field}{'select_hash'} ) ) {
+       <% foreach my $record ( qsearch( $href->{$field}{'select_table'}, $href->{$field}{'select_hash'} ) ) {
           my $value = $record->getfield($href->{$field}{'select_key'}); %>
          <OPTION VALUE="<%= $value %>"<%= $plandata{$field} =~ /(^|, *)$value *(,|$)/ ? ' SELECTED' : '' %>><%= $record->getfield($href->{$field}{'select_label'}) %>
        <% } %>
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 18f6aa938..22277ce71 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_referral.cgi,v 1.5 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $part_referral;
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 39f49e14c..91995674a 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_svc.cgi,v 1.14 2002-01-30 14:18:08 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi
index 4f33f6b38..6bed85c19 100755
--- a/httemplate/edit/process/REAL_cust_pkg.cgi
+++ b/httemplate/edit/process/REAL_cust_pkg.cgi
@@ -1,5 +1,4 @@
 <%
-#<!-- $Id: REAL_cust_pkg.cgi,v 1.1 2001-10-15 14:58:03 ivan Exp $ -->
 
 my $pkgnum = $cgi->param('pkgnum') or die;
 my $old = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
diff --git a/httemplate/edit/process/agent.cgi b/httemplate/edit/process/agent.cgi
index 93ce4f9f2..182eeab41 100755
--- a/httemplate/edit/process/agent.cgi
+++ b/httemplate/edit/process/agent.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $agentnum = $cgi->param('agentnum');
diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
index 4e98cf113..67aacfdd5 100755
--- a/httemplate/edit/process/agent_type.cgi
+++ b/httemplate/edit/process/agent_type.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent_type.cgi,v 1.4 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 my $typenum = $cgi->param('typenum');
diff --git a/httemplate/edit/process/cust_bill_pay.cgi b/httemplate/edit/process/cust_bill_pay.cgi
index 16d30bd4c..0c33506a8 100755
--- a/httemplate/edit/process/cust_bill_pay.cgi
+++ b/httemplate/edit/process/cust_bill_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_bill_pay.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 $cgi->param('paynum') =~ /^(\d*)$/ or die "Illegal paynum!";
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index 51fca74e3..ac92631f8 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_credit.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 $cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
index afe297308..4879b0eab 100755
--- a/httemplate/edit/process/cust_credit_bill.cgi
+++ b/httemplate/edit/process/cust_credit_bill.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_credit_bill.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 $cgi->param('crednum') =~ /^(\d*)$/ or die "Illegal crednum!";
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index fa50dc626..c8038ecf6 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $error = '';
diff --git a/httemplate/edit/process/cust_main_county-collapse.cgi b/httemplate/edit/process/cust_main_county-collapse.cgi
index 4888b781f..8e67140a8 100755
--- a/httemplate/edit/process/cust_main_county-collapse.cgi
+++ b/httemplate/edit/process/cust_main_county-collapse.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county-collapse.cgi,v 1.2 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my($query) = $cgi->keywords;
diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index 342779048..64061deed 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county-expand.cgi,v 1.5 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 $cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index e9d130897..0800789b5 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county.cgi,v 1.4 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 foreach ( $cgi->param ) {
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index 953ff3edb..82442ae00 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pay.cgi,v 1.7 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 $cgi->param('linknum') =~ /^(\d+)$/
diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
index 25b320150..f8c9f5151 100755
--- a/httemplate/edit/process/cust_pkg.cgi
+++ b/httemplate/edit/process/cust_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $error = '';
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 9ad1527a1..d489426f9 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_pkg.cgi,v 1.9 2002-02-10 02:16:47 ivan Exp $ -->
 <%
 
 my $dbh = dbh;
@@ -61,7 +60,7 @@ if ( $error ) {
   myexit();
 }
 
-foreach $part_svc (qsearch('part_svc',{})) {
+foreach my $part_svc (qsearch('part_svc',{})) {
   my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
   my $old_pkg_svc = qsearchs('pkg_svc', {
     'pkgpart' => $pkgpart,
diff --git a/httemplate/edit/process/part_referral.cgi b/httemplate/edit/process/part_referral.cgi
index 7e37db855..fd2c01506 100755
--- a/httemplate/edit/process/part_referral.cgi
+++ b/httemplate/edit/process/part_referral.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_referral.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $refnum = $cgi->param('refnum');
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 29a954cc9..5a4fb7797 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: quick-cust_pkg.cgi,v 1.4 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #untaint custnum
diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
index 178d7d85a..5e8a16f4a 100755
--- a/httemplate/edit/process/svc_acct.cgi
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
diff --git a/httemplate/edit/process/svc_acct_pop.cgi b/httemplate/edit/process/svc_acct_pop.cgi
index 5d699f2f5..46ad74d62 100755
--- a/httemplate/edit/process/svc_acct_pop.cgi
+++ b/httemplate/edit/process/svc_acct_pop.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_pop.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $popnum = $cgi->param('popnum');
diff --git a/httemplate/edit/process/svc_acct_sm.cgi b/httemplate/edit/process/svc_acct_sm.cgi
index 25cd88d5a..41d03fb92 100755
--- a/httemplate/edit/process/svc_acct_sm.cgi
+++ b/httemplate/edit/process/svc_acct_sm.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_sm.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
diff --git a/httemplate/edit/process/svc_domain.cgi b/httemplate/edit/process/svc_domain.cgi
index 0b7ec4928..19f8eb4f8 100755
--- a/httemplate/edit/process/svc_domain.cgi
+++ b/httemplate/edit/process/svc_domain.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_domain.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #remove this to actually test the domains!
diff --git a/httemplate/edit/process/svc_forward.cgi b/httemplate/edit/process/svc_forward.cgi
index 5f0247fe5..bb066d8a6 100755
--- a/httemplate/edit/process/svc_forward.cgi
+++ b/httemplate/edit/process/svc_forward.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_forward.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 681d8b5d9..fed39e7bc 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct.cgi,v 1.14 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index c984ef9e8..97d42f5be 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_pop.cgi,v 1.5 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $svc_acct_pop;
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 62a041da9..0cb27b864 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_sm.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 57ee941f9..671a12db7 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_domain.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my($svcnum, $pkgnum, $svcpart, $kludge_action, $purpose, $part_svc,
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index cda577b76..88558ca90 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_forward.cgi,v 1.8 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
-- 
cgit v1.2.1


From a4c96748eb6eab29a70f3a944c6520283a635c78 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 16:05:22 +0000
Subject: *finally* seems to be working under Mason.  sheesh. *finally* seems
 to be working under Mason.  sheesh. *finally* seems to be working under
 Mason.  sheesh. *finally* seems to be working under Mason.  sheesh. *finally*
 seems to be working under Mason.  sheesh. *finally* seems to be working under
 Mason.  sheesh. *finally* seems to be working under Mason.  sheesh. *finally*
 seems to be working under Mason.  sheesh.

---
 httemplate/edit/REAL_cust_pkg.cgi           | 3 ++-
 httemplate/edit/agent.cgi                   | 1 +
 httemplate/edit/agent_type.cgi              | 1 +
 httemplate/edit/cust_bill_pay.cgi           | 1 +
 httemplate/edit/cust_credit.cgi             | 1 +
 httemplate/edit/cust_credit_bill.cgi        | 1 +
 httemplate/edit/cust_main.cgi               | 1 +
 httemplate/edit/cust_main_county-expand.cgi | 1 +
 httemplate/edit/cust_main_county.cgi        | 1 +
 httemplate/edit/cust_pay.cgi                | 1 +
 httemplate/edit/cust_pkg.cgi                | 1 +
 httemplate/edit/part_bill_event.cgi         | 1 +
 httemplate/edit/part_pkg.cgi                | 1 +
 httemplate/edit/part_referral.cgi           | 1 +
 httemplate/edit/part_svc.cgi                | 1 +
 httemplate/edit/process/quick-cust_pkg.cgi  | 3 +++
 httemplate/edit/svc_acct.cgi                | 1 +
 httemplate/edit/svc_acct_pop.cgi            | 1 +
 httemplate/edit/svc_acct_sm.cgi             | 1 +
 httemplate/edit/svc_domain.cgi              | 1 +
 httemplate/edit/svc_forward.cgi             | 1 +
 21 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 8ea0e084d..abfaac3fc 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,5 +1,6 @@
+<!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.1 2001-10-15 14:58:03 ivan Exp $ -->
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.2 2002-02-10 16:05:22 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index 25e4765ba..3fca34326 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $agent;
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 8b729201d..4a4cd9a47 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my($agent_type);
diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index bfa2b3baf..d90659724 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my($paynum, $amount, $invnum);
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 316226500..aae0df2fc 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index 7528d85fc..1a97e1312 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my($crednum, $amount, $invnum);
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index a0472bdf5..41643a37f 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
   #for misplaced logic below
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index 05bfa6f0e..66e8aaf9e 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my($taxnum, $delim, $expansion );
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index 19368857c..a11711770 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 print header("Edit tax rates", menubar(
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 6738dcd38..27d36eb54 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index 7fb88c3ce..d546f7409 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my %pkg = ();
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 25d9bc0ff..40016433d 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 if ( $cgi->param('eventpart') && $cgi->param('eventpart') =~ /^(\d+)$/ ) {
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index a98179e12..d32702668 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 22277ce71..73be9e337 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $part_referral;
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 91995674a..63ec1dce1 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 5a4fb7797..c663dce32 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -12,6 +12,9 @@ my @cust_pkg = ();
 my $error = FS::cust_pkg::order($custnum, [ $pkgpart ], [], \@cust_pkg, );
 
 if ($error) {
+%>
+<!-- mason kludge -->
+<%
   eidiot($error);
 } else {
   print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?". $cust_pkg[0]->pkgnum );
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index fed39e7bc..73ecdd98d 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index 97d42f5be..5db48a3f7 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $svc_acct_pop;
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 0cb27b864..0fd5f7622 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 671a12db7..d20e1f336 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my($svcnum, $pkgnum, $svcpart, $kludge_action, $purpose, $part_svc,
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 88558ca90..5f1466bbb 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
-- 
cgit v1.2.1


From 1eb7fd4c48cadb7a6c8e45c561cd16e01279a56a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 16:14:50 +0000
Subject: s/POP/Access Number/ in the webui

---
 httemplate/edit/svc_acct_pop.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index 5db48a3f7..399502a70 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -17,9 +17,9 @@ my $action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
 my $hashref = $svc_acct_pop->hashref;
 
 my $p1 = popurl(1);
-print header("$action POP", menubar(
+print header("$action Access Number", menubar(
   'Main Menu' => popurl(2),
-  'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
+  'View all Access Numbers' => popurl(2). "browse/svc_acct_pop.cgi",
 ));
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
@@ -44,7 +44,7 @@ Local     <INPUT TYPE="text" NAME="loc" SIZE=5 MAXLENGTH=4 VALUE="$hashref->{loc
 END
 
 print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{popnum} ? "Apply changes" : "Add POP",
+      $hashref->{popnum} ? "Apply changes" : "Add Access Number",
       qq!">!;
 
 print <<END;
-- 
cgit v1.2.1


From 0b0f8fb76939a617b142595672cc15e034ab7336 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 16:40:21 +0000
Subject: fix "no previous account to recall hidden password from" error when
 adding new accounts & get an error on first try

---
 httemplate/edit/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 73ecdd98d..4bc81c9fd 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -72,7 +72,7 @@ my $otaker = getotaker;
 my $username = $svc_acct->username;
 my $password;
 if ( $svc_acct->_password ) {
-  if ( $conf->exists('showpasswords') ) {
+  if ( $conf->exists('showpasswords') || ! $svcnum ) {
     $password = $svc_acct->_password;
   } else {
     $password = "*HIDDEN*";
-- 
cgit v1.2.1


From ddb53fcc9fc80561354b97e4e7803004990138d0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 18:56:49 +0000
Subject: use unique tokens to prevent double-submission of payments in the web
 UI (closes: Bug#320)

---
 httemplate/edit/cust_pay.cgi | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 27d36eb54..f6ae7b299 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -32,6 +32,8 @@ if ( $cgi->param('error') ) {
 }
 my $_date = time;
 
+my $paybatch = "webui-$_date-$$-". rand() * 2**32;
+
 my $p1 = popurl(1);
 print header("Post payment", '');
 
@@ -111,11 +113,12 @@ print qq!<TR><TD ALIGN="right">Check #</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="te
 
 print qq!<TR><TD ALIGN="right">Auto-apply<BR>to invoices</TD><TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>!;
 
+print "</TABLE>";
+
 #paybatch
-print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="">!;
+print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="$paybatch">!;
 
 print <<END;
-</TABLE>
 <BR>
 <INPUT TYPE="submit" VALUE="Post payment">
     </FORM>
-- 
cgit v1.2.1


From 7e3eb82f87c371785544b706b7347c7edde2b593 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 19:58:43 +0000
Subject: update billing documentation for the new world of invoice events
 added freeside-daily replacing freeside-bill for the new world of invoice
 events

---
 httemplate/edit/process/part_bill_event.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/part_bill_event.cgi b/httemplate/edit/process/part_bill_event.cgi
index 1716c71b9..4049ade80 100755
--- a/httemplate/edit/process/part_bill_event.cgi
+++ b/httemplate/edit/process/part_bill_event.cgi
@@ -12,7 +12,7 @@ if ( ! $cgi->param('plan_weight_eventcode') ) {
   $error = "Must select an action";
 } else {
 
-  $cgi->param('plan_weight_eventcode') =~ /^(\w+):(\d+):(.*)$/
+  $cgi->param('plan_weight_eventcode') =~ /^([\w\-]+):(\d+):(.*)$/
     or die "illegal plan_weight_eventcode:".
            $cgi->param('plan_weight_eventcode');
   $cgi->param('plan', $1);
-- 
cgit v1.2.1


From 46477667466732de54a034fae994e71f9ca62b50 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 22:21:47 +0000
Subject: slighly different wording

---
 httemplate/edit/part_pkg.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index d32702668..f4ebd6770 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -211,7 +211,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'flat_comission' => {
-    'name' => 'Flat rate with recurring comission per active package',
+    'name' => 'Flat rate with recurring comission per (any) active package',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -232,7 +232,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'flat_comission_pkg' => {
-    'name' => 'Flat rate with recurring comission per active (selected) package',
+    'name' => 'Flat rate with recurring comission per (selected) active package',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
-- 
cgit v1.2.1


From 505345d25040f78a9fdffa5666cd6b9f41a117a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 22:31:14 +0000
Subject: ui

---
 httemplate/edit/svc_acct.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 4bc81c9fd..e42745cf7 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -81,7 +81,8 @@ if ( $svc_acct->_password ) {
   $password = '';
 }
 
-my $ulen = $svc_acct->dbdef_table->column('username')->length;
+my $ulen = $conf->config('usernamemax')
+           || $svc_acct->dbdef_table->column('username')->length;
 my $ulen2 = $ulen+2;
 
 my $pmax = $conf->config('passwordmax') || 8;
@@ -103,7 +104,7 @@ print 'Service # '. ( $svcnum ? "<B>$svcnum</B>" : " (NEW)" ). '<BR>'.
       <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
 END
 
-print &itable("#cccccc",2), <<END;
+print &ntable("#cccccc",2), <<END;
 <TR><TD>
 <TR><TD ALIGN="right">Username</TD>
 <TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
-- 
cgit v1.2.1


From f255042296a645e7d90c19ee6740796250cfb9f3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 11 Feb 2002 19:38:58 +0000
Subject: svc_www is working!

also auto-create and add A records if necessary using apacheip config file.

and show all domain_records on view/svc_domain.cgi page
---
 httemplate/edit/process/svc_www.cgi | 36 ++++++++++++++++++++++++++++++++++++
 httemplate/edit/svc_acct.cgi        |  1 -
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 httemplate/edit/process/svc_www.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/svc_www.cgi b/httemplate/edit/process/svc_www.cgi
new file mode 100644
index 000000000..38d5e1c79
--- /dev/null
+++ b/httemplate/edit/process/svc_www.cgi
@@ -0,0 +1,36 @@
+<%
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+my $svcnum = $1;
+
+my $old;
+if ( $svcnum ) {
+  $old = qsearchs('svc_acct', { 'svcnum' => $svcnum } )
+    or die "fatal: can't find account (svcnum $svcnum)!";
+} else {
+  $old = '';
+}
+
+my $new = new FS::svc_www ( {
+  map {
+    ($_, scalar($cgi->param($_)));
+  #} qw(svcnum pkgnum svcpart recnum usersvc)
+  } ( fields('svc_www'), qw( pkgnum svcpart ) )
+} );
+
+my $error;
+if ( $svcnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcnum = $new->svcnum;
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_www.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_www.cgi?" . $svcnum );
+}
+
+%>
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index e42745cf7..3fa7019eb 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -105,7 +105,6 @@ print 'Service # '. ( $svcnum ? "<B>$svcnum</B>" : " (NEW)" ). '<BR>'.
 END
 
 print &ntable("#cccccc",2), <<END;
-<TR><TD>
 <TR><TD ALIGN="right">Username</TD>
 <TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
 <TR><TD ALIGN="right">Password</TD>
-- 
cgit v1.2.1


From 268e2f7e607c5d7a4b22ebef71556783f2cd2dc2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 11 Feb 2002 21:51:39 +0000
Subject: don't display useless finger and shell fields if uid is set to fixed
 & blank in the service definition - causes: Error: Can't have finger-name
 without uid

---
 httemplate/edit/svc_acct.cgi | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 3fa7019eb..d147a1683 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -47,9 +47,11 @@ if ( $cgi->param('error') ) {
     my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
     if ($cust_pkg) {
       my($cust_main)=qsearchs('cust_main',{'custnum'=> $cust_pkg->custnum } );
-      $svc_acct->setfield('finger',
-        $cust_main->getfield('first') . " " . $cust_main->getfield('last')
-      ) ;
+      unless ( $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
+        $svc_acct->setfield('finger',
+          $cust_main->getfield('first') . " " . $cust_main->getfield('last')
+        );
+      }
     }
 
     #set fixed and default fields from part_svc
@@ -187,12 +189,20 @@ my($uid,$gid,$finger,$dir)=(
 print <<END;
 <INPUT TYPE="hidden" NAME="uid" VALUE="$uid">
 <INPUT TYPE="hidden" NAME="gid" VALUE="$gid">
-<TR><TD ALIGN="right">GECOS</TD><TD><INPUT TYPE="text" NAME="finger" VALUE="$finger"></TD></TR>
-<INPUT TYPE="hidden" NAME="dir" VALUE="$dir">
 END
 
+if ( !$finger && $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
+  print '<INPUT TYPE="hidden" NAME="finger" VALUE="">';
+} else {
+  print '<TR><TD ALIGN="right">GECOS</TD>'.
+        qq!<TD><INPUT TYPE="text" NAME="finger" VALUE="$finger"></TD></TR>!;
+}
+print qq!<INPUT TYPE="hidden" NAME="dir" VALUE="$dir">!;
+
 my $shell = $svc_acct->shell;
-if ( $part_svc->part_svc_column('shell')->columnflag eq "F" ) {
+if ( $part_svc->part_svc_column('shell')->columnflag eq "F"
+     || ( !$shell && $part_svc->part_svc_column('uid')->columnflag eq 'F' )
+   ) {
   print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
 } else {
   print qq!<TR><TD ALIGN="right">Shell</TD><TD><SELECT NAME="shell" SIZE=1>!;
-- 
cgit v1.2.1


From 8fe3fe6ae4075fab902685fd145c48122baedfcb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Feb 2002 01:13:23 +0000
Subject: service definition domsvc is now a domain pulldown closes: Bug#328

---
 httemplate/edit/part_svc.cgi | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 63ec1dce1..ee0457bae 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -111,7 +111,13 @@ my %defs = (
     'gid'       => 'GID (when blank, defaults to UID)',
     'shell'     => 'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
     'finger'    => 'GECOS',
-    'domsvc'    => 'svcnum from svc_domain',
+    'domsvc'    => {
+                     desc =>'svcnum from svc_domain',
+                     type =>'select',
+                     select_table => 'svc_domain',
+                     select_key   => 'svcnum',
+                     select_label => 'domain',
+                   },
   },
   'svc_domain' => {
     'domain'    => 'Domain',
@@ -194,8 +200,10 @@ function fixup(what) {
                  : $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};
+    my $def = $defs{$svcdb}{$field};
+    my $desc = ref($def) ? $def->{desc} : $def;
+    
+    print "- <FONT SIZE=-1>$desc</FONT>" if $desc;
     print "</TD>";
     print qq!<TD><INPUT TYPE="radio" NAME="${svcdb}__${field}_flag" VALUE=""!.
       ' CHECKED'x($flag eq ''). ">Off</TD>";
@@ -203,8 +211,24 @@ function fixup(what) {
       ' CHECKED'x($flag eq 'D'). ">Default ";
     print qq!<INPUT TYPE="radio" NAME="${svcdb}__${field}_flag" VALUE="F"!.
       ' CHECKED'x($flag eq 'F'). ">Fixed ";
-    print qq!<INPUT TYPE="text" NAME="${svcdb}__${field}" VALUE="$value">!,
-      "</TD></TR>\n";
+    print '<BR>';
+    if ( ref($def) ) {
+      if ( $def->{type} eq 'select' ) {
+        print qq!<SELECT NAME="${svcdb}__${field}">!;
+        print '<OPTION>' unless $value;
+        foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
+          my $rvalue = $record->getfield($def->{select_key});
+          print qq!<OPTION VALUE="$rvalue"!.
+                ( $rvalue==$value ? ' SELECTED>' : '>' ).
+                $record->getfield($def->{select_label});
+        }
+      } else {
+        print 'UNKNOWN TYPE '. $def->{type};
+      }
+    } else {
+      print qq!<INPUT TYPE="text" NAME="${svcdb}__${field}" VALUE="$value">!;
+    }
+    print "</TD></TR>\n";
     #$ptmp='';
   }
   print "</TABLE>" unless $svcdb eq 'konq_kludge';
-- 
cgit v1.2.1


From 69569a366264e4114f37d0e1036b5a09ceb56fd7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Feb 2002 01:25:06 +0000
Subject: red warning for unknown type :)

---
 httemplate/edit/part_svc.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index ee0457bae..c3a4942ea 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -223,7 +223,7 @@ function fixup(what) {
                 $record->getfield($def->{select_label});
         }
       } else {
-        print 'UNKNOWN TYPE '. $def->{type};
+        print '<font color="#ff0000">unknown type'. $def->{type};
       }
     } else {
       print qq!<INPUT TYPE="text" NAME="${svcdb}__${field}" VALUE="$value">!;
-- 
cgit v1.2.1


From 543ed3f877829e4335eda48d7198d2f92d03545e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Feb 2002 04:49:32 +0000
Subject: oops

---
 httemplate/edit/part_bill_event.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 40016433d..018fc94a4 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -93,7 +93,7 @@ tie my %events, 'Tie::IxHash',
   'addpost' => {
     'name' => 'Add postal invoicing',
     'code' => '$cust_main->invoicing_list_addpost(); "";',
-    'pad'  => 20,
+    'weight'  => 20,
   },
 
   'comp' => {
-- 
cgit v1.2.1


From 412e2892a324cdd838f4a790102359adcc9b7400 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Feb 2002 03:45:21 +0000
Subject: fix modified <SELECT>s under netcape4, use one for svc_acct.popnum
 too

---
 httemplate/edit/part_svc.cgi | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index c3a4942ea..918e6ab9c 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -104,7 +104,14 @@ my %defs = (
     'dir'       => 'Home directory',
     'uid'       => 'UID (set to fixed and blank for dial-only)',
     'slipip'    => 'IP address (Set to fixed and blank to disable dialin, or, set a value to be exported to RADIUS Framed-IP-Address.  Use the special value <code>0e0</code> [zero e zero] to enable export to RADIUS without a Framed-IP-Address.)',
-    'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
+#    'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
+    'popnum'    => {
+                     desc => 'Access number',
+                     type => 'select',
+                     select_table => 'svc_acct_pop',
+                     select_key   => 'popnum',
+                     select_label => 'city',
+                   },
     'username'  => 'Username',
     'quota'     => '',
     '_password' => 'Password',
@@ -215,13 +222,15 @@ function fixup(what) {
     if ( ref($def) ) {
       if ( $def->{type} eq 'select' ) {
         print qq!<SELECT NAME="${svcdb}__${field}">!;
-        print '<OPTION>' unless $value;
+        print '<OPTION> </OPTION>' unless $value;
         foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
+          warn $rvalue;
           my $rvalue = $record->getfield($def->{select_key});
           print qq!<OPTION VALUE="$rvalue"!.
                 ( $rvalue==$value ? ' SELECTED>' : '>' ).
-                $record->getfield($def->{select_label});
+                $record->getfield($def->{select_label}). '</OPTION>';
         }
+        print '</SELECT>';
       } else {
         print '<font color="#ff0000">unknown type'. $def->{type};
       }
-- 
cgit v1.2.1


From 32e8c2a2a58428acd539d880357c76720334c011 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Feb 2002 08:39:21 +0000
Subject: safe web demo operation!  closes: Bug#217

fix bug in edit/part_pkg: s/bkg/pkg/

edit/part_pkg.cgi - plan <SELECT> is now properly stick on errors, closes: Bug#323
---
 httemplate/edit/part_pkg.cgi | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index f4ebd6770..ae268811a 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -29,8 +29,10 @@ if ( $cgi->param('clone') ) {
 } elsif ( $query && $query =~ /^(\d+)$/ ) {
   $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
 } else {
-  $part_pkg ||= new FS::part_pkg {};
-  $part_pkg->plan('flat');
+  unless ( $part_pkg ) {
+    $part_pkg = new FS::part_pkg {};
+    $part_pkg->plan('flat');
+  }
 }
 unless ( $part_pkg->plan ) { #backwards-compat
   $part_pkg->plan('flat');
@@ -279,7 +281,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_bkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+    'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
   },
 
   'sesmon_minute' => {
@@ -300,7 +302,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_min', 'recur_minly_charge' ],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $min = $cust_pkg->seconds_since($cust_bkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
+    'recur' => '\'my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
 
   },
 
-- 
cgit v1.2.1


From 1c98cb6461e83c28e14341de568ba33328048293 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Feb 2002 10:14:00 +0000
Subject: oops!

---
 httemplate/edit/svc_www.cgi | 179 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 179 insertions(+)
 create mode 100644 httemplate/edit/svc_www.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
new file mode 100644
index 000000000..e1a914f1a
--- /dev/null
+++ b/httemplate/edit/svc_www.cgi
@@ -0,0 +1,179 @@
+<!-- mason kludge -->
+<%
+
+my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_www );
+if ( $cgi->param('error') ) {
+  $svc_www = new FS::svc_www ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_www')
+  } );
+  $svcnum = $svc_www->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_www=qsearchs('svc_www',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_www) svcnum!";
+
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
+
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+  
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+  } else { #adding
+
+    $svc_www = new FS::svc_www({});
+
+    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+    $svcnum='';
+
+    #set fixed and default fields from part_svc
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      $svc_www->setfield( $part_svc_column->columnname,
+                          $part_svc_column->columnvalue,
+                        );
+    }
+
+  }
+}
+my $action = $svc_www->svcnum ? 'Edit' : 'Add';
+
+my( %username, %arec );
+if ($pkgnum) {
+
+  my($u_part_svc,@u_acct_svcparts);
+  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
+    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
+  }
+
+  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+  my($custnum)=$cust_pkg->getfield('custnum');
+  my($i_cust_pkg);
+  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
+    my($acct_svcpart);
+    foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
+                                              #record(s) in cust_svc ( for this
+                                              #pkgnum ! )
+      my($i_cust_svc);
+      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
+        my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+        $username{$svc_acct->getfield('svcnum')}=$svc_acct->getfield('username');
+      }  
+    }
+  }
+
+
+  my($d_part_svc,@d_acct_svcparts);
+  foreach $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
+    push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
+  }
+
+  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
+    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
+    my($acct_svcpart);
+    foreach $acct_svcpart (@d_acct_svcparts) {
+      my($i_cust_svc);
+      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
+        my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+        my $domain_rec;
+        foreach $domain_rec ( qsearch('domain_record',{
+            'svcnum'  => $svc_domain->svcnum,
+            'rectype' => 'A' } ),
+        qsearch('domain_record',{
+            'svcnum'  => $svc_domain->svcnum,
+            'rectype' => 'CNAME'
+            } ) ) {
+          $arec{$domain_rec->recnum} =
+            $domain_rec->reczone eq '@'
+              ? $svc_domain->domain
+              : $domain_rec->reczone. '.'. $svc_domain->domain;
+        }
+        $arec{'@.'. $svc_domain->domain} = $svc_domain->domain
+          unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
+                                             reczone => '@',                } );
+        $arec{'www.'. $svc_domain->domain} = 'www.'. $svc_domain->domain
+          unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
+                                             reczone => 'www',              } );
+      }
+    }
+  }
+
+} elsif ( $action eq 'Edit' ) {
+
+  my($domain_rec) = qsearchs('domain_record', { 'recnum'=>$svc_www->recnum });
+  $arec{$svc_www->recnum} = join '.', $domain_rec->recdata, $domain_rec->reczone;
+
+} else {
+  die "\$action eq Add, but \$pkgnum is null!\n";
+}
+
+
+my $p1 = popurl(1);
+print header("Web Hosting $action", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/svc_www.cgi" METHOD=POST>!;
+
+#display
+
+ 
+
+#svcnum
+print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
+print qq!Service #<B>!, $svcnum ? $svcnum : "(NEW)", "</B><BR><BR>";
+
+#pkgnum
+print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+ 
+#svcpart
+print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
+
+my($recnum,$usersvc)=(
+  $svc_www->recnum,
+  $svc_www->usersvc,
+);
+
+print &ntable("#cccccc",2),
+      '<TR><TD ALIGN="right">Zone</TD><TD><SELECT NAME="recnum" SIZE=1>';
+foreach $_ (keys %arec) {
+  print "<OPTION", $_ eq $recnum ? " SELECTED" : "",
+        qq! VALUE="$_">$arec{$_}!;
+}
+print "</SELECT></TD></TR>";
+
+print '<TR><TD ALIGN="right">Username</TD><TD><SELECT NAME="usersvc" SIZE=1>';
+foreach $_ (keys %username) {
+  print "<OPTION", ($_ eq $usersvc) ? " SELECTED" : "",
+        qq! VALUE="$_">$username{$_}!;
+}
+print "</SELECT></TD></TR>";
+
+print '</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">';
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+
-- 
cgit v1.2.1


From 0ab8b21b9b39d9349c94e6cea10dbb006ff176a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Feb 2002 20:09:12 +0000
Subject: bad warning, causing errors with strict

---
 httemplate/edit/part_svc.cgi | 1 -
 1 file changed, 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 918e6ab9c..57ab3985e 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -224,7 +224,6 @@ function fixup(what) {
         print qq!<SELECT NAME="${svcdb}__${field}">!;
         print '<OPTION> </OPTION>' unless $value;
         foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
-          warn $rvalue;
           my $rvalue = $record->getfield($def->{select_key});
           print qq!<OPTION VALUE="$rvalue"!.
                 ( $rvalue==$value ? ' SELECTED>' : '>' ).
-- 
cgit v1.2.1


From b500b9de7f863e1a54fe117a565c04ef917109d8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Feb 2002 02:57:39 +0000
Subject: allow custom packages to edit service quantities also

---
 httemplate/edit/part_pkg.cgi | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index ae268811a..8e7a6c5cf 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -110,7 +110,9 @@ my $thead =  "\n\n". ntable('#cccccc', 2). <<END;
 <TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH><TH BGCOLOR="#dcdcdc">Service</TH></TR>
 END
 
-unless ( $cgi->param('clone') ) {
+#unless ( $cgi->param('clone') ) {
+#dunno why...
+unless ( 0 ) {
   #print <<END, $thead;
   print <<END, itable(), '<TR><TD VALIGN="top">', $thead;
 <BR><BR>Enter the quantity of each service this package includes.<BR><BR>
@@ -135,7 +137,9 @@ foreach my $part_svc ( @part_svc ) {
 
   push @fixups, "pkg_svc$svcpart";
 
-  unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
+  #unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
+  #dunno why...
+  unless ( 0 ) {
     print '<TR>'; # if $count == 0 ;
     print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=4 MAXLENGTH=3 VALUE="!,
           $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0,
@@ -153,7 +157,9 @@ foreach my $part_svc ( @part_svc ) {
   }
 }
 
-unless ( $cgi->param('clone') ) {
+#unless ( $cgi->param('clone') ) {
+#dunno why...
+unless ( 0 ) {
   print "</TR></TABLE></TD></TR></TABLE>";
   #print "</TR></TABLE>";
 }
-- 
cgit v1.2.1


From 55e8ec50af441be65887fae5ffb866941620fe54 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Feb 2002 22:13:00 +0000
Subject: billing vs. shipping states weren't sorted in the same order.  UI
 glitch only

---
 httemplate/edit/cust_main.cgi | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 41643a37f..2798d5dde 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -170,6 +170,7 @@ print <<END;
 <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
 END
 
+#false laziness with ship_state
 my $countrydefault = $conf->config('countrydefault') || 'US';
 $cust_main->country( $countrydefault ) unless $cust_main->country;
 $cust_main->state( $conf->config('statedefault') || 'CA' )
@@ -265,11 +266,17 @@ END
   <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="ship_city" VALUE="$ship_city" onChange="changed(this)"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="ship_state" SIZE="1" onChange="changed(this)">
 END
 
+  #false laziness with regular state
   $cust_main->ship_country( $conf->config('countrydefault') || 'US' )
     unless $cust_main->ship_country;
   $cust_main->ship_state( $conf->config('statedefault') || 'CA' )
     unless $cust_main->ship_state || $cust_main->ship_country ne 'US';
-  foreach ( qsearch('cust_main_county',{}) ) {
+  foreach ( sort {
+       ( $b->country eq $countrydefault ) <=> ( $a->country eq $countrydefault )
+    or $a->country                        cmp $b->country
+    or $a->state                          cmp $b->state
+    or $a->county                         cmp $b->county
+  } qsearch('cust_main_county',{}) ) {
     print "<OPTION";
     print " SELECTED" if ( $cust_main->ship_state eq $_->state
                            && $cust_main->ship_county eq $_->county 
-- 
cgit v1.2.1


From 69044f612f6e9695b52fa922df0de0ea957fcafd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Feb 2002 11:11:56 +0000
Subject: fix a weird oops with service address editing UI that would leave
 some fields blank... ?

---
 httemplate/edit/cust_main.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 2798d5dde..89a946b0f 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -232,7 +232,8 @@ END
   unless ( $cust_main->ship_last ) {
     print ' CHECKED';
     foreach (
-      qw( last first company address1 address2 city state zip daytime night fax)
+      qw( last first company address1 address2 city county state zip country
+          daytime night fax )
     ) {
       $cust_main->set("ship_$_", $cust_main->get($_) );
     }
-- 
cgit v1.2.1


From f96adaf19c0097ef8c9d6f29a5541b75381cc05d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Mar 2002 15:33:22 +0000
Subject: abstract stupid HTML layer trick out to HTML::Widgets::SelectLayers

---
 httemplate/edit/part_pkg.cgi | 256 ++++++++++++++++---------------------------
 httemplate/edit/part_svc.cgi | 225 ++++++++++++-------------------------
 2 files changed, 167 insertions(+), 314 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 8e7a6c5cf..d3213dd46 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -42,24 +42,12 @@ unless ( $part_pkg->plan ) { #backwards-compat
 $action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
 my $hashref = $part_pkg->hashref;
 
-%>
-
-<SCRIPT>
-function visualize(what) {
-  if (document.getElementById) {
-    document.getElementById('d<%= $part_pkg->plan %>').style.visibility = "visible";
-  } else {
-    document.l<%= $part_pkg->plan %>.visibility = "visible";
-  }
-}
-</SCRIPT>
-
-<% 
 
 print header("$action Package Definition", menubar(
   'Main Menu' => popurl(2),
   'View all packages' => popurl(2). 'browse/part_pkg.cgi',
-), ' onLoad="visualize()"');
+));
+#), ' onLoad="visualize()"');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
@@ -164,8 +152,12 @@ unless ( 0 ) {
   #print "</TR></TABLE>";
 }
 
+foreach my $f ( qw( clone pkgnum ) ) {
+  print qq!<INPUT TYPE="hidden" NAME="$f" VALUE="!. $cgi->param($f). '">';
+}
+print '<INPUT TYPE="hidden" NAME="pkgpart" VALUE="'. $part_pkg->pkgpart. '">';
+
 # prolly should be in database
-use Tie::IxHash;
 tie my %plans, 'Tie::IxHash',
   'flat' => {
     'name' => 'Flat rate',
@@ -314,159 +306,99 @@ tie my %plans, 'Tie::IxHash',
 
 ;
 
-%>
-
-<SCRIPT>
-var layer = null;
-
-function changed(what) {
-  layer = what.options[what.selectedIndex].value;
-<% foreach my $layer ( keys %plans ) { %>
-  if (layer == "<%= $layer %>" ) {
-    <% foreach my $not ( grep { $_ ne $layer } keys %plans ) { %>
-      if (document.getElementById) {
-        document.getElementById('d<%= $not %>').style.visibility = "hidden";
-      } else {
-        document.l<%= $not %>.visibility = "hidden";
-      }
-    <% } %>
-    if (document.getElementById) {
-      document.getElementById('d<%= $layer %>').style.visibility = "visible";
-    } else {
-      document.l<%= $layer %>.visibility = "visible";
-    }
-  }
-<% } %>
-}
-
-</SCRIPT>
-<BR>
-Price plan <SELECT NAME="plan" SIZE=1 onChange="changed(this);">
-<OPTION>
-<% foreach my $layer (keys %plans ) { %>
-<OPTION VALUE="<%= $layer %>"<%= ' SELECTED'x($layer eq $part_pkg->plan) %>><%= $plans{$layer}->{'name'} %>
-<% } %>
-</SELECT></FORM>
-
-<SCRIPT>
-function fchanged(what) {
-  fixup(what.form);
-}
-
-function fixup(what) {
-<% foreach my $f ( qw( pkg comment freq ), @fixups ) { %>
-  what.<%= $f %>.value = document.dummy.<%= $f %>.value;
-<% } %>
-<% foreach my $f ( qw( setuptax recurtax disabled ) ) { %>
-  if (document.dummy.<%= $f %>.checked)
-    what.<%= $f %>.value = 'Y';
-  else
-    what.<%= $f %>.value = '';
-<% } %>
-  what.plan.value = document.dummy.plan.options[document.dummy.plan.selectedIndex].value;
-<% foreach my $p ( keys %plans ) { %>
-  if ( what.plan.value == "<%= $p %>" ) {
-    what.setup.value = <%= $plans{$p}->{setup} %>;
-    what.recur.value = <%= $plans{$p}->{recur} %>;
-  }
-<% } %>
-}
-</SCRIPT>
-
-<% my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
+my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
                     split("\n", $part_pkg->plandata );
-   #foreach my $layer ( 'konq_kludge', keys %plans ) { 
-   foreach my $layer ( 'konq_kludge', keys %plans ) {
-     my $visibility = "hidden";
-%>
-<SCRIPT>
-if (document.getElementById) {
-    document.write("<DIV ID=\"d<%= $layer %>\" STYLE=\"visibility: <%= $visibility %>; position: absolute\">");
-} else {
-<% $visibility="show" if $visibility eq "visible"; %>
-    document.write("<LAYER ID=\"l<%= $layer %>\" VISIBILITY=\"<%= $visibility %>\">");
-}
-</SCRIPT>
-
-<FORM NAME="<%= $layer %>" ACTION="process/part_pkg.cgi" METHOD=POST onSubmit="fixup(this)">
-<INPUT TYPE="hidden" NAME="plan" VALUE="<%= $part_pkg->plan %>">
-<INPUT TYPE="hidden" NAME="pkg" VALUE="<%= $hashref->{pkg} %>">
-<INPUT TYPE="hidden" NAME="comment" VALUE="$<%= $hashref->{comment} %>">
-<INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>">
-<INPUT TYPE="hidden" NAME="setuptax" VALUE="<%= $hashref->{setuptax} %>">
-<INPUT TYPE="hidden" NAME="recurtax" VALUE="<%= $hashref->{recurtax} %>">
-<INPUT TYPE="hidden" NAME="disabled" VALUE="<%= $hashref->{disabled} %>">
-<% foreach my $f ( @fixups ) { %>
-<INPUT TYPE="hidden" NAME="<%= $f %>" VALUE="">
-<% } %>
 
-<%
-if ( $cgi->param('clone') ) {
-  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
-}
-if ( $cgi->param('pkgnum') ) {
-  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
-}
-%>
+tie my %options, 'Tie::IxHash', map { $_=>$plans{$_}->{'name'} } keys %plans;
+
+my $widget = new HTML::Widgets::SelectLayers(
+  'selected_layer' => $part_pkg->plan,
+  'options'        => \%options,
+  'form_name'      => 'dummy',
+  'form_action'    => 'process/part_pkg.cgi',
+  'form_text'      => [ qw(pkg comment freq clone pkgnum pkgpart), @fixups ],
+  'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
+  'fixup_callback' => sub {
+                        #my $ = @_;
+                        my $html = '';
+                        for my $p ( keys %plans ) {
+                          $html .= "if ( what.plan.value == \"$p\" ) {
+                                      what.setup.value = $plans{$p}->{setup} ;
+                                      what.recur.value = $plans{$p}->{recur} ;
+                                    }\n";
+                        }
+                        $html;
+                      },
+  'layer_callback' => sub {
+    my $layer = shift;
+    my $html = qq!<INPUT TYPE="hidden" NAME="plan" VALUE="$layer">!.
+               ntable("#cccccc",2);
+    my $href = $plans{$layer}->{'fields'};
+    foreach my $field ( exists($plans{$layer}->{'fieldorder'})
+                          ? @{$plans{$layer}->{'fieldorder'}}
+                          : keys %{ $href }
+                      ) {
+
+      $html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>';
+
+      if ( ! exists($href->{$field}{'type'}) ) {
+        $html .= qq!<INPUT TYPE="text" NAME="$field" VALUE="!.
+                 ( exists($plandata{$field})
+                     ? $plandata{$field}
+                     : $href->{$field}{'default'} ).
+                 qq!" onChange="fchanged(this)">!;
+      } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) {
+        $html .= qq!<SELECT MULTIPLE NAME="$field" onChange="fchanged(this)">!;
+        foreach my $record (
+          qsearch( $href->{$field}{'select_table'},
+                   $href->{$field}{'select_hash'}   )
+        ) {
+          my $value = $record->getfield($href->{$field}{'select_key'});
+          $html .= qq!<OPTION VALUE="$value"!.
+                   (  $plandata{$field} =~ /(^|, *)$value *(,|$)/
+                        ? ' SELECTED'
+                        : ''          ).
+                   '>'. $record->getfield($href->{$field}{'select_label'})
+        }
+        $html .= '</SELECT>';
+      }
 
-<INPUT TYPE="hidden" NAME="pkgpart" VALUE="<%= $hashref->{pkgpart} %>">
-<%= ntable("#cccccc",2) %>
+      $html .= '</TD></TR>';
+    }
+    $html .= '</TABLE>';
+
+    $html .= '<INPUT TYPE="hidden" NAME="plandata" VALUE="'.
+             join(',', keys %{ $href } ). '">'.
+             '<BR><BR>';
+             
+    $html .= '<INPUT TYPE="submit" VALUE="'.
+             ( $hashref->{pkgpart} ? "Apply changes" : "Add package" ).
+             '" onClick="fchanged(this)">';
+
+    $html .= '<BR><BR>don\'t edit this unless you know what you\'re doing '.
+             '<INPUT TYPE="button" VALUE="refresh expressions" '.
+               'onClick="fchanged(this)">'.
+             ntable("#cccccc",2).
+             '<TR><TD>'.
+             '<FONT SIZE="1">Setup expression<BR>'.
+             '<INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="'.
+               $hashref->{setup}. '" onLoad="fchanged(this)">'.
+             '</FONT><BR>'.
+             '<FONT SIZE="1">Recurring espression<BR>'.
+             '<INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="'.
+               $hashref->{recur}. '" onLoad="fchanged(this)">'.
+             '</FONT>'.
+             '</TR></TD>'.
+             '</TABLE>';
+
+    $html;
 
-<% my $href = $plans{$layer}->{'fields'};
-   foreach my $field ( exists($plans{$layer}->{'fieldorder'})
-                         ? @{$plans{$layer}->{'fieldorder'}}
-                         : keys %{ $href }
-                     ) {
-%>
-  <TR><TD ALIGN="right"><%= $href->{$field}{'name'} %></TD>
-  <TD>
-  <% if ( ! exists($href->{$field}{'type'}) ) { %>
-       <INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)">
-  <% } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) { %>
-       <SELECT MULTIPLE NAME="<%= $field %>" onChange="fchanged(this)">
-       <% foreach my $record ( qsearch( $href->{$field}{'select_table'}, $href->{$field}{'select_hash'} ) ) {
-          my $value = $record->getfield($href->{$field}{'select_key'}); %>
-         <OPTION VALUE="<%= $value %>"<%= $plandata{$field} =~ /(^|, *)$value *(,|$)/ ? ' SELECTED' : '' %>><%= $record->getfield($href->{$field}{'select_label'}) %>
-       <% } %>
-       </SELECT>
-  <% } %>
-  </TD></TR>
-<% } %>
-
-</TABLE>
-<INPUT TYPE="hidden" NAME="plandata" VALUE="<%= join(',', keys %{ $href } ) %>">
-<BR><BR>
+  },
+);
 
-<%
-print qq!<INPUT TYPE="submit" VALUE="!,
-      $hashref->{pkgpart} ? "Apply changes" : "Add package",
-      qq!" onClick="fchanged(this)">!;
 %>
 
-<BR><BR>don't edit this unless you know what you're doing <INPUT TYPE="button" VALUE="refresh expressions" onClick="fchanged(this)"><%= ntable("#cccccc",2) %><TR><TD>
-<FONT SIZE="1">Setup expression<BR><INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="<%= $hashref->{setup} %>" onLoad="fchanged(this)"></FONT><BR>
-<FONT SIZE="1">Recurring espression<BR><INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="<%= $hashref->{recur} %>" onLoad="fchanged(this)"></FONT>
-</TR></TD>
-</TABLE>
-
-</FORM>
-
-<SCRIPT>
-if (document.getElementById) {
-  document.write("</DIV>");
-} else {
-  document.write("</LAYER>");
-}
-</SCRIPT>
-
-<% } %>
-
-<TAG onLoad="
-    if (document.getElementById) {
-      document.getElementById('d<%= $part_pkg->plan %>').style.visibility = 'visible';
-    } else {
-      document.l<%= $part_pkg->plan %>.visibility = 'visible';
-    }
-">
+<BR>
+Price plan <%= $widget->html %>
   </BODY>
 </HTML>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 57ab3985e..3292a9b9b 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -15,25 +15,16 @@
    }
    my $action = $part_svc->svcpart ? 'Edit' : 'Add';
    my $hashref = $part_svc->hashref;
-   my $p_svcdb = $part_svc->svcdb || 'svc_acct';
+#   my $p_svcdb = $part_svc->svcdb || 'svc_acct';
 
-%>
 
-<SCRIPT>
-function visualize(what) {
-  if (document.getElementById) {
-    document.getElementById('d<%= $p_svcdb %>').style.visibility = "visible";
-  } else {
-    document.l<%= $p_svcdb %>.visibility = "visible";
-  }
-}
-</SCRIPT>
+           #" onLoad=\"visualize()\""
+%>
 
 <%= header("$action Service Definition",
            menubar( 'Main Menu'         => $p,
                     'View all service definitions' => "${p}browse/part_svc.cgi"
                   ),
-           " onLoad=\"visualize()\""
            )
 %>
 
@@ -47,6 +38,7 @@ function visualize(what) {
 <BR><BR>
 Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>"><BR>
 Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>><BR>
+<INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
 <BR>
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
@@ -64,37 +56,6 @@ values.  For example, a SLIP/PPP account may have a default (or perhaps fixed)
 blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
 <B>/usr/bin/passwd</B>.
 <BR><BR>
-<SCRIPT>
-var svcdb = null;
-function changed(what) {
-  svcdb = what.options[what.selectedIndex].value;
-<% foreach my $svcdb ( qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ) ) { %>
-  if (svcdb == "<%= $svcdb %>" ) {
-    <% foreach my $not ( grep { $_ ne $svcdb } (
-                           qw(svc_acct svc_domain svc_acct_sm svc_forward svc_www) ) ) { %>
-      if (document.getElementById) {
-        document.getElementById('d<%= $not %>').style.visibility = "hidden";
-      } else {
-        document.l<%= $not %>.visibility = "hidden";
-      }
-    <% } %>
-    if (document.getElementById) {
-      document.getElementById('d<%= $svcdb %>').style.visibility = "visible";
-    } else {
-      document.l<%= $svcdb %>.visibility = "visible";
-    }
-  }
-<% } %>
-}
-</SCRIPT>
-<% my @dbs = $hashref->{svcdb}
-             ? ( $hashref->{svcdb} )
-             : qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www ); %>
-Table<SELECT NAME="svcdb" SIZE=1 onChange="changed(this)">
-<% foreach my $svcdb (@dbs) { %>
-<OPTION VALUE="<%= $svcdb %>" <%= ' SELECTED'x($svcdb eq $hashref->{svcdb}) %>><%= $svcdb %>
-<% } %>
-</SELECT></FORM>
 
 <%
 #these might belong somewhere else for other user interfaces 
@@ -152,121 +113,81 @@ my %defs = (
   },
 );
 
-#  svc_acct svc_domain svc_acct_sm svc_charge svc_wo
-foreach my $svcdb ( qw(
-  konq_kludge svc_acct svc_domain svc_acct_sm svc_forward svc_www
-) ) {
-
-#  my(@fields) = $svcdb eq 'konq_kludge'
-#                  ? ()
-#                  : grep { $_ ne 'svcnum' } fields($svcdb);
-  #yucky kludge
-  my(@fields) = defined( $FS::Record::dbdef->table($svcdb) )
-                  ? grep { $_ ne 'svcnum' } fields($svcdb)
-                  : ();
-  #my($rowspan)=scalar(@rows);
-
-  #my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>";
-#  $visibility = $svcdb eq $part_svc->svcdb ? "SHOW" : "HIDDEN";
-#  $visibility = $svcdb eq $p_svcdb ? "visible" : "hidden";
-  my $visibility = "hidden";
-%>
-<SCRIPT>
-if (document.getElementById) {
-    document.write("<DIV ID=\"d<%= $svcdb %>\" STYLE=\"visibility: <%= $visibility %>; position: absolute\">");
-} else {
-<% $visibility="show" if $visibility eq "visible"; %>
-    document.write("<LAYER ID=\"l<%= $svcdb %>\" VISIBILITY=\"<%= $visibility %>\">");
-}
-
-function fixup(what) {
-  what.svc.value = document.dummy.svc.value;
-  what.svcdb.value = document.dummy.svcdb.options[document.dummy.svcdb.selectedIndex].value;
-  if (document.dummy.disabled.checked)
-    what.disabled.value = 'Y';
-  else
-    what.disabled.value = '';
-}
-</SCRIPT>
-<FORM NAME="<%= $svcdb %>" ACTION="process/part_svc.cgi" METHOD=POST onSubmit="fixup(this)">
-<INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
-<INPUT TYPE="hidden" NAME="svc" VALUE="<%= $hashref->{svc} %>">
-<INPUT TYPE="hidden" NAME="disabled" VALUE="<%= $hashref->{disabled} %>">
-<INPUT TYPE="hidden" NAME="svcdb" VALUE="<%= $svcdb %>">
-<%
-  #print "$svcdb<BR>" unless $svcdb eq 'konq_kludge';
-  print table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>" unless $svcdb eq 'konq_kludge';
-
-  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";
-    my $def = $defs{$svcdb}{$field};
-    my $desc = ref($def) ? $def->{desc} : $def;
-    
-    print "- <FONT SIZE=-1>$desc</FONT>" if $desc;
-    print "</TD>";
-    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}__${field}_flag" VALUE="D"!.
-      ' CHECKED'x($flag eq 'D'). ">Default ";
-    print qq!<INPUT TYPE="radio" NAME="${svcdb}__${field}_flag" VALUE="F"!.
-      ' CHECKED'x($flag eq 'F'). ">Fixed ";
-    print '<BR>';
-    if ( ref($def) ) {
-      if ( $def->{type} eq 'select' ) {
-        print qq!<SELECT NAME="${svcdb}__${field}">!;
-        print '<OPTION> </OPTION>' unless $value;
-        foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
-          my $rvalue = $record->getfield($def->{select_key});
-          print qq!<OPTION VALUE="$rvalue"!.
-                ( $rvalue==$value ? ' SELECTED>' : '>' ).
-                $record->getfield($def->{select_label}). '</OPTION>';
+  my @dbs = $hashref->{svcdb}
+             ? ( $hashref->{svcdb} )
+             : qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www );
+
+  tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } @dbs;
+  my $widget = new HTML::Widgets::SelectLayers(
+    #'selected_layer' => $p_svcdb,
+    'selected_layer' => $hashref->{svcdb} || 'svc_acct',
+    'options'        => \%svcdb,
+    'form_name'      => 'dummy',
+    'form_action'    => 'process/part_svc.cgi',
+    'form_text'      => [ qw( svc svcpart ) ],
+    'form_checkbox'  => [ 'disabled' ],
+    'layer_callback' => sub {
+      my $layer = shift;
+      my $html = qq!<INPUT TYPE="hidden" NAME="svcdb" VALUE="$layer">!.
+                 table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>";
+      #yucky kludge
+      my @fields = defined( $FS::Record::dbdef->table($layer) )
+                      ? grep { $_ ne 'svcnum' } fields($layer)
+                      : ();
+      foreach my $field (@fields) {
+        my $part_svc_column = $part_svc->part_svc_column($field);
+        my $value = $cgi->param('error')
+                      ? $cgi->param("${layer}__${field}")
+                      : $part_svc_column->columnvalue;
+        my $flag = $cgi->param('error')
+                     ? $cgi->param("${layer}__${field}_flag")
+                     : $part_svc_column->columnflag;
+        my $def = $defs{$layer}{$field};
+        my $desc = ref($def) ? $def->{desc} : $def;
+        
+        $html .= "<TR><TD>$field";
+        $html .= "- <FONT SIZE=-1>$desc</FONT>" if $desc;
+        $html .=  "</TD>";
+        $html .=
+          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
+          ' CHECKED'x($flag eq ''). ">Off</TD>".
+          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
+          ' CHECKED'x($flag eq 'D'). ">Default ".
+          qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
+          ' CHECKED'x($flag eq 'F'). ">Fixed ".
+          '<BR>';
+        if ( ref($def) ) {
+          if ( $def->{type} eq 'select' ) {
+            $html .= qq!<SELECT NAME="${layer}__${field}">!;
+            $html .= '<OPTION> </OPTION>' unless $value;
+            foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
+              my $rvalue = $record->getfield($def->{select_key});
+              $html .= qq!<OPTION VALUE="$rvalue"!.
+                       ( $rvalue==$value ? ' SELECTED>' : '>' ).
+                       $record->getfield($def->{select_label}). '</OPTION>';
+            }
+            $html .= '</SELECT>';
+          } else {
+            $html .= '<font color="#ff0000">unknown type'. $def->{type};
+          }
+        } else {
+          $html .=
+            qq!<INPUT TYPE="text" NAME="${layer}__${field}" VALUE="$value">!;
         }
-        print '</SELECT>';
-      } else {
-        print '<font color="#ff0000">unknown type'. $def->{type};
+        $html .= "</TD></TR>\n";
       }
-    } else {
-      print qq!<INPUT TYPE="text" NAME="${svcdb}__${field}" VALUE="$value">!;
-    }
-    print "</TD></TR>\n";
-    #$ptmp='';
-  }
-  print "</TABLE>" unless $svcdb eq 'konq_kludge';
+      $html .= "</TABLE>";
 
-print qq!\n<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{svcpart} ? "Apply changes" : "Add service",
-      qq!">! unless $svcdb eq 'konq_kludge';
+      $html .= '<BR><INPUT TYPE="submit" VALUE="'.
+               ($hashref->{svcpart} ? 'Apply changes' : 'Add service'). '">';
 
-  print "</FORM>";
-  print <<END;
-    <SCRIPT>
-    if (document.getElementById) {
-      document.write("</DIV>");
-    } else {
-      document.write("</LAYER>");
-    }
-    </SCRIPT>
-END
-}
-#print "</TABLE>";
-%>
+      $html;
 
-<TAG onLoad="
-    if (document.getElementById) {
-      document.getElementById('d<%= $p_svcdb %>').style.visibility = 'visible';
-    } else {
-      document.l<%= $p_svcdb %>.visibility = 'visible';
-    }
-">
+    },
+  );
 
+%>
+Table <%= $widget->html %>
   </BODY>
 </HTML>
 
-- 
cgit v1.2.1


From 14d6b3092a296ada5a0252752fd15a0087c63374 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Mar 2002 15:52:12 +0000
Subject: added (incomplete) export foo

---
 httemplate/edit/part_export.cgi         | 80 +++++++++++++++++++++++++++++++++
 httemplate/edit/process/part_export.cgi | 43 ++++++++++++++++++
 2 files changed, 123 insertions(+)
 create mode 100644 httemplate/edit/part_export.cgi
 create mode 100644 httemplate/edit/process/part_export.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
new file mode 100644
index 000000000..ffce0438f
--- /dev/null
+++ b/httemplate/edit/part_export.cgi
@@ -0,0 +1,80 @@
+<!-- mason kludge -->
+<%
+
+#if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
+#  $cgi->param('clone', $1);
+#} else {
+#  $cgi->param('clone', '');
+#}
+#if ( $cgi->param('svcpart') && $cgi->param('svcpart') =~ /^(\d+)$/ ) {
+#  $cgi->param('svcpart', $1);
+#} else {
+#  $cgi->param('svcpart', '');
+#}
+
+my($query) = $cgi->keywords;
+my $action = '';
+my $part_export = '';
+my $options = {};
+if ( $cgi->param('error') ) {
+  $part_export = new FS::part_export ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_export')
+  } );
+}
+
+warn "***$query***";
+if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
+  $action = 'Add';
+  my $old_part_export = qsearchs('part_export', { 'exportnum' => $1 } );
+  unless ( $part_export ) {
+    ($part_export, $options) = $old_part_export->clone;
+  }
+} elsif ( $cgi->param('new_with_svcpart') 
+          && $cgi->param('new_with_svcpart') =~ /^(\d+)$/ ) {
+  $part_export ||= new FS::part_export ( { 'svcpart' => $1 } );
+} elsif ( $query =~ /^(\d+)$/ ) {
+  $part_export ||= qsearchs('part_export', { 'exportnum' => $1 } );
+}
+$action ||= $part_export->exportnum ? 'Edit' : 'Add';
+
+my @types = qw(shell bsdshell textradius sqlradius cp);
+
+%>
+<%= header("$action Export", menubar(
+  'Main Menu' => popurl(2),
+), ' onLoad="visualize()"')
+%>
+
+<% if ( $cgi->param('error') ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
+
+<FORM ACTION="<%= popurl(1) %>process/part_export.cgi" METHOD=POST>
+<% #print '<FORM NAME="dummy">'; %>
+
+<%= ntable("#cccccc",2) %>
+<TR>
+  <TD ALIGN="right">Service</TD>
+  <TD BGCOLOR="#ffffff">
+    <%= $part_export->svcpart %> - <%= $part_export->part_svc->svc %>
+  </TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Export</TD>
+  <TD><SELECT NAME="exporttype"><OPTION></OPTION>
+<% foreach my $type ( @types ) { %>
+    <OPTION><%= $type %></OPTION>
+<% } %>
+  </SELECT></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Export host</TD>
+  <TD>
+    <INPUT TYPE="text" NAME="machine" VALUE="<%= $part_export->machine %>">
+  </TD>
+</TR>
+</TABLE>
+</FORM>
+</BODY>
+</HTML>
+
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
new file mode 100644
index 000000000..9ee1c5974
--- /dev/null
+++ b/httemplate/edit/process/part_export.cgi
@@ -0,0 +1,43 @@
+<%
+
+my $dbh = dbh;
+
+my $exportnum = $cgi->param('exportnum');
+
+my $old = qsearchs('part_export', { 'exportnum'=>$exportnum } ) if $exportnum;
+
+my $new = new FS::part_export ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('part_export')
+} );
+
+local $SIG{HUP} = 'IGNORE';
+local $SIG{INT} = 'IGNORE';
+local $SIG{QUIT} = 'IGNORE';
+local $SIG{TERM} = 'IGNORE';
+local $SIG{TSTP} = 'IGNORE';
+local $SIG{PIPE} = 'IGNORE';
+
+local $FS::UID::AutoCommit = 0;
+
+my $error;
+if ( $exportnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $exportnum = $new->exportnum;
+}
+if ( $error ) {
+  $dbh->rollback;
+  $cgi->param('error', $error );
+  print $cgi->redirect(popurl(2). "part_export.cgi?". $cgi->query_string );
+  myexit();
+}
+
+#options
+
+$dbh->commit or die $dbh->errstr;
+print $cgi->redirect(popurl(3). "browse/part_svc.cgi");
+
+%>
-- 
cgit v1.2.1


From 105c166a23234dd923757a477b4efcda65fb2881 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Mar 2002 20:51:09 +0000
Subject: okay, now you can specify an alternate invoice template, and it'll be
 auto-createad and added to the list of configuration options. closes: Bug#314

---
 httemplate/edit/part_bill_event.cgi | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 018fc94a4..324daeb90 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -126,6 +126,14 @@ tie my %events, 'Tie::IxHash',
     'weight' => 50,
   },
 
+  'send_alternate' => {
+    'name' => 'Send invoice (email/print) with alternate template',
+    'code' => '$cust_bill->send(\'%%%templatename%%%\');',
+    'html' =>
+        '<INPUT TYPE="text" NAME="templatename" VALUE="%%%templatename%%%">',
+    'weight' => 50,
+  },
+
   'bill' => {
     'name' => 'Generate invoices (normally only used with a <i>Late Fee</i> event)',
     'code' => '$cust_main->bill();',
-- 
cgit v1.2.1


From cd2371a35a0c416366fa1822d99571ca68a5ad1e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Mar 2002 17:48:28 +0000
Subject: changes dum big "state/county/country" select to three, linked with
 javascript closes: Bug#353

---
 httemplate/edit/cust_main.cgi         | 79 ++++++++++++++++-------------------
 httemplate/edit/process/cust_main.cgi | 13 ------
 2 files changed, 37 insertions(+), 55 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 89a946b0f..39b6ca594 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -69,7 +69,7 @@ print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
 
 # agent
 
-my $r = qq!<font color="#ff0000">*</font>!;
+my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
 my @agents = qsearch( 'agent', {} );
 #die "No agents created!" unless @agents;
@@ -147,7 +147,7 @@ my($last,$first,$ss,$company,$address1,$address2,$city,$zip)=(
 );
 
 print "<BR><BR>Billing address", &itable("#cccccc"), <<END;
-<TR><TH ALIGN="right">${r}Contact name<BR>(last, first)</TH><TD COLSPAN=3>
+<TR><TH ALIGN="right">${r}Contact&nbsp;name<BR>(last,&nbsp;first)</TH><TD COLSPAN=3>
 END
 
 print <<END;
@@ -167,30 +167,24 @@ print <<END;
 <TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70></TD></TR>
 <TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TD></TR>
 <TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70></TD></TR>
-<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
+<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State</TH><TD>
 END
 
-#false laziness with ship_state
+#false laziness with ship state
 my $countrydefault = $conf->config('countrydefault') || 'US';
 $cust_main->country( $countrydefault ) unless $cust_main->country;
+
 $cust_main->state( $conf->config('statedefault') || 'CA' )
   unless $cust_main->state || $cust_main->country ne 'US';
-foreach ( sort {
-     ( $b->country eq $countrydefault ) <=> ( $a->country eq $countrydefault )
-  or $a->country                        cmp $b->country
-  or $a->state                          cmp $b->state
-  or $a->county                         cmp $b->county
-} qsearch('cust_main_county',{}) ) {
-  print "<OPTION";
-  print " SELECTED" if ( $cust_main->state eq $_->state
-                         && $cust_main->county eq $_->county 
-                         && $cust_main->country eq $_->country
-                       );
-  print ">",$_->state;
-  print " (",$_->county,")" if $_->county;
-  print " / ", $_->country;
-}
-print qq!</SELECT></TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10></TD></TR>!;
+
+my($county_html, $state_html, $country_html) =
+  FS::cust_main_county::regionselector( $cust_main->county,
+                                        $cust_main->state,
+                                        $cust_main->country );
+
+print "$county_html $state_html";
+
+print qq!</TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10></TD></TR>!;
 
 my($daytime,$night,$fax)=(
   $cust_main->daytime,
@@ -199,12 +193,13 @@ my($daytime,$night,$fax)=(
 );
 
 print <<END;
+<TR><TH ALIGN="right">${r}Country</TH><TD>$country_html</TD></TR>
 <TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18></TD></TR>
 <TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18></TD></TR>
 <TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12></TD></TR>
 END
 
-print "</TABLE>$r required fields<BR>";
+print "</TABLE>${r}required fields<BR>";
 
 # service address
 
@@ -221,7 +216,11 @@ END
 print "      what.form.ship_$_.value = what.form.$_.value;\n"
   for (qw( last first company address1 address2 city zip daytime night fax ));
 print <<END;
+      what.form.ship_country.selectedIndex = what.form.country.selectedIndex;
+      ship_country_changed(what.form.ship_country);
       what.form.ship_state.selectedIndex = what.form.state.selectedIndex;
+      ship_state_changed(what.form.ship_state);
+      what.form.ship_county.selectedIndex = what.form.county.selectedIndex;
     }
   }
   </SCRIPT>
@@ -251,7 +250,7 @@ END
   );
 
   print &itable("#cccccc"), <<END;
-  <TR><TH ALIGN="right">${r}Contact name<BR>(last, first)</TH><TD COLSPAN=5>
+  <TR><TH ALIGN="right">${r}Contact&nbsp;name<BR>(last,&nbsp;first)</TH><TD COLSPAN=5>
 END
 
   print <<END;
@@ -264,30 +263,25 @@ END
   <TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_company" VALUE="$ship_company" SIZE=70 onChange="changed(this)"></TD></TR>
   <TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_address1" VALUE="$ship_address1" SIZE=70 onChange="changed(this)"></TD></TR>
   <TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_address2" VALUE="$ship_address2" SIZE=70 onChange="changed(this)"></TD></TR>
-  <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="ship_city" VALUE="$ship_city" onChange="changed(this)"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="ship_state" SIZE="1" onChange="changed(this)">
+  <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="ship_city" VALUE="$ship_city" onChange="changed(this)"></TD><TH ALIGN="right">${r}State</TH><TD>
 END
 
   #false laziness with regular state
-  $cust_main->ship_country( $conf->config('countrydefault') || 'US' )
-    unless $cust_main->ship_country;
+  $cust_main->ship_country( $countrydefault ) unless $cust_main->ship_country;
+
   $cust_main->ship_state( $conf->config('statedefault') || 'CA' )
     unless $cust_main->ship_state || $cust_main->ship_country ne 'US';
-  foreach ( sort {
-       ( $b->country eq $countrydefault ) <=> ( $a->country eq $countrydefault )
-    or $a->country                        cmp $b->country
-    or $a->state                          cmp $b->state
-    or $a->county                         cmp $b->county
-  } qsearch('cust_main_county',{}) ) {
-    print "<OPTION";
-    print " SELECTED" if ( $cust_main->ship_state eq $_->state
-                           && $cust_main->ship_county eq $_->county 
-                           && $cust_main->ship_country eq $_->country
-                         );
-    print ">",$_->state;
-    print " (",$_->county,")" if $_->county;
-    print " / ", $_->country;
-  }
-  print qq!</SELECT></TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="ship_zip" VALUE="$ship_zip" SIZE=10 onChange="changed(this)"></TD></TR>!;
+
+  my($ship_county_html, $ship_state_html, $ship_country_html) =
+    FS::cust_main_county::regionselector( $cust_main->ship_county,
+                                          $cust_main->ship_state,
+                                          $cust_main->ship_country,
+                                          'ship_',
+                                          'changed(this)', );
+
+  print "$ship_county_html $ship_state_html";
+
+  print qq!</TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="ship_zip" VALUE="$ship_zip" SIZE=10 onChange="changed(this)"></TD></TR>!;
 
   my($ship_daytime,$ship_night,$ship_fax)=(
     $cust_main->ship_daytime,
@@ -296,12 +290,13 @@ END
   );
 
   print <<END;
+  <TR><TH ALIGN="right">${r}Country</TH><TD>$ship_country_html</TD></TR>
   <TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_daytime" VALUE="$ship_daytime" SIZE=18 onChange="changed(this)"></TD></TR>
   <TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_night" VALUE="$ship_night" SIZE=18 onChange="changed(this)"></TD></TR>
   <TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_fax" VALUE="$ship_fax" SIZE=12 onChange="changed(this)"></TD></TR>
 END
 
-  print "</TABLE>$r required fields<BR>";
+  print "</TABLE>${r}required fields<BR>";
 
 }
 
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index c8038ecf6..6ce60d14a 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -8,19 +8,6 @@ $cgi->param('tax','') unless defined $cgi->param('tax');
 
 $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
 
-$cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
-  or die "Oops, illegal \"state\" param: ". $cgi->param('state');
-$cgi->param('state', $1);
-$cgi->param('county', $3 || '');
-$cgi->param('country', $4);
-
-$cgi->param('ship_state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/
-  or $cgi->param('ship_state') =~ /^(((())))$/
-  or die "Oops, illegal \"ship_state\" param: ". $cgi->param('ship_state');
-$cgi->param('ship_state', $1);
-$cgi->param('ship_county', $3 || '');
-$cgi->param('ship_country', $4);
-
 my $payby = $cgi->param('payby');
 if ( $payby ) {
   $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
-- 
cgit v1.2.1


From f1038a648b3d53db925b23519e7cd2a30c6837ed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Mar 2002 21:31:49 +0000
Subject: new export!  infostreet and sqlradius provisioning switched over 
 (Bug #299 - doesn't close it, but all the groundwork is done)

also removes non-transactional ICRADIUS export from svc_acct.export
  (closes: Bug#347)
---
 httemplate/edit/part_export.cgi         | 130 ++++++++++++++++++++++++++++----
 httemplate/edit/process/part_export.cgi |   3 +
 2 files changed, 118 insertions(+), 15 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index ffce0438f..a44bd39d5 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -22,7 +22,7 @@ if ( $cgi->param('error') ) {
   } );
 }
 
-warn "***$query***";
+#warn "***$query***";
 if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
   $action = 'Add';
   my $old_part_export = qsearchs('part_export', { 'exportnum' => $1 } );
@@ -37,7 +37,112 @@ if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
 }
 $action ||= $part_export->exportnum ? 'Edit' : 'Add';
 
-my @types = qw(shell bsdshell textradius sqlradius cp);
+my %exports = (
+  'svc_acct' => {
+    'sysvshell' => {
+      'desc' =>
+        'Batch export of /etc/passwd and /etc/shadow files (Linux/SysV)',
+      'options' => {},
+    },
+    'bsdshell' => {
+      'desc' =>
+        'Batch export of /etc/passwd and /etc/master.passwd files (BSD)',
+      'options' => {},
+    },
+#    'nis' => {
+#      'desc' =>
+#        'Batch export of /etc/global/passwd and /etc/global/shadow for NIS ',
+#      'options' => {},
+#    },
+    'bsdshell' => {
+      'desc' =>
+        'Batch export of /etc/passwd and /etc/master.passwd files (BSD)',
+      'options' => {},
+    },
+    'textradius' => {
+      'desc' => 'Batch export of a text /etc/raddb/users file (Livingston, Cistron)',
+    },
+    'sqlradius' => {
+      'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
+      'options' => {
+        'datasrc'  => { label=>'DBI data source' },
+        'username' => { label=>'Database username' },
+        'password' => { label=>'Database password' },
+      },
+      'nodomain' => 'Y',
+      'notes' => 'Not specifying datasrc will export to the freeside database? (no...  notes on MySQL replication, etc., from Conf.pm && export.html etc.',
+    },
+    'cyrus' => {
+      'desc' => 'Real-time export to Cyrus IMAP server',
+    },
+    'cp' => {
+      'desc' => 'Real-time export to Critical Path Account Provisioning Protocol',
+    },
+    'infostreet' => {
+      'desc' => 'Real-time export to InfoStreet streetSmartAPI',
+      'options' => {
+        'url'      => { label=>'XML-RPC Access URL', },
+        'login'    => { label=>'InfoStreet login', },
+        'password' => { label=>'InfoStreet password', },
+        'groupID'  => { label=>'InfoStreet groupID', },
+      },
+      'nodomain' => 'Y',
+      'notes' => 'http://www.infostreet.com/ .... install Frontier::Client',
+    }
+  },
+
+  'svc_domain' => {},
+
+  'svc_acct_sm' => {},
+
+  'svc_forward' => {},
+
+  'svc_www' => {},
+
+);
+
+my $svcdb = $part_export->part_svc->svcdb;
+my %layers = map { $_ => "$_ - ". $exports{$svcdb}{$_}{desc} }
+               keys %{$exports{$svcdb}};
+$layers{''}='';
+
+my $widget = new HTML::Widgets::SelectLayers(
+  'selected_layer' => $part_export->exporttype,
+  'selected_layer' => $part_export->exporttype,
+  'options'        => \%layers,
+  'form_name'      => 'dummy',
+  'form_action'    => 'process/part_export.cgi',
+  'form_text'      => [qw( exportnum svcpart machine )],
+#  'form_checkbox'  => [qw()],
+  'html_between'    => "</TD></TR></TABLE>\n",
+  'layer_callback'  => sub {
+    my $layer = shift;
+    my $html = qq!<INPUT TYPE="hidden" NAME="exporttype" VALUE="$layer">!.
+               ntable("#cccccc",2);
+    foreach my $option ( keys %{$exports{$svcdb}->{$layer}{options}} ) {
+#    foreach my $option ( qw(url login password groupID ) ) {
+      my $optinfo = $exports{$svcdb}->{$layer}{options}{$option};
+      my $label = $optinfo->{label};
+      my $value = $part_export->option($option);
+      $html .= qq!<TR><TD ALIGN="right">$label</TD><TD>!.
+               qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value"></TD>!.
+               '</TR>';
+    }
+    $html .= '</TABLE>';
+
+    $html .= '<INPUT TYPE="hidden" NAME="options" VALUE="'.
+             join(',', keys %{$exports{$svcdb}->{$layer}{options}} ). '">';
+
+    $html .= '<INPUT TYPE="hidden" NAME="nodomain" VALUE="'.
+             $exports{$svcdb}->{$layer}{nodomain}. '">';
+
+    $html .= '<INPUT TYPE="submit" VALUE="'.
+             ( $part_export->exportnum ? "Apply changes" : "Add export" ).
+             '">';
+
+    $html;
+  },
+);
 
 %>
 <%= header("$action Export", menubar(
@@ -46,35 +151,30 @@ my @types = qw(shell bsdshell textradius sqlradius cp);
 %>
 
 <% if ( $cgi->param('error') ) { %>
-<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+  <BR><BR>
 <% } %>
 
-<FORM ACTION="<%= popurl(1) %>process/part_export.cgi" METHOD=POST>
-<% #print '<FORM NAME="dummy">'; %>
+<FORM NAME="dummy">
+<INPUT TYPE="hidden" NAME="exportnum" VALUE="<%= $part_export->exportnum %>">
 
 <%= ntable("#cccccc",2) %>
 <TR>
   <TD ALIGN="right">Service</TD>
   <TD BGCOLOR="#ffffff">
     <%= $part_export->svcpart %> - <%= $part_export->part_svc->svc %>
+    <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $part_export->svcpart %>">
   </TD>
 </TR>
-<TR>
-  <TD ALIGN="right">Export</TD>
-  <TD><SELECT NAME="exporttype"><OPTION></OPTION>
-<% foreach my $type ( @types ) { %>
-    <OPTION><%= $type %></OPTION>
-<% } %>
-  </SELECT></TD>
-</TR>
 <TR>
   <TD ALIGN="right">Export host</TD>
   <TD>
     <INPUT TYPE="text" NAME="machine" VALUE="<%= $part_export->machine %>">
   </TD>
 </TR>
-</TABLE>
-</FORM>
+<TR>
+  <TD ALIGN="right">Export</TD>
+  <TD><%= $widget->html %>
 </BODY>
 </HTML>
 
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
index 9ee1c5974..8160527f6 100644
--- a/httemplate/edit/process/part_export.cgi
+++ b/httemplate/edit/process/part_export.cgi
@@ -6,6 +6,9 @@ my $exportnum = $cgi->param('exportnum');
 
 my $old = qsearchs('part_export', { 'exportnum'=>$exportnum } ) if $exportnum;
 
+#fixup options
+my %options = map { $_=>$cgi->param($_) } $cgi->param('options');
+
 my $new = new FS::part_export ( {
   map {
     $_, scalar($cgi->param($_));
-- 
cgit v1.2.1


From 415150fe1997eb2688dfd492710f644574e29daf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 21 Mar 2002 06:57:20 +0000
Subject: more for the new world of export...

---
 httemplate/edit/part_export.cgi         |  2 +-
 httemplate/edit/process/part_export.cgi | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index a44bd39d5..7ba6fa12b 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -70,7 +70,7 @@ my %exports = (
         'password' => { label=>'Database password' },
       },
       'nodomain' => 'Y',
-      'notes' => 'Not specifying datasrc will export to the freeside database? (no...  notes on MySQL replication, etc., from Conf.pm && export.html etc.',
+      'notes' => 'Not specifying datasrc will export to the freeside database? (no...  notes on MySQL replication, DBI::Proxy, etc., from Conf.pm && export.html etc.',
     },
     'cyrus' => {
       'desc' => 'Real-time export to Cyrus IMAP server',
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
index 8160527f6..b4ce0b352 100644
--- a/httemplate/edit/process/part_export.cgi
+++ b/httemplate/edit/process/part_export.cgi
@@ -1,7 +1,5 @@
 <%
 
-my $dbh = dbh;
-
 my $exportnum = $cgi->param('exportnum');
 
 my $old = qsearchs('part_export', { 'exportnum'=>$exportnum } ) if $exportnum;
@@ -26,21 +24,17 @@ local $FS::UID::AutoCommit = 0;
 
 my $error;
 if ( $exportnum ) {
-  $error = $new->replace($old);
+  $error = $new->replace($old,\%options);
 } else {
-  $error = $new->insert;
-  $exportnum = $new->exportnum;
+  $error = $new->insert,\%options);
+#  $exportnum = $new->exportnum;
 }
+
 if ( $error ) {
-  $dbh->rollback;
   $cgi->param('error', $error );
   print $cgi->redirect(popurl(2). "part_export.cgi?". $cgi->query_string );
-  myexit();
+} else {
+  print $cgi->redirect(popurl(3). "browse/part_svc.cgi");
 }
 
-#options
-
-$dbh->commit or die $dbh->errstr;
-print $cgi->redirect(popurl(3). "browse/part_svc.cgi");
-
 %>
-- 
cgit v1.2.1


From b159f42fa3f48cc2ca3b43773e7661e17d2fb072 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Mar 2002 12:49:43 +0000
Subject: more new export...

---
 httemplate/edit/part_export.cgi         |  2 +-
 httemplate/edit/process/part_export.cgi | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 7ba6fa12b..3d867f50a 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -27,7 +27,7 @@ if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
   $action = 'Add';
   my $old_part_export = qsearchs('part_export', { 'exportnum' => $1 } );
   unless ( $part_export ) {
-    ($part_export, $options) = $old_part_export->clone;
+    ($part_export, $options) = $old_part_export->clone($cgi->param('svcpart'));
   }
 } elsif ( $cgi->param('new_with_svcpart') 
           && $cgi->param('new_with_svcpart') =~ /^(\d+)$/ ) {
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
index b4ce0b352..d0c87a02a 100644
--- a/httemplate/edit/process/part_export.cgi
+++ b/httemplate/edit/process/part_export.cgi
@@ -5,7 +5,8 @@ my $exportnum = $cgi->param('exportnum');
 my $old = qsearchs('part_export', { 'exportnum'=>$exportnum } ) if $exportnum;
 
 #fixup options
-my %options = map { $_=>$cgi->param($_) } $cgi->param('options');
+warn join('-', split(',',$cgi->param('options')));
+my %options = map { $_=>$cgi->param($_) } split(',',$cgi->param('options'));
 
 my $new = new FS::part_export ( {
   map {
@@ -13,20 +14,13 @@ my $new = new FS::part_export ( {
   } fields('part_export')
 } );
 
-local $SIG{HUP} = 'IGNORE';
-local $SIG{INT} = 'IGNORE';
-local $SIG{QUIT} = 'IGNORE';
-local $SIG{TERM} = 'IGNORE';
-local $SIG{TSTP} = 'IGNORE';
-local $SIG{PIPE} = 'IGNORE';
-
-local $FS::UID::AutoCommit = 0;
-
 my $error;
 if ( $exportnum ) {
+  warn $old;
+  warn $exportnum;
   $error = $new->replace($old,\%options);
 } else {
-  $error = $new->insert,\%options);
+  $error = $new->insert(\%options);
 #  $exportnum = $new->exportnum;
 }
 
-- 
cgit v1.2.1


From 20bb426a02c0ea54d8feaea7c5da51735ab70293 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Mar 2002 18:56:33 +0000
Subject: RADIUS groups on the way!

---
 httemplate/edit/part_svc.cgi | 4 ++++
 httemplate/edit/svc_acct.cgi | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 3292a9b9b..b1bb7f3d3 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -86,6 +86,10 @@ my %defs = (
                      select_key   => 'svcnum',
                      select_label => 'domain',
                    },
+    'radius_groups' => {
+                         desc =>'ICRADIUS/FreeRADIUS groups',
+                         type =>'radius_usergroup_selector',
+                       },
   },
   'svc_domain' => {
     'domain'    => 'Domain',
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index d147a1683..6846b5c93 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -239,6 +239,10 @@ foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
   }
 }
 
+print '<TR><TD ALIGN="right">RADIUS groups</TD><TD>'.
+      &FS::svc_acct::radius_usergroup_selector( [ $svc_acct->radius_groups ] ).
+      '</TD></TR>';
+
 #submit
 print qq!</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">!; 
 
-- 
cgit v1.2.1


From 8fe83dcb8807a86209625a5aab7e574073f0a907 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 23 Mar 2002 16:16:00 +0000
Subject: group editing seems to be working...  everything except defaults...
 oh and export...

---
 httemplate/edit/process/svc_acct.cgi |  5 ++++-
 httemplate/edit/svc_acct.cgi         | 11 ++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
index 5e8a16f4a..950a8602f 100755
--- a/httemplate/edit/process/svc_acct.cgi
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -20,12 +20,15 @@ if ( $cgi->param('_password') eq '*HIDDEN*' ) {
   $cgi->param('_password',$old->getfield('_password'));
 }
 
+#unmunge usergroup
+$cgi->param('usergroup', [ $cgi->param('radius_usergroup') ] );
+
 my $new = new FS::svc_acct ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
   #  shell quota slipip)
-  } ( fields('svc_acct'), qw( pkgnum svcpart ) )
+  } ( fields('svc_acct'), qw( pkgnum svcpart usergroup ) )
 } );
 
 my $error;
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 6846b5c93..8a80d4c72 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -4,7 +4,7 @@
 my $conf = new FS::Conf;
 my @shells = $conf->config('shells');
 
-my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct);
+my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct, @groups);
 if ( $cgi->param('error') ) {
   $svc_acct = new FS::svc_acct ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_acct')
@@ -14,6 +14,7 @@ if ( $cgi->param('error') ) {
   $svcpart = $cgi->param('svcpart');
   $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
   die "No part_svc entry!" unless $part_svc;
+  @groups = $cgi->param('radius_usergroup');
 } else {
   my($query) = $cgi->keywords;
   if ( $query =~ /^(\d+)$/ ) { #editing
@@ -30,6 +31,8 @@ if ( $cgi->param('error') ) {
     $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
     die "No part_svc entry!" unless $part_svc;
 
+    @groups = $svc_acct->radius_groups;
+
   } else { #adding
 
     $svc_acct = new FS::svc_acct({}); 
@@ -63,6 +66,8 @@ if ( $cgi->param('error') ) {
                          );
     }
 
+    #SET DEFAULT GROUP(S) FROM PART_SVC!!!!
+
   }
 }
 my $action = $svcnum ? 'Edit' : 'Add';
@@ -100,7 +105,7 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 print 'Service # '. ( $svcnum ? "<B>$svcnum</B>" : " (NEW)" ). '<BR>'.
       'Service: <B>'. $part_svc->svc. '</B><BR><BR>'.
       <<END;
-    <FORM ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
+    <FORM NAME="OneTrueForm" ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
       <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
       <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
@@ -240,7 +245,7 @@ foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
 }
 
 print '<TR><TD ALIGN="right">RADIUS groups</TD><TD>'.
-      &FS::svc_acct::radius_usergroup_selector( [ $svc_acct->radius_groups ] ).
+      &FS::svc_acct::radius_usergroup_selector( \@groups ).
       '</TD></TR>';
 
 #submit
-- 
cgit v1.2.1


From 74e64d70361848f089aad9a7881c2af9caf6e479 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 23 Mar 2002 17:49:01 +0000
Subject: okay group editing UI as well as part_svc group editing UI seem to be
 working

---
 httemplate/edit/part_svc.cgi         | 12 ++++++++----
 httemplate/edit/process/part_svc.cgi | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index b1bb7f3d3..b4900a01c 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -86,10 +86,10 @@ my %defs = (
                      select_key   => 'svcnum',
                      select_label => 'domain',
                    },
-    'radius_groups' => {
-                         desc =>'ICRADIUS/FreeRADIUS groups',
-                         type =>'radius_usergroup_selector',
-                       },
+    'usergroup' => {
+                     desc =>'ICRADIUS/FreeRADIUS groups',
+                     type =>'radius_usergroup_selector',
+                   },
   },
   'svc_domain' => {
     'domain'    => 'Domain',
@@ -138,6 +138,7 @@ my %defs = (
       my @fields = defined( $FS::Record::dbdef->table($layer) )
                       ? grep { $_ ne 'svcnum' } fields($layer)
                       : ();
+      push @fields, 'usergroup' if $layer eq 'svc_acct'; #kludge
       foreach my $field (@fields) {
         my $part_svc_column = $part_svc->part_svc_column($field);
         my $value = $cgi->param('error')
@@ -171,6 +172,9 @@ my %defs = (
                        $record->getfield($def->{select_label}). '</OPTION>';
             }
             $html .= '</SELECT>';
+          } elsif ( $def->{type} eq 'radius_usergroup_selector' ) {
+            $html .= FS::svc_acct::radius_usergroup_selector(
+              [ split(',', $value) ], "${layer}__${field}" );
           } else {
             $html .= '<font color="#ff0000">unknown type'. $def->{type};
           }
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 423db93b5..31ab13438 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -4,14 +4,18 @@ my $svcpart = $cgi->param('svcpart');
 
 my $old = qsearchs('part_svc',{'svcpart'=>$svcpart}) if $svcpart;
 
+$cgi->param( 'svc_acct__usergroup',
+             join(',', $cgi->param('svc_acct__usergroup') ) );
+
 my $new = new FS::part_svc ( {
   map {
     $_, scalar($cgi->param($_));
 #  } qw(svcpart svc svcdb)
   } ( fields('part_svc'),
       map { my $svcdb = $_;
-            map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  }
-              fields($svcdb)
+            my @fields = fields($svcdb);
+            push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
+            map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  } @fields;
           } grep defined( $FS::Record::dbdef->table($_) ),
                  qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www )
     )
@@ -19,9 +23,9 @@ my $new = new FS::part_svc ( {
 
 my $error;
 if ( $svcpart ) {
-  $error = $new->replace($old, '1.3-COMPAT');
+  $error = $new->replace($old, '1.3-COMPAT', [ 'usergroup' ] );
 } else {
-  $error = $new->insert;
+  $error = $new->insert( [ 'usergroup' ] );
   $svcpart=$new->getfield('svcpart');
 }
 
-- 
cgit v1.2.1


From 7dc23049c25d316da196647a8be1d74dfc09a02a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 24 Mar 2002 14:29:00 +0000
Subject: ICRADIUS groups all done!  UI and provisioning.  closes: Bug#362

fix some bugs in the export and add queue_dangerous_controls option too
---
 httemplate/edit/svc_acct.cgi | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 8a80d4c72..723c91c29 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -61,13 +61,15 @@ if ( $cgi->param('error') ) {
     foreach my $part_svc_column (
       grep { $_->columnflag } $part_svc->all_part_svc_column
     ) {
-      $svc_acct->setfield( $part_svc_column->columnname,
-                           $part_svc_column->columnvalue,
-                         );
+      if ( $part_svc_column->columnname eq 'usergroup' ) {
+        @groups = split(',', $part_svc_column->columnvalue);
+      } else {
+        $svc_acct->setfield( $part_svc_column->columnname,
+                             $part_svc_column->columnvalue,
+                           );
+      }
     }
 
-    #SET DEFAULT GROUP(S) FROM PART_SVC!!!!
-
   }
 }
 my $action = $svcnum ? 'Edit' : 'Add';
@@ -244,9 +246,13 @@ foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
   }
 }
 
-print '<TR><TD ALIGN="right">RADIUS groups</TD><TD>'.
-      &FS::svc_acct::radius_usergroup_selector( \@groups ).
-      '</TD></TR>';
+print '<TR><TD ALIGN="right">RADIUS groups</TD>';
+if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
+  print '<TD BGCOLOR="#ffffff">'. join('<BR>', @groups);
+} else {
+  print '<TD>'. &FS::svc_acct::radius_usergroup_selector( \@groups );
+}
+print '</TD></TR>';
 
 #submit
 print qq!</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">!; 
-- 
cgit v1.2.1


From 1858140b774bfe3a694a2ededf70de797da31c51 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 24 Mar 2002 17:42:58 +0000
Subject: "subscription" price plan from "Luke Pfeifer" <freeside@globalli.com>

---
 httemplate/edit/part_pkg.cgi | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index d3213dd46..60319f9d9 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -160,7 +160,7 @@ print '<INPUT TYPE="hidden" NAME="pkgpart" VALUE="'. $part_pkg->pkgpart. '">';
 # prolly should be in database
 tie my %plans, 'Tie::IxHash',
   'flat' => {
-    'name' => 'Flat rate',
+    'name' => 'Flat rate (anniversary billing)',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -175,7 +175,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'prorate' => {
-    'name' => 'First month pro-rated, then flat-rate',
+    'name' => 'First partial month pro-rated, then flat-rate (1st of month billing)',
     'fields' =>  {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -189,6 +189,21 @@ tie my %plans, 'Tie::IxHash',
     'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'',
   },
 
+  'subscription' => {
+    'name' => 'First partial month full charge, then flat-rate (1st of month billing)',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                      },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,1,$mon,$year); \' + what.recur_fee.value',
+  },
+
   'flat_comission_cust' => {
     'name' => 'Flat rate with recurring comission per active customer',
     'fields' => {
-- 
cgit v1.2.1


From f38abb144955686f880a528ed6fe4c9c5453517b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 24 Mar 2002 20:01:31 +0000
Subject: UI improvements for agents

---
 httemplate/edit/cust_main.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 39b6ca594..33e72d864 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -85,7 +85,8 @@ if ( scalar(@agents) == 1 ) {
   } @agents) {
       print '<OPTION VALUE="', $agent->agentnum, '"',
       " SELECTED"x($agent->agentnum==$agentnum),
-      ">", $agent->agentnum,": ", $agent->agent;
+      ">". $agent->agent;
+      #">", $agent->agentnum,": ", $agent->agent;
   }
   print "</SELECT>";
 }
-- 
cgit v1.2.1


From c6da895a2fb2c233716381b7e45ebbeb1c2f6aaa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Mar 2002 00:32:46 +0000
Subject: further export bugfixing add 10 kid limit to freeside-queued
 sqlradius_reset now works (closes: Bug#372)

---
 httemplate/edit/part_export.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 3d867f50a..25e8f5be0 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -70,7 +70,7 @@ my %exports = (
         'password' => { label=>'Database password' },
       },
       'nodomain' => 'Y',
-      'notes' => 'Not specifying datasrc will export to the freeside database? (no...  notes on MySQL replication, DBI::Proxy, etc., from Conf.pm && export.html etc.',
+      'notes' => 'Not specifying datasrc will export to the freeside database? (no...  notes on MySQL replication, DBI::Proxy, etc., from Conf.pm && export.html etc., reset with bin/sqlradius_reset',
     },
     'cyrus' => {
       'desc' => 'Real-time export to Cyrus IMAP server',
-- 
cgit v1.2.1


From 8ea299358401bea12bef7c2dd1841cef3cf45c20 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 27 Mar 2002 05:36:10 +0000
Subject: s/referral/advertising source/

yes, the name sucks.  got a better one?
---
 httemplate/edit/part_referral.cgi | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 73be9e337..617f5dfca 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -17,9 +17,9 @@ my $action = $part_referral->refnum ? 'Edit' : 'Add';
 my $hashref = $part_referral->hashref;
 
 my $p1 = popurl(1);
-print header("$action Referral", menubar(
+print header("$action Advertising source", menubar(
   'Main Menu' => popurl(2),
-  'View all referrals' => popurl(2). "browse/part_referral.cgi",
+  'View all advertising sources' => popurl(2). "browse/part_referral.cgi",
 ));
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
@@ -32,13 +32,11 @@ print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$hashref->{refnum}">!,
       "Referral #", $hashref->{refnum} ? $hashref->{refnum} : "(NEW)";
 
 print <<END;
-<PRE>
-Referral   <INPUT TYPE="text" NAME="referral" SIZE=32 VALUE="$hashref->{referral}">
-</PRE>
+Advertising source <INPUT TYPE="text" NAME="referral" SIZE=32 VALUE="$hashref->{referral}">
 END
 
 print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{refnum} ? "Apply changes" : "Add referral",
+      $hashref->{refnum} ? "Apply changes" : "Add advertising source",
       qq!">!;
 
 print <<END;
-- 
cgit v1.2.1


From 63df8b9db2932e2039c4268e90e1ff522ba0f61a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 30 Mar 2002 02:35:15 +0000
Subject: finish up s/referral/advertising source/

---
 httemplate/edit/part_referral.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 617f5dfca..f784dfa3e 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -28,8 +28,8 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 
 print qq!<FORM ACTION="${p1}process/part_referral.cgi" METHOD=POST>!;
 
-print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$hashref->{refnum}">!,
-      "Referral #", $hashref->{refnum} ? $hashref->{refnum} : "(NEW)";
+print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$hashref->{refnum}">!;
+#print "Referral #", $hashref->{refnum} ? $hashref->{refnum} : "(NEW)";
 
 print <<END;
 Advertising source <INPUT TYPE="text" NAME="referral" SIZE=32 VALUE="$hashref->{referral}">
-- 
cgit v1.2.1


From 92badebcb286260d7861bd09a2450eea18c4259e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Apr 2002 00:42:21 +0000
Subject: Checkin of disparate changes from working on the road: - generic SQL
 query - move exports out to their own files - small cleanup of selfadmin
 server

---
 httemplate/edit/part_export.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 25e8f5be0..0ca964e02 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -87,7 +87,7 @@ my %exports = (
         'groupID'  => { label=>'InfoStreet groupID', },
       },
       'nodomain' => 'Y',
-      'notes' => 'http://www.infostreet.com/ .... install Frontier::Client',
+      'notes' => 'Real-time export to <a href="http://www.infostreet.com/">InfoStreet</a> streetSmartAPI.  Requires installation of <a href="http://search.cpan.org/search?dist=Frontier-Client">Frontier::Client</a> from CPAN.',
     }
   },
 
-- 
cgit v1.2.1


From 0bd54ce52909122fa729e12709f6f155dd39c09c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Apr 2002 20:52:59 +0000
Subject: don't specify date (not on submitting form)

---
 httemplate/edit/process/cust_credit_bill.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
index 4879b0eab..23e2e6ce5 100755
--- a/httemplate/edit/process/cust_credit_bill.cgi
+++ b/httemplate/edit/process/cust_credit_bill.cgi
@@ -17,7 +17,7 @@ if ($cgi->param('invnum') =~ /^Refund$/) {
     'reason'  => $cust_credit->reason,
     'refund'  => $cgi->param('amount'),
     'payby'   => 'BILL',
-    '_date'   => $cgi->param('_date'),
+    #'_date'   => $cgi->param('_date'),
     'payinfo' => 'Cash',
     'crednum' => $crednum,
   } );
-- 
cgit v1.2.1


From 87af741da0dd5f6a76bbb566b4d6c54cd5b15315 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Apr 2002 23:51:18 +0000
Subject: - add message catalog table & beginning of web interface - add
 security_phrase and conf option to svc_acct.pm - random other stuff

---
 httemplate/edit/svc_acct.cgi | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 723c91c29..540d04c38 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -122,6 +122,15 @@ print &ntable("#cccccc",2), <<END;
 </TR>
 END
 
+if ( $conf->exists('security_phrase') ) {
+  print <<END;
+  <TR><TD ALIGN="right">Security phrase</TD>
+  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase" SIZE=32>
+    (for forgotten passwords)</TD>
+  </TD>
+END
+}
+
 #domain
 my $domsvc = $svc_acct->domsvc || 0;
 if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
-- 
cgit v1.2.1


From 195652229909566ccb3a6ae249d8fa26f25da55a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Apr 2002 00:08:08 +0000
Subject: security phrase bug fixes

---
 httemplate/edit/svc_acct.cgi | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 540d04c38..eca0a31cf 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -122,6 +122,7 @@ print &ntable("#cccccc",2), <<END;
 </TR>
 END
 
+my $sec_phrase = $svc_acct->sec_phrase;
 if ( $conf->exists('security_phrase') ) {
   print <<END;
   <TR><TD ALIGN="right">Security phrase</TD>
@@ -129,6 +130,8 @@ if ( $conf->exists('security_phrase') ) {
     (for forgotten passwords)</TD>
   </TD>
 END
+} else {
+  print qq!<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="$sec_phrase">!;
 }
 
 #domain
-- 
cgit v1.2.1


From 44e3eff0aa6e7bdb7f4ecd9ee1ddf141e1b68af3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Apr 2002 05:56:09 +0000
Subject: working message catalogs (not used for enough yet) - almost (but not
 quite) closes Bug#385 - still have to catalog the   backend things triggered
 by signup server.

---
 httemplate/edit/msgcat.cgi         | 57 ++++++++++++++++++++++++++++++++++++++
 httemplate/edit/process/msgcat.cgi | 19 +++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100755 httemplate/edit/msgcat.cgi
 create mode 100644 httemplate/edit/process/msgcat.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/msgcat.cgi b/httemplate/edit/msgcat.cgi
new file mode 100755
index 000000000..5d256c05b
--- /dev/null
+++ b/httemplate/edit/msgcat.cgi
@@ -0,0 +1,57 @@
+<!-- mason kludge -->
+<%
+
+print header("Message catalog", menubar(
+#  'Main Menu' => $p,
+)), '<BR>';
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !. $cgi->param('error')
+  if $cgi->param('error');
+
+my $widget = new HTML::Widgets::SelectLayers(
+  'selected_layer' => 'en_US',
+  'options'        => { 'en_US'=>'en_US' },
+  'form_action'    => 'process/msgcat.cgi',
+  'layer_callback' => sub {
+    my $layer = shift;
+    my $html = qq!<INPUT TYPE="hidden" NAME="locale" VALUE="$layer">!.
+               "<BR>Messages for locale $layer<BR>". table().
+               "<TR><TH COLSPAN=2>Code</TH>".
+               "<TH>Message</TH>";
+    $html .= "<TH>en_US Message</TH>" unless $layer eq 'en_US';
+    $html .= '</TR>';
+
+    #foreach my $msgcat ( sort { $a->msgcode cmp $b->msgcode }
+    #                       qsearch('msgcat', { 'locale' => $layer } ) ) {
+    foreach my $msgcat ( qsearch('msgcat', { 'locale' => $layer } ) ) {
+      $html .=
+        '<TR><TD>'. $msgcat->msgnum. '</TD><TD>'. $msgcat->msgcode. '</TD>'.
+        '<TD><INPUT TYPE="text" SIZE=32 '.
+        qq! NAME="!. $msgcat->msgnum. '" '.
+        qq!VALUE="!. $msgcat->msg. qq!"></TD>!;
+      unless ( $layer eq 'en_US' ) {
+        my $en_msgcat = qsearchs('msgcat', {
+          'locale'  => 'en_US',
+          'msgcode' => $msgcat->msgcode,
+        } );
+        $html .= '<TD>'. $en_msgcat->msg. '</TD>';
+      }
+      $html .= '</TR>';
+    }
+
+    $html .= '</TABLE><BR><INPUT TYPE="submit" VALUE="Apply changes">';
+
+    $html;
+  },
+
+);
+
+print $widget->html;
+
+print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/process/msgcat.cgi b/httemplate/edit/process/msgcat.cgi
new file mode 100644
index 000000000..ab30f06b5
--- /dev/null
+++ b/httemplate/edit/process/msgcat.cgi
@@ -0,0 +1,19 @@
+<%
+
+my $error;
+foreach my $param ( grep { /^\d+$/ } $cgi->param ) {
+  my $old = qsearchs('msgcat', { msgnum=>$param } );
+  my $new = new FS::msgcat { $old->hash };
+  $new->msg($cgi->param($param));
+  $error = $new->replace($old);
+  last if $error;
+}
+
+if ( $error ) {
+  $cgi->param('error',$error);
+  print $cgi->redirect($p. "msgcat.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "browse/msgcat.cgi");
+}
+
+%>
-- 
cgit v1.2.1


From 0b65ce59c7d2ee712389c27954382274ddf718a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Apr 2002 13:42:49 +0000
Subject: bulk checkin from working on the road:

- use msgcat for more error messages - should be all things that would come3
  back from the signup server normally now
- signup server: don't display access number <SELECT> if there's none or one
- signup_server-realtime config option to run billing for signup server
  signups immediately
- signup server: pkg available to success templates, better documentation on
  success templates
- httemplate/edit/msgcat.cgi fields are properly sticky on errors
- httemplate/edit/process/msgcat.cgi - don't update identical fields
---
 httemplate/edit/msgcat.cgi         | 7 ++++---
 httemplate/edit/process/msgcat.cgi | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/msgcat.cgi b/httemplate/edit/msgcat.cgi
index 5d256c05b..ee9b1c6b3 100755
--- a/httemplate/edit/msgcat.cgi
+++ b/httemplate/edit/msgcat.cgi
@@ -1,11 +1,12 @@
 <!-- mason kludge -->
 <%
 
-print header("Message catalog", menubar(
+print header("Edit Message catalog", menubar(
 #  'Main Menu' => $p,
 )), '<BR>';
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !. $cgi->param('error')
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !. $cgi->param('error').
+      '</FONT><BR><BR>'
   if $cgi->param('error');
 
 my $widget = new HTML::Widgets::SelectLayers(
@@ -28,7 +29,7 @@ my $widget = new HTML::Widgets::SelectLayers(
         '<TR><TD>'. $msgcat->msgnum. '</TD><TD>'. $msgcat->msgcode. '</TD>'.
         '<TD><INPUT TYPE="text" SIZE=32 '.
         qq! NAME="!. $msgcat->msgnum. '" '.
-        qq!VALUE="!. $msgcat->msg. qq!"></TD>!;
+        qq!VALUE="!. ($cgi->param($msgcat->msgnum)||$msgcat->msg). qq!"></TD>!;
       unless ( $layer eq 'en_US' ) {
         my $en_msgcat = qsearchs('msgcat', {
           'locale'  => 'en_US',
diff --git a/httemplate/edit/process/msgcat.cgi b/httemplate/edit/process/msgcat.cgi
index ab30f06b5..1f94f6668 100644
--- a/httemplate/edit/process/msgcat.cgi
+++ b/httemplate/edit/process/msgcat.cgi
@@ -3,6 +3,7 @@
 my $error;
 foreach my $param ( grep { /^\d+$/ } $cgi->param ) {
   my $old = qsearchs('msgcat', { msgnum=>$param } );
+  next if $old->msg eq $cgi->param($param); #no need to update identical records
   my $new = new FS::msgcat { $old->hash };
   $new->msg($cgi->param($param));
   $error = $new->replace($old);
-- 
cgit v1.2.1


From a7c1b602f88c177db34477ed4cdc1f72603f8995 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Apr 2002 22:05:31 +0000
Subject: (almost) everything for bug#375 - create export_svc table - part_svc
 to part_export is now properly many-to-many, not one-to-many

still need to finish service editing (choosing exports) in
httemplate/edit/part_svc.cgi and httemplate/edti/process/part_svc.cgi

and do somethinga about that manual $svcdb = 'svc_acct' in
httemplate/edit/part_export.cgi (do part_export records need a svcdb?
probably not... should be able to just pass an svcdb on creation of new
exports, move the big %exports hash into part_export.pm and allow
httemplate/edit/part_svc.cgi to query it for exports that can apply to a given
svcdb....
---
 httemplate/edit/part_export.cgi         | 39 ++++++++-------------------------
 httemplate/edit/process/part_export.cgi |  3 ++-
 2 files changed, 11 insertions(+), 31 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 0ca964e02..f3127403e 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -6,34 +6,18 @@
 #} else {
 #  $cgi->param('clone', '');
 #}
-#if ( $cgi->param('svcpart') && $cgi->param('svcpart') =~ /^(\d+)$/ ) {
-#  $cgi->param('svcpart', $1);
-#} else {
-#  $cgi->param('svcpart', '');
-#}
 
 my($query) = $cgi->keywords;
 my $action = '';
 my $part_export = '';
-my $options = {};
 if ( $cgi->param('error') ) {
   $part_export = new FS::part_export ( {
     map { $_, scalar($cgi->param($_)) } fields('part_export')
   } );
-}
-
-#warn "***$query***";
-if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
-  $action = 'Add';
-  my $old_part_export = qsearchs('part_export', { 'exportnum' => $1 } );
-  unless ( $part_export ) {
-    ($part_export, $options) = $old_part_export->clone($cgi->param('svcpart'));
-  }
-} elsif ( $cgi->param('new_with_svcpart') 
-          && $cgi->param('new_with_svcpart') =~ /^(\d+)$/ ) {
-  $part_export ||= new FS::part_export ( { 'svcpart' => $1 } );
 } elsif ( $query =~ /^(\d+)$/ ) {
-  $part_export ||= qsearchs('part_export', { 'exportnum' => $1 } );
+  $part_export = qsearchs('part_export', { 'exportnum' => $1 } );
+} else {
+  $part_export = new FS::part_export;
 }
 $action ||= $part_export->exportnum ? 'Edit' : 'Add';
 
@@ -101,18 +85,20 @@ my %exports = (
 
 );
 
-my $svcdb = $part_export->part_svc->svcdb;
+#my $svcdb = $part_export->part_svc->svcdb;
+#YUCK
+my $svcdb = 'svc_acct';
+
 my %layers = map { $_ => "$_ - ". $exports{$svcdb}{$_}{desc} }
                keys %{$exports{$svcdb}};
 $layers{''}='';
 
 my $widget = new HTML::Widgets::SelectLayers(
-  'selected_layer' => $part_export->exporttype,
   'selected_layer' => $part_export->exporttype,
   'options'        => \%layers,
   'form_name'      => 'dummy',
   'form_action'    => 'process/part_export.cgi',
-  'form_text'      => [qw( exportnum svcpart machine )],
+  'form_text'      => [qw( exportnum machine )],
 #  'form_checkbox'  => [qw()],
   'html_between'    => "</TD></TR></TABLE>\n",
   'layer_callback'  => sub {
@@ -123,7 +109,7 @@ my $widget = new HTML::Widgets::SelectLayers(
 #    foreach my $option ( qw(url login password groupID ) ) {
       my $optinfo = $exports{$svcdb}->{$layer}{options}{$option};
       my $label = $optinfo->{label};
-      my $value = $part_export->option($option);
+      my $value = $cgi->param($option) || $part_export->option($option);
       $html .= qq!<TR><TD ALIGN="right">$label</TD><TD>!.
                qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value"></TD>!.
                '</TR>';
@@ -159,13 +145,6 @@ my $widget = new HTML::Widgets::SelectLayers(
 <INPUT TYPE="hidden" NAME="exportnum" VALUE="<%= $part_export->exportnum %>">
 
 <%= ntable("#cccccc",2) %>
-<TR>
-  <TD ALIGN="right">Service</TD>
-  <TD BGCOLOR="#ffffff">
-    <%= $part_export->svcpart %> - <%= $part_export->part_svc->svc %>
-    <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $part_export->svcpart %>">
-  </TD>
-</TR>
 <TR>
   <TD ALIGN="right">Export host</TD>
   <TD>
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
index d0c87a02a..34eb699bf 100644
--- a/httemplate/edit/process/part_export.cgi
+++ b/httemplate/edit/process/part_export.cgi
@@ -18,6 +18,7 @@ my $error;
 if ( $exportnum ) {
   warn $old;
   warn $exportnum;
+  warn $new->machine;
   $error = $new->replace($old,\%options);
 } else {
   $error = $new->insert(\%options);
@@ -28,7 +29,7 @@ if ( $error ) {
   $cgi->param('error', $error );
   print $cgi->redirect(popurl(2). "part_export.cgi?". $cgi->query_string );
 } else {
-  print $cgi->redirect(popurl(3). "browse/part_svc.cgi");
+  print $cgi->redirect(popurl(3). "browse/part_export.cgi");
 }
 
 %>
-- 
cgit v1.2.1


From e6ea57971831f25d682d97a0ba508c39b66ecd8b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Apr 2002 13:22:03 +0000
Subject: - should finish off the part_svc -> part_export
 s/one-to-many/many-to-many/   transition (closes: Bug#375) - fixes a nasty
 export scoping bug with message catalogs, whew

---
 httemplate/edit/part_export.cgi         | 80 +++------------------------------
 httemplate/edit/part_svc.cgi            | 26 ++++++++++-
 httemplate/edit/process/agent_type.cgi  |  1 +
 httemplate/edit/process/part_export.cgi |  8 ++--
 httemplate/edit/process/part_svc.cgi    | 23 ++++++++++
 5 files changed, 59 insertions(+), 79 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index f3127403e..77b80d06f 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -21,76 +21,10 @@ if ( $cgi->param('error') ) {
 }
 $action ||= $part_export->exportnum ? 'Edit' : 'Add';
 
-my %exports = (
-  'svc_acct' => {
-    'sysvshell' => {
-      'desc' =>
-        'Batch export of /etc/passwd and /etc/shadow files (Linux/SysV)',
-      'options' => {},
-    },
-    'bsdshell' => {
-      'desc' =>
-        'Batch export of /etc/passwd and /etc/master.passwd files (BSD)',
-      'options' => {},
-    },
-#    'nis' => {
-#      'desc' =>
-#        'Batch export of /etc/global/passwd and /etc/global/shadow for NIS ',
-#      'options' => {},
-#    },
-    'bsdshell' => {
-      'desc' =>
-        'Batch export of /etc/passwd and /etc/master.passwd files (BSD)',
-      'options' => {},
-    },
-    'textradius' => {
-      'desc' => 'Batch export of a text /etc/raddb/users file (Livingston, Cistron)',
-    },
-    'sqlradius' => {
-      'desc' => 'Real-time export to SQL-backed RADIUS (ICRADIUS, FreeRADIUS)',
-      'options' => {
-        'datasrc'  => { label=>'DBI data source' },
-        'username' => { label=>'Database username' },
-        'password' => { label=>'Database password' },
-      },
-      'nodomain' => 'Y',
-      'notes' => 'Not specifying datasrc will export to the freeside database? (no...  notes on MySQL replication, DBI::Proxy, etc., from Conf.pm && export.html etc., reset with bin/sqlradius_reset',
-    },
-    'cyrus' => {
-      'desc' => 'Real-time export to Cyrus IMAP server',
-    },
-    'cp' => {
-      'desc' => 'Real-time export to Critical Path Account Provisioning Protocol',
-    },
-    'infostreet' => {
-      'desc' => 'Real-time export to InfoStreet streetSmartAPI',
-      'options' => {
-        'url'      => { label=>'XML-RPC Access URL', },
-        'login'    => { label=>'InfoStreet login', },
-        'password' => { label=>'InfoStreet password', },
-        'groupID'  => { label=>'InfoStreet groupID', },
-      },
-      'nodomain' => 'Y',
-      'notes' => 'Real-time export to <a href="http://www.infostreet.com/">InfoStreet</a> streetSmartAPI.  Requires installation of <a href="http://search.cpan.org/search?dist=Frontier-Client">Frontier::Client</a> from CPAN.',
-    }
-  },
-
-  'svc_domain' => {},
-
-  'svc_acct_sm' => {},
-
-  'svc_forward' => {},
-
-  'svc_www' => {},
-
-);
-
-#my $svcdb = $part_export->part_svc->svcdb;
-#YUCK
-my $svcdb = 'svc_acct';
+#my $exports = FS::part_export::export_info($svcdb);
+my $exports = FS::part_export::export_info();
 
-my %layers = map { $_ => "$_ - ". $exports{$svcdb}{$_}{desc} }
-               keys %{$exports{$svcdb}};
+my %layers = map { $_ => "$_ - ". $exports->{$_}{desc} } keys %$exports;
 $layers{''}='';
 
 my $widget = new HTML::Widgets::SelectLayers(
@@ -105,9 +39,9 @@ my $widget = new HTML::Widgets::SelectLayers(
     my $layer = shift;
     my $html = qq!<INPUT TYPE="hidden" NAME="exporttype" VALUE="$layer">!.
                ntable("#cccccc",2);
-    foreach my $option ( keys %{$exports{$svcdb}->{$layer}{options}} ) {
+    foreach my $option ( keys %{$exports->{$layer}{options}} ) {
 #    foreach my $option ( qw(url login password groupID ) ) {
-      my $optinfo = $exports{$svcdb}->{$layer}{options}{$option};
+      my $optinfo = $exports->{$layer}{options}{$option};
       my $label = $optinfo->{label};
       my $value = $cgi->param($option) || $part_export->option($option);
       $html .= qq!<TR><TD ALIGN="right">$label</TD><TD>!.
@@ -117,10 +51,10 @@ my $widget = new HTML::Widgets::SelectLayers(
     $html .= '</TABLE>';
 
     $html .= '<INPUT TYPE="hidden" NAME="options" VALUE="'.
-             join(',', keys %{$exports{$svcdb}->{$layer}{options}} ). '">';
+             join(',', keys %{$exports->{$layer}{options}} ). '">';
 
     $html .= '<INPUT TYPE="hidden" NAME="nodomain" VALUE="'.
-             $exports{$svcdb}->{$layer}{nodomain}. '">';
+             $exports->{$layer}{nodomain}. '">';
 
     $html .= '<INPUT TYPE="submit" VALUE="'.
              ( $part_export->exportnum ? "Apply changes" : "Add export" ).
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index b4900a01c..e9c571f9c 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -132,8 +132,30 @@ my %defs = (
     'form_checkbox'  => [ 'disabled' ],
     'layer_callback' => sub {
       my $layer = shift;
-      my $html = qq!<INPUT TYPE="hidden" NAME="svcdb" VALUE="$layer">!.
-                 table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>";
+      my $html = qq!<INPUT TYPE="hidden" NAME="svcdb" VALUE="$layer">!;
+
+      my $columns = 3;
+      my $count = 0;
+      my @part_export =
+        grep { $layer eq FS::part_export::exporttype2svcdb($_->exporttype) }
+          qsearch( 'part_export', {} );
+      $html .= '<BR><BR>'. table().
+               table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
+      foreach my $part_export ( @part_export ) {
+        $html .= '<TD><INPUT TYPE="checkbox"'.
+                 ' NAME="exportnum'. $part_export->exportnum. '"  VALUE="1" ';
+        $html .= 'CHECKED'
+          if qsearchs( 'export_svc', {
+                                       exportnum => $part_export->exportnum,
+                                       svcpart   => $part_svc->svcpart       });
+        $html .= '> '. $part_export->exporttype. ' to '. $part_export->machine.
+                 '</TD>';
+        $count++;
+        $html .= '</TR><TR>' unless $count % $columns;
+      }
+      $html .= '</TR></TABLE><BR><BR>';
+
+      $html .=  table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>";
       #yucky kludge
       my @fields = defined( $FS::Record::dbdef->table($layer) )
                       ? grep { $_ ne 'svcnum' } fields($layer)
diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
index 67aacfdd5..516594573 100755
--- a/httemplate/edit/process/agent_type.cgi
+++ b/httemplate/edit/process/agent_type.cgi
@@ -22,6 +22,7 @@ if ( $error ) {
   print $cgi->redirect(popurl(2). "agent_type.cgi?". $cgi->query_string );
 } else {
 
+  #false laziness w/ edit/process/part_svc.cgi
   foreach my $part_pkg (qsearch('part_pkg',{})) {
     my($pkgpart)=$part_pkg->getfield('pkgpart');
 
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
index 34eb699bf..6b4d007e4 100644
--- a/httemplate/edit/process/part_export.cgi
+++ b/httemplate/edit/process/part_export.cgi
@@ -5,7 +5,7 @@ my $exportnum = $cgi->param('exportnum');
 my $old = qsearchs('part_export', { 'exportnum'=>$exportnum } ) if $exportnum;
 
 #fixup options
-warn join('-', split(',',$cgi->param('options')));
+#warn join('-', split(',',$cgi->param('options')));
 my %options = map { $_=>$cgi->param($_) } split(',',$cgi->param('options'));
 
 my $new = new FS::part_export ( {
@@ -16,9 +16,9 @@ my $new = new FS::part_export ( {
 
 my $error;
 if ( $exportnum ) {
-  warn $old;
-  warn $exportnum;
-  warn $new->machine;
+  #warn $old;
+  #warn $exportnum;
+  #warn $new->machine;
   $error = $new->replace($old,\%options);
 } else {
   $error = $new->insert(\%options);
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 31ab13438..859670b17 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -33,6 +33,29 @@ if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "part_svc.cgi?". $cgi->query_string );
 } else {
+
+  #false laziness w/ edit/process/agent_type.cgi
+  foreach my $part_export (qsearch('part_export',{})) {
+    my $exportnum = $part_export->exportnum;
+    my $export_svc = qsearchs('export_svc', {
+      'exportnum' => $part_export->exportnum,
+      'svcpart'   => $new->svcpart,
+    } );
+    if ( $export_svc && ! $cgi->param("exportnum". $part_export->exportnum) ) {
+      $error = $export_svc->delete;
+      die $error if $error;
+    } elsif ( $cgi->param("exportnum". $part_export->exportnum)
+              && ! $export_svc ) {
+      $export_svc = new FS::export_svc ( {
+        'exportnum' => $part_export->exportnum,
+        'svcpart'   => $new->svcpart,
+      } );
+      $error = $export_svc->insert;
+      die $error if $error;
+    }
+
+  }
+
   print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
 }
 
-- 
cgit v1.2.1


From 81faa8d34d1287a61fd723d73ab02a022cf5d050 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Apr 2002 15:14:58 +0000
Subject: fudge up FS::cust_pkg::order ("Order and cancel packages") to try to
 move services between svcparts as a last resort...

---
 httemplate/edit/cust_pkg.cgi | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index d546f7409..485d601eb 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -3,7 +3,16 @@
 
 my %pkg = ();
 my %comment = ();
-foreach (qsearch('part_pkg', { 'disabled' => '' })) {
+my %all_pkg = ();
+my %all_comment = ();
+#foreach (qsearch('part_pkg', { 'disabled' => '' })) {
+#  $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
+#  $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
+#}
+foreach (qsearch('part_pkg', {} )) {
+  $all_pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
+  $all_comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
+  next if $_->disabled;
   $pkg{ $_ -> getfield('pkgpart') } = $_->getfield('pkg');
   $comment{ $_ -> getfield('pkgpart') } = $_->getfield('comment');
 }
@@ -46,7 +55,7 @@ END
     my($pkgnum,$pkgpart)=( $_->getfield('pkgnum'), $_->getfield('pkgpart') );
     print qq!<TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="$pkgnum"!;
     print " CHECKED" if $remove_pkg{$pkgnum};
-    print qq!>$pkgnum: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n!;
+    print qq!>$pkgnum: $all_pkg{$pkgpart} - $all_comment{$pkgpart}</TD>\n!;
     $count ++ ;
     if ($count == 2)
     {
-- 
cgit v1.2.1


From 327df8aefdcf96c9c83805570abf4cc242cf46b9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 13 Apr 2002 13:36:26 +0000
Subject: - documentation updates - move Critical Path export to new-style
 export - bin/sqlradius_reset gets a manpage and becomes
 FS/bin/freeside-sqlradius-reset

---
 httemplate/edit/part_export.cgi | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 77b80d06f..b72b277c9 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -39,12 +39,17 @@ my $widget = new HTML::Widgets::SelectLayers(
     my $layer = shift;
     my $html = qq!<INPUT TYPE="hidden" NAME="exporttype" VALUE="$layer">!.
                ntable("#cccccc",2);
+
+    $html .= '<TR><TD ALIGN="right">Description</TD><TD BGCOLOR=#ffffff>'.
+             $exports->{$layer}{notes}. '</TD></TR>'
+      if $layer;
+
     foreach my $option ( keys %{$exports->{$layer}{options}} ) {
 #    foreach my $option ( qw(url login password groupID ) ) {
       my $optinfo = $exports->{$layer}{options}{$option};
       my $label = $optinfo->{label};
       my $value = $cgi->param($option) || $part_export->option($option);
-      $html .= qq!<TR><TD ALIGN="right">$label</TD><TD>!.
+      $html .= qq!<TR><TD ALIGN="right">$label</TD>!.
                qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value"></TD>!.
                '</TR>';
     }
-- 
cgit v1.2.1


From 1290c097176adcd62d48b1250233d53adb4b50a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Apr 2002 08:52:38 +0000
Subject: move the last of the real-time exports out of svc_acct.pm and into
 part_export

---
 httemplate/edit/part_export.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index b72b277c9..4affeb48f 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -48,7 +48,9 @@ my $widget = new HTML::Widgets::SelectLayers(
 #    foreach my $option ( qw(url login password groupID ) ) {
       my $optinfo = $exports->{$layer}{options}{$option};
       my $label = $optinfo->{label};
-      my $value = $cgi->param($option) || $part_export->option($option);
+      my $value = $cgi->param($option)
+                  || $part_export->option($option)
+                  || (exists $optinfo->{default} ? $optinfo->{default} : '');
       $html .= qq!<TR><TD ALIGN="right">$label</TD>!.
                qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value"></TD>!.
                '</TR>';
-- 
cgit v1.2.1


From ffe9f4473c5c9c7cb7caeaa5b39160d7b3e8d137 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 20 Apr 2002 12:37:23 +0000
Subject: bind export

---
 httemplate/edit/part_export.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 4affeb48f..af89c4ead 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -52,7 +52,7 @@ my $widget = new HTML::Widgets::SelectLayers(
                   || $part_export->option($option)
                   || (exists $optinfo->{default} ? $optinfo->{default} : '');
       $html .= qq!<TR><TD ALIGN="right">$label</TD>!.
-               qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value"></TD>!.
+               qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64></TD>!.
                '</TR>';
     }
     $html .= '</TABLE>';
-- 
cgit v1.2.1


From 672600ec20269dad5ec798b4a62711bfb29e49c0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Apr 2002 21:18:10 +0000
Subject: add pkgpart to agent type listing

---
 httemplate/edit/agent_type.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 4a4cd9a47..637c710ab 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -46,7 +46,7 @@ foreach my $part_pkg ( qsearch('part_pkg',{ 'disabled' => '' }) ) {
           : '',
         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>',
   ;
 }
 
-- 
cgit v1.2.1


From 91a5fe454cc6411bc0f8db545bc42f55fe2cd510 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Apr 2002 07:32:49 +0000
Subject: harmless ui glitch

---
 httemplate/edit/REAL_cust_pkg.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index abfaac3fc..580313e88 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,6 +1,6 @@
 <!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.2 2002-02-10 16:05:22 ivan Exp $ -->
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.3 2002-04-23 07:32:49 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
@@ -75,7 +75,7 @@ print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
   if $cancel;
 
 %>
-</TABLE></TD></TR></TABLE>'.
+</TABLE></TD></TR></TABLE>
 <BR><INPUT TYPE="submit" VALUE="Apply Changes">
 </FORM>
 </BODY>
-- 
cgit v1.2.1


From a351f58cf394121aa1f72139356567c4785bf47f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Apr 2002 09:47:25 +0000
Subject: add flat_delayed plan

---
 httemplate/edit/part_pkg.cgi | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 60319f9d9..dea02f1cc 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -174,6 +174,24 @@ tie my %plans, 'Tie::IxHash',
     'recur' => 'what.recur_fee.value',
   },
 
+  'flat_delayed' => {
+    'name' => 'Free for X days, then flat rate (anniversary billing)',
+    'fields' =>  {
+      'free_days' => { 'name' => 'Initial free days',
+                       'default' => 0,
+                     },
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                      },
+    },
+    'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'$sdate += 86400 * \' + what.free_days.value + \'; \' + what.recur_fee.value',
+  },
+
   'prorate' => {
     'name' => 'First partial month pro-rated, then flat-rate (1st of month billing)',
     'fields' =>  {
-- 
cgit v1.2.1


From 2a22a4862979750c1886ac8f125043854be47d58 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Apr 2002 10:37:08 +0000
Subject: free_delayed try #2

---
 httemplate/edit/part_pkg.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index dea02f1cc..a63fc23fe 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -188,8 +188,8 @@ tie my %plans, 'Tie::IxHash',
                       },
     },
     'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'$sdate += 86400 * \' + what.free_days.value + \'; \' + what.recur_fee.value',
+    'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
+    'recur' => 'what.recur_fee.value',
   },
 
   'prorate' => {
-- 
cgit v1.2.1


From a63b2729682586d8860290576e9307629424dbe0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 May 2002 12:38:40 +0000
Subject: texas tax!

---
 httemplate/edit/agent.cgi                          |  8 +++---
 httemplate/edit/cust_main.cgi                      |  4 ++-
 httemplate/edit/cust_main_county-expand.cgi        | 15 ++++++-----
 httemplate/edit/cust_main_county.cgi               | 29 ++++++++++++++--------
 httemplate/edit/part_pkg.cgi                       | 26 +++++++++++++++++++
 .../edit/process/cust_main_county-expand.cgi       |  4 ++-
 httemplate/edit/process/cust_main_county.cgi       | 11 +++++---
 7 files changed, 71 insertions(+), 26 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index 3fca34326..449456cdd 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -51,12 +51,12 @@ print <<END;
 </SELECT></TD>
 </TR>
 <TR>
-  <TD ALIGN="right">Frequency (unimplemented)</TD>
-  <TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}"></TD>
+  <TD ALIGN="right"><!--Frequency--></TD>
+  <TD><INPUT TYPE="hidden" NAME="freq" VALUE="$hashref->{freq}"></TD>
 </TR>
 <TR>
-  <TD ALIGN="right">Program (unimplemented)</TD>
-  <TD><INPUT TYPE="text" NAME="prog" VALUE="$hashref->{prog}"></TD>
+  <TD ALIGN="right"><!--Program--></TD>
+  <TD><INPUT TYPE="hidden" NAME="prog" VALUE="$hashref->{prog}"></TD>
 </TR>
 </TABLE>
 END
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 33e72d864..e92abefd7 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -98,7 +98,9 @@ if ( $custnum && ! $conf->exists('editreferrals') ) {
   print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
 } else {
   my(@referrals) = qsearch('part_referral',{});
-  if ( scalar(@referrals) == 1 ) {
+  if ( scalar(@referrals) == 0 ) {
+    die "You have not created any advertising sources.  You must create at least one advertising source before adding a customer.  Go to ". popurl(2). "browse/part_referral.cgi and create one or more advertising sources.";
+  } elsif ( scalar(@referrals) == 1 ) {
     $refnum ||= $referrals[0]->refnum;
     print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
   } else {
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index 66e8aaf9e..9f314a457 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,16 +1,18 @@
 <!-- mason kludge -->
 <%
 
-my($taxnum, $delim, $expansion );
+my($taxnum, $delim, $expansion, $taxclass );
+my($query) = $cgi->keywords;
 if ( $cgi->param('error') ) {
   $taxnum = $cgi->param('taxnum');
   $delim = $cgi->param('delim');
   $expansion = $cgi->param('expansion');
+  $taxclass = $cgi->param('taxclass');
 } else {
-  my ($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/
-    or die "Illegal taxnum!";
-  $taxnum = $1;
+  $query =~ /^(taxclass)?(\d+)$/
+    or die "Illegal taxnum (query $query)";
+  $taxclass = $1 ? 'taxclass' : '';
+  $taxnum = $2;
   $delim = 'n';
   $expansion = '';
 }
@@ -31,11 +33,12 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 print <<END;
     <FORM ACTION="${p1}process/cust_main_county-expand.cgi" METHOD=POST>
       <INPUT TYPE="hidden" NAME="taxnum" VALUE="$taxnum">
+      <INPUT TYPE="hidden" NAME="taxclass" VALUE="$taxclass">
       Separate by
 END
 print '<INPUT TYPE="radio" NAME="delim" VALUE="n"';
 print ' CHECKED' if $delim eq 'n';
-print '>line (rumor has it broken on some browsers) or',
+print '>line (broken on some browsers) or',
       '<INPUT TYPE="radio" NAME="delim" VALUE="s"';
 print ' CHECKED' if $delim eq 's';
 print '>whitespace.';
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index a11711770..7ef37a48d 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -14,8 +14,10 @@ print qq!<FORM ACTION="!, popurl(1),
       <TR>
         <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
-        <TH>County</TH>
+        <TH><FONT SIZE=-1>County</FONT></TH>
+        <TH><FONT SIZE=-1>Taxclass</FONT></TH>
         <TH><FONT SIZE=-1>Tax</FONT></TH>
+        <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH>
       </TR>
 END
 
@@ -26,22 +28,29 @@ foreach my $cust_main_county ( sort {    $a->country cmp $b->country
   my($hashref)=$cust_main_county->hashref;
   print <<END;
       <TR>
-        <TD>$hashref->{country}</TD>
+        <TD BGCOLOR="#ffffff">$hashref->{country}</TD>
 END
 
-  print "<TD>", $hashref->{state}
-      ? $hashref->{state}
-      : '(ALL)'
+  print "<TD", $hashref->{state}
+      ? ' BGCOLOR="#ffffff">'.$hashref->{state}
+      : ' BGCOLOR="#cccccc">(ALL)'
     , "</TD>";
 
-  print "<TD>", $hashref->{county}
-      ? $hashref->{county}
-      : '(ALL)'
+  print "<TD", $hashref->{county}
+      ? ' BGCOLOR="#ffffff">'. $hashref->{county}
+      : ' BGCOLOR="#cccccc">(ALL)'
+    , "</TD>";
+
+  print "<TD", $hashref->{taxclass}
+      ? ' BGCOLOR="#ffffff">'. $hashref->{taxclass}
+      : ' BGCOLOR="#cccccc">(ALL)'
     , "</TD>";
 
   print qq!<TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
-        qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD></TR>!;
-END
+        qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD>!;
+  print qq!<TD>\$<INPUT TYPE="text" NAME="exempt_amount!, $hashref->{taxnum},
+        qq!" VALUE="!, $hashref->{exempt_amount}||0, qq!" SIZE=6></TD>!;
+  print '</TR>';
 
 }
 
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index a63fc23fe..e03017db4 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -88,6 +88,23 @@ print '>';
 
 print '</TD></TR>';
 
+my $conf = new FS::Conf;
+if ( $conf->exists('enable_taxclasses') ) {
+  print '<TR><TD ALIGN="right">Tax class</TD><TD><SELECT NAME="taxclass">';
+  my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
+    or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
+  foreach my $taxclass ( map $_->[0], @{$sth->fetchall_arrayref} ) {
+    print qq!<OPTION VALUE="$taxclass"!;
+    print ' SELECTED' if $taxclass eq $hashref->{taxclass};
+    print qq!>$taxclass</OPTION>!;
+  }
+  print '</SELECT></TD></TR>';
+} else {
+  print
+    '<INPUT TYPE="hidden" NAME="taxclass" VALUE="'. $hashref->{taxclass}. '">';
+}
+
 print '<TR><TD ALIGN="right">Disable new orders</TD><TD>';
 print '<INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"';
 print ' CHECKED' if $hashref->{disabled} eq "Y";
@@ -344,6 +361,14 @@ my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
 
 tie my %options, 'Tie::IxHash', map { $_=>$plans{$_}->{'name'} } keys %plans;
 
+my @form_select = ();
+if ( $conf->exists('enable_taxclasses') ) {
+  push @form_select, 'taxclass';
+} else {
+  push @fixups, 'taxclass'; #hidden
+}
+
+
 my $widget = new HTML::Widgets::SelectLayers(
   'selected_layer' => $part_pkg->plan,
   'options'        => \%options,
@@ -351,6 +376,7 @@ my $widget = new HTML::Widgets::SelectLayers(
   'form_action'    => 'process/part_pkg.cgi',
   'form_text'      => [ qw(pkg comment freq clone pkgnum pkgpart), @fixups ],
   'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
+  'form_select'    => [ @form_select ],
   'fixup_callback' => sub {
                         #my $ = @_;
                         my $html = '';
diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index 64061deed..a452711c1 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -27,7 +27,9 @@ foreach ( @expansion) {
   my(%hash)=$cust_main_county->hash;
   my($new)=new FS::cust_main_county \%hash;
   $new->setfield('taxnum','');
-  if ( ! $cust_main_county->state ) {
+  if ( $cgi->param('taxclass') ) {
+    $new->setfield('taxclass', $_);
+  } elsif ( ! $cust_main_county->state ) {
     $new->setfield('state',$_);
   } else {
     $new->setfield('county',$_);
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index 0800789b5..990a23919 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -1,13 +1,16 @@
 <%
 
-foreach ( $cgi->param ) {
+foreach ( grep { /^tax\d+$/ } $cgi->param ) {
   /^tax(\d+)$/ or die "Illegal form $_!";
   my($taxnum)=$1;
   my($old)=qsearchs('cust_main_county',{'taxnum'=>$taxnum})
     or die "Couldn't find taxnum $taxnum!";
-  next unless $old->getfield('tax') ne $cgi->param("tax$taxnum");
-  my(%hash)=$old->hash;
-  $hash{tax}=$cgi->param("tax$taxnum");
+  my $exempt_amount = $cgi->param("exempt_amount$taxnum");
+  next unless $old->tax ne $cgi->param("tax$taxnum")
+              || $old->exempt_amount ne $exempt_amount;
+  my %hash = $old->hash;
+  $hash{tax} = $cgi->param("tax$taxnum");
+  $hash{exempt_amount} = $exempt_amount;
   my($new)=new FS::cust_main_county \%hash;
   my($error)=$new->replace($old);
   if ( $error ) {
-- 
cgit v1.2.1


From cab37352b30b0bb1318ff237fb4dda8482f4bfef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 May 2002 15:21:00 +0000
Subject: s/Referral/Advertising source/

---
 httemplate/edit/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index e92abefd7..cf8de2f13 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -104,7 +104,7 @@ if ( $custnum && ! $conf->exists('editreferrals') ) {
     $refnum ||= $referrals[0]->refnum;
     print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
   } else {
-    print qq!<BR><BR>${r}Referral <SELECT NAME="refnum" SIZE="1">!;
+    print qq!<BR><BR>${r}Advertising source <SELECT NAME="refnum" SIZE="1">!;
     print "<OPTION> " unless $refnum;
     my($referral);
     foreach $referral (sort {
-- 
cgit v1.2.1


From 3f9ac2ff50fff9d55ff5976ee1417dc6ba56f39e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 16 May 2002 13:42:54 +0000
Subject: service definition cloning

---
 httemplate/edit/part_svc.cgi | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index e9c571f9c..f2073f935 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,10 +1,17 @@
 <!-- mason kludge -->
 <% 
    my $part_svc;
+   my $clone = '';
    if ( $cgi->param('error') ) { #error
      $part_svc = new FS::part_svc ( {
        map { $_, scalar($cgi->param($_)) } fields('part_svc')
      } );
+   } elsif ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {#clone
+     #$cgi->param('clone') =~ /^(\d+)$/ or die "malformed query: $query";
+     $part_svc = qsearchs('part_svc', { 'svcpart'=>$1 } )
+       or die "unknown svcpart: $1";
+     $clone = $part_svc->svcpart;
+     $part_svc->svcpart('');
    } elsif ( $cgi->keywords ) { #edit
      my($query) = $cgi->keywords;
      $query =~ /^(\d+)$/ or die "malformed query: $query";
@@ -146,8 +153,8 @@ my %defs = (
                  ' NAME="exportnum'. $part_export->exportnum. '"  VALUE="1" ';
         $html .= 'CHECKED'
           if qsearchs( 'export_svc', {
-                                       exportnum => $part_export->exportnum,
-                                       svcpart   => $part_svc->svcpart       });
+                                   exportnum => $part_export->exportnum,
+                                   svcpart   => $clone || $part_svc->svcpart });
         $html .= '> '. $part_export->exporttype. ' to '. $part_export->machine.
                  '</TD>';
         $count++;
@@ -161,6 +168,7 @@ my %defs = (
                       ? grep { $_ ne 'svcnum' } fields($layer)
                       : ();
       push @fields, 'usergroup' if $layer eq 'svc_acct'; #kludge
+      $part_svc->svcpart($clone) if $clone; #haha, undone below
       foreach my $field (@fields) {
         my $part_svc_column = $part_svc->part_svc_column($field);
         my $value = $cgi->param('error')
@@ -206,6 +214,7 @@ my %defs = (
         }
         $html .= "</TD></TR>\n";
       }
+      $part_svc->svcpart('') if $clone; #undone
       $html .= "</TABLE>";
 
       $html .= '<BR><INPUT TYPE="submit" VALUE="'.
-- 
cgit v1.2.1


From 23186f0338ec248d930c85db08cc997bca42525b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 22 May 2002 18:44:01 +0000
Subject: bind export, editing zones, deleting unaudited domains, mmm

---
 httemplate/edit/process/domain_record.cgi | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100755 httemplate/edit/process/domain_record.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/domain_record.cgi b/httemplate/edit/process/domain_record.cgi
new file mode 100755
index 000000000..8fb0368f6
--- /dev/null
+++ b/httemplate/edit/process/domain_record.cgi
@@ -0,0 +1,31 @@
+<%
+
+my $recnum = $cgi->param('recnum');
+
+my $old = qsearchs('agent',{'recnum'=>$recnum}) if $recnum;
+
+my $new = new FS::domain_record ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('domain_record')
+} );
+
+my $error;
+if ( $recnum ) {
+  $error=$new->replace($old);
+} else {
+  $error=$new->insert;
+  $recnum=$new->getfield('recnum');
+}
+
+if ( $error ) {
+#  $cgi->param('error', $error);
+#  print $cgi->redirect(popurl(2). "agent.cgi?". $cgi->query_string );
+  #no edit screen to send them back to
+  eidiot($error);
+} else { 
+  my $svcnum = $new->svcnum;
+  print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
+}
+
+%>
-- 
cgit v1.2.1


From 4920ad2671d712afe23d731e25bc5b53955397b7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 23 May 2002 13:00:08 +0000
Subject: bind: allow adding slave domains too

---
 httemplate/edit/process/domain_record.cgi | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/domain_record.cgi b/httemplate/edit/process/domain_record.cgi
index 8fb0368f6..b8c3f62a1 100755
--- a/httemplate/edit/process/domain_record.cgi
+++ b/httemplate/edit/process/domain_record.cgi
@@ -22,6 +22,9 @@ if ( $error ) {
 #  $cgi->param('error', $error);
 #  print $cgi->redirect(popurl(2). "agent.cgi?". $cgi->query_string );
   #no edit screen to send them back to
+%>
+<!-- mason kludge -->
+<%
   eidiot($error);
 } else { 
   my $svcnum = $new->svcnum;
-- 
cgit v1.2.1


From e1be5ef574d0aa9fad3fda9828f3853d2444e9f7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 27 May 2002 06:53:06 +0000
Subject: fix javascript bug reported by baloo@gimpgirl.com, thanks

---
 httemplate/edit/cust_bill_pay.cgi | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index d90659724..8cdf4509a 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -59,14 +59,13 @@ foreach my $cust_bill ( @cust_bill ) {
 END
 }
 
-#print <<END;
 #  if ( cust_bill == "Refund" ) {
 #    what.form.amount.value = "$credited";
 #  }
-#}
-#</SCRIPT>
-#END
-print "</SCRIPT>\n";
+print <<END;
+}
+</SCRIPT>
+END
 
 print qq!<BR>Invoice #<SELECT NAME="invnum" SIZE=1 onChange="changed(this)">!,
       '<OPTION VALUE="">';
-- 
cgit v1.2.1


From 6198edc29b71b77dfa6868f76effb4286579259e Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 31 May 2002 00:33:39 +0000
Subject: Added support for part_exports that are used with more than one
 svcdb.

---
 httemplate/edit/part_svc.cgi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index f2073f935..36f764140 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -144,9 +144,11 @@ my %defs = (
       my $columns = 3;
       my $count = 0;
       my @part_export =
-        grep { $layer eq FS::part_export::exporttype2svcdb($_->exporttype) }
-          qsearch( 'part_export', {} );
-      $html .= '<BR><BR>'. table().
+#        grep { $layer eq FS::part_export::exporttype2svcdb($_->exporttype) }
+#          qsearch( 'part_export', {} );
+         map { qsearch( 'part_export', {exporttype => $_ } ) }
+           keys(%{FS::part_export::export_info($layer)});
+     $html .= '<BR><BR>'. table().
                table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
       foreach my $part_export ( @part_export ) {
         $html .= '<TD><INPUT TYPE="checkbox"'.
-- 
cgit v1.2.1


From 0e8861ca6b3b04b99ea9477e8c1555561b21c929 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Sat, 8 Jun 2002 07:48:37 +0000
Subject: Default svcpart support for part_pkg.  Fixes 'bug' with new customer
 and online signup.

---
 httemplate/edit/part_pkg.cgi | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index e03017db4..770facb7e 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -112,7 +112,10 @@ print '>';
 print '</TD></TR></TABLE>';
 
 my $thead =  "\n\n". ntable('#cccccc', 2). <<END;
-<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH><TH BGCOLOR="#dcdcdc">Service</TH></TR>
+<TR>
+<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH>
+<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Service</FONT></TH>
+</TR>
 END
 
 #unless ( $cgi->param('clone') ) {
@@ -169,6 +172,16 @@ unless ( 0 ) {
   #print "</TR></TABLE>";
 }
 
+print qq!Default service <SELECT NAME="def_svcpart" onChange="fchanged(this)">!,
+      qq!<OPTION VALUE="0">None!;
+foreach my $part_svc ( @part_svc ) {
+  print qq!<OPTION VALUE="!, $part_svc->svcpart, '"',
+        (($hashref->{def_svcpart} == $part_svc->svcpart) ? " SELECTED>" : ">"),
+        $part_svc->svc, qq!</OPTION>!;
+}
+print qq!</SELECT><BR>\n!;
+
+
 foreach my $f ( qw( clone pkgnum ) ) {
   print qq!<INPUT TYPE="hidden" NAME="$f" VALUE="!. $cgi->param($f). '">';
 }
@@ -376,7 +389,7 @@ my $widget = new HTML::Widgets::SelectLayers(
   'form_action'    => 'process/part_pkg.cgi',
   'form_text'      => [ qw(pkg comment freq clone pkgnum pkgpart), @fixups ],
   'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
-  'form_select'    => [ @form_select ],
+  'form_select'    => [ qw(def_svcpart), @form_select ],
   'fixup_callback' => sub {
                         #my $ = @_;
                         my $html = '';
-- 
cgit v1.2.1


From 3162b06a6d3be9ddf4daea2c29cd94516ac40f68 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 10 Jun 2002 01:39:51 +0000
Subject: Rollback part_pkg.def_svcpart changes.

---
 httemplate/edit/part_pkg.cgi | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 770facb7e..e03017db4 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -112,10 +112,7 @@ print '>';
 print '</TD></TR></TABLE>';
 
 my $thead =  "\n\n". ntable('#cccccc', 2). <<END;
-<TR>
-<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH>
-<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Service</FONT></TH>
-</TR>
+<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH><TH BGCOLOR="#dcdcdc">Service</TH></TR>
 END
 
 #unless ( $cgi->param('clone') ) {
@@ -172,16 +169,6 @@ unless ( 0 ) {
   #print "</TR></TABLE>";
 }
 
-print qq!Default service <SELECT NAME="def_svcpart" onChange="fchanged(this)">!,
-      qq!<OPTION VALUE="0">None!;
-foreach my $part_svc ( @part_svc ) {
-  print qq!<OPTION VALUE="!, $part_svc->svcpart, '"',
-        (($hashref->{def_svcpart} == $part_svc->svcpart) ? " SELECTED>" : ">"),
-        $part_svc->svc, qq!</OPTION>!;
-}
-print qq!</SELECT><BR>\n!;
-
-
 foreach my $f ( qw( clone pkgnum ) ) {
   print qq!<INPUT TYPE="hidden" NAME="$f" VALUE="!. $cgi->param($f). '">';
 }
@@ -389,7 +376,7 @@ my $widget = new HTML::Widgets::SelectLayers(
   'form_action'    => 'process/part_pkg.cgi',
   'form_text'      => [ qw(pkg comment freq clone pkgnum pkgpart), @fixups ],
   'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
-  'form_select'    => [ qw(def_svcpart), @form_select ],
+  'form_select'    => [ @form_select ],
   'fixup_callback' => sub {
                         #my $ = @_;
                         my $html = '';
-- 
cgit v1.2.1


From 0ff28424ec1178ba6369d643d3b5f43d51a17514 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Jun 2002 08:29:09 +0000
Subject: add crypt option to (bsd|sysv)shell export

---
 httemplate/edit/part_export.cgi | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index af89c4ead..fbc698e8b 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -45,15 +45,30 @@ my $widget = new HTML::Widgets::SelectLayers(
       if $layer;
 
     foreach my $option ( keys %{$exports->{$layer}{options}} ) {
-#    foreach my $option ( qw(url login password groupID ) ) {
       my $optinfo = $exports->{$layer}{options}{$option};
       my $label = $optinfo->{label};
+      my $type = defined($optinfo->{type}) ? $optinfo->{type} : 'text';
       my $value = $cgi->param($option)
                   || $part_export->option($option)
                   || (exists $optinfo->{default} ? $optinfo->{default} : '');
-      $html .= qq!<TR><TD ALIGN="right">$label</TD>!.
-               qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64></TD>!.
-               '</TR>';
+      $html .= qq!<TR><TD ALIGN="right">$label</TD><TD>!;
+      if ( $type eq 'select' ) {
+        $html .= qq!<SELECT NAME="$option">!;
+        foreach my $select_option ( @{$optinfo->{options}} ) {
+          #if ( ref($select_option) ) {
+          #} else {
+            $selected = $select_option eq $value ? ' SELECTED' : '';
+            $html .= qq!<OPTION VALUE="$select_option"$selected>!.
+                     qq!$select_option</OPTION>!;
+          #}
+        }
+        $html .= '</SELECT>';
+      } elsif ( $type eq 'text' ) {
+        $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
+      } else {
+        $html .= "unknown type $type";
+      }
+      $html .= '</TD></TR>';
     }
     $html .= '</TABLE>';
 
-- 
cgit v1.2.1


From 19aebb0a743cf80a620f34fc7c6ad71f79764265 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Jun 2002 01:12:29 +0000
Subject: mark@pc-intouch.com: exporttype2svcdb removal

---
 httemplate/edit/part_svc.cgi | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 36f764140..4ccb770fb 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -144,10 +144,8 @@ my %defs = (
       my $columns = 3;
       my $count = 0;
       my @part_export =
-#        grep { $layer eq FS::part_export::exporttype2svcdb($_->exporttype) }
-#          qsearch( 'part_export', {} );
-         map { qsearch( 'part_export', {exporttype => $_ } ) }
-           keys(%{FS::part_export::export_info($layer)});
+        map { qsearch( 'part_export', {exporttype => $_ } ) }
+          keys %{FS::part_export::export_info($layer)};
      $html .= '<BR><BR>'. table().
                table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
       foreach my $part_export ( @part_export ) {
-- 
cgit v1.2.1


From cf6020a0c273d549d33f3e9999bd8b68d9b6d133 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Jun 2002 01:29:21 +0000
Subject: shellcommands w/passwords

---
 httemplate/edit/part_export.cgi         | 2 ++
 httemplate/edit/process/part_export.cgi | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index fbc698e8b..486bd4300 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -63,6 +63,8 @@ my $widget = new HTML::Widgets::SelectLayers(
           #}
         }
         $html .= '</SELECT>';
+      } elsif ( $type eq 'textarea' ) {
+        $html .= qq!<TEXTAREA NAME="$option">$value</TEXTAREA>!;
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
       } else {
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
index 6b4d007e4..fa009edbb 100644
--- a/httemplate/edit/process/part_export.cgi
+++ b/httemplate/edit/process/part_export.cgi
@@ -6,7 +6,11 @@ my $old = qsearchs('part_export', { 'exportnum'=>$exportnum } ) if $exportnum;
 
 #fixup options
 #warn join('-', split(',',$cgi->param('options')));
-my %options = map { $_=>$cgi->param($_) } split(',',$cgi->param('options'));
+my %options = map {
+  my $value = $cgi->param($_);
+  $value =~ s/\r\n/\n/g; #browsers? (textarea)
+  $_ => $value;
+} split(',', $cgi->param('options'));
 
 my $new = new FS::part_export ( {
   map {
-- 
cgit v1.2.1


From 551e695713ce31e4608a0a608a3941eaa7cdd64b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 23 Jun 2002 01:33:28 +0000
Subject: forgot %> when converting from CGI, works now, patch from "Stephen
 Bechard" <steve@destek.net>

---
 httemplate/edit/svc_www.cgi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index e1a914f1a..d2c9ade5c 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -175,5 +175,4 @@ print <<END;
   </BODY>
 </HTML>
 END
-
-
+%>
-- 
cgit v1.2.1


From 7283d56b43fad5d8c9d4b2f224f0e49201f9e901 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 23 Jun 2002 05:44:54 +0000
Subject: patch to get this working from Stephen Bechard <steve@destek.net>

---
 httemplate/edit/process/svc_www.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/svc_www.cgi b/httemplate/edit/process/svc_www.cgi
index 38d5e1c79..40913145a 100644
--- a/httemplate/edit/process/svc_www.cgi
+++ b/httemplate/edit/process/svc_www.cgi
@@ -5,8 +5,8 @@ my $svcnum = $1;
 
 my $old;
 if ( $svcnum ) {
-  $old = qsearchs('svc_acct', { 'svcnum' => $svcnum } )
-    or die "fatal: can't find account (svcnum $svcnum)!";
+  $old = qsearchs('svc_www', { 'svcnum' => $svcnum } )
+    or die "fatal: can't find website (svcnum $svcnum)!";
 } else {
   $old = '';
 }
-- 
cgit v1.2.1


From d17a7cdeed4fbd901084369347b56d3d4f02c11b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Jun 2002 00:41:03 +0000
Subject: ui

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index e03017db4..19545bd12 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -69,7 +69,7 @@ print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 print ntable("#cccccc",2), <<END;
 <TR><TD ALIGN="right">Package (customer-visable)</TD><TD><INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}"></TD></TR>
 <TR><TD ALIGN="right">Comment (customer-hidden)</TD><TD><INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}"></TD></TR>
-<TR><TD ALIGN="right">Frequency (months) of recurring fee</TD><TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}" SIZE=3></TD></TR>
+<TR><TD ALIGN="right">Frequency (months) of recurring fee</TD><TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}" SIZE=3>&nbsp;&nbsp;<I>0=no recurring fee, 1=monthly, 3=quarterly, 12=yearly</TD></TR>
 <TR><TD ALIGN="right">Setup fee tax exempt</TD><TD>
 END
 
-- 
cgit v1.2.1


From ecb895ccbbf52ed2babc0885c9925022175e33a0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Jun 2002 01:35:08 +0000
Subject: working one-time charges

---
 httemplate/edit/process/quick-charge.cgi   | 27 +++++++++++++++++++++++++++
 httemplate/edit/process/quick-cust_pkg.cgi |  4 ++--
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 httemplate/edit/process/quick-charge.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi
new file mode 100644
index 000000000..49175d848
--- /dev/null
+++ b/httemplate/edit/process/quick-charge.cgi
@@ -0,0 +1,27 @@
+<%
+
+#untaint custnum
+$cgi->param('custnum') =~ /^(\d+)$/
+  or die 'illegal custnum '. $cgi->param('custnum');
+my $custnum = $1;
+
+$cgi->param('amount') =~ /^\s*(\d+(\.\d{1,2})?)\s*$/
+  or die 'illegal amount '. $cgi->param('amount');
+my $amount = $1;
+
+my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+  or die "unknown custnum $custnum";
+
+my $error = $cust_main->charge( $amount, $cgi->param('pkg') );
+
+if ($error) {
+%>
+<!-- mason kludge -->
+<%
+  eidiot($error);
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum" );
+}
+
+%>
+
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index c663dce32..a8f5b1453 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -2,10 +2,10 @@
 
 #untaint custnum
 $cgi->param('custnum') =~ /^(\d+)$/
-  or eidiot 'illegal custnum '. $cgi->param('custnum');
+  or die 'illegal custnum '. $cgi->param('custnum');
 my $custnum = $1;
 $cgi->param('pkgpart') =~ /^(\d+)$/
-  or eidiot 'illegal pkgpart '. $cgi->param('pkgpart');
+  or die 'illegal pkgpart '. $cgi->param('pkgpart');
 my $pkgpart = $1;
 
 my @cust_pkg = ();
-- 
cgit v1.2.1


From 2c9b97801b3981efaf6c65118e3cc1a0368e649c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 03:47:40 +0000
Subject: one-time charges with tax classes

---
 httemplate/edit/part_pkg.cgi             | 1 +
 httemplate/edit/process/quick-charge.cgi | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 19545bd12..08d5dc906 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -89,6 +89,7 @@ print '>';
 print '</TD></TR>';
 
 my $conf = new FS::Conf;
+#false laziness w/ view/cust_main.cgi quick order
 if ( $conf->exists('enable_taxclasses') ) {
   print '<TR><TD ALIGN="right">Tax class</TD><TD><SELECT NAME="taxclass">';
   my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi
index 49175d848..477f58508 100644
--- a/httemplate/edit/process/quick-charge.cgi
+++ b/httemplate/edit/process/quick-charge.cgi
@@ -12,7 +12,12 @@ my $amount = $1;
 my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
   or die "unknown custnum $custnum";
 
-my $error = $cust_main->charge( $amount, $cgi->param('pkg') );
+my $error = $cust_main->charge(
+  $amount,
+  $cgi->param('pkg'),
+  '$'. sprintf("%.2f",$amount),
+  $cgi->param('taxclass')
+);
 
 if ($error) {
 %>
-- 
cgit v1.2.1


From 5d65d52a1b53172da6bcaf37cc375a3f4f3edfd9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Jul 2002 07:32:20 +0000
Subject: fix speling

---
 httemplate/edit/part_pkg.cgi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 08d5dc906..b6ecff2d0 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -241,7 +241,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'flat_comission_cust' => {
-    'name' => 'Flat rate with recurring comission per active customer',
+    'name' => 'Flat rate with recurring commission per active customer',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -249,7 +249,7 @@ tie my %plans, 'Tie::IxHash',
       'recur_fee' => { 'name' => 'Recurring fee for this package',
                        'default' => 0,
                      },
-      'comission_amount' => { 'name' => 'Comission amount per month (per active customer)',
+      'comission_amount' => { 'name' => 'Commission amount per month (per active customer)',
                               'default' => 0,
                             },
       'comission_depth'  => { 'name' => 'Number of layers',
@@ -262,7 +262,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'flat_comission' => {
-    'name' => 'Flat rate with recurring comission per (any) active package',
+    'name' => 'Flat rate with recurring commission per (any) active package',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -270,7 +270,7 @@ tie my %plans, 'Tie::IxHash',
       'recur_fee' => { 'name' => 'Recurring fee for this package',
                        'default' => 0,
                      },
-      'comission_amount' => { 'name' => 'Comission amount per month (per active package)',
+      'comission_amount' => { 'name' => 'Commission amount per month (per active package)',
                               'default' => 0,
                             },
       'comission_depth'  => { 'name' => 'Number of layers',
@@ -283,7 +283,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'flat_comission_pkg' => {
-    'name' => 'Flat rate with recurring comission per (selected) active package',
+    'name' => 'Flat rate with recurring commission per (selected) active package',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -291,7 +291,7 @@ tie my %plans, 'Tie::IxHash',
       'recur_fee' => { 'name' => 'Recurring fee for this package',
                        'default' => 0,
                      },
-      'comission_amount' => { 'name' => 'Comission amount per month (per uncancelled package)',
+      'comission_amount' => { 'name' => 'Commission amount per month (per uncancelled package)',
                               'default' => 0,
                             },
       'comission_depth'  => { 'name' => 'Number of layers',
-- 
cgit v1.2.1


From 9b6e476ab5a9f42877543065eff960928df2304b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 6 Jul 2002 11:08:48 +0000
Subject: fix UI for forwards - use HTML::Widgets::SelectLayers, closes:
 Bug#303

---
 httemplate/edit/svc_forward.cgi | 133 +++++++++++++---------------------------
 1 file changed, 43 insertions(+), 90 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 5f1466bbb..bc19fe1de 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -119,105 +119,58 @@ my($srcsvc,$dstsvc,$dst)=(
 
 #display
 
-my $p1 = popurl(1);
-print header("Mail Forward $action", '',
-      " onLoad=\"visualize()\"");
-
 %>
 
-<SCRIPT>
-function visualize(what){
-    if (document.getElementById) {
-      document.getElementById('dother').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
-    }
-}
-function fixup(what){
-    if (document.getElementById) {
-      if (document.getElementById('dother').style.visibility == 'hidden') {
-        what.dst.value='';
-      }
-    }
-}
-</SCRIPT>
-
-<%
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
+<%= header("Mail Forward $action") %>
 
-print qq!<FORM ACTION="${p1}process/svc_forward.cgi" onSubmit="fixup(this)" METHOD=POST>!;
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+  <BR><BR>
+<% } %>
 
-#svcnum
-print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
-print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
-print qq!<BR>!;
+Service #<%= $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
+Service: <B><%= $part_svc->svc %></B><BR><BR>
 
-#pkgnum
-print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
- 
-#svcpart
-print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
-
-#srcsvc
-print qq!\n\nMail to <SELECT NAME="srcsvc" SIZE=1>!;
-foreach $_ (keys %email) {
-  print "<OPTION", $_ eq $srcsvc ? " SELECTED" : "",
-        qq! VALUE="$_">$email{$_}!;
-}
-print "</SELECT>";
+<FORM NAME="dummy">
 
-#dstsvc
-print qq! forwards to <SELECT NAME="dstsvc" SIZE=1 onChange="changed(this)">!;
-foreach $_ (keys %email) {
-  print "<OPTION", $_ eq $dstsvc ? " SELECTED" : "",
-        qq! VALUE="$_">$email{$_}!;
-}
-print "<OPTION", 0 eq $dstsvc ? " SELECTED" : "",
-      qq! VALUE="0">(other)!;
-print "</SELECT> mailbox.";
-
-%>
-
-<SCRIPT>
-var selectchoice = null;
-function changed(what) {
-  selectchoice = what.options[what.selectedIndex].value;
-  if (selectchoice == "0") {
-    if (document.getElementById) {
-      document.getElementById('dother').style.visibility = "visible";
-    }
-  }else{
-    if (document.getElementById) {
-      document.getElementById('dother').style.visibility = "hidden";
-    }
-  }
-}
-if (document.getElementById) {
-    document.write("<DIV ID=\"dother\" STYLE=\"visibility: hidden\">");
-}
-</SCRIPT>
+<%= ntable("#cccccc",2) %>
+<TR><TD ALIGN="right">Email to</TD><TD><SELECT NAME="srcsvc" SIZE=1>
+<% foreach $_ (keys %email) { %>
+  <OPTION<%= $_ eq $srcsvc ? " SELECTED" : "" %> VALUE="<%= $_ %>"><%= $email{$_} %></OPTION>
+<% } %>
+</SELECT></TD></TR>
 
 <%
-print qq! Other destination: <INPUT TYPE="text" NAME="dst" VALUE="$dst">!;
+  tie my %tied_email, 'Tie::IxHash',
+    ''  => 'SELECT DESTINATION',
+    %email,
+    '0' => '(other email address)';
+  my $widget = new HTML::Widgets::SelectLayers(
+    'selected_layer' => $dstsvc,
+    'options'        => \%tied_email,
+    'form_name'      => 'dummy',
+    'form_action'    => 'process/svc_forward.cgi',
+    'form_select'    => ['srcsvc'],
+    'html_between'   => '</TD></TR></TABLE>',
+    'layer_callback' => sub {
+      my $layer = shift;
+      my $html = qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!.
+                 qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!.
+                 qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!.
+                 qq!<INPUT TYPE="hidden" NAME="dstsvc" VALUE="$layer">!;
+      if ( $layer eq '0' ) {
+        $html .= ntable("#cccccc",2).
+                 '<TR><TD ALIGN="right">Destination email</TD>'.
+                 qq!<TD><INPUT TYPE="text" NAME="dst" VALUE="$dst"></TD>!.
+                 '</TR></TABLE>';
+      }
+      $html .= '<BR><INPUT TYPE="submit" VALUE="Submit">';
+      $html;
+    },
+  );
 %>
 
-<SCRIPT>
-if (document.getElementById) {
-    document.write("</DIV>");
-}
-</SCRIPT>
-
-<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>
-</FORM>
-
-<TAG onLoad="
-    if (document.getElementById) {
-      document.getElementById('dother').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
-      document.getElementById('dlabel').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
-    }
-">
-
-
+<TR><TD ALIGN="right">Forwards to</TD>
+<TD><%= $widget->html %>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From 1f8d7610c245ecb21667aa656ce083420e5bb797 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 8 Jul 2002 13:07:40 +0000
Subject: edit expiration dates

---
 httemplate/edit/REAL_cust_pkg.cgi         | 19 +++++++++++++------
 httemplate/edit/process/REAL_cust_pkg.cgi |  1 +
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 580313e88..0d2f1c238 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,6 +1,6 @@
 <!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.3 2002-04-23 07:32:49 ivan Exp $ -->
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.4 2002-07-08 13:07:40 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
@@ -45,7 +45,7 @@ print '<FORM NAME="formname" ACTION="process/REAL_cust_pkg.cgi" METHOD="POST">',
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>!
   if $error;
 
-print &ntable("#cccccc"), '<TR><TD>', &ntable("#cccccc",2),
+print ntable("#cccccc",2),
       '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
       $pkgnum, '</TD></TR>',
       '<TR><TD ALIGN="right">Package</TD><TD BGCOLOR="#ffffff">',
@@ -66,16 +66,23 @@ print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
        time2str("%D",$susp), '</TD></TR>'
   if $susp;
 
-print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$expire), '</TD></TR>'
-  if $expire;
+#print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
+#       time2str("%D",$expire), '</TD></TR>'
+#  if $expire;
+print '<TR><TD ALIGN="right">Expiration date'.
+      '</TD><TD>',
+      '<INPUT TYPE="text" NAME="expire" SIZE=32 VALUE="',
+      ( $expire ? time2str("%c %z (%Z)",$expire) : "" ), '">'.
+      '<BR><FONT SIZE=-1>(will <b>cancel</b> this package'.
+      ' when the date is reached)</FONT>'.
+      '</TD></TR>';
 
 print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
        time2str("%D",$cancel), '</TD></TR>'
   if $cancel;
 
 %>
-</TABLE></TD></TR></TABLE>
+</TABLE>
 <BR><INPUT TYPE="submit" VALUE="Apply Changes">
 </FORM>
 </BODY>
diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi
index 6bed85c19..2e0352c76 100755
--- a/httemplate/edit/process/REAL_cust_pkg.cgi
+++ b/httemplate/edit/process/REAL_cust_pkg.cgi
@@ -5,6 +5,7 @@ my $old = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 my %hash = $old->hash;
 $hash{'setup'} = $cgi->param('setup') ? str2time($cgi->param('setup')) : '';
 $hash{'bill'} = $cgi->param('bill') ? str2time($cgi->param('bill')) : '';
+$hash{'expire'} = $cgi->param('expire') ? str2time($cgi->param('expire')) : '';
 my $new = new FS::cust_pkg \%hash;
 
 my $error = $new->replace($old);
-- 
cgit v1.2.1


From 6f697cb59812d287079190681d3fc7330f29b960 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 8 Jul 2002 15:56:32 +0000
Subject: better error message

---
 httemplate/edit/svc_acct.cgi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index eca0a31cf..90b26324a 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -12,8 +12,8 @@ if ( $cgi->param('error') ) {
   $svcnum = $svc_acct->svcnum;
   $pkgnum = $cgi->param('pkgnum');
   $svcpart = $cgi->param('svcpart');
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  die "No part_svc entry!" unless $part_svc;
+  $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
+  die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
   @groups = $cgi->param('radius_usergroup');
 } else {
   my($query) = $cgi->keywords;
@@ -28,8 +28,8 @@ if ( $cgi->param('error') ) {
     $pkgnum=$cust_svc->pkgnum;
     $svcpart=$cust_svc->svcpart;
 
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
+    $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
+    die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
 
     @groups = $svc_acct->radius_groups;
 
@@ -41,8 +41,8 @@ if ( $cgi->param('error') ) {
       $pkgnum=$1 if /^pkgnum(\d+)$/;
       $svcpart=$1 if /^svcpart(\d+)$/;
     }
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
+    $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
+    die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
 
     $svcnum='';
 
-- 
cgit v1.2.1


From 86dccb51c86156fcf06b981a48fd2a40d204cc53 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 24 Aug 2002 07:20:24 +0000
Subject: don't substitute defaults for empty options when editing exports

---
 httemplate/edit/part_export.cgi | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 486bd4300..bd427aa40 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -50,7 +50,10 @@ my $widget = new HTML::Widgets::SelectLayers(
       my $type = defined($optinfo->{type}) ? $optinfo->{type} : 'text';
       my $value = $cgi->param($option)
                   || $part_export->option($option)
-                  || (exists $optinfo->{default} ? $optinfo->{default} : '');
+                  || ( (exists $optinfo->{default} && !$part_export->exportnum)
+                       ? $optinfo->{default}
+                       : ''
+                     );
       $html .= qq!<TR><TD ALIGN="right">$label</TD><TD>!;
       if ( $type eq 'select' ) {
         $html .= qq!<SELECT NAME="$option">!;
-- 
cgit v1.2.1


From 0ccfb017d1075a2def6e151fb78b1a162eb6c0e8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Aug 2002 11:33:53 +0000
Subject: use eidiot rather than die for (hopefully) better error message

---
 httemplate/edit/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index cf8de2f13..831b2ab97 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -73,7 +73,7 @@ my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
 my @agents = qsearch( 'agent', {} );
 #die "No agents created!" unless @agents;
-die "You have not created any agents.  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
+eidiot "You have not created any agents.  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
 my $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
 if ( scalar(@agents) == 1 ) {
   print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
@@ -99,7 +99,7 @@ if ( $custnum && ! $conf->exists('editreferrals') ) {
 } else {
   my(@referrals) = qsearch('part_referral',{});
   if ( scalar(@referrals) == 0 ) {
-    die "You have not created any advertising sources.  You must create at least one advertising source before adding a customer.  Go to ". popurl(2). "browse/part_referral.cgi and create one or more advertising sources.";
+    eidiot "You have not created any advertising sources.  You must create at least one advertising source before adding a customer.  Go to ". popurl(2). "browse/part_referral.cgi and create one or more advertising sources.";
   } elsif ( scalar(@referrals) == 1 ) {
     $refnum ||= $referrals[0]->refnum;
     print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
-- 
cgit v1.2.1


From 10adfb99055cc684f96cf446da34a7423cac3459 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Aug 2002 23:42:47 +0000
Subject: new invoice event: upload a CSV file

---
 httemplate/edit/part_bill_event.cgi         | 24 ++++++++++++++++++++++++
 httemplate/edit/process/part_bill_event.cgi |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 324daeb90..a10a186a9 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -134,6 +134,30 @@ tie my %events, 'Tie::IxHash',
     'weight' => 50,
   },
 
+  'send_csv_ftp' => {
+    'name' => 'Upload CSV invoice data to an FTP server',
+    'code' => '$cust_bill->send_csv( protocol => \'ftp\',
+                                     server   => \'%%%ftpserver%%%\',
+                                     username => \'%%%ftpusername%%%\',
+                                     password => \'%%%ftppassword%%%\',
+                                     dir      => \'%%%ftpdir%%%\'       );',
+    'html' =>
+        '<TABLE BORDER=0><TR><TD ALIGN="right">FTP server: </TD>'.
+          '<TD><INPUT TYPE="text" NAME="ftpserver" VALUE="%%%ftpserver%%%">'.
+          '</TD></TR>'.
+        '<TR><TD ALIGN="right">FTP username: </TD><TD>'.
+          '<INPUT TYPE="text" NAME="ftpusername" VALUE="%%%ftpusername%%%">'.
+          '</TD></TR>'.
+        '<TR><TD ALIGN="right">FTP password: </TD><TD>'.
+          '<INPUT TYPE="text" NAME="ftppassword" VALUE="%%%ftppassword%%%">'.
+          '</TD></TR>'.
+        '<TR><TD ALIGN="right">FTP directory: </TD>'.
+          '<TD><INPUT TYPE="text" NAME="ftpdir" VALUE="%%%ftpdir%%%">'.
+          '</TD></TR>'.
+        '</TABLE>',
+    'weight' => 50,
+  },
+
   'bill' => {
     'name' => 'Generate invoices (normally only used with a <i>Late Fee</i> event)',
     'code' => '$cust_main->bill();',
diff --git a/httemplate/edit/process/part_bill_event.cgi b/httemplate/edit/process/part_bill_event.cgi
index 4049ade80..e224bf634 100755
--- a/httemplate/edit/process/part_bill_event.cgi
+++ b/httemplate/edit/process/part_bill_event.cgi
@@ -12,7 +12,7 @@ if ( ! $cgi->param('plan_weight_eventcode') ) {
   $error = "Must select an action";
 } else {
 
-  $cgi->param('plan_weight_eventcode') =~ /^([\w\-]+):(\d+):(.*)$/
+  $cgi->param('plan_weight_eventcode') =~ /^([\w\-]+):(\d+):(.*)$/s
     or die "illegal plan_weight_eventcode:".
            $cgi->param('plan_weight_eventcode');
   $cgi->param('plan', $1);
-- 
cgit v1.2.1


From 83b1806aa999a09a2825f3d8343e85d48e803f12 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 4 Sep 2002 08:42:23 +0000
Subject: spelling

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index b6ecff2d0..38d7358a5 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -67,7 +67,7 @@ print '<FORM NAME="dummy">';
 print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 
 print ntable("#cccccc",2), <<END;
-<TR><TD ALIGN="right">Package (customer-visable)</TD><TD><INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}"></TD></TR>
+<TR><TD ALIGN="right">Package (customer-visible)</TD><TD><INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}"></TD></TR>
 <TR><TD ALIGN="right">Comment (customer-hidden)</TD><TD><INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}"></TD></TR>
 <TR><TD ALIGN="right">Frequency (months) of recurring fee</TD><TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}" SIZE=3>&nbsp;&nbsp;<I>0=no recurring fee, 1=monthly, 3=quarterly, 12=yearly</TD></TR>
 <TR><TD ALIGN="right">Setup fee tax exempt</TD><TD>
-- 
cgit v1.2.1


From afb81dcb0fd47759bb5234d7f5989dc8df0aa502 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 5 Sep 2002 17:01:36 +0000
Subject: "same as billing address" box would uncheck itself on errors (only
 looked at previous ship_last, not CGI checkbox value too)  Closes: Bug#448

---
 httemplate/edit/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 831b2ab97..3a5df086f 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -231,7 +231,7 @@ END
 
   print '<BR>Service address ',
         '(<INPUT TYPE="checkbox" NAME="same" VALUE="Y" onClick="samechanged(this)"';
-  unless ( $cust_main->ship_last ) {
+  unless ( $cust_main->ship_last && $cgi->param('same') ne 'Y' ) {
     print ' CHECKED';
     foreach (
       qw( last first company address1 address2 city county state zip country
-- 
cgit v1.2.1


From 44398c83f25bf4e43838df9f39331c29fdeff19d Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 9 Sep 2002 23:05:30 +0000
Subject: svc_broadband merge

---
 httemplate/edit/ac.cgi                    | 163 ++++++++++++++++++++++
 httemplate/edit/ac_type.cgi               | 106 +++++++++++++++
 httemplate/edit/part_svc.cgi              |  13 +-
 httemplate/edit/process/ac.cgi            |  28 ++++
 httemplate/edit/process/ac_block.cgi      |  21 +++
 httemplate/edit/process/ac_field.cgi      |  21 +++
 httemplate/edit/process/ac_type.cgi       |  28 ++++
 httemplate/edit/process/part_ac_field.cgi |  21 +++
 httemplate/edit/process/part_svc.cgi      |   2 +-
 httemplate/edit/process/svc_broadband.cgi |  45 ++++++
 httemplate/edit/svc_broadband.cgi         | 219 ++++++++++++++++++++++++++++++
 11 files changed, 665 insertions(+), 2 deletions(-)
 create mode 100755 httemplate/edit/ac.cgi
 create mode 100755 httemplate/edit/ac_type.cgi
 create mode 100755 httemplate/edit/process/ac.cgi
 create mode 100755 httemplate/edit/process/ac_block.cgi
 create mode 100755 httemplate/edit/process/ac_field.cgi
 create mode 100755 httemplate/edit/process/ac_type.cgi
 create mode 100755 httemplate/edit/process/part_ac_field.cgi
 create mode 100644 httemplate/edit/process/svc_broadband.cgi
 create mode 100644 httemplate/edit/svc_broadband.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/ac.cgi b/httemplate/edit/ac.cgi
new file mode 100755
index 000000000..86b05a4a1
--- /dev/null
+++ b/httemplate/edit/ac.cgi
@@ -0,0 +1,163 @@
+<!-- mason kludge -->
+<%
+
+my($ac);
+if ( $cgi->param('error') ) {
+  $ac = new FS::ac ( {
+    map { $_, scalar($cgi->param($_)) } fields('ac')
+  } );
+} elsif ( $cgi->keywords ) { #editing
+  my( $query ) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $ac=qsearchs('ac',{'acnum'=>$1});
+} else { #adding
+  $ac = new FS::ac {};
+}
+my $action = $ac->acnum ? 'Edit' : 'Add';
+my $hashref = $ac->hashref;
+
+print header("$action Access Concentrator", menubar(
+  'Main Menu' => "$p",
+  'View all access concentrators' => "${p}browse/ac.cgi",
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print '<FORM ACTION="', popurl(1), 'process/ac.cgi" METHOD=POST>',
+      qq!<INPUT TYPE="hidden" NAME="acnum" VALUE="$hashref->{acnum}">!,
+      "Access Concentrator #", $hashref->{acnum} ? $hashref->{acnum} : "(NEW)";
+
+print <<END;
+
+<TABLE COLOR="#cccccc">
+  <TR>
+    <TH ALIGN="RIGHT">Access Concentrator</TH>
+    <TD>
+      <INPUT TYPE="text" NAME="acname" SIZE=15 VALUE="$hashref->{acname}">
+    </TD>
+  </TD>
+END
+
+
+if (! $ac->acnum) {
+  print <<END;
+  <TR>
+    <TH ALIGN="RIGHT">Access Concentrator Type</TH>
+    <TD><SELECT NAME="actypenum" SIZE="1"><OPTION VALUE=""></OPTION>
+END
+
+  foreach (qsearch('ac_type', {})) {
+    my $narf = $_->hashref;
+    print qq!<OPTION! .
+          ($narf->{actypenum} eq $hashref->{actypenum} ? ' SELECTED' : '') .
+          qq! VALUE="$narf->{actypenum}">$narf->{actypenum}: $narf->{actypename}! .
+          qq!</OPTION>!;
+  }
+
+  print '</TD></TR></TABLE>';
+} else {
+  print '</TABLE>';
+  print qq!<INPUT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">!;
+}
+
+print qq!</TABLE><BR><BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{acnum} ? "Apply changes" : "Add access concentrator",
+      qq!"></FORM>!;
+
+if ($hashref->{acnum}) {
+  print table();
+  print <<END;
+    Additional Fields:<BR>
+    <TH>
+      <TD>Field Name</TD>
+      <TD COLSPAN=2>Field Value</TD>
+    </TH>
+END
+
+  #my @ac_fields = qsearch('ac_field', { acnum => $hashref->{acnum} });
+  my @ac_fields = $ac->ac_field;
+  foreach (@ac_fields) {
+    print qq!\n<TR><TD></TD>!;
+    my $part_ac_field = qsearchs('part_ac_field',
+                          { acfieldpart => $_->getfield('acfieldpart') });
+    print '<TD>' . $part_ac_field->getfield('name') .
+          '</TD><TD>' . $_->getfield('value') . '</TD></TR>';
+    print "\n";
+  }
+
+  print '<FORM ACTION="', popurl(1), 'process/ac_field.cgi" METHOD=POST>';
+  print <<END;
+    <TR>
+      <TD><INPUT TYPE="hidden" NAME="acnum" VALUE="$hashref->{acnum}">
+          <INPUT TYPE="hidden" NAME="acname" VALUE="$hashref->{acname}">
+          <INPuT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">
+          <SMALL>(NEW)</SMALL>
+      </TD>
+      <TD><SELECT NAME="acfieldpart"><OPTION></OPTION>
+END
+
+  my @part_ac_fields = qsearch('part_ac_field',
+                         { actypenum => $hashref->{actypenum} });
+  foreach my $part_ac_field (@part_ac_fields) {
+    my $acfieldpart = $part_ac_field->getfield('acfieldpart');
+    if (grep {$_->getfield('acfieldpart') eq $acfieldpart} @ac_fields) {next;}
+    print qq!<OPTION VALUE="${acfieldpart}">! .
+          $part_ac_field->getfield('name') . '</OPTION>';
+  }
+
+  print <<END;
+        </SELECT>
+      </TD>
+      <TD><INPUT TYPE="text" SIZE="15" NAME="value"></TD>
+      <TD><INPUT TYPE="submit" VALUE="Add"></TD>
+    </TR>
+    </FORM>
+  </TABLE>
+END
+
+}
+
+if ($hashref->{acnum}) {
+
+  print qq!<BR><BR>IP Address Blocks:<BR>! . table() .
+        qq!<TR><TH></TH><TH>Network/Mask</TH>! .
+        qq!<TH>Gateway Address</TH><TH>Mask length</TH></TR>\n!;
+
+  foreach (qsearch('ac_block', { acnum => $hashref->{acnum} })) {
+    my $ip_addr = new NetAddr::IP($_->getfield('ip_gateway'),
+                                  $_->getfield('ip_netmask'));
+    print qq!<TR><TD></TD><TD>! . $ip_addr->network->addr() . '/' .
+          $ip_addr->network->mask() . qq!</TD>!;
+
+    print qq!<TD>! . $_->getfield('ip_gateway') . qq!</TD>\n! .
+          qq!<TD>! . $_->getfield('ip_netmask') . qq!</TD></TR>!;
+
+  }
+
+  print '<FORM ACTION="', popurl(1), 'process/ac_block.cgi" METHOD=POST>';
+  print <<END;
+  <TR>
+    <TD><INPUT TYPE="hidden" NAME="acnum" VALUE="$hashref->{acnum}">
+        <INPUT TYPE="hidden" NAME="acname" VALUE="$hashref->{acname}">
+        <INPuT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">
+       <SMALL>(NEW)</SMALL>
+    </TD>
+    <TD></TD>
+    <TD><INPUT TYPE="text" NAME="ip_gateway" SIZE="15"></TD>
+    <TD><INPUT TYPE="text" NAME="ip_netmask" SIZE="2"></TD>
+    <TD><INPUT TYPE="submit" VALUE="Add"></TD>
+  </TR>
+  </FORM>
+</TABLE>
+END
+
+}
+
+print <<END;
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/ac_type.cgi b/httemplate/edit/ac_type.cgi
new file mode 100755
index 000000000..ccc3d579c
--- /dev/null
+++ b/httemplate/edit/ac_type.cgi
@@ -0,0 +1,106 @@
+<!-- mason kludge -->
+<%
+
+my $ac_type;
+if ( $cgi->param('error') ) {
+  $ac_type = new FS::ac_type ( {
+    map { $_, scalar($cgi->param($_)) } fields('ac_type')
+  } );
+} elsif ( $cgi->keywords ) { #editing
+  my($query)=$cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $ac_type=qsearchs('ac_type',{'actypenum'=>$1});
+} else { #adding
+  $ac_type = new FS::ac_type {};
+}
+my $action = $ac_type->actypenum ? 'Edit' : 'Add';
+my $hashref = $ac_type->hashref;
+
+my @ut_types = qw( float number text alpha anything ip domain );
+
+my $p1 = popurl(1);
+print header("$action Access Concentrator Type", menubar(
+  'Main Menu' => popurl(2),
+  'View all Access Concentrator types' => popurl(2). "browse/ac_type.cgi",
+));
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/ac_type.cgi" METHOD=POST>!;
+
+#display
+
+print qq!<INPUT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">!,
+      "AC Type #", $hashref->{actypenum} ? $hashref->{actypenum} : "(NEW)";
+
+print <<TROZ;
+<PRE>
+AC Type Name <INPUT TYPE="text" NAME="actypename" SIZE=15 VALUE="$hashref->{actypename}">
+</PRE>
+
+TROZ
+
+print qq!<BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{actypenum} ? "Apply changes" : "Add AC Type",
+      qq!"></FORM>!;
+
+
+if ($hashref->{actypenum}) {
+  print qq!   <BR>Available fields:<BR>! .  table();
+
+  print qq!    <TH><TD>Field name</TD><TD>Field type</TD><TD></TD></TH>!;
+
+  my @part_ac_field = qsearch ( 'part_ac_field',
+                                { actypenum => $hashref->{actypenum} } );
+  foreach ( @part_ac_field ) {
+    my $pf_hashref = $_->hashref;
+    print <<END;
+      <TR>
+        <TD>$pf_hashref->{acfieldpart}</TD>
+        <TD>$pf_hashref->{name}</TD>
+        <TD>$pf_hashref->{ut_type}</TD>
+      </TR>
+END
+  }
+
+  my $name, $ut_type = '';
+  if ($cgi->param('error')) {
+    $name = $cgi->param('name');
+    $ut_type = $cgi->param('ut_type');
+  }
+
+  print <<END;
+      <FORM ACTION="${p1}process/part_ac_field.cgi" METHOD=GET>
+      <TR>
+       <TD><SMALL>(NEW)</SMALL>
+         <INPUT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">
+       </TD>
+       <TD>
+         <INPUT TYPE="text" NAME="name" VALUE="${name}">
+       </TD>
+       <TD>
+         <SELECT NAME="ut_type" SIZE=1><OPTION>
+END
+
+  foreach ( @ut_types ) {
+    print qq!<OPTION! . ($ut_type ? " SELECTED>$_" : ">$_");
+  }
+
+  print <<END;
+        </SELECT>
+      </TD>
+      <TD><INPUT TYPE="submit" VALUE="Add"></TD>
+    </TR>
+    </FORM>
+  </TABLE>
+END
+
+}
+
+%>
+
+ </BODY>
+</HTML>
+
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 4ccb770fb..a23107a40 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -53,6 +53,7 @@ Services are items you offer to your customers.
     <LI>svc_acct_sm - <B>deprecated</B> (use svc_forward for new installations) Virtual domain mail aliasing.
     <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
+    <LI>svc_broadband - Broadband/High-speed Internet service
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
        <LI>svc_wo - Work orders (Partially unimplemented)
 -->
@@ -122,11 +123,21 @@ my %defs = (
     #'recnum' => '',
     #'usersvc' => '',
   },
+  'svc_broadband' => {
+    'actypenum' => 'This is the actypenum that refers to the type of AC that can be provisioned for this service.  This field must be set fixed.',
+    'speed_down' => 'Maximum download speed for this service in Kbps.  0 denotes unlimited.',
+    'speed_up' => 'Maximum upload speed for this service in Kbps.  0 denotes unlimited.',
+    'acnum' => 'acnum of a specific AC that this service is restricted to.  Not required',
+    'ip_addr' => 'IP address.  Leave blank for automatic assignment.',
+    'ip_netmask' => 'Mask length, aka. netmask bits.  (Eg. 255.255.255.0 == 24)',
+    'mac_addr' => 'MAC address which is used by some ACs for access control.  Specified by 6 colon seperated hex octets. (Eg. 00:00:0a:bc:1a:2b)',
+    'location' => 'Defines the physically location at which this service was installed.  This is not necessarily the billing address',
+  },
 );
 
   my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
-             : qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www );
+             : qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www svc_broadband );
 
   tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } @dbs;
   my $widget = new HTML::Widgets::SelectLayers(
diff --git a/httemplate/edit/process/ac.cgi b/httemplate/edit/process/ac.cgi
new file mode 100755
index 000000000..fc434a807
--- /dev/null
+++ b/httemplate/edit/process/ac.cgi
@@ -0,0 +1,28 @@
+<%
+
+my $acnum = $cgi->param('acnum');
+
+my $old = qsearchs('ac',{'acnum'=>$acnum}) if $acnum;
+
+my $new = new FS::ac ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('ac')
+} );
+
+my $error = '';
+if ( $acnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $acnum=$new->getfield('acnum');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "browse/ac.cgi");
+}
+
+%>
diff --git a/httemplate/edit/process/ac_block.cgi b/httemplate/edit/process/ac_block.cgi
new file mode 100755
index 000000000..b1c3c726b
--- /dev/null
+++ b/httemplate/edit/process/ac_block.cgi
@@ -0,0 +1,21 @@
+<%
+
+my $new = new FS::ac_block ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('ac_block')
+} );
+
+my $error = '';
+$error = $new->check;
+
+unless ( $error ) { $error = $new->insert; }
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->param('acnum'));
+}
+
+%>
diff --git a/httemplate/edit/process/ac_field.cgi b/httemplate/edit/process/ac_field.cgi
new file mode 100755
index 000000000..2bfe3312f
--- /dev/null
+++ b/httemplate/edit/process/ac_field.cgi
@@ -0,0 +1,21 @@
+<%
+
+my $new = new FS::ac_field ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('ac_field')
+} );
+
+my $error = '';
+$error = $new->check;
+
+unless ( $error ) { $error = $new->insert; }
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->param('acnum'));
+}
+
+%>
diff --git a/httemplate/edit/process/ac_type.cgi b/httemplate/edit/process/ac_type.cgi
new file mode 100755
index 000000000..ca232ba58
--- /dev/null
+++ b/httemplate/edit/process/ac_type.cgi
@@ -0,0 +1,28 @@
+<%
+
+my $actypenum = $cgi->param('actypenum');
+
+my $old = qsearchs('ac_type',{'actypenum'=>$actypenum}) if $actypenum;
+
+my $new = new FS::ac_type ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('ac_type')
+} );
+
+my $error = '';
+if ( $actypenum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $actypenum=$new->getfield('actypenum');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "ac_type.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "browse/ac_type.cgi");
+}
+
+%>
diff --git a/httemplate/edit/process/part_ac_field.cgi b/httemplate/edit/process/part_ac_field.cgi
new file mode 100755
index 000000000..38ad586f7
--- /dev/null
+++ b/httemplate/edit/process/part_ac_field.cgi
@@ -0,0 +1,21 @@
+<%
+
+my $new = new FS::part_ac_field ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('part_ac_field')
+} );
+
+my $error = '';
+$error = $new->check;
+
+unless ( $error ) { $error = $new->insert; }
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "ac_type.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(2). "ac_type.cgi?". $cgi->param('actypenum'));
+}
+
+%>
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 859670b17..69e8ac2fa 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -17,7 +17,7 @@ my $new = new FS::part_svc ( {
             push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
             map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  } @fields;
           } grep defined( $FS::Record::dbdef->table($_) ),
-                 qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www )
+                 qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www svc_broadband )
     )
 } );
 
diff --git a/httemplate/edit/process/svc_broadband.cgi b/httemplate/edit/process/svc_broadband.cgi
new file mode 100644
index 000000000..fd7ba20d5
--- /dev/null
+++ b/httemplate/edit/process/svc_broadband.cgi
@@ -0,0 +1,45 @@
+<%
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+my $svcnum = $1;
+
+my $old;
+if ( $svcnum ) {
+  $old = qsearchs('svc_broadband', { 'svcnum' => $svcnum } )
+    or die "fatal: can't find broadband service (svcnum $svcnum)!";
+} else {
+  $old = '';
+}
+
+my $new = new FS::svc_broadband ( {
+  map {
+    ($_, scalar($cgi->param($_)));
+  } ( fields('svc_broadband'), qw( pkgnum svcpart ) )
+} );
+
+unless ( $new->ip_addr ) {
+  $new->ip_addr(join('.', (map $cgi->param('ip_addr_'.$_), (a..d))));
+}
+
+unless ( $new->mac_addr) {
+  $new->mac_addr(join(':', (map $cgi->param('mac_addr_'.$_), (a..f))));
+}
+
+my $error;
+if ( $svcnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcnum = $new->svcnum;
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  $cgi->param('ip_addr', $new->ip_addr);
+  $cgi->param('mac_addr', $new->mac_addr);
+  print $cgi->redirect(popurl(2). "svc_broadband.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_broadband.cgi?" . $svcnum );
+}
+
+%>
diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
new file mode 100644
index 000000000..d8a1f7a2a
--- /dev/null
+++ b/httemplate/edit/svc_broadband.cgi
@@ -0,0 +1,219 @@
+<!-- mason kludge -->
+<%
+
+my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_broadband );
+if ( $cgi->param('error') ) {
+  $svc_broadband = new FS::svc_broadband ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_broadband')
+  } );
+  $svcnum = $svc_broadband->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_broadband=qsearchs('svc_broadband',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_broadband) svcnum!";
+
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
+
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+  
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+  } else { #adding
+
+    $svc_broadband = new FS::svc_broadband({});
+
+    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+    $svcnum='';
+
+    #set fixed and default fields from part_svc
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      $svc_broadband->setfield( $part_svc_column->columnname,
+                                $part_svc_column->columnvalue,
+                              );
+    }
+
+  }
+}
+my $action = $svc_broadband->svcnum ? 'Edit' : 'Add';
+
+my @ac_list;
+
+if ($pkgnum) {
+
+  unless ($svc_broadband->actypenum) {die "actypenum must be set fixed";};
+  @ac_list = qsearch('ac', { actypenum => $svc_broadband->getfield('actypenum') });
+
+} elsif ( $action eq 'Edit' ) {
+
+  #Nothing?
+
+} else {
+  die "\$action eq Add, but \$pkgnum is null!\n";
+}
+
+
+my $p1 = popurl(1);
+print header("Broadband Service $action", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/svc_broadband.cgi" METHOD=POST>!;
+
+#display
+
+ 
+
+#svcnum
+print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
+print qq!Service #<B>!, $svcnum ? $svcnum : "(NEW)", "</B><BR><BR>";
+
+#pkgnum
+print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+ 
+#svcpart
+print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
+
+#actypenum
+print '<INPUT TYPE="hidden" NAME="actypenum" VALUE="' .
+      $svc_broadband->actypenum . '">';
+
+
+print &ntable("#cccccc",2) . qq!<TR><TD ALIGN="right">AC</TD><TD>!;
+
+#acnum
+if (( $part_svc->part_svc_column('acnum')->columnflag eq 'F' ) or
+    ( !$pkgnum )) {
+
+  my $ac = qsearchs('ac', { acnum => $svc_broadband->acnum });
+  my ($acnum, $acname) = ($ac->acnum, $ac->acname);
+
+  print qq!<INPUT TYPE="hidden" NAME="acnum" VALUE="${acnum}">! .
+        qq!${acnum}: ${acname}</TD></TR>!;
+
+} else {
+
+  my @ac_list = qsearch('ac', { actypenum => $svc_broadband->actypenum });
+  print qq!<SELECT NAME="acnum" SIZE="1"><OPTION VALUE=""></OPTION>!;
+
+  foreach ( @ac_list ) {
+    my ($acnum, $acname) = ($_->acnum, $_->acname);
+    print qq!<OPTION VALUE="${acnum}"! .
+          ($acnum == $svc_broadband->acnum ? ' SELECTED>' : '>') .
+          qq!${acname}</OPTION>!;
+  }
+  print '</TD></TR>';
+
+}
+
+#speed_up & speed_down
+my ($speed_up, $speed_down) = ($svc_broadband->speed_up,
+                               $svc_broadband->speed_down);
+
+print '<TR><TD ALIGN="right">Download speed</TD><TD>';
+if ( $part_svc->part_svc_column('speed_down')->columnflag eq 'F' ) {
+  print qq!<INPUT TYPE="hidden" NAME="speed_down" VALUE="${speed_down}">! .
+        qq!${speed_down}Kbps</TD></TR>!;
+} else {
+  print qq!<INPUT TYPE="text" NAME="speed_down" SIZE=5 VALUE="${speed_down}">! .
+        qq!Kbps</TD></TR>!;
+}
+
+print '<TR><TD ALIGN="right">Upload speed</TD><TD>';
+if ( $part_svc->part_svc_column('speed_up')->columnflag eq 'F' ) {
+  print qq!<INPUT TYPE="hidden" NAME="speed_up" VALUE="${speed_up}">! .
+        qq!${speed_up}Kbps</TD></TR>!;
+} else {
+  print qq!<INPUT TYPE="text" NAME="speed_up" SIZE=5 VALUE="${speed_up}">! .
+        qq!Kbps</TD></TR>!;
+}
+
+#ip_addr & ip_netmask
+#We're assuming that ip_netmask is fixed if ip_addr is fixed.
+#If it isn't, well, <shudder> what the heck are you doing!?!?
+
+my ($ip_addr, $ip_netmask) = ($svc_broadband->ip_addr,
+                              $svc_broadband->ip_netmask);
+
+print '<TR><TD ALIGN="right">IP address/Mask</TD><TD>';
+if ( $part_svc->part_svc_column('ip_addr')->columnflag eq 'F' ) {
+  print qq!<INPUT TYPE="hidden" NAME="ip_addr" VALUE="${ip_addr}">! .
+        qq!<INPUT TYPE="hidden" NAME="ip_netmask" VALUE="${ip_netmask}">! .
+        qq!${ip_addr}/${ip_netmask}</TD></TR>!;
+} else {
+  $ip_addr =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/;
+  print <<END;
+  <INPUT TYPE="text" NAME="ip_addr_a" SIZE="3" MAXLENGTH="3" VALUE="${1}">.
+  <INPUT TYPE="text" NAME="ip_addr_b" SIZE="3" MAXLENGTH="3" VALUE="${2}">.
+  <INPUT TYPE="text" NAME="ip_addr_c" SIZE="3" MAXLENGTH="3" VALUE="${3}">.
+  <INPUT TYPE="text" NAME="ip_addr_d" SIZE="3" MAXLENGTH="3" VALUE="${4}">/
+  <INPUT TYPE="text" NAME="ip_netmask" SIZE="2" MAXLENGTH="2" VALUE="${ip_netmask}">
+</TD></TR>
+<TR><TD COLSPAN="2" WIDTH="300">
+<P><SMALL>Leave the IP address and netmask blank for automatic assignment of a /32 address.  Specifing the netmask and not the address will force assignment of a larger block.</SMALL></P>
+</TD></TR>
+END
+}
+
+#mac_addr
+my $mac_addr = $svc_broadband->mac_addr;
+
+unless (( $part_svc->part_svc_column('mac_addr')->columnflag eq 'F' ) and
+        ( $mac_addr eq '' )) {
+  print '<TR><TD ALIGN="right">MAC Address</TD><TD>';
+  if ( $part_svc->part_svc_column('mac_addr')->columnflag eq 'F' ) { #Why?
+    print qq!<INPUT TYPE="hidden" NAME="mac_addr" VALUE="${mac_addr}">! .
+          qq!${mac_addr}</TD></TR>!;
+  } else {
+    #Ewwww
+    $mac_addr =~ /^([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2})$/i;
+    print <<END;
+  <INPUT TYPE="text" NAME="mac_addr_a" SIZE="2" MACLENGTH="2" VALUE="${1}">:
+  <INPUT TYPE="text" NAME="mac_addr_b" SIZE="2" MACLENGTH="2" VALUE="${2}">:
+  <INPUT TYPE="text" NAME="mac_addr_c" SIZE="2" MACLENGTH="2" VALUE="${3}">:
+  <INPUT TYPE="text" NAME="mac_addr_d" SIZE="2" MACLENGTH="2" VALUE="${4}">:
+  <INPUT TYPE="text" NAME="mac_addr_e" SIZE="2" MACLENGTH="2" VALUE="${5}">:
+  <INPUT TYPE="text" NAME="mac_addr_f" SIZE="2" MACLENGTH="2" VALUE="${6}">
+</TD></TR>
+END
+
+  }
+}
+
+#location
+my $location = $svc_broadband->location;
+
+print '<TR><TD VALIGN="top" ALIGN="right">Location</TD><TD BGCOLOR="#e8e8e8">';
+if ( $part_svc->part_svc_column('location')->columnflag eq 'F' ) {
+  print qq!<PRE>${location}</PRE></TD></TR>!;
+} else {
+  print qq!<TEXTAREA ROWS="4" COLS="30" NAME="location">${location}</TEXTAREA>!;
+}
+
+print '</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">';
+
+print <<END;
+
+    </FORM>
+  </BODY>
+</HTML>
+END
+%>
-- 
cgit v1.2.1


From 3595c874f8e476e58b98b7ab6d86918d4dbb1d5c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Sep 2002 09:19:42 +0000
Subject: remove svc_acct_sm

---
 httemplate/edit/part_svc.cgi            |   8 +-
 httemplate/edit/process/part_svc.cgi    |   2 +-
 httemplate/edit/process/svc_acct_sm.cgi |  34 ------
 httemplate/edit/svc_acct_sm.cgi         | 178 --------------------------------
 4 files changed, 2 insertions(+), 220 deletions(-)
 delete mode 100755 httemplate/edit/process/svc_acct_sm.cgi
 delete mode 100755 httemplate/edit/svc_acct_sm.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index a23107a40..b2862f5a3 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -50,7 +50,6 @@ Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref-
 Services are items you offer to your customers.
 <UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
     <LI>svc_domain - Domains
-    <LI>svc_acct_sm - <B>deprecated</B> (use svc_forward for new installations) Virtual domain mail aliasing.
     <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
     <LI>svc_broadband - Broadband/High-speed Internet service
@@ -102,11 +101,6 @@ my %defs = (
   'svc_domain' => {
     'domain'    => 'Domain',
   },
-  'svc_acct_sm' => {
-    'domuser'   => 'domuser@virtualdomain.com',
-    'domuid'    => 'UID where domuser@virtualdomain.com mail is forwarded',
-    'domsvc'    => 'svcnum from svc_domain for virtualdomain.com',
-  },
   'svc_forward' => {
     'srcsvc'    => 'service from which mail is to be forwarded',
     'dstsvc'    => 'service to which mail is to be forwarded',
@@ -137,7 +131,7 @@ my %defs = (
 
   my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
-             : qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www svc_broadband );
+             : qw( svc_acct svc_domain svc_forward svc_www svc_broadband );
 
   tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } @dbs;
   my $widget = new HTML::Widgets::SelectLayers(
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 69e8ac2fa..9633fabdf 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -17,7 +17,7 @@ my $new = new FS::part_svc ( {
             push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
             map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  } @fields;
           } grep defined( $FS::Record::dbdef->table($_) ),
-                 qw( svc_acct svc_domain svc_acct_sm svc_forward svc_www svc_broadband )
+                 qw( svc_acct svc_domain svc_forward svc_www svc_broadband )
     )
 } );
 
diff --git a/httemplate/edit/process/svc_acct_sm.cgi b/httemplate/edit/process/svc_acct_sm.cgi
deleted file mode 100755
index 41d03fb92..000000000
--- a/httemplate/edit/process/svc_acct_sm.cgi
+++ /dev/null
@@ -1,34 +0,0 @@
-<%
-
-$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-my $svcnum =$1;
-
-my $old = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
-
-#unmunge domsvc and domuid
-#$cgi->param('domsvc',(split(/:/, $cgi->param('domsvc') ))[0] );
-#$cgi->param('domuid',(split(/:/, $cgi->param('domuid') ))[0] );
-
-my $new = new FS::svc_acct_sm ( {
-  map {
-    ($_, scalar($cgi->param($_)));
-  #} qw(svcnum pkgnum svcpart domuser domuid domsvc)
-  } ( fields('svc_acct_sm'), qw( pkgnum svcpart ) )
-} );
-
-my $error = '';
-if ( $svcnum ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $svcnum = $new->getfield('svcnum');
-} 
-
-if ($error) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "svc_acct_sm.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/svc_acct_sm.cgi?$svcnum");
-}
-
-%>
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
deleted file mode 100755
index 0fd5f7622..000000000
--- a/httemplate/edit/svc_acct_sm.cgi
+++ /dev/null
@@ -1,178 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
-
-my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct_sm );
-if ( $cgi->param('error') ) {
-  $svc_acct_sm = new FS::svc_acct_sm ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_acct_sm')
-  } );
-  $svcnum = $svc_acct_sm->svcnum;
-  $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $cgi->param('svcpart');
-  #$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  #die "No part_svc entry!" unless $part_svc;
-} else {
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $svcnum=$1;
-    $svc_acct_sm=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum})
-      or die "Unknown (svc_acct_sm) svcnum!";
-
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-      or die "Unknown (cust_svc) svcnum!";
-
-    $pkgnum=$cust_svc->pkgnum;
-    $svcpart=$cust_svc->svcpart;
-  
-    #$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    #die "No part_svc entry!" unless $part_svc;
-
-  } else { #adding
-
-    $svc_acct_sm = new FS::svc_acct_sm({});
-
-    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
-      $pkgnum=$1 if /^pkgnum(\d+)$/;
-      $svcpart=$1 if /^svcpart(\d+)$/;
-    }
-    my $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-    $svcnum='';
-
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_acct_sm->setfield( $part_svc_column->columnname,
-                              $part_svc_column->columnvalue,
-                            );
-    }
-
-  }
-}
-my $action = $svc_acct_sm->svcnum ? 'Edit' : 'Add';
-
-my %username = ();
-my %domain = ();
-if ($pkgnum) {
-
-  #find all possible uids (and usernames)
-
-  my @u_acct_svcparts = ();
-  foreach my $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
-    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
-  }
-
-  my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  my($custnum)=$cust_pkg->getfield('custnum');
-  foreach my $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
-    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
-    my($acct_svcpart);
-    foreach $acct_svcpart (@u_acct_svcparts) {   #now find the corresponding 
-                                              #record(s) in cust_svc ( for this
-                                              #pkgnum ! )
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        $username{$svc_acct->getfield('uid')}=$svc_acct->getfield('username');
-      }  
-    }
-  }
-
-  #find all possible domains (and domsvc's)
-
-  my @d_acct_svcparts = ();
-  foreach my $d_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_domain'}) ) {
-    push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
-  }
-
-  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
-    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
-    my($acct_svcpart);
-    foreach $acct_svcpart (@d_acct_svcparts) {
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        my($svc_domain)=qsearch('svc_domain',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        $domain{$svc_domain->getfield('svcnum')}=$svc_domain->getfield('domain');
-      }
-    }
-  }
-
-} elsif ( $action eq 'Edit' ) {
-
-  my($svc_acct)=qsearchs('svc_acct',{'uid'=>$svc_acct_sm->domuid});
-  $username{$svc_acct_sm->uid} = $svc_acct->username;
-
-  my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$svc_acct_sm->domsvc});
-  $domain{$svc_acct_sm->domsvc} = $svc_domain->domain;
-
-} else {
-  die "\$action eq Add, but \$pkgnum is null!\n";
-}
-
-my $p1 = popurl(1);
-print header("Mail Alias $action", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/svc_acct_sm.cgi" METHOD=POST>!;
-
-#display
-
-	#formatting
-	print "<PRE>";
-
-#svcnum
-print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
-print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
-
-#pkgnum
-print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
- 
-#svcpart
-print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
-
-my($domuser,$domsvc,$domuid)=(
-  $svc_acct_sm->domuser,
-  $svc_acct_sm->domsvc,
-  $svc_acct_sm->domuid,
-);
-
-#domuser
-print qq!\n\nMail to <INPUT TYPE="text" NAME="domuser" VALUE="$domuser"> <I>( * for anything )</I>!;
-
-#domsvc
-print qq! \@ <SELECT NAME="domsvc" SIZE=1>!;
-foreach $_ (keys %domain) {
-  print "<OPTION", $_ eq $domsvc ? " SELECTED" : "",
-        qq! VALUE="$_">$domain{$_}!;
-}
-print "</SELECT>";
-
-#uid
-print qq!\nforwards to <SELECT NAME="domuid" SIZE=1>!;
-foreach $_ (keys %username) {
-  print "<OPTION", ($_ eq $domuid) ? " SELECTED" : "",
-        qq! VALUE="$_">$username{$_}!;
-}
-print "</SELECT>\@$mydomain mailbox.";
-
-	#formatting
-	print "</PRE>\n";
-
-print qq!<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>!;
-
-print <<END;
-
-    </FORM>
-  </BODY>
-</HTML>
-END
-
-%>
-- 
cgit v1.2.1


From 0c9f7a9f0e0cb21407051b7804f8454e85421f14 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Sep 2002 10:21:47 +0000
Subject: remove obsolete cybercash support

---
 httemplate/edit/part_bill_event.cgi | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index a10a186a9..1b20ef1d2 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -108,12 +108,6 @@ tie my %events, 'Tie::IxHash',
     'weight' => 30,
   },
 
-  'realtime-card-cybercash' => {
-    'name' => '(<b>deprecated</b>) Run card with <a href="http://www.cybercash.com/cashregister">CyberCash CashRegister</a> realtime gateway',
-    'code' => '$cust_bill->realtime_card_cybercash();',
-    'weight' => 30,
-  },
-
   'batch-card' => {
     'name' => 'Add card to the pending credit card batch',
     'code' => '$cust_bill->batch_card();',
-- 
cgit v1.2.1


From c1e33a61324f4e06157c522af7882a97a021830f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 18 Sep 2002 22:50:44 +0000
Subject: remove domain config file, closes: Bug#269

---
 httemplate/edit/svc_forward.cgi | 1 -
 1 file changed, 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index bc19fe1de..0d815b9e5 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -2,7 +2,6 @@
 <%
 
 my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
 
 my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_forward);
 if ( $cgi->param('error') ) {
-- 
cgit v1.2.1


From 8965012fa53fd05d851d2f5abed4e056ab758797 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Sep 2002 11:17:39 +0000
Subject: all taxes now have names.  closes: Bug#15

---
 httemplate/edit/cust_main_county.cgi         |  5 ++++-
 httemplate/edit/process/cust_main_county.cgi | 17 +++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index 7ef37a48d..f3d28825a 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -15,7 +15,8 @@ print qq!<FORM ACTION="!, popurl(1),
         <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
         <TH><FONT SIZE=-1>County</FONT></TH>
-        <TH><FONT SIZE=-1>Taxclass</FONT></TH>
+        <TH><FONT SIZE=-1>Taxclass</FONT><BR><FONT SIZE=-2>(per-package classification)</FONT></TH>
+        <TH><FONT SIZE=-1>Tax name</FONT><BR><FONT SIZE=-2>(printed on invoices)</FONT></TH>
         <TH><FONT SIZE=-1>Tax</FONT></TH>
         <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH>
       </TR>
@@ -46,6 +47,8 @@ END
       : ' BGCOLOR="#cccccc">(ALL)'
     , "</TD>";
 
+  print qq!<TD><INPUT TYPE="text" NAME="taxname!, $hashref->{taxnum},
+        qq!" VALUE="!, $hashref->{taxname}, qq!"></TD>!;
   print qq!<TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
         qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD>!;
   print qq!<TD>\$<INPUT TYPE="text" NAME="exempt_amount!, $hashref->{taxnum},
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index 990a23919..6d80ad512 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -2,17 +2,18 @@
 
 foreach ( grep { /^tax\d+$/ } $cgi->param ) {
   /^tax(\d+)$/ or die "Illegal form $_!";
-  my($taxnum)=$1;
-  my($old)=qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+  my $taxnum = $1;
+  my $old = qsearchs('cust_main_county', { 'taxnum' => $taxnum })
     or die "Couldn't find taxnum $taxnum!";
-  my $exempt_amount = $cgi->param("exempt_amount$taxnum");
-  next unless $old->tax ne $cgi->param("tax$taxnum")
-              || $old->exempt_amount ne $exempt_amount;
+  next unless    $old->tax           != $cgi->param("tax$taxnum")
+              || $old->exempt_amount != $cgi->param("exempt_amount$taxnum")
+              || $old->taxname       ne $cgi->param("taxname$taxnum");
   my %hash = $old->hash;
   $hash{tax} = $cgi->param("tax$taxnum");
-  $hash{exempt_amount} = $exempt_amount;
-  my($new)=new FS::cust_main_county \%hash;
-  my($error)=$new->replace($old);
+  $hash{exempt_amount} = $cgi->param("exempt_amount$taxnum");
+  $hash{taxname} = $cgi->param("taxname$taxnum");
+  my $new = new FS::cust_main_county \%hash;
+  my $error = $new->replace($old);
   if ( $error ) {
     $cgi->param('error', $error);
     print $cgi->redirect(popurl(2). "cust_main_county.cgi?". $cgi->query_string );
-- 
cgit v1.2.1


From c4d2226e0cc4bdd6d9f689b061b5f4f5b9609b0b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Oct 2002 12:57:06 +0000
Subject: working on the road:   - easier "change package" link for changing
 one package to another   - sqlradius export now compatible with Pg   -
 indices on phone numbers   - install instructions specify Pg 7.1 (at least
 until ILIKE thing is changed)   - searching on phone number fragments

---
 httemplate/edit/process/cust_pkg.cgi | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
index f8c9f5151..df8471c27 100755
--- a/httemplate/edit/process/cust_pkg.cgi
+++ b/httemplate/edit/process/cust_pkg.cgi
@@ -11,16 +11,23 @@ my @remove_pkgnums = map {
   $1;
 } $cgi->param('remove_pkg');
 
+my $error_redirect;
 my @pkgparts;
-foreach my $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
-  if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
-    my $num_pkgs = $1;
-    while ( $num_pkgs-- ) {
-      push @pkgparts,$pkgpart;
+if ( $cgi->param('new_pkgpart') =~ /^(\d+)$/ ) { #came from misc/change_pkg.cgi
+  $error_redirect = "misc/change_pkg.cgi";
+  @pkgparts = ($1);
+} else { #came from edit/cust_pkg.cgi
+  $error_redirect = "edit/cust_pkg.cgi";
+  foreach my $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
+    if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
+      my $num_pkgs = $1;
+      while ( $num_pkgs-- ) {
+        push @pkgparts,$pkgpart;
+      }
+    } else {
+      $error = "Illegal quantity";
+      last;
     }
-  } else {
-    $error = "Illegal quantity";
-    last;
   }
 }
 
@@ -28,7 +35,7 @@ $error ||= FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
 
 if ($error) {
   $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_pkg.cgi?". $cgi->query_string );
+  print $cgi->redirect(popurl(3). $error_redirect. '?'. $cgi->query_string );
 } else {
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 }
-- 
cgit v1.2.1


From b97ccb2b958567490841cfc93d2c4a401d98cdb0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 8 Oct 2002 04:46:40 +0000
Subject: payby-default config option, with special "HIDE" option to disable
 billing information in the web interface (closes: Bug#468)

---
 httemplate/edit/cust_main.cgi | 120 +++++++++++++++++++++++++++++-------------
 1 file changed, 83 insertions(+), 37 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 3a5df086f..a76cd36d1 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -336,48 +336,94 @@ sub expselect {
   $return;
 }
 
-print "<BR>Billing information", &itable("#cccccc"),
-      qq!<TR><TD><INPUT TYPE="checkbox" NAME="tax" VALUE="Y"!;
-print qq! CHECKED! if $cust_main->tax eq "Y";
-print qq!>Tax Exempt</TD></TR>!;
-print qq!<TR><TD><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
-my @invoicing_list = $cust_main->invoicing_list;
-print qq! CHECKED!
-  if ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
-     || grep { $_ eq 'POST' } @invoicing_list;
-print qq!>Postal mail invoice</TD></TR>!;
-my $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
-print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
-
-print "<TR><TD>Billing type</TD></TR>",
-      "</TABLE>",
-      &table("#cccccc"), "<TR>";
-
-my($payinfo, $payname)=(
-  $cust_main->payinfo,
-  $cust_main->payname,
-);
+my $payby_default = $conf->config('payby-default');
+
+if ( $payby_default eq 'HIDE' ) {
+
+  $cust_main->payby('BILL') unless $cust_main->payby;
+
+  foreach my $field (qw( tax payby )) {
+    print qq!<INPUT TYPE="hidden" NAME="$field" VALUE="!.
+          $cust_main->getfield($field). '">';
+  }
+
+  print qq!<INPUT TYPE="hidden" NAME="invoicing_list" VALUE="!.
+        join(', ', $cust_main->invoicing_list). '">';
+
+  foreach my $payby (qw( CARD BILL COMP )) {
+    foreach my $field (qw( payinfo payname )) {
+      print qq!<INPUT TYPE="hidden" NAME="${payby}_$field" VALUE="!.
+            $cust_main->getfield($field). '">';
+    }
+
+    #false laziness w/expselect
+    my( $m, $y ) = (0, 0);
+    if ( scalar(@_) ) {
+      my $date = shift || '01-2000';
+      if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
+        ( $m, $y ) = ( $2, $1 );
+      } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+        ( $m, $y ) = ( $1, $3 );
+      } else {
+        die "unrecognized expiration date format: $date";
+      }
+    }
+
+    print qq!<INPUT TYPE="hidden" NAME="${payby}_month" VALUE="$m"!.
+          qq!<INPUT TYPE="hidden" NAME="${payby}_year"  VALUE="$y"!;
+
+  }
 
-my %payby = (
-  'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
-  'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
+} else {
+
+  print "<BR>Billing information", &itable("#cccccc"),
+        qq!<TR><TD><INPUT TYPE="checkbox" NAME="tax" VALUE="Y"!;
+  print qq! CHECKED! if $cust_main->tax eq "Y";
+  print qq!>Tax Exempt</TD></TR><TR><TD>!.
+        qq!<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
+
+  my @invoicing_list = $cust_main->invoicing_list;
+  print qq! CHECKED!
+    if ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
+       || grep { $_ eq 'POST' } @invoicing_list;
+  print qq!>Postal mail invoice</TD></TR>!;
+  my $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
+  print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
+
+  print "<TR><TD>Billing type</TD></TR>",
+        "</TABLE>",
+        &table("#cccccc"), "<TR>";
+
+  my($payinfo, $payname)=(
+    $cust_main->payinfo,
+    $cust_main->payname,
+  );
+
+  my %payby = (
+    'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
+    'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
 );
-my %paybychecked = (
-  'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-  'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
-  'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
+
+  my %paybychecked = (
+    'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+    'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
 );
-for (qw(CARD BILL COMP)) {
-  print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-  if ($cust_main->payby eq "$_") {
-    print qq! CHECKED> $paybychecked{$_}</TD>!;
-  } else {
-    print qq!> $payby{$_}</TD>!;
+
+  $cust_main->payby($payby_default) unless $cust_main->payby;
+  for (qw(CARD BILL COMP)) {
+    print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+    if ($cust_main->payby eq "$_") {
+      print qq! CHECKED> $paybychecked{$_}</TD>!;
+    } else {
+      print qq!> $payby{$_}</TD>!;
+    }
   }
-}
 
-print "</TR></TABLE>$r required fields for each billing type";
+  print "</TR></TABLE>$r required fields for each billing type";
+
+}
 
 if ( defined $cust_main->dbdef_table->column('comments') ) {
     print "<BR><BR>Comments", &itable("#cccccc"),
-- 
cgit v1.2.1


From f5571d9d6c79d04e65f8da92be923c3f3ae5c54a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Oct 2002 16:28:58 +0000
Subject: expiration date bugfix for HIDE

---
 httemplate/edit/cust_main.cgi | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index a76cd36d1..38d8d2b7e 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -357,16 +357,14 @@ if ( $payby_default eq 'HIDE' ) {
     }
 
     #false laziness w/expselect
-    my( $m, $y ) = (0, 0);
-    if ( scalar(@_) ) {
-      my $date = shift || '01-2000';
-      if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
-        ( $m, $y ) = ( $2, $1 );
-      } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-        ( $m, $y ) = ( $1, $3 );
-      } else {
-        die "unrecognized expiration date format: $date";
-      }
+    my( $m, $y );
+    my $date = $cust_main->paydate || '12-2037';
+    if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
+      ( $m, $y ) = ( $2, $1 );
+    } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+      ( $m, $y ) = ( $1, $3 );
+    } else {
+      die "unrecognized expiration date format: $date";
     }
 
     print qq!<INPUT TYPE="hidden" NAME="${payby}_month" VALUE="$m"!.
-- 
cgit v1.2.1


From 5f062fcd57e44d412cdf036649c38db5353a72f9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Oct 2002 16:48:09 +0000
Subject: bugfix in payby-default HIDE expiration dates

---
 httemplate/edit/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 38d8d2b7e..0921cb373 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -367,8 +367,8 @@ if ( $payby_default eq 'HIDE' ) {
       die "unrecognized expiration date format: $date";
     }
 
-    print qq!<INPUT TYPE="hidden" NAME="${payby}_month" VALUE="$m"!.
-          qq!<INPUT TYPE="hidden" NAME="${payby}_year"  VALUE="$y"!;
+    print qq!<INPUT TYPE="hidden" NAME="${payby}_month" VALUE="$m">!.
+          qq!<INPUT TYPE="hidden" NAME="${payby}_year"  VALUE="$y">!;
 
   }
 
-- 
cgit v1.2.1


From eb9d5b215af1fbe867b75c12328126f650f9fb06 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Oct 2002 10:15:55 +0000
Subject: ACH support

---
 httemplate/edit/cust_main.cgi         | 12 ++++++++----
 httemplate/edit/process/cust_main.cgi |  9 +++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 0921cb373..9e62b00ef 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -350,7 +350,7 @@ if ( $payby_default eq 'HIDE' ) {
   print qq!<INPUT TYPE="hidden" NAME="invoicing_list" VALUE="!.
         join(', ', $cust_main->invoicing_list). '">';
 
-  foreach my $payby (qw( CARD BILL COMP )) {
+  foreach my $payby (qw( CARD CHEK BILL COMP )) {
     foreach my $field (qw( payinfo payname )) {
       print qq!<INPUT TYPE="hidden" NAME="${payby}_$field" VALUE="!.
             $cust_main->getfield($field). '">';
@@ -399,18 +399,22 @@ if ( $payby_default eq 'HIDE' ) {
 
   my %payby = (
     'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR>${r}Exp !. expselect("BILL", "12-2037"). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
+    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
 );
 
+  my( $account, $aba ) = split('@', $payinfo);
+
   my %paybychecked = (
     'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("BILL", $cust_main->paydate). qq!<BR>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
 );
 
   $cust_main->payby($payby_default) unless $cust_main->payby;
-  for (qw(CARD BILL COMP)) {
+  for (qw(CARD CHEK BILL COMP)) {
     print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
     if ($cust_main->payby eq "$_") {
       print qq! CHECKED> $paybychecked{$_}</TD>!;
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 6ce60d14a..c15ea0321 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -10,9 +10,14 @@ $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
 
 my $payby = $cgi->param('payby');
 if ( $payby ) {
-  $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
+  if ( $payby eq 'CHEK' ) {
+    $cgi->param('payinfo',
+      $cgi->param('CHEK_payinfo1'). '@'. $cgi->param('CHEK_payinfo2') );
+  } else {
+    $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
+  }
   $cgi->param('paydate',
-  $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
+    $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
   $cgi->param('payname', $cgi->param( $payby. '_payname' ) );
 }
 
-- 
cgit v1.2.1


From 6f8a6c416174bcf8095c959085d14ba820425aad Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Oct 2002 13:26:46 +0000
Subject: sqlradacct_hour price plan to charge per-hour against an external
 radacct table

---
 httemplate/edit/part_pkg.cgi | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 38d7358a5..ddd86765a 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -355,6 +355,37 @@ tie my %plans, 'Tie::IxHash',
 
   },
 
+  'sqlradacct_hour' => {
+    'name' => 'Base charge plus charge per-hour from an external SQL radacct table',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'sql_datasrc' => { 'name' => 'DBI data source',
+                         'default' => 'DBI:mysql:host=radius.server.name;dbname=radius',
+                       },
+      'sql_username' => { 'name' => 'Database username',
+                          'default' => 'radius',
+                        },
+      'sql_password' => { 'name' => 'Database password',
+                          'default' => '',
+                        },
+      'recur_included_hours' => { 'name' => 'Hours included',
+                                  'default' => 0,
+                                },
+      'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
+                                 'default' => 0,
+                               },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
+    'setup' => 'what.setup_fee.value',
+    'recur' => '\'my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate))[0,1,2,3,4,5]; $mon+=$part_pkg->freq; until ($mon<12) { $mon-=12; $year++ }; $edate = timelocal($sec,$min,$hour,$mday,$mon,$year); my $hours = $cust_pkg->seconds_since_sqlradacct($sdate, $edate, \' + what.sql_datasrc + \', \' + what.sql_username + \', \' + what.sql_password + \' ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+  },
+
+
 ;
 
 my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-- 
cgit v1.2.1


From ac96a7afbae06cc3b594b3e461bec8a34d65cfe5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Oct 2002 13:46:16 +0000
Subject: dayphone/nightphone as customizable labels, closes: Bug#464

---
 httemplate/edit/cust_main.cgi | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 9e62b00ef..d99b54aed 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -195,10 +195,13 @@ my($daytime,$night,$fax)=(
   $cust_main->fax,
 );
 
+my $daytime_label = gettext('daytime') || 'Day Phone';
+my $night_label = gettext('night') || 'Night Phone';
+
 print <<END;
 <TR><TH ALIGN="right">${r}Country</TH><TD>$country_html</TD></TR>
-<TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18></TD></TR>
-<TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18></TD></TR>
+<TR><TD ALIGN="right">$daytime_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18></TD></TR>
+<TR><TD ALIGN="right">$night_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18></TD></TR>
 <TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12></TD></TR>
 END
 
@@ -294,8 +297,8 @@ END
 
   print <<END;
   <TR><TH ALIGN="right">${r}Country</TH><TD>$ship_country_html</TD></TR>
-  <TR><TD ALIGN="right">Day Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_daytime" VALUE="$ship_daytime" SIZE=18 onChange="changed(this)"></TD></TR>
-  <TR><TD ALIGN="right">Night Phone</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_night" VALUE="$ship_night" SIZE=18 onChange="changed(this)"></TD></TR>
+  <TR><TD ALIGN="right">$daytime_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_daytime" VALUE="$ship_daytime" SIZE=18 onChange="changed(this)"></TD></TR>
+  <TR><TD ALIGN="right">$night_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_night" VALUE="$ship_night" SIZE=18 onChange="changed(this)"></TD></TR>
   <TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_fax" VALUE="$ship_fax" SIZE=12 onChange="changed(this)"></TD></TR>
 END
 
-- 
cgit v1.2.1


From dcef219e16a1b4b6d552b8ea2ae17fd58fb2be3a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Oct 2002 14:21:17 +0000
Subject: fix dayphone/nightphone msgcat

---
 httemplate/edit/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index d99b54aed..8f2fe7cee 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -195,8 +195,8 @@ my($daytime,$night,$fax)=(
   $cust_main->fax,
 );
 
-my $daytime_label = gettext('daytime') || 'Day Phone';
-my $night_label = gettext('night') || 'Night Phone';
+my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
+my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
 
 print <<END;
 <TR><TH ALIGN="right">${r}Country</TH><TD>$country_html</TD></TR>
-- 
cgit v1.2.1


From 7bb23c47594c1111aecb5fe8fdb2042e509cca86 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 14 Oct 2002 06:17:14 +0000
Subject: fix sql radacct billing

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index ddd86765a..5fbcd0bd1 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -382,7 +382,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate))[0,1,2,3,4,5]; $mon+=$part_pkg->freq; until ($mon<12) { $mon-=12; $year++ }; $edate = timelocal($sec,$min,$hour,$mday,$mon,$year); my $hours = $cust_pkg->seconds_since_sqlradacct($sdate, $edate, \' + what.sql_datasrc + \', \' + what.sql_username + \', \' + what.sql_password + \' ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+    'recur' => '\'my $hours = $cust_pkg->seconds_since_sqlradacct($cust_pkg->last_bill, $sdate, \' + what.sql_datasrc + \', \' + what.sql_username + \', \' + what.sql_password + \' ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
   },
 
 
-- 
cgit v1.2.1


From ab6a6774557598dc7cdfc57c941a4bf48f3bb64a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 14 Oct 2002 07:30:30 +0000
Subject: svc-acct-alldomains config file allows selection of accounts from any
 domain

---
 httemplate/edit/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 90b26324a..c27bab88a 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -163,7 +163,7 @@ if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
   }
 
   my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
-  if ($cust_pkg) {
+  if ($cust_pkg && !$conf->exists('svc_acct-alldomains') ) {
     my @cust_svc =
       map { qsearch('cust_svc', { 'pkgnum' => $_->pkgnum } ) }
           qsearch('cust_pkg', { 'custnum' => $cust_pkg->custnum } );
-- 
cgit v1.2.1


From acfb0f48c226a5cba64fbe391677391128a6cbf7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Oct 2002 14:16:17 +0000
Subject: radacct update: use sqlradius for datasrc, not plandata options
 (whew)

---
 httemplate/edit/part_pkg.cgi | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 5fbcd0bd1..187578a35 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -356,7 +356,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'sqlradacct_hour' => {
-    'name' => 'Base charge plus charge per-hour from an external SQL radacct table',
+    'name' => 'Base charge plus charge per-hour from an external sqlradius radacct table',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -364,15 +364,6 @@ tie my %plans, 'Tie::IxHash',
       'recur_flat' => { 'name' => 'Base monthly charge for this package',
                         'default' => 0,
                       },
-      'sql_datasrc' => { 'name' => 'DBI data source',
-                         'default' => 'DBI:mysql:host=radius.server.name;dbname=radius',
-                       },
-      'sql_username' => { 'name' => 'Database username',
-                          'default' => 'radius',
-                        },
-      'sql_password' => { 'name' => 'Database password',
-                          'default' => '',
-                        },
       'recur_included_hours' => { 'name' => 'Hours included',
                                   'default' => 0,
                                 },
@@ -382,7 +373,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $hours = $cust_pkg->seconds_since_sqlradacct($cust_pkg->last_bill, $sdate, \' + what.sql_datasrc + \', \' + what.sql_username + \', \' + what.sql_password + \' ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+    'recur' => '\'my $hours = $cust_pkg->seconds_since_sqlradacct($cust_pkg->last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
   },
 
 
-- 
cgit v1.2.1


From f076e082da5f5ec892e2ff6919e478baa1fd2274 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Oct 2002 15:14:07 +0000
Subject: Prevent a fixed or default username or password from being defined

---
 httemplate/edit/part_svc.cgi | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index b2862f5a3..f1d42f341 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -80,7 +80,10 @@ my %defs = (
                      select_key   => 'popnum',
                      select_label => 'city',
                    },
-    'username'  => 'Username',
+    'username'  => {
+                      desc => 'Username',
+                      type => 'disabled',
+                   },
     'quota'     => '',
     '_password' => 'Password',
     'gid'       => 'GID (when blank, defaults to UID)',
@@ -188,15 +191,20 @@ my %defs = (
         $html .= "<TR><TD>$field";
         $html .= "- <FONT SIZE=-1>$desc</FONT>" if $desc;
         $html .=  "</TD>";
-        $html .=
-          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
-          ' CHECKED'x($flag eq ''). ">Off</TD>".
-          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
-          ' CHECKED'x($flag eq 'D'). ">Default ".
-          qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
-          ' CHECKED'x($flag eq 'F'). ">Fixed ".
-          '<BR>';
         if ( ref($def) ) {
+          $flag = '' if $def->{type} eq 'disabled';
+          $html .=
+            qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
+            ' CHECKED'x($flag eq ''). ">Off</TD>".
+            '<TD>';
+          unless ( $def->{type} eq 'disabled' ) {
+            $html .= 
+              qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
+              ' CHECKED'x($flag eq 'D'). ">Default ".
+              qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
+              ' CHECKED'x($flag eq 'F'). ">Fixed ".
+              '<BR>';
+          }
           if ( $def->{type} eq 'select' ) {
             $html .= qq!<SELECT NAME="${layer}__${field}">!;
             $html .= '<OPTION> </OPTION>' unless $value;
@@ -210,6 +218,9 @@ my %defs = (
           } elsif ( $def->{type} eq 'radius_usergroup_selector' ) {
             $html .= FS::svc_acct::radius_usergroup_selector(
               [ split(',', $value) ], "${layer}__${field}" );
+          } elsif ( $def->{type} eq 'disabled' ) {
+            $html .=
+              qq!<INPUT TYPE="hidden" NAME="${layer}__${field}" VALUE="">!;
           } else {
             $html .= '<font color="#ff0000">unknown type'. $def->{type};
           }
-- 
cgit v1.2.1


From 7c220a811b73a1d237cf0ffd09c48a80ff985a3b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Oct 2002 15:20:41 +0000
Subject: don't disable for all items

---
 httemplate/edit/part_svc.cgi | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index f1d42f341..5fbec4f88 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -191,20 +191,20 @@ my %defs = (
         $html .= "<TR><TD>$field";
         $html .= "- <FONT SIZE=-1>$desc</FONT>" if $desc;
         $html .=  "</TD>";
+        $flag = '' if ref($def) && $def->{type} eq 'disabled';
+        $html .=
+          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
+          ' CHECKED'x($flag eq ''). ">Off</TD>".
+          '<TD>';
+        unless ( ref($def) && $def->{type} eq 'disabled' ) {
+          $html .= 
+            qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
+            ' CHECKED'x($flag eq 'D'). ">Default ".
+            qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
+            ' CHECKED'x($flag eq 'F'). ">Fixed ".
+            '<BR>';
+        }
         if ( ref($def) ) {
-          $flag = '' if $def->{type} eq 'disabled';
-          $html .=
-            qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
-            ' CHECKED'x($flag eq ''). ">Off</TD>".
-            '<TD>';
-          unless ( $def->{type} eq 'disabled' ) {
-            $html .= 
-              qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
-              ' CHECKED'x($flag eq 'D'). ">Default ".
-              qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
-              ' CHECKED'x($flag eq 'F'). ">Fixed ".
-              '<BR>';
-          }
           if ( $def->{type} eq 'select' ) {
             $html .= qq!<SELECT NAME="${layer}__${field}">!;
             $html .= '<OPTION> </OPTION>' unless $value;
-- 
cgit v1.2.1


From 37e3aa89ddad4fce6b5829946925ce53745cdcc3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Oct 2002 06:28:13 +0000
Subject: oops - allow adding CHECK invoice events too

---
 httemplate/edit/part_bill_event.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 1b20ef1d2..5486b1855 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -41,7 +41,7 @@ print ntable("#cccccc",2), <<END;
 <TR><TD ALIGN="right">Payby</TD><TD><SELECT NAME="payby">
 END
 
-for (qw(CARD BILL COMP)) {
+for (qw(CARD CHEK BILL COMP)) {
   print qq!<OPTION VALUE="$_"!;
   if ($part_bill_event->payby eq $_) {
     print " SELECTED>$_</OPTION>";
-- 
cgit v1.2.1


From 28a584bc4a0ea3e868871cf1e2471e6412bfb3f3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Oct 2002 08:13:06 +0000
Subject: ACH fixes from s5

---
 httemplate/edit/part_bill_event.cgi | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 5486b1855..70aca99eb 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -108,6 +108,12 @@ tie my %events, 'Tie::IxHash',
     'weight' => 30,
   },
 
+  'realtime-check' => {
+    'name' => 'Run check with a <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> realtime gateway',
+    'code' => '$cust_bill->realtime_ach();',
+    'weight' => 30,
+  },
+
   'batch-card' => {
     'name' => 'Add card to the pending credit card batch',
     'code' => '$cust_bill->batch_card();',
-- 
cgit v1.2.1


From bcc33ffd55343ce8c2e8f576997ce10018b9d716 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 25 Oct 2002 13:39:02 +0000
Subject: show export numbers

---
 httemplate/edit/part_svc.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 5fbec4f88..0ee0a468a 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -154,7 +154,7 @@ my %defs = (
       my @part_export =
         map { qsearch( 'part_export', {exporttype => $_ } ) }
           keys %{FS::part_export::export_info($layer)};
-     $html .= '<BR><BR>'. table().
+      $html .= '<BR><BR>'. table().
                table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
       foreach my $part_export ( @part_export ) {
         $html .= '<TD><INPUT TYPE="checkbox"'.
@@ -163,8 +163,8 @@ my %defs = (
           if qsearchs( 'export_svc', {
                                    exportnum => $part_export->exportnum,
                                    svcpart   => $clone || $part_svc->svcpart });
-        $html .= '> '. $part_export->exporttype. ' to '. $part_export->machine.
-                 '</TD>';
+        $html .= '>'. $part_export->exportnum. ': '.  $part_export->exporttype.
+                 ' to '. $part_export->machine. '</TD>';
         $count++;
         $html .= '</TR><TR>' unless $count % $columns;
       }
-- 
cgit v1.2.1


From 548a47b0ec1040320e56f17cfac71f716785cb95 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Nov 2002 23:29:38 +0000
Subject: bandwidth charges from sqlradius

---
 httemplate/edit/part_pkg.cgi | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 187578a35..6141c0083 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -356,7 +356,7 @@ tie my %plans, 'Tie::IxHash',
   },
 
   'sqlradacct_hour' => {
-    'name' => 'Base charge plus charge per-hour from an external sqlradius radacct table',
+    'name' => 'Base charge plus charge per-hour (and for data) from an external sqlradius radacct table',
     'fields' => {
       'setup_fee' => { 'name' => 'Setup fee for this package',
                        'default' => 0,
@@ -370,13 +370,34 @@ tie my %plans, 'Tie::IxHash',
       'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
                                  'default' => 0,
                                },
+      'recur_included_input' => { 'name' => 'Input megabytes included',
+                                  'default' => 0,
+                                },
+      'recur_input_charge' => { 'name' =>
+                                        'Additional charge per input megabyte',
+                                'default' => 0,
+                              },
+      'recur_included_output' => { 'name' => 'Output megabytes included',
+                                   'default' => 0,
+                                },
+      'recur_output_charge' => { 'name' =>
+                                       'Additional charge per output megabyte',
+                                'default' => 0,
+                              },
+      'recur_included_total' => { 'name' =>
+                                       'Total input+output megabytes included',
+                                  'default' => 0,
+                                },
+      'recur_total_charge' => { 'name' =>
+                                 'Additional charge per input+output megabyte',
+                                'default' => 0,
+                              },
     },
-    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
+    'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_input recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $hours = $cust_pkg->seconds_since_sqlradacct($cust_pkg->last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "Acct-Input-Octets" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "Acct-Output-Octets" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge + \' * $input + \' + what.recur_output_charge + \' * $output + \' + what.recur_total_charge + \' * $total ;\'',
   },
 
-
 ;
 
 my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-- 
cgit v1.2.1


From b4206f7dd4e3f00b1fac73245ade1d28388f2ad3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 Nov 2002 23:41:07 +0000
Subject: fix for correct radacct column names

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 6141c0083..bbecd0c52 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -395,7 +395,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_input recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "Acct-Input-Octets" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "Acct-Output-Octets" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge + \' * $input + \' + what.recur_output_charge + \' * $output + \' + what.recur_total_charge + \' * $total ;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctInputOctets" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctOutputOctets" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge + \' * $input + \' + what.recur_output_charge + \' * $output + \' + what.recur_total_charge + \' * $total ;\'',
   },
 
 ;
-- 
cgit v1.2.1


From 456021fddfef45aaf2d629af509fda9074db00cf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Nov 2002 03:58:42 +0000
Subject: data charging

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index bbecd0c52..be52e5b77 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -393,7 +393,7 @@ tie my %plans, 'Tie::IxHash',
                                 'default' => 0,
                               },
     },
-    'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_input recur_output_charge recur_included_total recur_total_charge )],
+    'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
     'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctInputOctets" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctOutputOctets" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge + \' * $input + \' + what.recur_output_charge + \' * $output + \' + what.recur_total_charge + \' * $total ;\'',
   },
-- 
cgit v1.2.1


From 928c6b2dbe79b079eb79eca941bc8f1e24dd5795 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 6 Nov 2002 04:11:44 +0000
Subject: data billing

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index be52e5b77..bea6dcb7f 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -395,7 +395,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctInputOctets" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctOutputOctets" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge + \' * $input + \' + what.recur_output_charge + \' * $output + \' + what.recur_total_charge + \' * $total ;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctInputOctets" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctOutputOctets" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge.value + \' * $input + \' + what.recur_output_charge.value + \' * $output + \' + what.recur_total_charge.value + \' * $total ;\'',
   },
 
 ;
-- 
cgit v1.2.1


From db7c28d12dae1ff90383fa64725893b198007865 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 9 Nov 2002 10:59:08 +0000
Subject: javascript quoting problem in per-hour charging

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index bea6dcb7f..1fd634961 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -395,7 +395,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctInputOctets" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, "AcctOutputOctets" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge.value + \' * $input + \' + what.recur_output_charge.value + \' * $output + \' + what.recur_total_charge.value + \' * $total ;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge.value + \' * $input + \' + what.recur_output_charge.value + \' * $output + \' + what.recur_total_charge.value + \' * $total ;\'',
   },
 
 ;
-- 
cgit v1.2.1


From b0995f6ec4eeaad9c72be4963970f1d69fe1ef02 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Nov 2002 10:15:37 +0000
Subject: preliminary ldap export

---
 httemplate/edit/part_export.cgi | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index bd427aa40..d64526dd4 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -70,6 +70,8 @@ my $widget = new HTML::Widgets::SelectLayers(
         $html .= qq!<TEXTAREA NAME="$option">$value</TEXTAREA>!;
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
+      } elsif ( $type eq 'checkbox' ) {
+        $html .= qq!<INPUT TYPE="checkbox" NAME="$option" VALUE="1">!;
       } else {
         $html .= "unknown type $type";
       }
-- 
cgit v1.2.1


From d9877cfc04344365f799b52057a13fc39c5743b7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Nov 2002 05:17:46 +0000
Subject: oops, remove 10 digit account number limit

---
 httemplate/edit/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 8f2fe7cee..c8db6b206 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -402,7 +402,7 @@ if ( $payby_default eq 'HIDE' ) {
 
   my %payby = (
     'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
 );
-- 
cgit v1.2.1


From 789c34c5251f4b831a7cb27bd2a9af700ccf2ced Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 19 Nov 2002 09:51:59 +0000
Subject: add LEC billing

---
 httemplate/edit/cust_main.cgi       | 6 ++++--
 httemplate/edit/part_bill_event.cgi | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index c8db6b206..5642604d2 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -353,7 +353,7 @@ if ( $payby_default eq 'HIDE' ) {
   print qq!<INPUT TYPE="hidden" NAME="invoicing_list" VALUE="!.
         join(', ', $cust_main->invoicing_list). '">';
 
-  foreach my $payby (qw( CARD CHEK BILL COMP )) {
+  foreach my $payby (qw( CARD CHEK LECB BILL COMP )) {
     foreach my $field (qw( payinfo payname )) {
       print qq!<INPUT TYPE="hidden" NAME="${payby}_$field" VALUE="!.
             $cust_main->getfield($field). '">';
@@ -403,6 +403,7 @@ if ( $payby_default eq 'HIDE' ) {
   my %payby = (
     'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
     'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+    'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
 );
@@ -412,12 +413,13 @@ if ( $payby_default eq 'HIDE' ) {
   my %paybychecked = (
     'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
     'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+    'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
 );
 
   $cust_main->payby($payby_default) unless $cust_main->payby;
-  for (qw(CARD CHEK BILL COMP)) {
+  for (qw(CARD CHEK LECB BILL COMP)) {
     print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
     if ($cust_main->payby eq "$_") {
       print qq! CHECKED> $paybychecked{$_}</TD>!;
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 70aca99eb..30a60ea41 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -41,7 +41,7 @@ print ntable("#cccccc",2), <<END;
 <TR><TD ALIGN="right">Payby</TD><TD><SELECT NAME="payby">
 END
 
-for (qw(CARD CHEK BILL COMP)) {
+for (qw(CARD CHEK LECB BILL COMP)) {
   print qq!<OPTION VALUE="$_"!;
   if ($part_bill_event->payby eq $_) {
     print " SELECTED>$_</OPTION>";
-- 
cgit v1.2.1


From 37dc3ebec42104e6ba77dae9a4d8dbdf31364678 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Nov 2002 11:14:04 +0000
Subject: add lec billing event

---
 httemplate/edit/part_bill_event.cgi | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 30a60ea41..2104b4530 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -114,6 +114,12 @@ tie my %events, 'Tie::IxHash',
     'weight' => 30,
   },
 
+  'realtime-lec' => {
+    'name' => 'Run phone bill ("LEC") billing with a <a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> realtime gateway',
+    'code' => '$cust_bill->realtime_lec();',
+    'weight' => 30,
+  },
+
   'batch-card' => {
     'name' => 'Add card to the pending credit card batch',
     'code' => '$cust_bill->batch_card();',
-- 
cgit v1.2.1


From f4ea75e514763082b64e1b3654cfbbba2ddf1c01 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 25 Nov 2002 10:46:55 +0000
Subject: fix disappearing radius group bug, whew

---
 httemplate/edit/svc_acct.cgi | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index c27bab88a..d4c9a738d 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -72,6 +72,12 @@ if ( $cgi->param('error') ) {
 
   }
 }
+
+#fixed radius groups always override & display
+if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
+  @groups = split(',', $part_svc->part_svc_column('usergroup')->columnvalue);
+}
+
 my $action = $svcnum ? 'Edit' : 'Add';
 
 my $svc = $part_svc->getfield('svc');
-- 
cgit v1.2.1


From 50dbca8812cac271c584cbe5629d4583cd11a01c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 16 Dec 2002 21:52:01 +0000
Subject: fix for Pg 7.3, are there others?

---
 httemplate/edit/part_svc.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 0ee0a468a..d0cc9b645 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -160,7 +160,8 @@ my %defs = (
         $html .= '<TD><INPUT TYPE="checkbox"'.
                  ' NAME="exportnum'. $part_export->exportnum. '"  VALUE="1" ';
         $html .= 'CHECKED'
-          if qsearchs( 'export_svc', {
+          if ( $clone || $part_svc->svcpart ) #null svcpart search causing error
+              && qsearchs( 'export_svc', {
                                    exportnum => $part_export->exportnum,
                                    svcpart   => $clone || $part_svc->svcpart });
         $html .= '>'. $part_export->exportnum. ': '.  $part_export->exporttype.
-- 
cgit v1.2.1


From db57fc8a00107bdbf5830b5c11b53dd0cfd7ec3b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Jan 2003 06:19:50 +0000
Subject: whitespace inconsistancy causing extraneous diffs

---
 httemplate/edit/part_svc.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index d0cc9b645..d4bb4704c 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -164,7 +164,7 @@ my %defs = (
               && qsearchs( 'export_svc', {
                                    exportnum => $part_export->exportnum,
                                    svcpart   => $clone || $part_svc->svcpart });
-        $html .= '>'. $part_export->exportnum. ': '.  $part_export->exporttype.
+        $html .= '>'. $part_export->exportnum. ': '. $part_export->exporttype.
                  ' to '. $part_export->machine. '</TD>';
         $count++;
         $html .= '</TR><TR>' unless $count % $columns;
-- 
cgit v1.2.1


From 27ee26568a1a58b0fb65b7269a43cd3da6d66b35 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Jan 2003 07:26:52 +0000
Subject: another Pg 7.3 fix

---
 httemplate/edit/part_export.cgi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index d64526dd4..bdf41e2b2 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -49,11 +49,11 @@ my $widget = new HTML::Widgets::SelectLayers(
       my $label = $optinfo->{label};
       my $type = defined($optinfo->{type}) ? $optinfo->{type} : 'text';
       my $value = $cgi->param($option)
-                  || $part_export->option($option)
-                  || ( (exists $optinfo->{default} && !$part_export->exportnum)
-                       ? $optinfo->{default}
-                       : ''
-                     );
+                 || ( $part_export->exportnum && $part_export->option($option) )
+                 || ( (exists $optinfo->{default} && !$part_export->exportnum)
+                      ? $optinfo->{default}
+                      : ''
+                    );
       $html .= qq!<TR><TD ALIGN="right">$label</TD><TD>!;
       if ( $type eq 'select' ) {
         $html .= qq!<SELECT NAME="$option">!;
-- 
cgit v1.2.1


From 0354f39ed0e74fd2eae1d9da13906625b4f56591 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 5 Feb 2003 23:17:17 +0000
Subject: svc_broadband rewrite

---
 httemplate/edit/part_router_field.cgi             |  70 ++++++
 httemplate/edit/part_sb_field.cgi                 |  79 +++++++
 httemplate/edit/process/addr_block/add.cgi        |  20 ++
 httemplate/edit/process/addr_block/allocate.cgi   |  25 +++
 httemplate/edit/process/addr_block/deallocate.cgi |  24 +++
 httemplate/edit/process/addr_block/split.cgi      |  19 ++
 httemplate/edit/process/generic.cgi               |  69 ++++++
 httemplate/edit/process/router.cgi                | 100 +++++++++
 httemplate/edit/process/svc_broadband.cgi         |  54 ++++-
 httemplate/edit/router.cgi                        |  88 ++++++++
 httemplate/edit/svc_broadband.cgi                 | 251 ++++++++++------------
 11 files changed, 646 insertions(+), 153 deletions(-)
 create mode 100644 httemplate/edit/part_router_field.cgi
 create mode 100644 httemplate/edit/part_sb_field.cgi
 create mode 100755 httemplate/edit/process/addr_block/add.cgi
 create mode 100755 httemplate/edit/process/addr_block/allocate.cgi
 create mode 100755 httemplate/edit/process/addr_block/deallocate.cgi
 create mode 100755 httemplate/edit/process/addr_block/split.cgi
 create mode 100644 httemplate/edit/process/generic.cgi
 create mode 100644 httemplate/edit/process/router.cgi
 create mode 100755 httemplate/edit/router.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_router_field.cgi b/httemplate/edit/part_router_field.cgi
new file mode 100644
index 000000000..c3e99be2c
--- /dev/null
+++ b/httemplate/edit/part_router_field.cgi
@@ -0,0 +1,70 @@
+<!-- mason kludge -->
+<%
+my ($routerfieldpart, $part_router_field);
+
+if ( $cgi->param('error') ) {
+  $part_router_field = new FS::part_router_field ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_router_field')});
+  $routerfieldpart = $part_router_field->routerfieldpart;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $routerfieldpart=$1;
+    $part_router_field=qsearchs('part_router_field',
+        {'routerfieldpart' => $routerfieldpart})
+      or die "Unknown routerfieldpart!";
+  
+  } else { #adding
+    $part_router_field = new FS::part_router_field({});
+  }
+}
+my $action = $part_router_field->routerfieldpart ? 'Edit' : 'Add';
+
+my $p1 = popurl(1);
+print header("$action Router Extended Field Definition", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+%>
+<FORM ACTION="<%=$p1%>process/generic.cgi" METHOD=POST>
+
+<INPUT TYPE="hidden" NAME="table" VALUE="part_router_field">
+<INPUT TYPE="hidden" NAME="redirect_ok" 
+    VALUE="<%=$p1%>part_router_field.cgi">
+<INPUT TYPE="hidden" NAME="routerfieldpart" VALUE="<%=
+  $routerfieldpart%>">
+Field #<B><%=$routerfieldpart or "(NEW)"%></B><BR><BR>
+
+<%=ntable("#cccccc",2)%>
+  <TR>
+    <TD ALIGN="right">Name</TD>
+    <TD><INPUT TYPE="text" NAME="name" MAXLENGTH=15 VALUE="<%=
+    $part_router_field->name%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Length</TD>
+    <TD><INPUT TYPE="text" NAME="length" MAXLENGTH=4 VALUE="<%=
+    $part_router_field->length%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">check_block</TD>
+    <TD><TEXTAREA COLS="20" ROWS="4" NAME="check_block"><%=
+    $part_router_field->check_block%></TEXTAREA></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">list_source</TD>
+    <TD><TEXTAREA COLS="20" ROWS="4" NAME="list_source"><%=
+    $part_router_field->list_source%></TEXTAREA></TD>
+  </TR>
+</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">
+
+</FORM>
+
+<BR><BR>
+<FONT SIZE=-2>If you don't understand what <I>check_block</I> and 
+<I>list_source</I> mean, <B>LEAVE THEM BLANK</B>.  We mean it.</FONT>
+
+
+</BODY>
+</HTML>
diff --git a/httemplate/edit/part_sb_field.cgi b/httemplate/edit/part_sb_field.cgi
new file mode 100644
index 000000000..9e0cc9e4f
--- /dev/null
+++ b/httemplate/edit/part_sb_field.cgi
@@ -0,0 +1,79 @@
+<!-- mason kludge -->
+<%
+my ($sbfieldpart, $part_sb_field);
+
+if ( $cgi->param('error') ) {
+  $part_sb_field = new FS::part_sb_field ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_sb_field')});
+  $sbfieldpart = $part_sb_field->sbfieldpart;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $sbfieldpart=$1;
+    $part_sb_field=qsearchs('part_sb_field',
+        {'sbfieldpart' => $sbfieldpart})
+      or die "Unknown sbfieldpart!";
+  
+  } else { #adding
+    $part_sb_field = new FS::part_sb_field({});
+  }
+}
+my $action = $part_sb_field->sbfieldpart ? 'Edit' : 'Add';
+
+my $p1 = popurl(1);
+print header("$action svc_broadband Extended Field Definition", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+%>
+<FORM ACTION="<%=$p1%>process/generic.cgi" METHOD="POST">
+
+<INPUT TYPE="hidden" NAME="table" VALUE="part_sb_field">
+<INPUT TYPE="hidden" NAME="redirect_ok" 
+    VALUE="<%=popurl(2)%>browse/part_sb_field.cgi">
+<INPUT TYPE="hidden" NAME="sbfieldpart" VALUE="<%=
+  $sbfieldpart%>">
+Field #<B><%=$sbfieldpart or "(NEW)"%></B><BR><BR>
+
+<%=ntable("#cccccc",2)%>
+  <TR>
+    <TD ALIGN="right">Name</TD>
+    <TD><INPUT TYPE="text" NAME="name" MAXLENGTH=15 VALUE="<%=
+    $part_sb_field->name%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Length</TD>
+    <TD><INPUT TYPE="text" NAME="length" MAXLENGTH=4 VALUE="<%=
+    $part_sb_field->length%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Service</TD>
+    <TD><SELECT SIZE=1 NAME="svcpart"><%
+      foreach my $part_svc (qsearch('part_svc', {svcdb => 'svc_broadband'})) {
+        %><OPTION VALUE="<%=$part_svc->svcpart%>"<%=
+	  ($part_svc->svcpart == $part_sb_field->svcpart) ? ' SELECTED' : ''%>">
+	  <%=$part_svc->svc%>
+      <% } %>
+      </SELECT></TD>
+  <TR>
+    <TD ALIGN="right">check_block</TD>
+    <TD><TEXTAREA COLS="20" ROWS="4" NAME="check_block"><%=
+    $part_sb_field->check_block%></TEXTAREA></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">list_source</TD>
+    <TD><TEXTAREA COLS="20" ROWS="4" NAME="list_source"><%=
+    $part_sb_field->list_source%></TEXTAREA></TD>
+  </TR>
+</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">
+
+</FORM>
+
+<BR><BR>
+<FONT SIZE=-2>If you don't understand what <I>check_block</I> and 
+<I>list_source</I> mean, <B>LEAVE THEM BLANK</B>.  We mean it.</FONT>
+
+
+</BODY>
+</HTML>
diff --git a/httemplate/edit/process/addr_block/add.cgi b/httemplate/edit/process/addr_block/add.cgi
new file mode 100755
index 000000000..34d799ccd
--- /dev/null
+++ b/httemplate/edit/process/addr_block/add.cgi
@@ -0,0 +1,20 @@
+<%
+
+my $error = '';
+my $ip_gateway = $cgi->param('ip_gateway');
+my $ip_netmask = $cgi->param('ip_netmask');
+
+my $new = new FS::addr_block {
+    ip_gateway => $ip_gateway,
+    ip_netmask => $ip_netmask,
+    routernum  => 0 };
+
+$error = $new->insert;
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi?". $cgi->query_string );
+} else { 
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi");
+} 
+%>
diff --git a/httemplate/edit/process/addr_block/allocate.cgi b/httemplate/edit/process/addr_block/allocate.cgi
new file mode 100755
index 000000000..85b0d7a7a
--- /dev/null
+++ b/httemplate/edit/process/addr_block/allocate.cgi
@@ -0,0 +1,25 @@
+<%
+my $error = '';
+my $blocknum = $cgi->param('blocknum');
+my $routernum = $cgi->param('routernum');
+
+my $addr_block = qsearchs('addr_block', { blocknum => $blocknum });
+my $router = qsearchs('router', { routernum => $routernum });
+
+if($addr_block) {
+  if ($router) {
+    $error = $addr_block->allocate($router);
+  } else {
+    $error = "Cannot find router with routernum $routernum";
+  }
+} else {
+  $error = "Cannot find block with blocknum $blocknum";
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi?" . $cgi->query_string);
+} else { 
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi");
+}
+%>
diff --git a/httemplate/edit/process/addr_block/deallocate.cgi b/httemplate/edit/process/addr_block/deallocate.cgi
new file mode 100755
index 000000000..cfb7ed04d
--- /dev/null
+++ b/httemplate/edit/process/addr_block/deallocate.cgi
@@ -0,0 +1,24 @@
+<%
+my $error = '';
+my $blocknum = $cgi->param('blocknum');
+
+my $addr_block = qsearchs('addr_block', { blocknum => $blocknum });
+
+if($addr_block) {
+  my $router = $addr_block->router;
+  if ($router) {
+    $error = $addr_block->deallocate($router);
+  } else {
+    $error = "Block is not allocated to a router";
+  }
+} else {
+  $error = "Cannot find block with blocknum $blocknum";
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi?" . $cgi->query_string);
+} else { 
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi");
+}
+%>
diff --git a/httemplate/edit/process/addr_block/split.cgi b/httemplate/edit/process/addr_block/split.cgi
new file mode 100755
index 000000000..bb6d4ba3e
--- /dev/null
+++ b/httemplate/edit/process/addr_block/split.cgi
@@ -0,0 +1,19 @@
+<%
+my $error = '';
+my $blocknum = $cgi->param('blocknum');
+my $addr_block = qsearchs('addr_block', { blocknum => $blocknum });
+
+if ( $addr_block) {
+  $error = $addr_block->split_block;
+} else {
+  $error = "Unknown blocknum: $blocknum";
+}
+
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi?". $cgi->query_string );
+} else { 
+  print $cgi->redirect(popurl(4). "browse/addr_block.cgi");
+} 
+%>
diff --git a/httemplate/edit/process/generic.cgi b/httemplate/edit/process/generic.cgi
new file mode 100644
index 000000000..751987f7a
--- /dev/null
+++ b/httemplate/edit/process/generic.cgi
@@ -0,0 +1,69 @@
+<%
+
+# Welcome to generic.cgi.
+# 
+# This script provides a generic edit/process/ backend for simple table 
+# editing.  All it knows how to do is take the values entered into 
+# the script and insert them into the table specified by $cgi->param('table').
+# If there's an existing record with the same primary key, it will be 
+# replaced.  (Deletion will be added in the future.)
+# 
+# Special cgi params for this script:
+# table: the name of the table to be edited.  The script will die horribly 
+#        if it can't find the table.
+# redirect_ok: URL to be displayed after a successful edit.  The value of 
+#              the record's primary key will be passed as a keyword.
+#              Defaults to (freeside root)/view/$table.cgi.
+# redirect_error: URL to be displayed if there's an error.  The original 
+#                 query string, plus the error message, will be passed.
+#                 Defaults to $cgi->referer() (i.e. go back where you 
+#                 came from).
+
+
+use FS::Record qw(qsearchs dbdef);
+use DBIx::DBSchema;
+use DBIx::DBSchema::Table;
+
+
+my $error;
+my $p2 = popurl(2);
+my $table = $cgi->param('table');
+my $dbdef = dbdef or die "Cannot fetch dbdef!";
+
+my $dbdef_table = $dbdef->table($table) or die "Cannot fetch schema for $table";
+
+my $pkey = $dbdef_table->primary_key or die "Cannot fetch pkey for $table";
+my $pkey_val = $cgi->param($pkey);
+
+
+#warn "new FS::Record ( $table, (hashref) )";
+my $new = FS::Record::new ( "FS::$table", {
+    map { $_, scalar($cgi->param($_)) } fields($table) 
+} );
+
+#warn 'created $new of class '.ref($new);
+
+if($pkey_val and (my $old = qsearchs($table, { $pkey, $pkey_val} ))) {
+  # edit
+  $error = $new->replace($old);
+} else {
+  #add
+  $error = $new->insert;
+  $pkey_val = $new->getfield($pkey);
+  # New records usually don't have their primary keys set until after 
+  # they've been checked/inserted, so grab the new $pkey_val so we can 
+  # redirect to it.
+}
+
+my $redirect_ok = (($cgi->param('redirect_ok')) ?
+                    $cgi->param('redirect_ok') : $p2."view/$table.cgi");
+my $redirect_error = (($cgi->param('redirect_error')) ?
+                       $cgi->param('redirect_error') : $cgi->referer());
+
+if($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect($redirect_error . '?' . $cgi->query_string);
+} else {
+  print $cgi->redirect($redirect_ok . '?' .$pkey_val);
+}
+%>
diff --git a/httemplate/edit/process/router.cgi b/httemplate/edit/process/router.cgi
new file mode 100644
index 000000000..c0cb884f0
--- /dev/null
+++ b/httemplate/edit/process/router.cgi
@@ -0,0 +1,100 @@
+<%
+
+use FS::UID qw(dbh);
+
+my $dbh = dbh;
+local $FS::UID::AutoCommit=0;
+
+sub check {
+  my $error = shift;
+  if($error) {
+    $cgi->param('error', $error);
+    print $cgi->redirect(popurl(3) . "edit/router.cgi?". $cgi->query_string);
+    $dbh->rollback;
+    exit;
+  }
+}
+
+my $error = '';
+my $routernum  = $cgi->param('routernum');
+my $routername = $cgi->param('routername');
+my $old = qsearchs('router', { routernum => $routernum });
+my @old_rf;
+my @old_psr;
+
+my $new = new FS::router {
+    routernum  => $routernum,
+    routername => $routername,
+    svcnum     => 0
+    };
+
+if($old) {
+  if($old->routername ne $new->routername) {
+    $error = $new->replace($old);
+  } #else do nothing
+} else {
+  $error = $new->insert;
+}
+
+check($error);
+
+if ($old) {
+  @old_psr = $old->part_svc_router;
+  foreach $psr (@old_psr) {
+    if($cgi->param('svcpart_'.$psr->svcpart) eq 'ON') {
+      # do nothing
+    } else {
+      $error = $psr->delete;
+    }
+  }
+  check($error);
+  @old_rf = $old->router_field;
+  foreach $rf (@old_rf) {
+    if(my $new_val = $cgi->param('rf_'.$rf->routerfieldpart)) {
+      if($new_val ne $rf->value) {
+        my $new_rf = new FS::router_field 
+	  { routernum       => $routernum,
+	    value           => $new_val,
+	    routerfieldpart => $rf->routerfieldpart };
+	$error = $new_rf->replace($rf);
+      } #else do nothing
+    } else {
+      $error = $rf->delete;
+    }
+    check($error);
+  }
+}
+
+foreach($cgi->param) {
+  if($cgi->param($_) eq 'ON' and /^svcpart_(\d+)$/) {
+    my $svcpart = $1;
+    if(grep {$_->svcpart == $svcpart} @old_psr) {
+      # do nothing
+    } else {
+      my $new_psr = new FS::part_svc_router { svcpart   => $svcpart,
+                                              routernum => $routernum };
+      $error = $new_psr->insert;
+    }
+    check($error);
+  } elsif($cgi->param($_) ne '' and /^rf_(\d+)$/) {
+    my $part = $1;
+    if(my @x = grep {$_->routerfieldpart == $part} @old_rf) {
+      # already handled all of these
+    } else {
+      my $new_rf = new FS::router_field
+        { routernum       => $routernum,
+	  value           => $cgi->param('rf_'.$part),
+	  routerfieldpart => $part };
+      $error = $new_rf->insert;
+      check($error);
+    }
+  }
+}
+
+
+
+# Yay, everything worked!
+$dbh->commit or die $dbh->errstr;
+print $cgi->redirect(popurl(3). "edit/router.cgi?$routernum");
+
+%>
diff --git a/httemplate/edit/process/svc_broadband.cgi b/httemplate/edit/process/svc_broadband.cgi
index fd7ba20d5..ab8b9f9d8 100644
--- a/httemplate/edit/process/svc_broadband.cgi
+++ b/httemplate/edit/process/svc_broadband.cgi
@@ -1,12 +1,19 @@
 <%
 
+# If it's stupid but it works, it's not stupid.
+# -- U.S. Army
+
+local $FS::UID::AutoCommit = 0;
+my $dbh = FS::UID::dbh;
+
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my $svcnum = $1;
 
-my $old;
+my $old; my @old_sbf;
 if ( $svcnum ) {
   $old = qsearchs('svc_broadband', { 'svcnum' => $svcnum } )
     or die "fatal: can't find broadband service (svcnum $svcnum)!";
+  @old_sbf = $old->sb_field;
 } else {
   $old = '';
 }
@@ -17,14 +24,6 @@ my $new = new FS::svc_broadband ( {
   } ( fields('svc_broadband'), qw( pkgnum svcpart ) )
 } );
 
-unless ( $new->ip_addr ) {
-  $new->ip_addr(join('.', (map $cgi->param('ip_addr_'.$_), (a..d))));
-}
-
-unless ( $new->mac_addr) {
-  $new->mac_addr(join(':', (map $cgi->param('mac_addr_'.$_), (a..f))));
-}
-
 my $error;
 if ( $svcnum ) {
   $error = $new->replace($old);
@@ -33,12 +32,47 @@ if ( $svcnum ) {
   $svcnum = $new->svcnum;
 }
 
+unless ($error) {
+  my $sb_field;
+
+  foreach ($cgi->param) {
+    #warn "\$cgi->param $_: " . $cgi->param($_);
+    if(/^sbf_(\d+)/) {
+      my $part = $1;
+      #warn "\$part $part";
+      $sb_field = new FS::sb_field 
+        { svcnum      => $svcnum,
+          value       => $cgi->param($_),
+          sbfieldpart => $part };
+      if (my @x = grep { $_->sbfieldpart eq $part } @old_sbf) {
+      #if (my $old_sb_field = (grep { $_->sbfieldpart eq $part} @old_Sbf)[0]) {
+        #warn "array: " . scalar(@x);
+        if (length($sb_field->value) && ($sb_field->value ne $x[0]->value)) { 
+          #warn "replacing " . $x[0]->value . " with " . $sb_field->value;
+          $error = $sb_field->replace($x[0]);
+          #$error = $sb_field->replace($old_sb_field);
+        } elsif (length($sb_field->value) == 0) { 
+          #warn "delete";
+          $error = $x[0]->delete;
+        }
+      } else {
+        if (length($sb_field->value) > 0) { 
+          #warn "insert";
+          $error = $sb_field->insert;
+        }
+        # else do nothing
+      }
+    }
+  }
+}
+
 if ( $error ) {
   $cgi->param('error', $error);
   $cgi->param('ip_addr', $new->ip_addr);
-  $cgi->param('mac_addr', $new->mac_addr);
+  $dbh->rollback;
   print $cgi->redirect(popurl(2). "svc_broadband.cgi?". $cgi->query_string );
 } else {
+  $dbh->commit or die $dbh->errstr;
   print $cgi->redirect(popurl(3). "view/svc_broadband.cgi?" . $svcnum );
 }
 
diff --git a/httemplate/edit/router.cgi b/httemplate/edit/router.cgi
new file mode 100755
index 000000000..d2279ff00
--- /dev/null
+++ b/httemplate/edit/router.cgi
@@ -0,0 +1,88 @@
+<HTML><BODY>
+
+<%
+
+my $router;
+if ( $cgi->keywords ) {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $router = qsearchs('router', { routernum => $1 }) 
+      or print $cgi->redirect(popurl(2)."browse/router.cgi") ;
+} else {
+  $router = new FS::router ( {
+    map { $_, scalar($cgi->param($_)) } fields('router')
+  } );
+}
+
+my $routernum = $router->routernum;
+my $action = $routernum ? 'Edit' : 'Add';
+my $hashref = $router->hashref;
+
+print header("$action Router", menubar(
+  'Main Menu' => "$p",
+  'View all routers' => "${p}browse/router.cgi",
+));
+
+if($cgi->param('error')) {
+%> <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT>
+<% } %>
+
+<FORM ACTION="<%=popurl(1)%>process/router.cgi" METHOD=POST>
+  <INPUT TYPE="hidden" NAME="routernum" VALUE="<%=$routernum%>">
+    Router #<%=$routernum or "(NEW)"%>
+
+<BR><BR>Name <INPUT TYPE="text" NAME="routername" SIZE=32 VALUE="<%=$hashref->{routername}%>">
+<%=table() %>
+
+<%
+# I know, I know.  Massive false laziness with edit/svc_broadband.cgi.  But 
+# Kristian won't let me generalize the custom field mechanism to every table in 
+# the database, so this is what we get.  <snarl>
+# -- MW
+
+my @part_router_field = qsearch('part_router_field', { });
+my %rf = map { $_->part_router_field->name, $_->value } $router->router_field;
+foreach (sort { $a->name cmp $b->name } @part_router_field) {
+  %>
+  <TR>
+    <TD ALIGN="right"><%=$_->name%></TD>
+    <TD><%
+  if(my @opts = $_->list_values) {
+    %>  <SELECT NAME="rf_<%=$_->routerfieldpart%>" SIZE="1">
+          <%
+    foreach $opt (@opts) {
+      %>  <OPTION VALUE="<%=$opt%>"<%=($opt eq $rf{$_->name}) 
+              ? ' SELECTED' : ''%>>
+            <%=$opt%>
+	  </OPTION>
+   <% } %>
+	</SELECT>
+ <% } else { %>
+        <INPUT NAME="rf_<%=$_->routerfieldpart%>"
+        VALUE="<%=$rf{$_->name}%>"
+        <%=$_->length ? 'SIZE="'.$_->length.'"' : ''%>>
+  <% } %></TD>
+  </TR>
+<% } %>
+</TABLE>
+
+
+
+<BR><BR>Select the service types available on this router<BR>
+<%
+
+foreach my $part_svc ( qsearch('part_svc', { svcdb    => 'svc_broadband',
+                                             disabled => '' }) ) {
+  %>
+  <BR>
+  <INPUT TYPE="checkbox" NAME="svcpart_<%=$part_svc->svcpart%>"<%=
+      qsearchs('part_svc_router', { svcpart   => $part_svc->svcpart, 
+                                    routernum => $routernum } ) ? 'CHECKED' : ''%> VALUE="ON">
+  <A HREF="<%=${p}%>edit/part_svc.cgi?<%=$part_svc->svcpart%>">
+    <%=$part_svc->svcpart%>: <%=$part_svc->svc%></A>
+  <% } %>
+
+  <BR><BR><INPUT TYPE="submit" VALUE="Apply changes">
+  </FORM>
+</BODY></HTML>
+
diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index d8a1f7a2a..f017d7a6e 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -1,6 +1,13 @@
 <!-- mason kludge -->
 <%
 
+# If it's stupid but it works, it's still stupid.
+#  -Kristian
+
+
+use HTML::Widgets::SelectLayers;
+use Tie::IxHash;
+
 my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_broadband );
 if ( $cgi->param('error') ) {
   $svc_broadband = new FS::svc_broadband ( {
@@ -38,6 +45,8 @@ if ( $cgi->param('error') ) {
     $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
     die "No part_svc entry!" unless $part_svc;
 
+    $svc_broadband->setfield('svcpart', $svcpart);
+
     $svcnum='';
 
     #set fixed and default fields from part_svc
@@ -53,12 +62,9 @@ if ( $cgi->param('error') ) {
 }
 my $action = $svc_broadband->svcnum ? 'Edit' : 'Add';
 
-my @ac_list;
-
 if ($pkgnum) {
 
-  unless ($svc_broadband->actypenum) {die "actypenum must be set fixed";};
-  @ac_list = qsearch('ac', { actypenum => $svc_broadband->getfield('actypenum') });
+  #Nothing?
 
 } elsif ( $action eq 'Edit' ) {
 
@@ -68,152 +74,111 @@ if ($pkgnum) {
   die "\$action eq Add, but \$pkgnum is null!\n";
 }
 
-
 my $p1 = popurl(1);
-print header("Broadband Service $action", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/svc_broadband.cgi" METHOD=POST>!;
-
-#display
-
- 
-
-#svcnum
-print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
-print qq!Service #<B>!, $svcnum ? $svcnum : "(NEW)", "</B><BR><BR>";
-
-#pkgnum
-print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
- 
-#svcpart
-print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
-
-#actypenum
-print '<INPUT TYPE="hidden" NAME="actypenum" VALUE="' .
-      $svc_broadband->actypenum . '">';
-
-
-print &ntable("#cccccc",2) . qq!<TR><TD ALIGN="right">AC</TD><TD>!;
-
-#acnum
-if (( $part_svc->part_svc_column('acnum')->columnflag eq 'F' ) or
-    ( !$pkgnum )) {
-
-  my $ac = qsearchs('ac', { acnum => $svc_broadband->acnum });
-  my ($acnum, $acname) = ($ac->acnum, $ac->acname);
-
-  print qq!<INPUT TYPE="hidden" NAME="acnum" VALUE="${acnum}">! .
-        qq!${acnum}: ${acname}</TD></TR>!;
-
-} else {
-
-  my @ac_list = qsearch('ac', { actypenum => $svc_broadband->actypenum });
-  print qq!<SELECT NAME="acnum" SIZE="1"><OPTION VALUE=""></OPTION>!;
-
-  foreach ( @ac_list ) {
-    my ($acnum, $acname) = ($_->acnum, $_->acname);
-    print qq!<OPTION VALUE="${acnum}"! .
-          ($acnum == $svc_broadband->acnum ? ' SELECTED>' : '>') .
-          qq!${acname}</OPTION>!;
-  }
-  print '</TD></TR>';
-
-}
-
-#speed_up & speed_down
-my ($speed_up, $speed_down) = ($svc_broadband->speed_up,
-                               $svc_broadband->speed_down);
 
-print '<TR><TD ALIGN="right">Download speed</TD><TD>';
-if ( $part_svc->part_svc_column('speed_down')->columnflag eq 'F' ) {
-  print qq!<INPUT TYPE="hidden" NAME="speed_down" VALUE="${speed_down}">! .
-        qq!${speed_down}Kbps</TD></TR>!;
-} else {
-  print qq!<INPUT TYPE="text" NAME="speed_down" SIZE=5 VALUE="${speed_down}">! .
-        qq!Kbps</TD></TR>!;
-}
-
-print '<TR><TD ALIGN="right">Upload speed</TD><TD>';
-if ( $part_svc->part_svc_column('speed_up')->columnflag eq 'F' ) {
-  print qq!<INPUT TYPE="hidden" NAME="speed_up" VALUE="${speed_up}">! .
-        qq!${speed_up}Kbps</TD></TR>!;
-} else {
-  print qq!<INPUT TYPE="text" NAME="speed_up" SIZE=5 VALUE="${speed_up}">! .
-        qq!Kbps</TD></TR>!;
-}
+my ($ip_addr, $speed_up, $speed_down, $blocknum) =
+    ($svc_broadband->ip_addr,
+     $svc_broadband->speed_up,
+     $svc_broadband->speed_down,
+     $svc_broadband->blocknum);
 
-#ip_addr & ip_netmask
-#We're assuming that ip_netmask is fixed if ip_addr is fixed.
-#If it isn't, well, <shudder> what the heck are you doing!?!?
-
-my ($ip_addr, $ip_netmask) = ($svc_broadband->ip_addr,
-                              $svc_broadband->ip_netmask);
-
-print '<TR><TD ALIGN="right">IP address/Mask</TD><TD>';
-if ( $part_svc->part_svc_column('ip_addr')->columnflag eq 'F' ) {
-  print qq!<INPUT TYPE="hidden" NAME="ip_addr" VALUE="${ip_addr}">! .
-        qq!<INPUT TYPE="hidden" NAME="ip_netmask" VALUE="${ip_netmask}">! .
-        qq!${ip_addr}/${ip_netmask}</TD></TR>!;
-} else {
-  $ip_addr =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/;
-  print <<END;
-  <INPUT TYPE="text" NAME="ip_addr_a" SIZE="3" MAXLENGTH="3" VALUE="${1}">.
-  <INPUT TYPE="text" NAME="ip_addr_b" SIZE="3" MAXLENGTH="3" VALUE="${2}">.
-  <INPUT TYPE="text" NAME="ip_addr_c" SIZE="3" MAXLENGTH="3" VALUE="${3}">.
-  <INPUT TYPE="text" NAME="ip_addr_d" SIZE="3" MAXLENGTH="3" VALUE="${4}">/
-  <INPUT TYPE="text" NAME="ip_netmask" SIZE="2" MAXLENGTH="2" VALUE="${ip_netmask}">
-</TD></TR>
-<TR><TD COLSPAN="2" WIDTH="300">
-<P><SMALL>Leave the IP address and netmask blank for automatic assignment of a /32 address.  Specifing the netmask and not the address will force assignment of a larger block.</SMALL></P>
-</TD></TR>
-END
-}
-
-#mac_addr
-my $mac_addr = $svc_broadband->mac_addr;
-
-unless (( $part_svc->part_svc_column('mac_addr')->columnflag eq 'F' ) and
-        ( $mac_addr eq '' )) {
-  print '<TR><TD ALIGN="right">MAC Address</TD><TD>';
-  if ( $part_svc->part_svc_column('mac_addr')->columnflag eq 'F' ) { #Why?
-    print qq!<INPUT TYPE="hidden" NAME="mac_addr" VALUE="${mac_addr}">! .
-          qq!${mac_addr}</TD></TR>!;
-  } else {
-    #Ewwww
-    $mac_addr =~ /^([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2})$/i;
-    print <<END;
-  <INPUT TYPE="text" NAME="mac_addr_a" SIZE="2" MACLENGTH="2" VALUE="${1}">:
-  <INPUT TYPE="text" NAME="mac_addr_b" SIZE="2" MACLENGTH="2" VALUE="${2}">:
-  <INPUT TYPE="text" NAME="mac_addr_c" SIZE="2" MACLENGTH="2" VALUE="${3}">:
-  <INPUT TYPE="text" NAME="mac_addr_d" SIZE="2" MACLENGTH="2" VALUE="${4}">:
-  <INPUT TYPE="text" NAME="mac_addr_e" SIZE="2" MACLENGTH="2" VALUE="${5}">:
-  <INPUT TYPE="text" NAME="mac_addr_f" SIZE="2" MACLENGTH="2" VALUE="${6}">
-</TD></TR>
-END
+%>
 
+<%=header("Broadband Service $action", '')%>
+
+<% if ($cgi->param('error')) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT><BR>
+<% } %>
+
+Service #<B><%=$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
+
+<FORM ACTION="<%=${p1}%>process/svc_broadband.cgi" METHOD=POST>
+  <INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
+  <INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%=$pkgnum%>">
+  <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%=$svcpart%>">
+  <INPUT TYPE="hidden" NAME="ip_addr" VALUE="<%=$ip_addr%>">
+
+  <%=&ntable("#cccccc",2)%>
+
+    <TR>
+      <TD ALIGN="right">Download speed</TD>
+      <TD BGCOLOR="#ffffff">
+<% if ( $part_svc->part_svc_column('speed_down')->columnflag eq 'F' ) { %>
+        <INPUT TYPE="hidden" NAME="speed_down" VALUE="<%=$speed_down%>"><%=$speed_down%>Kbps
+<% } else { %>
+    <INPUT TYPE="text" NAME="speed_down" SIZE=5 VALUE="<%=$speed_down%>">Kbps
+<% } %>
+      </TD>
+    </TR>
+    <TR>
+      <TD ALIGN="right">Upload speed</TD>
+      <TD BGCOLOR="#ffffff">
+<% if ( $part_svc->part_svc_column('speed_up')->columnflag eq 'F' ) { %>
+        <INPUT TYPE="hidden" NAME="speed_up" VALUE="<%=$speed_up%>"><%=$speed_up%>Kbps
+<% } else { %>
+        <INPUT TYPE="text" NAME="speed_up" SIZE=5 VALUE="<%=$speed_up%>">Kbps
+<% } %>
+      </TD>
+    </TR>
+<% if ($action eq 'Add') { %>
+    <TR>
+      <TD ALIGN="right">Router/Block</TD>
+      <TD BGCOLOR="#ffffff">
+        <SELECT NAME="blocknum">
+<%
+  foreach my $router ($svc_broadband->allowed_routers) {
+    foreach my $addr_block ($router->addr_block) {
+%>
+        <OPTION VALUE="<%=$addr_block->blocknum%>"<%=($addr_block->blocknum eq $blocknum) ? ' SELECTED' : ''%>>
+          <%=$router->routername%>:<%=$addr_block->ip_gateway%>/<%=$addr_block->ip_netmask%></OPTION>
+<%
+    }
   }
-}
-
-#location
-my $location = $svc_broadband->location;
+%>
+        </SELECT>
+      </TD>
+    </TR>
+<% } else { %>
 
-print '<TR><TD VALIGN="top" ALIGN="right">Location</TD><TD BGCOLOR="#e8e8e8">';
-if ( $part_svc->part_svc_column('location')->columnflag eq 'F' ) {
-  print qq!<PRE>${location}</PRE></TD></TR>!;
-} else {
-  print qq!<TEXTAREA ROWS="4" COLS="30" NAME="location">${location}</TEXTAREA>!;
-}
+    <TR>
+      <TD ALIGN="right">Router/Block</TD>
+      <TD BGCOLOR="#ffffff">
+        <%=$svc_broadband->addr_block->router->routername%>:<%=$svc_broadband->addr_block->NetAddr%>
+        <INPUT TYPE="hidden" NAME="blocknum" VALUE="<%=$svc_broadband->blocknum%>">
+      </TD>
+    </TR>
 
-print '</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">';
+<% } %>
 
-print <<END;
+<%
 
-    </FORM>
-  </BODY>
+  my @part_sb_field = qsearch('part_sb_field', { svcpart => $svcpart });
+  my $sbf_hashref = $svc_broadband->sb_field_hashref($svcpart);
+  foreach (sort { $a->name cmp $b->name } @part_sb_field) {
+    %>
+    <TR>
+      <TD ALIGN="right"><%=$_->name%></TD>
+      <TD><%
+      if(my @opts = $_->list_values) {
+        %>
+	<SELECT NAME="sbf_<%=$_->sbfieldpart%>" SIZE=1> <%
+        foreach $opt (@opts) { %>
+          <OPTION VALUE="<%=$opt%>"<%=
+	    ($opt eq $sbf_hashref->{$_->name}) ? ' SELECTED' : ''%>>
+	    <%=$opt%></OPTION><%
+        } %></SELECT>
+   <% } else { %>
+        <INPUT NAME="sbf_<%=$_->sbfieldpart%>"
+	    VALUE="<%=$sbf_hashref->{$_->name}%>"
+     <%=$_->length ? 'SIZE="'.$_->length.'"' : ''%>>
+   <% } %>
+      </TD>
+    </TR>
+<% } %>
+  </TABLE>
+  <BR>
+  <INPUT TYPE="submit" NAME="submit" VALUE="Submit">
+</FORM>
+</BODY>
 </HTML>
-END
-%>
+
-- 
cgit v1.2.1


From 6e2dcb26245ef419438f60e99c91873a8d762625 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 5 Feb 2003 23:23:00 +0000
Subject: svc_broadband rewrite

---
 httemplate/edit/ac.cgi                    | 163 ------------------------------
 httemplate/edit/ac_type.cgi               | 106 -------------------
 httemplate/edit/process/ac.cgi            |  28 -----
 httemplate/edit/process/ac_block.cgi      |  21 ----
 httemplate/edit/process/ac_field.cgi      |  21 ----
 httemplate/edit/process/ac_type.cgi       |  28 -----
 httemplate/edit/process/part_ac_field.cgi |  21 ----
 7 files changed, 388 deletions(-)
 delete mode 100755 httemplate/edit/ac.cgi
 delete mode 100755 httemplate/edit/ac_type.cgi
 delete mode 100755 httemplate/edit/process/ac.cgi
 delete mode 100755 httemplate/edit/process/ac_block.cgi
 delete mode 100755 httemplate/edit/process/ac_field.cgi
 delete mode 100755 httemplate/edit/process/ac_type.cgi
 delete mode 100755 httemplate/edit/process/part_ac_field.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/ac.cgi b/httemplate/edit/ac.cgi
deleted file mode 100755
index 86b05a4a1..000000000
--- a/httemplate/edit/ac.cgi
+++ /dev/null
@@ -1,163 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my($ac);
-if ( $cgi->param('error') ) {
-  $ac = new FS::ac ( {
-    map { $_, scalar($cgi->param($_)) } fields('ac')
-  } );
-} elsif ( $cgi->keywords ) { #editing
-  my( $query ) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $ac=qsearchs('ac',{'acnum'=>$1});
-} else { #adding
-  $ac = new FS::ac {};
-}
-my $action = $ac->acnum ? 'Edit' : 'Add';
-my $hashref = $ac->hashref;
-
-print header("$action Access Concentrator", menubar(
-  'Main Menu' => "$p",
-  'View all access concentrators' => "${p}browse/ac.cgi",
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print '<FORM ACTION="', popurl(1), 'process/ac.cgi" METHOD=POST>',
-      qq!<INPUT TYPE="hidden" NAME="acnum" VALUE="$hashref->{acnum}">!,
-      "Access Concentrator #", $hashref->{acnum} ? $hashref->{acnum} : "(NEW)";
-
-print <<END;
-
-<TABLE COLOR="#cccccc">
-  <TR>
-    <TH ALIGN="RIGHT">Access Concentrator</TH>
-    <TD>
-      <INPUT TYPE="text" NAME="acname" SIZE=15 VALUE="$hashref->{acname}">
-    </TD>
-  </TD>
-END
-
-
-if (! $ac->acnum) {
-  print <<END;
-  <TR>
-    <TH ALIGN="RIGHT">Access Concentrator Type</TH>
-    <TD><SELECT NAME="actypenum" SIZE="1"><OPTION VALUE=""></OPTION>
-END
-
-  foreach (qsearch('ac_type', {})) {
-    my $narf = $_->hashref;
-    print qq!<OPTION! .
-          ($narf->{actypenum} eq $hashref->{actypenum} ? ' SELECTED' : '') .
-          qq! VALUE="$narf->{actypenum}">$narf->{actypenum}: $narf->{actypename}! .
-          qq!</OPTION>!;
-  }
-
-  print '</TD></TR></TABLE>';
-} else {
-  print '</TABLE>';
-  print qq!<INPUT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">!;
-}
-
-print qq!</TABLE><BR><BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{acnum} ? "Apply changes" : "Add access concentrator",
-      qq!"></FORM>!;
-
-if ($hashref->{acnum}) {
-  print table();
-  print <<END;
-    Additional Fields:<BR>
-    <TH>
-      <TD>Field Name</TD>
-      <TD COLSPAN=2>Field Value</TD>
-    </TH>
-END
-
-  #my @ac_fields = qsearch('ac_field', { acnum => $hashref->{acnum} });
-  my @ac_fields = $ac->ac_field;
-  foreach (@ac_fields) {
-    print qq!\n<TR><TD></TD>!;
-    my $part_ac_field = qsearchs('part_ac_field',
-                          { acfieldpart => $_->getfield('acfieldpart') });
-    print '<TD>' . $part_ac_field->getfield('name') .
-          '</TD><TD>' . $_->getfield('value') . '</TD></TR>';
-    print "\n";
-  }
-
-  print '<FORM ACTION="', popurl(1), 'process/ac_field.cgi" METHOD=POST>';
-  print <<END;
-    <TR>
-      <TD><INPUT TYPE="hidden" NAME="acnum" VALUE="$hashref->{acnum}">
-          <INPUT TYPE="hidden" NAME="acname" VALUE="$hashref->{acname}">
-          <INPuT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">
-          <SMALL>(NEW)</SMALL>
-      </TD>
-      <TD><SELECT NAME="acfieldpart"><OPTION></OPTION>
-END
-
-  my @part_ac_fields = qsearch('part_ac_field',
-                         { actypenum => $hashref->{actypenum} });
-  foreach my $part_ac_field (@part_ac_fields) {
-    my $acfieldpart = $part_ac_field->getfield('acfieldpart');
-    if (grep {$_->getfield('acfieldpart') eq $acfieldpart} @ac_fields) {next;}
-    print qq!<OPTION VALUE="${acfieldpart}">! .
-          $part_ac_field->getfield('name') . '</OPTION>';
-  }
-
-  print <<END;
-        </SELECT>
-      </TD>
-      <TD><INPUT TYPE="text" SIZE="15" NAME="value"></TD>
-      <TD><INPUT TYPE="submit" VALUE="Add"></TD>
-    </TR>
-    </FORM>
-  </TABLE>
-END
-
-}
-
-if ($hashref->{acnum}) {
-
-  print qq!<BR><BR>IP Address Blocks:<BR>! . table() .
-        qq!<TR><TH></TH><TH>Network/Mask</TH>! .
-        qq!<TH>Gateway Address</TH><TH>Mask length</TH></TR>\n!;
-
-  foreach (qsearch('ac_block', { acnum => $hashref->{acnum} })) {
-    my $ip_addr = new NetAddr::IP($_->getfield('ip_gateway'),
-                                  $_->getfield('ip_netmask'));
-    print qq!<TR><TD></TD><TD>! . $ip_addr->network->addr() . '/' .
-          $ip_addr->network->mask() . qq!</TD>!;
-
-    print qq!<TD>! . $_->getfield('ip_gateway') . qq!</TD>\n! .
-          qq!<TD>! . $_->getfield('ip_netmask') . qq!</TD></TR>!;
-
-  }
-
-  print '<FORM ACTION="', popurl(1), 'process/ac_block.cgi" METHOD=POST>';
-  print <<END;
-  <TR>
-    <TD><INPUT TYPE="hidden" NAME="acnum" VALUE="$hashref->{acnum}">
-        <INPUT TYPE="hidden" NAME="acname" VALUE="$hashref->{acname}">
-        <INPuT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">
-       <SMALL>(NEW)</SMALL>
-    </TD>
-    <TD></TD>
-    <TD><INPUT TYPE="text" NAME="ip_gateway" SIZE="15"></TD>
-    <TD><INPUT TYPE="text" NAME="ip_netmask" SIZE="2"></TD>
-    <TD><INPUT TYPE="submit" VALUE="Add"></TD>
-  </TR>
-  </FORM>
-</TABLE>
-END
-
-}
-
-print <<END;
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/edit/ac_type.cgi b/httemplate/edit/ac_type.cgi
deleted file mode 100755
index ccc3d579c..000000000
--- a/httemplate/edit/ac_type.cgi
+++ /dev/null
@@ -1,106 +0,0 @@
-<!-- mason kludge -->
-<%
-
-my $ac_type;
-if ( $cgi->param('error') ) {
-  $ac_type = new FS::ac_type ( {
-    map { $_, scalar($cgi->param($_)) } fields('ac_type')
-  } );
-} elsif ( $cgi->keywords ) { #editing
-  my($query)=$cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $ac_type=qsearchs('ac_type',{'actypenum'=>$1});
-} else { #adding
-  $ac_type = new FS::ac_type {};
-}
-my $action = $ac_type->actypenum ? 'Edit' : 'Add';
-my $hashref = $ac_type->hashref;
-
-my @ut_types = qw( float number text alpha anything ip domain );
-
-my $p1 = popurl(1);
-print header("$action Access Concentrator Type", menubar(
-  'Main Menu' => popurl(2),
-  'View all Access Concentrator types' => popurl(2). "browse/ac_type.cgi",
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print qq!<FORM ACTION="${p1}process/ac_type.cgi" METHOD=POST>!;
-
-#display
-
-print qq!<INPUT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">!,
-      "AC Type #", $hashref->{actypenum} ? $hashref->{actypenum} : "(NEW)";
-
-print <<TROZ;
-<PRE>
-AC Type Name <INPUT TYPE="text" NAME="actypename" SIZE=15 VALUE="$hashref->{actypename}">
-</PRE>
-
-TROZ
-
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{actypenum} ? "Apply changes" : "Add AC Type",
-      qq!"></FORM>!;
-
-
-if ($hashref->{actypenum}) {
-  print qq!   <BR>Available fields:<BR>! .  table();
-
-  print qq!    <TH><TD>Field name</TD><TD>Field type</TD><TD></TD></TH>!;
-
-  my @part_ac_field = qsearch ( 'part_ac_field',
-                                { actypenum => $hashref->{actypenum} } );
-  foreach ( @part_ac_field ) {
-    my $pf_hashref = $_->hashref;
-    print <<END;
-      <TR>
-        <TD>$pf_hashref->{acfieldpart}</TD>
-        <TD>$pf_hashref->{name}</TD>
-        <TD>$pf_hashref->{ut_type}</TD>
-      </TR>
-END
-  }
-
-  my $name, $ut_type = '';
-  if ($cgi->param('error')) {
-    $name = $cgi->param('name');
-    $ut_type = $cgi->param('ut_type');
-  }
-
-  print <<END;
-      <FORM ACTION="${p1}process/part_ac_field.cgi" METHOD=GET>
-      <TR>
-       <TD><SMALL>(NEW)</SMALL>
-         <INPUT TYPE="hidden" NAME="actypenum" VALUE="$hashref->{actypenum}">
-       </TD>
-       <TD>
-         <INPUT TYPE="text" NAME="name" VALUE="${name}">
-       </TD>
-       <TD>
-         <SELECT NAME="ut_type" SIZE=1><OPTION>
-END
-
-  foreach ( @ut_types ) {
-    print qq!<OPTION! . ($ut_type ? " SELECTED>$_" : ">$_");
-  }
-
-  print <<END;
-        </SELECT>
-      </TD>
-      <TD><INPUT TYPE="submit" VALUE="Add"></TD>
-    </TR>
-    </FORM>
-  </TABLE>
-END
-
-}
-
-%>
-
- </BODY>
-</HTML>
-
diff --git a/httemplate/edit/process/ac.cgi b/httemplate/edit/process/ac.cgi
deleted file mode 100755
index fc434a807..000000000
--- a/httemplate/edit/process/ac.cgi
+++ /dev/null
@@ -1,28 +0,0 @@
-<%
-
-my $acnum = $cgi->param('acnum');
-
-my $old = qsearchs('ac',{'acnum'=>$acnum}) if $acnum;
-
-my $new = new FS::ac ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('ac')
-} );
-
-my $error = '';
-if ( $acnum ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $acnum=$new->getfield('acnum');
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "browse/ac.cgi");
-}
-
-%>
diff --git a/httemplate/edit/process/ac_block.cgi b/httemplate/edit/process/ac_block.cgi
deleted file mode 100755
index b1c3c726b..000000000
--- a/httemplate/edit/process/ac_block.cgi
+++ /dev/null
@@ -1,21 +0,0 @@
-<%
-
-my $new = new FS::ac_block ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('ac_block')
-} );
-
-my $error = '';
-$error = $new->check;
-
-unless ( $error ) { $error = $new->insert; }
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->param('acnum'));
-}
-
-%>
diff --git a/httemplate/edit/process/ac_field.cgi b/httemplate/edit/process/ac_field.cgi
deleted file mode 100755
index 2bfe3312f..000000000
--- a/httemplate/edit/process/ac_field.cgi
+++ /dev/null
@@ -1,21 +0,0 @@
-<%
-
-my $new = new FS::ac_field ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('ac_field')
-} );
-
-my $error = '';
-$error = $new->check;
-
-unless ( $error ) { $error = $new->insert; }
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(2). "ac.cgi?". $cgi->param('acnum'));
-}
-
-%>
diff --git a/httemplate/edit/process/ac_type.cgi b/httemplate/edit/process/ac_type.cgi
deleted file mode 100755
index ca232ba58..000000000
--- a/httemplate/edit/process/ac_type.cgi
+++ /dev/null
@@ -1,28 +0,0 @@
-<%
-
-my $actypenum = $cgi->param('actypenum');
-
-my $old = qsearchs('ac_type',{'actypenum'=>$actypenum}) if $actypenum;
-
-my $new = new FS::ac_type ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('ac_type')
-} );
-
-my $error = '';
-if ( $actypenum ) {
-  $error = $new->replace($old);
-} else {
-  $error = $new->insert;
-  $actypenum=$new->getfield('actypenum');
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "ac_type.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "browse/ac_type.cgi");
-}
-
-%>
diff --git a/httemplate/edit/process/part_ac_field.cgi b/httemplate/edit/process/part_ac_field.cgi
deleted file mode 100755
index 38ad586f7..000000000
--- a/httemplate/edit/process/part_ac_field.cgi
+++ /dev/null
@@ -1,21 +0,0 @@
-<%
-
-my $new = new FS::part_ac_field ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('part_ac_field')
-} );
-
-my $error = '';
-$error = $new->check;
-
-unless ( $error ) { $error = $new->insert; }
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "ac_type.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(2). "ac_type.cgi?". $cgi->param('actypenum'));
-}
-
-%>
-- 
cgit v1.2.1


From c232fac0743999105f6948b9fa352fe2293b09f8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Feb 2003 05:26:50 +0000
Subject: time/data detail on invoices

---
 httemplate/edit/part_pkg.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 1fd634961..851d3aa4d 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -395,7 +395,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours + \' + what.recur_input_charge.value + \' * $input + \' + what.recur_output_charge.value + \' * $output + \' + what.recur_total_charge.value + \' * $total ;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); push @details, \"Last month\\\'s excess data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\", \"Last month\\\'s excess time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; \' + what.recur_flat.value + \' + $hourscharge + \' + what.recur_input_charge.value + \' * $input + \' + what.recur_output_charge.value + \' * $output + $totalcharge ;\'',
   },
 
 ;
@@ -485,11 +485,11 @@ my $widget = new HTML::Widgets::SelectLayers(
              '<TR><TD>'.
              '<FONT SIZE="1">Setup expression<BR>'.
              '<INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="'.
-               $hashref->{setup}. '" onLoad="fchanged(this)">'.
+               encode_entities($hashref->{setup}). '" onLoad="fchanged(this)">'.
              '</FONT><BR>'.
              '<FONT SIZE="1">Recurring espression<BR>'.
              '<INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="'.
-               $hashref->{recur}. '" onLoad="fchanged(this)">'.
+               encode_entities($hashref->{recur}). '" onLoad="fchanged(this)">'.
              '</FONT>'.
              '</TR></TD>'.
              '</TABLE>';
-- 
cgit v1.2.1


From 7a168617da5f6702422c098d714a11586d7655e9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 25 Feb 2003 05:40:36 +0000
Subject: remove max length on ACH account number

---
 httemplate/edit/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 5642604d2..6fc086a12 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -412,7 +412,7 @@ if ( $payby_default eq 'HIDE' ) {
 
   my %paybychecked = (
     'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
     'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
-- 
cgit v1.2.1


From 8df8fb820c0cd6559ee6fef3adffaf43df167353 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Mar 2003 10:41:52 +0000
Subject: another pg7.3 fix

---
 httemplate/edit/part_pkg.cgi | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 851d3aa4d..dee356250 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -131,11 +131,12 @@ my $columns = 3;
 my @part_svc = qsearch( 'part_svc', { 'disabled' => '' } );
 foreach my $part_svc ( @part_svc ) {
   my $svcpart = $part_svc->svcpart;
-  my $pkg_svc = qsearchs( 'pkg_svc', {
-    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
+  my $pkgpart = $cgi->param('clone') || $part_pkg->pkgpart;
+  my $pkg_svc = $pkgpart && qsearchs( 'pkg_svc', {
+    'pkgpart'  => $pkgpart,
     'svcpart'  => $svcpart,
   } ) || new FS::pkg_svc ( {
-    'pkgpart'  => $cgi->param('clone') || $part_pkg->pkgpart,
+    'pkgpart'  => $pkgpart,
     'svcpart'  => $svcpart,
     'quantity' => 0,
   });
-- 
cgit v1.2.1


From 7f089ef86f1e695fabf6b046e00f8cef14af9000 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Mar 2003 04:00:33 +0000
Subject: wide textareas

---
 httemplate/edit/part_export.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index bdf41e2b2..8a829e57a 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -67,7 +67,7 @@ my $widget = new HTML::Widgets::SelectLayers(
         }
         $html .= '</SELECT>';
       } elsif ( $type eq 'textarea' ) {
-        $html .= qq!<TEXTAREA NAME="$option">$value</TEXTAREA>!;
+        $html .= qq!<TEXTAREA NAME="$option" COLS=80>$value</TEXTAREA>!;
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
       } elsif ( $type eq 'checkbox' ) {
-- 
cgit v1.2.1


From 7f938ee850989e3bb2405dffaff72ede945b9f08 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Mar 2003 04:09:12 +0000
Subject: wrap this textbox hard

---
 httemplate/edit/part_export.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 8a829e57a..31d6134e2 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -67,7 +67,8 @@ my $widget = new HTML::Widgets::SelectLayers(
         }
         $html .= '</SELECT>';
       } elsif ( $type eq 'textarea' ) {
-        $html .= qq!<TEXTAREA NAME="$option" COLS=80>$value</TEXTAREA>!;
+        $html .= qq!<TEXTAREA NAME="$option" COLS=80 WRAP="hard">!.
+                 qq!$value</TEXTAREA>!;
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
       } elsif ( $type eq 'checkbox' ) {
-- 
cgit v1.2.1


From 6b081fe282b98f7075b83c107bc598d4fa3b7b2f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Mar 2003 04:36:23 +0000
Subject: virtual wrap...

---
 httemplate/edit/part_export.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 31d6134e2..839a114fb 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -67,7 +67,7 @@ my $widget = new HTML::Widgets::SelectLayers(
         }
         $html .= '</SELECT>';
       } elsif ( $type eq 'textarea' ) {
-        $html .= qq!<TEXTAREA NAME="$option" COLS=80 WRAP="hard">!.
+        $html .= qq!<TEXTAREA NAME="$option" COLS=80 WRAP="virtual">!.
                  qq!$value</TEXTAREA>!;
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
-- 
cgit v1.2.1


From f3b8b72d2a07683b2deb2774f29407e25e725b5a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 1 Apr 2003 01:22:25 +0000
Subject: correct last_bill problems with $0 invoice (non-existant) edge cases

---
 httemplate/edit/REAL_cust_pkg.cgi         | 18 +++++++++++++-----
 httemplate/edit/process/REAL_cust_pkg.cgi |  2 ++
 2 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 0d2f1c238..e44acba3c 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,6 +1,6 @@
 <!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.4 2002-07-08 13:07:40 ivan Exp $ -->
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.5 2003-04-01 01:22:24 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
@@ -56,11 +56,19 @@ print ntable("#cccccc",2),
       $otaker,  '</TD></TR>',
       '<TR><TD ALIGN="right">Setup date</TD><TD>'.
       '<INPUT TYPE="text" NAME="setup" SIZE=32 VALUE="',
-      ( $setup ? time2str("%c %z (%Z)",$setup) : "" ), '"></TD></TR>',
-      '<TR><TD ALIGN="right">Next bill date</TD><TD>',
+      ( $setup ? time2str("%c %z (%Z)",$setup) : "" ), '"></TD></TR>';
+
+print '<TR><TD ALIGN="right">Last bill date</TD><TD>',
+      '<INPUT TYPE="text" NAME="last_bill" SIZE=32 VALUE="',
+      ( $cust_pkg->last_bill
+        ? time2str("%c %z (%Z)", $cust_pkg->last_bill)
+        : ""                                          ),
+      '"></TD></TR>'
+  if $cust_pkg->dbdef_table->column('last_bill');
+
+print '<TR><TD ALIGN="right">Next bill date</TD><TD>',
       '<INPUT TYPE="text" NAME="bill" SIZE=32 VALUE="',
-      ( $bill ? time2str("%c %z (%Z)",$bill) : "" ), '"></TD></TR>',
-;
+      ( $bill ? time2str("%c %z (%Z)",$bill) : "" ), '"></TD></TR>';
 
 print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
        time2str("%D",$susp), '</TD></TR>'
diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi
index 2e0352c76..7f5c5e49c 100755
--- a/httemplate/edit/process/REAL_cust_pkg.cgi
+++ b/httemplate/edit/process/REAL_cust_pkg.cgi
@@ -5,6 +5,8 @@ my $old = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
 my %hash = $old->hash;
 $hash{'setup'} = $cgi->param('setup') ? str2time($cgi->param('setup')) : '';
 $hash{'bill'} = $cgi->param('bill') ? str2time($cgi->param('bill')) : '';
+$hash{'last_bill'} =
+  $cgi->param('last_bill') ? str2time($cgi->param('last_bill')) : '';
 $hash{'expire'} = $cgi->param('expire') ? str2time($cgi->param('expire')) : '';
 my $new = new FS::cust_pkg \%hash;
 
-- 
cgit v1.2.1


From 2a5963390ddd68ecb2e40568ca272c0a2f8b831a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 2 Apr 2003 03:25:15 +0000
Subject: fix disappearing email invoice on errors, finally (closes: Bug#35)

---
 httemplate/edit/cust_main.cgi         | 6 +++++-
 httemplate/edit/process/cust_main.cgi | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 6fc086a12..706526865 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -17,6 +17,7 @@ my $conf = new FS::Conf;
 
 my $error = '';
 my($custnum, $username, $password, $popnum, $cust_main, $saved_pkgpart);
+my(@invoicing_list);
 if ( $cgi->param('error') ) {
   $error = $cgi->param('error');
   $cust_main = new FS::cust_main ( {
@@ -32,6 +33,7 @@ if ( $cgi->param('error') ) {
   $username = $cgi->param('username');
   $password = $cgi->param('_password');
   $popnum = $cgi->param('popnum');
+  @invoicing_list = split( /\s*,\s*/, $cgi->param('invoicing_list') );
 } elsif ( $cgi->keywords ) { #editing
   my( $query ) = $cgi->keywords;
   $query =~ /^(\d+)$/;
@@ -41,6 +43,7 @@ if ( $cgi->param('error') ) {
   $username = '';
   $password = '';
   $popnum = 0;
+  @invoicing_list = $cust_main->invoicing_list;
 } else {
   $custnum='';
   $cust_main = new FS::cust_main ( {} );
@@ -50,6 +53,7 @@ if ( $cgi->param('error') ) {
   $username = '';
   $password = '';
   $popnum = 0;
+  @invoicing_list = ();
 }
 $cgi->delete_all();
 my $action = $custnum ? 'Edit' : 'Add';
@@ -383,7 +387,7 @@ if ( $payby_default eq 'HIDE' ) {
   print qq!>Tax Exempt</TD></TR><TR><TD>!.
         qq!<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
 
-  my @invoicing_list = $cust_main->invoicing_list;
+  #my @invoicing_list = $cust_main->invoicing_list;
   print qq! CHECKED!
     if ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
        || grep { $_ eq 'POST' } @invoicing_list;
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index c15ea0321..5e6000c05 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -25,6 +25,7 @@ $cgi->param('otaker', &getotaker );
 
 my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
 push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
+$cgi->param('invoicing_list', join(',', @invoicing_list) );
 
 #create new record object
 
-- 
cgit v1.2.1


From 030bef17868168b05a67d9f5866b55da1bb9439c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Apr 2003 20:53:57 +0000
Subject: on-demand vs. automatic cards & checks: added DCRD and DCHK payment
 types

---
 httemplate/edit/cust_main.cgi         | 16 ++++++++++------
 httemplate/edit/part_bill_event.cgi   |  2 +-
 httemplate/edit/process/cust_main.cgi |  4 ++--
 3 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 706526865..d8edbcd8e 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -357,7 +357,7 @@ if ( $payby_default eq 'HIDE' ) {
   print qq!<INPUT TYPE="hidden" NAME="invoicing_list" VALUE="!.
         join(', ', $cust_main->invoicing_list). '">';
 
-  foreach my $payby (qw( CARD CHEK LECB BILL COMP )) {
+  foreach my $payby (qw( CARD DCRD CHEK DCHK LECB BILL COMP )) {
     foreach my $field (qw( payinfo payname )) {
       print qq!<INPUT TYPE="hidden" NAME="${payby}_$field" VALUE="!.
             $cust_main->getfield($field). '">';
@@ -405,8 +405,10 @@ if ( $payby_default eq 'HIDE' ) {
   );
 
   my %payby = (
-    'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+    'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+    'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
+    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE=""><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
     'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
@@ -415,15 +417,17 @@ if ( $payby_default eq 'HIDE' ) {
   my( $account, $aba ) = split('@', $payinfo);
 
   my %paybychecked = (
-    'CARD' => qq!Credit card<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-    'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+    'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+    'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
+    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
     'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
 );
 
   $cust_main->payby($payby_default) unless $cust_main->payby;
-  for (qw(CARD CHEK LECB BILL COMP)) {
+  for (qw(CARD DCRD CHEK DCHK LECB BILL COMP)) {
     print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
     if ($cust_main->payby eq "$_") {
       print qq! CHECKED> $paybychecked{$_}</TD>!;
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 2104b4530..6426eed93 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -41,7 +41,7 @@ print ntable("#cccccc",2), <<END;
 <TR><TD ALIGN="right">Payby</TD><TD><SELECT NAME="payby">
 END
 
-for (qw(CARD CHEK LECB BILL COMP)) {
+for (qw(CARD DCRD CHEK DCHK LECB BILL COMP)) {
   print qq!<OPTION VALUE="$_"!;
   if ($part_bill_event->payby eq $_) {
     print " SELECTED>$_</OPTION>";
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 5e6000c05..3700d9b96 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -10,9 +10,9 @@ $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
 
 my $payby = $cgi->param('payby');
 if ( $payby ) {
-  if ( $payby eq 'CHEK' ) {
+  if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
     $cgi->param('payinfo',
-      $cgi->param('CHEK_payinfo1'). '@'. $cgi->param('CHEK_payinfo2') );
+      $cgi->param($payby. '_payinfo1'). '@'. $cgi->param($payby. '_payinfo2') );
   } else {
     $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
   }
-- 
cgit v1.2.1


From 76e4bd639e70f707f7b9623b6228904146fbf07b Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 21 Apr 2003 21:12:09 +0000
Subject: Lines added for clairity

---
 httemplate/edit/router.cgi | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/router.cgi b/httemplate/edit/router.cgi
index d2279ff00..b524c6494 100755
--- a/httemplate/edit/router.cgi
+++ b/httemplate/edit/router.cgi
@@ -32,6 +32,10 @@ if($cgi->param('error')) {
     Router #<%=$routernum or "(NEW)"%>
 
 <BR><BR>Name <INPUT TYPE="text" NAME="routername" SIZE=32 VALUE="<%=$hashref->{routername}%>">
+
+<BR><BR>
+Custom fields:
+<BR>
 <%=table() %>
 
 <%
-- 
cgit v1.2.1


From b938a41859030d3d3a126f39fa1b64b9211145a5 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 21 Apr 2003 21:13:20 +0000
Subject: Fixed bug with $routernum and new routers.  Navigation cleanup.

---
 httemplate/edit/process/router.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/router.cgi b/httemplate/edit/process/router.cgi
index c0cb884f0..1b7fc3805 100644
--- a/httemplate/edit/process/router.cgi
+++ b/httemplate/edit/process/router.cgi
@@ -34,6 +34,7 @@ if($old) {
   } #else do nothing
 } else {
   $error = $new->insert;
+  $routernum = $new->routernum;
 }
 
 check($error);
@@ -95,6 +96,6 @@ foreach($cgi->param) {
 
 # Yay, everything worked!
 $dbh->commit or die $dbh->errstr;
-print $cgi->redirect(popurl(3). "edit/router.cgi?$routernum");
+print $cgi->redirect(popurl(3). "browse/router.cgi");
 
 %>
-- 
cgit v1.2.1


From fcfad3cd469df0df1beb2d54ea990a387915ebe2 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 21 Apr 2003 21:29:35 +0000
Subject: Navigation fixes.

---
 httemplate/edit/part_router_field.cgi | 7 ++++---
 httemplate/edit/process/generic.cgi   | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_router_field.cgi b/httemplate/edit/part_router_field.cgi
index c3e99be2c..02962b1c0 100644
--- a/httemplate/edit/part_router_field.cgi
+++ b/httemplate/edit/part_router_field.cgi
@@ -21,7 +21,10 @@ if ( $cgi->param('error') ) {
 my $action = $part_router_field->routerfieldpart ? 'Edit' : 'Add';
 
 my $p1 = popurl(1);
-print header("$action Router Extended Field Definition", '');
+print header("$action Router Extended Field Definition",
+             menubar('Main Menu' => $p,
+                     'View all Extended Fields' => $p. 'browse/generic.cgi?part_router_field')
+            );
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
@@ -30,8 +33,6 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 <FORM ACTION="<%=$p1%>process/generic.cgi" METHOD=POST>
 
 <INPUT TYPE="hidden" NAME="table" VALUE="part_router_field">
-<INPUT TYPE="hidden" NAME="redirect_ok" 
-    VALUE="<%=$p1%>part_router_field.cgi">
 <INPUT TYPE="hidden" NAME="routerfieldpart" VALUE="<%=
   $routerfieldpart%>">
 Field #<B><%=$routerfieldpart or "(NEW)"%></B><BR><BR>
diff --git a/httemplate/edit/process/generic.cgi b/httemplate/edit/process/generic.cgi
index 751987f7a..9c54feb1d 100644
--- a/httemplate/edit/process/generic.cgi
+++ b/httemplate/edit/process/generic.cgi
@@ -27,6 +27,7 @@ use DBIx::DBSchema::Table;
 
 my $error;
 my $p2 = popurl(2);
+my $p3 = popurl(3);
 my $table = $cgi->param('table');
 my $dbdef = dbdef or die "Cannot fetch dbdef!";
 
@@ -56,7 +57,7 @@ if($pkey_val and (my $old = qsearchs($table, { $pkey, $pkey_val} ))) {
 }
 
 my $redirect_ok = (($cgi->param('redirect_ok')) ?
-                    $cgi->param('redirect_ok') : $p2."view/$table.cgi");
+                    $cgi->param('redirect_ok') : $p3."browse/generic.cgi?$table");
 my $redirect_error = (($cgi->param('redirect_error')) ?
                        $cgi->param('redirect_error') : $cgi->referer());
 
@@ -64,6 +65,6 @@ if($error) {
   $cgi->param('error', $error);
   print $cgi->redirect($redirect_error . '?' . $cgi->query_string);
 } else {
-  print $cgi->redirect($redirect_ok . '?' .$pkey_val);
+  print $cgi->redirect($redirect_ok);
 }
 %>
-- 
cgit v1.2.1


From f1324d535989205477e37d701c910b12c045687b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Apr 2003 17:55:09 +0000
Subject: mason is more strict about variables - patch from Richard Siddall,
 thanks

---
 httemplate/edit/part_export.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 839a114fb..4defbc86f 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -60,7 +60,7 @@ my $widget = new HTML::Widgets::SelectLayers(
         foreach my $select_option ( @{$optinfo->{options}} ) {
           #if ( ref($select_option) ) {
           #} else {
-            $selected = $select_option eq $value ? ' SELECTED' : '';
+            my $selected = $select_option eq $value ? ' SELECTED' : '';
             $html .= qq!<OPTION VALUE="$select_option"$selected>!.
                      qq!$select_option</OPTION>!;
           #}
-- 
cgit v1.2.1


From 7d0dbc7da5c736da8989b9aeb2e8911fa16462a9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Apr 2003 23:02:16 +0000
Subject: fix for bug triggered by nonexistant referring customer numbers

---
 httemplate/edit/cust_main.cgi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index d8edbcd8e..2b7d8d0dc 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -124,9 +124,11 @@ if ( $custnum && ! $conf->exists('editreferrals') ) {
 #referring customer
 
 #print qq!<BR><BR>Referring Customer: !;
-if ( $cust_main->referral_custnum ) {
-  my $referring_cust_main =
-    qsearchs('cust_main', { custnum => $cust_main->referral_custnum } );
+my $referring_cust_main = '';
+if ( $cust_main->referral_custnum
+     and $referring_cust_main =
+           qsearchs('cust_main', { custnum => $cust_main->referral_custnum } )
+) {
   print '<BR><BR>Referring Customer: <A HREF="'. popurl(1). '/cust_main.cgi?'.
         $cust_main->referral_custnum. '">'.
         $cust_main->referral_custnum. ': '.
-- 
cgit v1.2.1


From c4a7388a676878b64a3d3b2b2e0a4004e4daf669 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Tue, 29 Apr 2003 16:59:10 +0000
Subject: It helps if you can edit the ip_addr field.

---
 httemplate/edit/svc_broadband.cgi | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index f017d7a6e..ee7f8becf 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -96,10 +96,18 @@ Service #<B><%=$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
   <INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
   <INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%=$pkgnum%>">
   <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%=$svcpart%>">
-  <INPUT TYPE="hidden" NAME="ip_addr" VALUE="<%=$ip_addr%>">
 
   <%=&ntable("#cccccc",2)%>
-
+    <TR>
+      <TD ALIGN="right">IP Address</TD>
+      <TD BGCOLOR="#ffffff">
+<% if ( $part_svc->part_svc_column('ip_addr')->columnflag eq 'F' ) { %>
+        <INPUT TYPE="hidden" NAME="ip_addr" VALUE="<%=$ip_addr%>"><%=$ip_addr%>
+<% } else { %>
+        <INPUT TYPE="text" NAME="ip_addr" VALUE="<%=$ip_addr%>">
+<% } %>
+      </TD>
+    </TR>
     <TR>
       <TD ALIGN="right">Download speed</TD>
       <TD BGCOLOR="#ffffff">
-- 
cgit v1.2.1


From 61a2cea1f9f09fcb0482af442f45ef620277a8dc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 3 May 2003 02:06:56 +0000
Subject: enable quota maintenance in infostreet export

---
 httemplate/edit/svc_acct.cgi | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index d4c9a738d..4420bb609 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -244,7 +244,16 @@ my($quota,$slipip)=(
   $svc_acct->slipip,
 );
 
-print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
+if ( $part_svc->part_svc_column('quota')->columnflag eq "F" )
+{
+  print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
+} else {
+  print <<END;
+    <TR><TD ALIGN="right">Quota:</TD>
+        <TD> <INPUT TYPE="text" NAME="quota" VALUE="$quota" ></TD>
+    </TR>
+END
+}
 
 if ( $part_svc->part_svc_column('slipip')->columnflag eq "F" ) {
   print qq!<INPUT TYPE="hidden" NAME="slipip" VALUE="$slipip">!;
-- 
cgit v1.2.1


From 499b8660e2aa5632fc14e8fcfa6631800ade1e35 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Jun 2003 08:44:52 +0000
Subject: correct stickiness for checkbox options on export edit

---
 httemplate/edit/part_export.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 4defbc86f..0590549f5 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -72,7 +72,9 @@ my $widget = new HTML::Widgets::SelectLayers(
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
       } elsif ( $type eq 'checkbox' ) {
-        $html .= qq!<INPUT TYPE="checkbox" NAME="$option" VALUE="1">!;
+        $html .= qq!<INPUT TYPE="checkbox" NAME="$option" VALUE="1"!
+        $html .= ' CHECKED' if $value;
+        $html .= '>';
       } else {
         $html .= "unknown type $type";
       }
-- 
cgit v1.2.1


From 0ea5e6fa4782600ab33813555a38fd0880d6145c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Jun 2003 08:46:19 +0000
Subject: missing semi

---
 httemplate/edit/part_export.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 0590549f5..24d646b8b 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -72,7 +72,7 @@ my $widget = new HTML::Widgets::SelectLayers(
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
       } elsif ( $type eq 'checkbox' ) {
-        $html .= qq!<INPUT TYPE="checkbox" NAME="$option" VALUE="1"!
+        $html .= qq!<INPUT TYPE="checkbox" NAME="$option" VALUE="1"!;
         $html .= ' CHECKED' if $value;
         $html .= '>';
       } else {
-- 
cgit v1.2.1


From b0b6550717b6507a7cb27ea5a8c5cd5719d7d9c6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 1 Jul 2003 09:00:45 +0000
Subject: larger textareas in export options

---
 httemplate/edit/part_export.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 24d646b8b..cc60f1aeb 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -67,7 +67,7 @@ my $widget = new HTML::Widgets::SelectLayers(
         }
         $html .= '</SELECT>';
       } elsif ( $type eq 'textarea' ) {
-        $html .= qq!<TEXTAREA NAME="$option" COLS=80 WRAP="virtual">!.
+        $html .= qq!<TEXTAREA NAME="$option" COLS=80 ROWS=8 WRAP="virtual">!.
                  qq!$value</TEXTAREA>!;
       } elsif ( $type eq 'text' ) {
         $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
-- 
cgit v1.2.1


From a1f82a6afd45e0fd208b1e69c6647195eab48bb6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 9 Jul 2003 14:39:36 +0000
Subject: increase max domain length to 63

---
 httemplate/edit/svc_domain.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index d20e1f336..ca0e3398f 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -87,7 +87,7 @@ print ' CHECKED' if $kludge_action eq 'M';
 print qq!>Transfer!;
 
 print <<END;
-<P>Domain <INPUT TYPE="text" NAME="domain" VALUE="$domain" SIZE=28 MAXLENGTH=26>
+<P>Domain <INPUT TYPE="text" NAME="domain" VALUE="$domain" SIZE=28 MAXLENGTH=63>
 <BR>Purpose/Description: <INPUT TYPE="text" NAME="purpose" VALUE="$purpose" SIZE=64>
 <P><INPUT TYPE="submit" VALUE="Submit">
     </FORM>
-- 
cgit v1.2.1


From 1dd6907483dae3aab9dc7b112d1b38af9f4a7060 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Jul 2003 15:36:54 +0000
Subject: fix spurious "can't purchase pkgpart" errors

---
 httemplate/edit/cust_main.cgi         | 2 +-
 httemplate/edit/process/cust_main.cgi | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 2b7d8d0dc..eeceed889 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -485,7 +485,7 @@ unless ( $custnum ) {
     foreach my $part_pkg ( @part_pkg ) {
       print qq!<OPTION VALUE="!,
 #              $part_pkg->pkgpart. "_". $pkgpart{ $part_pkg->pkgpart }, '"';
-              $part_pkg->pkgpart. "_". $part_pkg->svcpart, '"';
+              $part_pkg->pkgpart. "_". $part_pkg->svcpart('svc_acct'), '"';
       print " SELECTED" if $saved_pkgpart && ( $part_pkg->pkgpart == $saved_pkgpart );
       print ">", $part_pkg->pkg, " - ", $part_pkg->comment;
     }
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 3700d9b96..818382856 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -52,7 +52,7 @@ if ( $new->custnum eq '' ) {
 
   if ( $cgi->param('pkgpart_svcpart') ) {
     my $x = $cgi->param('pkgpart_svcpart');
-    $x =~ /^(\d+)_(\d+)$/;
+    $x =~ /^(\d+)_(\d+)$/ or die "illegal pkgpart_svcpart $x\n";
     my($pkgpart, $svcpart) = ($1, $2);
     #false laziness: copied from FS::cust_pkg::order (which should become a
     #FS::cust_main method)
@@ -70,7 +70,7 @@ if ( $new->custnum eq '' ) {
     #eslaf
 
     # this should wind up in FS::cust_pkg!
-    $error ||= "Agent ". $new->agentnum. " (type ". $agent->typenum. ") can't".
+    $error ||= "Agent ". $new->agentnum. " (type ". $agent->typenum. ") can't ".
                "purchase pkgpart ". $pkgpart
       #unless $part_pkg{ $pkgpart };
       unless $pkgpart_href->{ $pkgpart };
-- 
cgit v1.2.1


From f2ffe6fc096fa59b1931da531b7a40b78cd6b747 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Tue, 5 Aug 2003 00:00:18 +0000
Subject: Virtual field merge

---
 httemplate/edit/part_router_field.cgi | 71 -------------------------------
 httemplate/edit/part_sb_field.cgi     | 79 -----------------------------------
 2 files changed, 150 deletions(-)
 delete mode 100644 httemplate/edit/part_router_field.cgi
 delete mode 100644 httemplate/edit/part_sb_field.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_router_field.cgi b/httemplate/edit/part_router_field.cgi
deleted file mode 100644
index 02962b1c0..000000000
--- a/httemplate/edit/part_router_field.cgi
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- mason kludge -->
-<%
-my ($routerfieldpart, $part_router_field);
-
-if ( $cgi->param('error') ) {
-  $part_router_field = new FS::part_router_field ( {
-    map { $_, scalar($cgi->param($_)) } fields('part_router_field')});
-  $routerfieldpart = $part_router_field->routerfieldpart;
-} else {
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $routerfieldpart=$1;
-    $part_router_field=qsearchs('part_router_field',
-        {'routerfieldpart' => $routerfieldpart})
-      or die "Unknown routerfieldpart!";
-  
-  } else { #adding
-    $part_router_field = new FS::part_router_field({});
-  }
-}
-my $action = $part_router_field->routerfieldpart ? 'Edit' : 'Add';
-
-my $p1 = popurl(1);
-print header("$action Router Extended Field Definition",
-             menubar('Main Menu' => $p,
-                     'View all Extended Fields' => $p. 'browse/generic.cgi?part_router_field')
-            );
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-%>
-<FORM ACTION="<%=$p1%>process/generic.cgi" METHOD=POST>
-
-<INPUT TYPE="hidden" NAME="table" VALUE="part_router_field">
-<INPUT TYPE="hidden" NAME="routerfieldpart" VALUE="<%=
-  $routerfieldpart%>">
-Field #<B><%=$routerfieldpart or "(NEW)"%></B><BR><BR>
-
-<%=ntable("#cccccc",2)%>
-  <TR>
-    <TD ALIGN="right">Name</TD>
-    <TD><INPUT TYPE="text" NAME="name" MAXLENGTH=15 VALUE="<%=
-    $part_router_field->name%>"></TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">Length</TD>
-    <TD><INPUT TYPE="text" NAME="length" MAXLENGTH=4 VALUE="<%=
-    $part_router_field->length%>"></TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">check_block</TD>
-    <TD><TEXTAREA COLS="20" ROWS="4" NAME="check_block"><%=
-    $part_router_field->check_block%></TEXTAREA></TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">list_source</TD>
-    <TD><TEXTAREA COLS="20" ROWS="4" NAME="list_source"><%=
-    $part_router_field->list_source%></TEXTAREA></TD>
-  </TR>
-</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">
-
-</FORM>
-
-<BR><BR>
-<FONT SIZE=-2>If you don't understand what <I>check_block</I> and 
-<I>list_source</I> mean, <B>LEAVE THEM BLANK</B>.  We mean it.</FONT>
-
-
-</BODY>
-</HTML>
diff --git a/httemplate/edit/part_sb_field.cgi b/httemplate/edit/part_sb_field.cgi
deleted file mode 100644
index 9e0cc9e4f..000000000
--- a/httemplate/edit/part_sb_field.cgi
+++ /dev/null
@@ -1,79 +0,0 @@
-<!-- mason kludge -->
-<%
-my ($sbfieldpart, $part_sb_field);
-
-if ( $cgi->param('error') ) {
-  $part_sb_field = new FS::part_sb_field ( {
-    map { $_, scalar($cgi->param($_)) } fields('part_sb_field')});
-  $sbfieldpart = $part_sb_field->sbfieldpart;
-} else {
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $sbfieldpart=$1;
-    $part_sb_field=qsearchs('part_sb_field',
-        {'sbfieldpart' => $sbfieldpart})
-      or die "Unknown sbfieldpart!";
-  
-  } else { #adding
-    $part_sb_field = new FS::part_sb_field({});
-  }
-}
-my $action = $part_sb_field->sbfieldpart ? 'Edit' : 'Add';
-
-my $p1 = popurl(1);
-print header("$action svc_broadband Extended Field Definition", '');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-%>
-<FORM ACTION="<%=$p1%>process/generic.cgi" METHOD="POST">
-
-<INPUT TYPE="hidden" NAME="table" VALUE="part_sb_field">
-<INPUT TYPE="hidden" NAME="redirect_ok" 
-    VALUE="<%=popurl(2)%>browse/part_sb_field.cgi">
-<INPUT TYPE="hidden" NAME="sbfieldpart" VALUE="<%=
-  $sbfieldpart%>">
-Field #<B><%=$sbfieldpart or "(NEW)"%></B><BR><BR>
-
-<%=ntable("#cccccc",2)%>
-  <TR>
-    <TD ALIGN="right">Name</TD>
-    <TD><INPUT TYPE="text" NAME="name" MAXLENGTH=15 VALUE="<%=
-    $part_sb_field->name%>"></TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">Length</TD>
-    <TD><INPUT TYPE="text" NAME="length" MAXLENGTH=4 VALUE="<%=
-    $part_sb_field->length%>"></TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">Service</TD>
-    <TD><SELECT SIZE=1 NAME="svcpart"><%
-      foreach my $part_svc (qsearch('part_svc', {svcdb => 'svc_broadband'})) {
-        %><OPTION VALUE="<%=$part_svc->svcpart%>"<%=
-	  ($part_svc->svcpart == $part_sb_field->svcpart) ? ' SELECTED' : ''%>">
-	  <%=$part_svc->svc%>
-      <% } %>
-      </SELECT></TD>
-  <TR>
-    <TD ALIGN="right">check_block</TD>
-    <TD><TEXTAREA COLS="20" ROWS="4" NAME="check_block"><%=
-    $part_sb_field->check_block%></TEXTAREA></TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">list_source</TD>
-    <TD><TEXTAREA COLS="20" ROWS="4" NAME="list_source"><%=
-    $part_sb_field->list_source%></TEXTAREA></TD>
-  </TR>
-</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">
-
-</FORM>
-
-<BR><BR>
-<FONT SIZE=-2>If you don't understand what <I>check_block</I> and 
-<I>list_source</I> mean, <B>LEAVE THEM BLANK</B>.  We mean it.</FONT>
-
-
-</BODY>
-</HTML>
-- 
cgit v1.2.1


From 58d44fbe5eb9ab32e6d87063a4a3b22ddba9a828 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Tue, 5 Aug 2003 00:20:51 +0000
Subject: Virtual field merge

---
 httemplate/edit/part_svc.cgi              | 72 +++++++++++++++++-------
 httemplate/edit/part_virtual_field.cgi    | 92 +++++++++++++++++++++++++++++++
 httemplate/edit/process/router.cgi        | 41 ++------------
 httemplate/edit/process/svc_broadband.cgi | 36 +-----------
 httemplate/edit/router.cgi                | 42 ++++----------
 httemplate/edit/svc_acct.cgi              | 12 +++-
 httemplate/edit/svc_broadband.cgi         | 34 +++---------
 httemplate/edit/svc_www.cgi               | 12 +++-
 8 files changed, 186 insertions(+), 155 deletions(-)
 create mode 100644 httemplate/edit/part_virtual_field.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index d4bb4704c..45e0b6ffe 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -65,6 +65,9 @@ blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
 <BR><BR>
 
 <%
+
+my %vfields;
+
 #these might belong somewhere else for other user interfaces 
 #pry need to eventually create stuff that's shared amount UIs
 my %defs = (
@@ -109,29 +112,43 @@ my %defs = (
     'dstsvc'    => 'service to which mail is to be forwarded',
     'dst'       => 'someone@another.domain.com to use when dstsvc is 0',
   },
-  'svc_charge' => {
-    'amount'    => 'amount',
-  },
-  'svc_wo' => {
-    'worker'    => 'Worker',
-    '_date'      => 'Date',
-  },
+#  'svc_charge' => {
+#    'amount'    => 'amount',
+#  },
+#  'svc_wo' => {
+#    'worker'    => 'Worker',
+#    '_date'      => 'Date',
+#  },
   'svc_www' => {
     #'recnum' => '',
     #'usersvc' => '',
   },
   'svc_broadband' => {
-    'actypenum' => 'This is the actypenum that refers to the type of AC that can be provisioned for this service.  This field must be set fixed.',
     'speed_down' => 'Maximum download speed for this service in Kbps.  0 denotes unlimited.',
     'speed_up' => 'Maximum upload speed for this service in Kbps.  0 denotes unlimited.',
-    'acnum' => 'acnum of a specific AC that this service is restricted to.  Not required',
     'ip_addr' => 'IP address.  Leave blank for automatic assignment.',
-    'ip_netmask' => 'Mask length, aka. netmask bits.  (Eg. 255.255.255.0 == 24)',
-    'mac_addr' => 'MAC address which is used by some ACs for access control.  Specified by 6 colon seperated hex octets. (Eg. 00:00:0a:bc:1a:2b)',
-    'location' => 'Defines the physically location at which this service was installed.  This is not necessarily the billing address',
+    'blocknum' => 'Address block.',
   },
 );
 
+  foreach $svcdb (keys(%defs)) {
+    my $self = "FS::$svcdb"->new;
+    $vfields{$svcdb} = {};
+    foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them
+      my $pvf = $self->pvf($field);
+      my @list = $pvf->list;
+      if (scalar @list) {
+        $defs{$svcdb}->{$field} = { desc        => $pvf->label,
+                                    type        => 'select',
+                                    select_list => \@list };
+      } else {
+        $defs{$svcdb}->{$field} = $pvf->label;
+      } #endif
+      $vfields{$svcdb}->{$field} = $pvf;
+      warn "\$vfields{$svcdb}->{$field} = $pvf";
+    } #next $field
+  } #next $svcdb
+  
   my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
              : qw( svc_acct svc_domain svc_forward svc_www svc_broadband );
@@ -157,7 +174,7 @@ my %defs = (
       $html .= '<BR><BR>'. table().
                table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
       foreach my $part_export ( @part_export ) {
-        $html .= '<TD><INPUT TYPE="checkbox"'.
+        $html .= '<TD><INPUT TYPE="checbox"'.
                  ' NAME="exportnum'. $part_export->exportnum. '"  VALUE="1" ';
         $html .= 'CHECKED'
           if ( $clone || $part_svc->svcpart ) #null svcpart search causing error
@@ -202,19 +219,27 @@ my %defs = (
             qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
             ' CHECKED'x($flag eq 'D'). ">Default ".
             qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
-            ' CHECKED'x($flag eq 'F'). ">Fixed ".
-            '<BR>';
+            ' CHECKED'x($flag eq 'F'). ">Fixed ";
+          $html .= '<BR>';
         }
         if ( ref($def) ) {
           if ( $def->{type} eq 'select' ) {
             $html .= qq!<SELECT NAME="${layer}__${field}">!;
             $html .= '<OPTION> </OPTION>' unless $value;
-            foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
-              my $rvalue = $record->getfield($def->{select_key});
-              $html .= qq!<OPTION VALUE="$rvalue"!.
-                       ( $rvalue==$value ? ' SELECTED>' : '>' ).
-                       $record->getfield($def->{select_label}). '</OPTION>';
-            }
+            if ( $def->{select_table} ) {
+              foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
+                my $rvalue = $record->getfield($def->{select_key});
+                $html .= qq!<OPTION VALUE="$rvalue"!.
+                         ( $rvalue==$value ? ' SELECTED>' : '>' ).
+                         $record->getfield($def->{select_label}). '</OPTION>';
+              } #next $record
+            } else { # select_list
+              foreach my $item ( @{$def->{select_list}} ) {
+                $html .= qq!<OPTION VALUE="$item"!.
+                         ( $item eq $value ? ' SELECTED>' : '>' ).
+                         $item. '</OPTION>';
+              } #next $item
+            } #endif
             $html .= '</SELECT>';
           } elsif ( $def->{type} eq 'radius_usergroup_selector' ) {
             $html .= FS::svc_acct::radius_usergroup_selector(
@@ -229,6 +254,11 @@ my %defs = (
           $html .=
             qq!<INPUT TYPE="text" NAME="${layer}__${field}" VALUE="$value">!;
         }
+
+        if($vfields{$layer}->{$field}) {
+          $html .= qq!<BR><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="X"!.
+          ' CHECKED'x($flag eq 'X'). ">Excluded ";
+        }
         $html .= "</TD></TR>\n";
       }
       $part_svc->svcpart('') if $clone; #undone
diff --git a/httemplate/edit/part_virtual_field.cgi b/httemplate/edit/part_virtual_field.cgi
new file mode 100644
index 000000000..8bc84387f
--- /dev/null
+++ b/httemplate/edit/part_virtual_field.cgi
@@ -0,0 +1,92 @@
+<!-- mason kludge -->
+<%
+my ($vfieldpart, $part_virtual_field);
+
+if ( $cgi->param('error') ) {
+  $part_virtual_field = new FS::part_virtual_field ( {
+    map { $_, scalar($cgi->param($_)) } fields('part_virtual_field')});
+  $vfieldpart = $part_virtual_field->vfieldpart;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $vfieldpart=$1;
+    $part_virtual_field=qsearchs('part_virtual_field',
+        {'vfieldpart' => $vfieldpart})
+      or die "Unknown vfieldpart!";
+  
+  } else { #adding
+    $part_virtual_field = new FS::part_virtual_field({});
+  }
+}
+my $action = $part_virtual_field->vfieldpart ? 'Edit' : 'Add';
+
+my $p1 = popurl(1);
+print header("$action Virtual Field Definition", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+%>
+<FORM ACTION="<%=$p1%>process/generic.cgi" METHOD="POST">
+
+<INPUT TYPE="hidden" NAME="table" VALUE="part_virtual_field">
+<INPUT TYPE="hidden" NAME="redirect_ok" 
+    VALUE="<%=popurl(2)%>browse/part_virtual_field.cgi">
+<INPUT TYPE="hidden" NAME="vfieldpart" VALUE="<%=
+  $vfieldpart%>">
+Field #<B><%=$vfieldpart or "(NEW)"%></B><BR><BR>
+
+<%=ntable("#cccccc",2)%>
+  <TR>
+    <TD ALIGN="right">Name</TD>
+    <TD><INPUT TYPE="text" NAME="name" MAXLENGTH=15 VALUE="<%=
+    $part_virtual_field->name%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Table</TD>
+    <TD><% if ($action eq 'Add') { %>
+      <SELECT SIZE=1 NAME="dbtable"><%
+        my $dbdef = dbdef;  # ick
+        foreach my $dbtable ($dbdef->tables) {
+          if ($dbtable !~ /^h_/
+          and $dbdef->table($dbtable)->primary_key) { %>
+            <OPTION VALUE="<%=$dbtable%>"><%=$dbtable%></OPTION><%
+          }
+        }
+      %></SELECT><%
+    } else { # Edit
+    %><%=$part_virtual_field->dbtable%>
+    <INPUT TYPE="hidden" NAME="dbtable" VALUE="<%=$part_virtual_field->dbtable%>">
+ <% } %>
+    </TD>
+  <TR>
+    <TD ALIGN="right">Label</TD>
+    <TD><INPUT TYPE="text" NAME="label" MAXLENGTH="20" VALUE="<%=
+    $part_virtual_field->label%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Length</TD>
+    <TD><INPUT TYPE="text" NAME="length" MAXLENGTH=4 VALUE="<%=
+    $part_virtual_field->length%>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Check</TD>
+    <TD><TEXTAREA COLS="20" ROWS="4" NAME="check_block"><%=
+    $part_virtual_field->check_block%></TEXTAREA></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">List source</TD>
+    <TD><TEXTAREA COLS="20" ROWS="4" NAME="list_source"><%=
+    $part_virtual_field->list_source%></TEXTAREA></TD>
+  </TR>
+</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">
+
+</FORM>
+
+<BR><BR>
+<FONT SIZE=-2>If you don't understand what <I>check_block</I> and 
+<I>list_source</I> mean, <B>LEAVE THEM BLANK</B>.  We mean it.</FONT>
+
+
+</BODY>
+</HTML>
diff --git a/httemplate/edit/process/router.cgi b/httemplate/edit/process/router.cgi
index 1b7fc3805..7e40c48a7 100644
--- a/httemplate/edit/process/router.cgi
+++ b/httemplate/edit/process/router.cgi
@@ -19,19 +19,16 @@ my $error = '';
 my $routernum  = $cgi->param('routernum');
 my $routername = $cgi->param('routername');
 my $old = qsearchs('router', { routernum => $routernum });
-my @old_rf;
 my @old_psr;
 
 my $new = new FS::router {
-    routernum  => $routernum,
-    routername => $routername,
-    svcnum     => 0
-    };
+  map {
+    ($_, scalar($cgi->param($_)));
+  } fields('router')
+};
 
 if($old) {
-  if($old->routername ne $new->routername) {
-    $error = $new->replace($old);
-  } #else do nothing
+  $error = $new->replace($old);
 } else {
   $error = $new->insert;
   $routernum = $new->routernum;
@@ -49,21 +46,6 @@ if ($old) {
     }
   }
   check($error);
-  @old_rf = $old->router_field;
-  foreach $rf (@old_rf) {
-    if(my $new_val = $cgi->param('rf_'.$rf->routerfieldpart)) {
-      if($new_val ne $rf->value) {
-        my $new_rf = new FS::router_field 
-	  { routernum       => $routernum,
-	    value           => $new_val,
-	    routerfieldpart => $rf->routerfieldpart };
-	$error = $new_rf->replace($rf);
-      } #else do nothing
-    } else {
-      $error = $rf->delete;
-    }
-    check($error);
-  }
 }
 
 foreach($cgi->param) {
@@ -77,23 +59,10 @@ foreach($cgi->param) {
       $error = $new_psr->insert;
     }
     check($error);
-  } elsif($cgi->param($_) ne '' and /^rf_(\d+)$/) {
-    my $part = $1;
-    if(my @x = grep {$_->routerfieldpart == $part} @old_rf) {
-      # already handled all of these
-    } else {
-      my $new_rf = new FS::router_field
-        { routernum       => $routernum,
-	  value           => $cgi->param('rf_'.$part),
-	  routerfieldpart => $part };
-      $error = $new_rf->insert;
-      check($error);
-    }
   }
 }
 
 
-
 # Yay, everything worked!
 $dbh->commit or die $dbh->errstr;
 print $cgi->redirect(popurl(3). "browse/router.cgi");
diff --git a/httemplate/edit/process/svc_broadband.cgi b/httemplate/edit/process/svc_broadband.cgi
index ab8b9f9d8..4912a3a9f 100644
--- a/httemplate/edit/process/svc_broadband.cgi
+++ b/httemplate/edit/process/svc_broadband.cgi
@@ -9,11 +9,10 @@ my $dbh = FS::UID::dbh;
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my $svcnum = $1;
 
-my $old; my @old_sbf;
+my $old;
 if ( $svcnum ) {
   $old = qsearchs('svc_broadband', { 'svcnum' => $svcnum } )
     or die "fatal: can't find broadband service (svcnum $svcnum)!";
-  @old_sbf = $old->sb_field;
 } else {
   $old = '';
 }
@@ -32,39 +31,6 @@ if ( $svcnum ) {
   $svcnum = $new->svcnum;
 }
 
-unless ($error) {
-  my $sb_field;
-
-  foreach ($cgi->param) {
-    #warn "\$cgi->param $_: " . $cgi->param($_);
-    if(/^sbf_(\d+)/) {
-      my $part = $1;
-      #warn "\$part $part";
-      $sb_field = new FS::sb_field 
-        { svcnum      => $svcnum,
-          value       => $cgi->param($_),
-          sbfieldpart => $part };
-      if (my @x = grep { $_->sbfieldpart eq $part } @old_sbf) {
-      #if (my $old_sb_field = (grep { $_->sbfieldpart eq $part} @old_Sbf)[0]) {
-        #warn "array: " . scalar(@x);
-        if (length($sb_field->value) && ($sb_field->value ne $x[0]->value)) { 
-          #warn "replacing " . $x[0]->value . " with " . $sb_field->value;
-          $error = $sb_field->replace($x[0]);
-          #$error = $sb_field->replace($old_sb_field);
-        } elsif (length($sb_field->value) == 0) { 
-          #warn "delete";
-          $error = $x[0]->delete;
-        }
-      } else {
-        if (length($sb_field->value) > 0) { 
-          #warn "insert";
-          $error = $sb_field->insert;
-        }
-        # else do nothing
-      }
-    }
-  }
-}
 
 if ( $error ) {
   $cgi->param('error', $error);
diff --git a/httemplate/edit/router.cgi b/httemplate/edit/router.cgi
index b524c6494..5c365a21e 100755
--- a/httemplate/edit/router.cgi
+++ b/httemplate/edit/router.cgi
@@ -16,7 +16,6 @@ if ( $cgi->keywords ) {
 
 my $routernum = $router->routernum;
 my $action = $routernum ? 'Edit' : 'Add';
-my $hashref = $router->hashref;
 
 print header("$action Router", menubar(
   'Main Menu' => "$p",
@@ -28,10 +27,13 @@ if($cgi->param('error')) {
 <% } %>
 
 <FORM ACTION="<%=popurl(1)%>process/router.cgi" METHOD=POST>
+  <INPUT TYPE="hidden" NAME="table" VALUE="router">
+  <INPUT TYPE="hidden" NAME="redirect_ok" VALUE="<%=$p3%>/browse/router.cgi">
+  <INPUT TYPE="hidden" NAME="redirect_error" VALUE="<%=$p3%>/edit/router.cgi">
   <INPUT TYPE="hidden" NAME="routernum" VALUE="<%=$routernum%>">
     Router #<%=$routernum or "(NEW)"%>
 
-<BR><BR>Name <INPUT TYPE="text" NAME="routername" SIZE=32 VALUE="<%=$hashref->{routername}%>">
+<BR><BR>Name <INPUT TYPE="text" NAME="routername" SIZE=32 VALUE="<%=$router->routername%>">
 
 <BR><BR>
 Custom fields:
@@ -39,35 +41,11 @@ Custom fields:
 <%=table() %>
 
 <%
-# I know, I know.  Massive false laziness with edit/svc_broadband.cgi.  But 
-# Kristian won't let me generalize the custom field mechanism to every table in 
-# the database, so this is what we get.  <snarl>
-# -- MW
-
-my @part_router_field = qsearch('part_router_field', { });
-my %rf = map { $_->part_router_field->name, $_->value } $router->router_field;
-foreach (sort { $a->name cmp $b->name } @part_router_field) {
-  %>
-  <TR>
-    <TD ALIGN="right"><%=$_->name%></TD>
-    <TD><%
-  if(my @opts = $_->list_values) {
-    %>  <SELECT NAME="rf_<%=$_->routerfieldpart%>" SIZE="1">
-          <%
-    foreach $opt (@opts) {
-      %>  <OPTION VALUE="<%=$opt%>"<%=($opt eq $rf{$_->name}) 
-              ? ' SELECTED' : ''%>>
-            <%=$opt%>
-	  </OPTION>
-   <% } %>
-	</SELECT>
- <% } else { %>
-        <INPUT NAME="rf_<%=$_->routerfieldpart%>"
-        VALUE="<%=$rf{$_->name}%>"
-        <%=$_->length ? 'SIZE="'.$_->length.'"' : ''%>>
-  <% } %></TD>
-  </TR>
-<% } %>
+foreach my $field ($router->virtual_fields) {
+  print $router->pvf($field)->widget('HTML', 'edit', 
+        $router->getfield($field));
+}
+%>
 </TABLE>
 
 
@@ -81,7 +59,7 @@ foreach my $part_svc ( qsearch('part_svc', { svcdb    => 'svc_broadband',
   <BR>
   <INPUT TYPE="checkbox" NAME="svcpart_<%=$part_svc->svcpart%>"<%=
       qsearchs('part_svc_router', { svcpart   => $part_svc->svcpart, 
-                                    routernum => $routernum } ) ? 'CHECKED' : ''%> VALUE="ON">
+                                    routernum => $routernum } ) ? ' CHECKED' : ''%> VALUE="ON">
   <A HREF="<%=${p}%>edit/part_svc.cgi?<%=$part_svc->svcpart%>">
     <%=$part_svc->svcpart%>: <%=$part_svc->svc%></A>
   <% } %>
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 4420bb609..44606d9a0 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -35,8 +35,6 @@ if ( $cgi->param('error') ) {
 
   } else { #adding
 
-    $svc_acct = new FS::svc_acct({}); 
-
     foreach $_ (split(/-/,$query)) {
       $pkgnum=$1 if /^pkgnum(\d+)$/;
       $svcpart=$1 if /^svcpart(\d+)$/;
@@ -44,6 +42,8 @@ if ( $cgi->param('error') ) {
     $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
     die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
 
+    $svc_acct = new FS::svc_acct({svcpart => $svcpart}); 
+
     $svcnum='';
 
     #set gecos
@@ -281,6 +281,14 @@ if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
 }
 print '</TD></TR>';
 
+foreach $field ($svc_acct->virtual_fields) {
+  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
+    # If the flag is X, it won't even show up in $svc_acct->virtual_fields.
+    print $svc_acct->pvf($field)->widget('HTML', 'edit', 
+        $svc_acct->getfield($field));
+  }
+}
+  
 #submit
 print qq!</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">!; 
 
diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index ee7f8becf..6828791c0 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -36,8 +36,6 @@ if ( $cgi->param('error') ) {
 
   } else { #adding
 
-    $svc_broadband = new FS::svc_broadband({});
-
     foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
       $pkgnum=$1 if /^pkgnum(\d+)$/;
       $svcpart=$1 if /^svcpart(\d+)$/;
@@ -45,7 +43,7 @@ if ( $cgi->param('error') ) {
     $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
     die "No part_svc entry!" unless $part_svc;
 
-    $svc_broadband->setfield('svcpart', $svcpart);
+    $svc_broadband = new FS::svc_broadband({ svcpart => $svcpart });
 
     $svcnum='';
 
@@ -159,30 +157,12 @@ Service #<B><%=$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
 <% } %>
 
 <%
-
-  my @part_sb_field = qsearch('part_sb_field', { svcpart => $svcpart });
-  my $sbf_hashref = $svc_broadband->sb_field_hashref($svcpart);
-  foreach (sort { $a->name cmp $b->name } @part_sb_field) {
-    %>
-    <TR>
-      <TD ALIGN="right"><%=$_->name%></TD>
-      <TD><%
-      if(my @opts = $_->list_values) {
-        %>
-	<SELECT NAME="sbf_<%=$_->sbfieldpart%>" SIZE=1> <%
-        foreach $opt (@opts) { %>
-          <OPTION VALUE="<%=$opt%>"<%=
-	    ($opt eq $sbf_hashref->{$_->name}) ? ' SELECTED' : ''%>>
-	    <%=$opt%></OPTION><%
-        } %></SELECT>
-   <% } else { %>
-        <INPUT NAME="sbf_<%=$_->sbfieldpart%>"
-	    VALUE="<%=$sbf_hashref->{$_->name}%>"
-     <%=$_->length ? 'SIZE="'.$_->length.'"' : ''%>>
-   <% } %>
-      </TD>
-    </TR>
-<% } %>
+foreach $field ($svc_broadband->virtual_fields) {
+  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
+    print $svc_broadband->pvf($field)->widget('HTML', 'edit',
+        $svc_broadband->getfield($field));
+  }
+} %>
   </TABLE>
   <BR>
   <INPUT TYPE="submit" NAME="submit" VALUE="Submit">
diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index d2c9ade5c..043af610b 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -29,12 +29,12 @@ if ( $cgi->param('error') ) {
 
   } else { #adding
 
-    $svc_www = new FS::svc_www({});
-
     foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
       $pkgnum=$1 if /^pkgnum(\d+)$/;
       $svcpart=$1 if /^svcpart(\d+)$/;
     }
+    $svc_www = new FS::svc_www { svcpart => $svcpart };
+
     $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
     die "No part_svc entry!" unless $part_svc;
 
@@ -167,6 +167,14 @@ foreach $_ (keys %username) {
 }
 print "</SELECT></TD></TR>";
 
+foreach $field ($svc_www->virtual_fields) {
+  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
+    # If the flag is X, it won't even show up in $svc_acct->virtual_fields.
+    print $svc_www->pvf($field)->widget('HTML', 'edit', 
+        $svc_www->getfield($field));
+  }
+}
+
 print '</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">';
 
 print <<END;
-- 
cgit v1.2.1


From 032f01f95762edfb8dac47c95309f0f98ced223c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Sep 2003 02:31:24 +0000
Subject: -w-safe and run under a 1.4 schema too

---
 httemplate/edit/part_svc.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 45e0b6ffe..18319b341 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -131,7 +131,7 @@ my %defs = (
   },
 );
 
-  foreach $svcdb (keys(%defs)) {
+  foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
     my $self = "FS::$svcdb"->new;
     $vfields{$svcdb} = {};
     foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them
@@ -153,7 +153,7 @@ my %defs = (
              ? ( $hashref->{svcdb} )
              : qw( svc_acct svc_domain svc_forward svc_www svc_broadband );
 
-  tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } @dbs;
+  tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } grep dbdef->table($_), @dbs;
   my $widget = new HTML::Widgets::SelectLayers(
     #'selected_layer' => $p_svcdb,
     'selected_layer' => $hashref->{svcdb} || 'svc_acct',
-- 
cgit v1.2.1


From 4f253eb015531465e049c858a7520e8c7a71d227 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Sep 2003 11:49:44 +0000
Subject: UI for multiple named taxes w/setup & recur exemptions 1.4
 schema-auto-adjusting backport

---
 httemplate/edit/cust_main_county.cgi | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index f3d28825a..efc12f3e0 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -16,12 +16,26 @@ print qq!<FORM ACTION="!, popurl(1),
         <TH><FONT SIZE=-1>State</FONT></TH>
         <TH><FONT SIZE=-1>County</FONT></TH>
         <TH><FONT SIZE=-1>Taxclass</FONT><BR><FONT SIZE=-2>(per-package classification)</FONT></TH>
-        <TH><FONT SIZE=-1>Tax name</FONT><BR><FONT SIZE=-2>(printed on invoices)</FONT></TH>
+END
+
+if ( dbdef->table('cust_main_county')->column('taxname') ) {
+  print '<TH><FONT SIZE=-1>Tax name</FONT><BR><FONT SIZE=-2>(printed on invoices)</FONT></TH>';
+}
+
+print <<END;
         <TH><FONT SIZE=-1>Tax</FONT></TH>
         <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH>
-      </TR>
 END
 
+if ( dbdef->table('cust_main_county')->column('setuptax') ) {
+  print '<TH><FONT SIZE=-1>Setup<BR>fee<BR>exempt</TH>';
+}
+if ( dbdef->table('cust_main_county')->column('recurtax') ) {
+  print '<TH><FONT SIZE=-1>Recurring<BR>fee<BR>exempt</TH>';
+}
+
+print '</TR>';
+
 foreach my $cust_main_county ( sort {    $a->country cmp $b->country
                                       or $a->state   cmp $b->state
                                       or $a->county  cmp $b->county
@@ -48,11 +62,26 @@ END
     , "</TD>";
 
   print qq!<TD><INPUT TYPE="text" NAME="taxname!, $hashref->{taxnum},
-        qq!" VALUE="!, $hashref->{taxname}, qq!"></TD>!;
+        qq!" VALUE="!, $hashref->{taxname}, qq!"></TD>!
+    if dbdef->table('cust_main_county')->column('taxname');
+
   print qq!<TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
         qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD>!;
   print qq!<TD>\$<INPUT TYPE="text" NAME="exempt_amount!, $hashref->{taxnum},
         qq!" VALUE="!, $hashref->{exempt_amount}||0, qq!" SIZE=6></TD>!;
+
+  print qq!<TD><INPUT TYPE="checkbox" NAME="setuptax!. $hashref->{taxnum}.
+        '" VALUE="Y"'.
+        ( $hashref->{setuptax} =~ /^Y$/i ? ' CHECKED' : '' ).
+        '"></TD>'
+    if dbdef->table('cust_main_county')->column('setuptax');
+
+  print qq!<TD><INPUT TYPE="checkbox" NAME="recurtax!. $hashref->{taxnum}.
+        '" VALUE="Y"'.
+        ( $hashref->{recurtax} =~ /^Y$/i ? ' CHECKED' : '' ).
+        '"></TD>'
+    if dbdef->table('cust_main_county')->column('recurtax');
+
   print '</TR>';
 
 }
-- 
cgit v1.2.1


From bfe2b53779bd76e03aa8deaca07ba916da6b3f5b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Sep 2003 08:11:12 +0000
Subject: fix tax edit UI

---
 httemplate/edit/cust_main_county.cgi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index efc12f3e0..4bcfcbe9b 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -65,21 +65,21 @@ END
         qq!" VALUE="!, $hashref->{taxname}, qq!"></TD>!
     if dbdef->table('cust_main_county')->column('taxname');
 
-  print qq!<TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
-        qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD>!;
-  print qq!<TD>\$<INPUT TYPE="text" NAME="exempt_amount!, $hashref->{taxnum},
-        qq!" VALUE="!, $hashref->{exempt_amount}||0, qq!" SIZE=6></TD>!;
+  print qq!<TD><TABLE><TR><TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
+        qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6></TD><TD>%</TD></TR></TABLE></TD>!;
+  print qq!<TD><TABLE><TR><TD>\$</TD><TD><INPUT TYPE="text" NAME="exempt_amount!, $hashref->{taxnum},
+        qq!" VALUE="!, $hashref->{exempt_amount}||0, qq!" SIZE=6></TD></TR></TABLE></TD>!;
 
   print qq!<TD><INPUT TYPE="checkbox" NAME="setuptax!. $hashref->{taxnum}.
         '" VALUE="Y"'.
         ( $hashref->{setuptax} =~ /^Y$/i ? ' CHECKED' : '' ).
-        '"></TD>'
+        '></TD>'
     if dbdef->table('cust_main_county')->column('setuptax');
 
   print qq!<TD><INPUT TYPE="checkbox" NAME="recurtax!. $hashref->{taxnum}.
         '" VALUE="Y"'.
         ( $hashref->{recurtax} =~ /^Y$/i ? ' CHECKED' : '' ).
-        '"></TD>'
+        '></TD>'
     if dbdef->table('cust_main_county')->column('recurtax');
 
   print '</TR>';
-- 
cgit v1.2.1


From 8bf17cd5daed65822e577b60794a4398e5e3dd2d Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 26 Sep 2003 21:02:13 +0000
Subject: $field isn't a global.

---
 httemplate/edit/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 44606d9a0..f1b8b800b 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -281,7 +281,7 @@ if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
 }
 print '</TD></TR>';
 
-foreach $field ($svc_acct->virtual_fields) {
+foreach my $field ($svc_acct->virtual_fields) {
   if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
     # If the flag is X, it won't even show up in $svc_acct->virtual_fields.
     print $svc_acct->pvf($field)->widget('HTML', 'edit', 
-- 
cgit v1.2.1


From c2a0b1b8e9d437434e326a3b573d7134c5697213 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Fri, 26 Sep 2003 23:33:09 +0000
Subject: $field is not a global.

---
 httemplate/edit/svc_www.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index 043af610b..ec5169e05 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -167,7 +167,7 @@ foreach $_ (keys %username) {
 }
 print "</SELECT></TD></TR>";
 
-foreach $field ($svc_www->virtual_fields) {
+foreach my $field ($svc_www->virtual_fields) {
   if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
     # If the flag is X, it won't even show up in $svc_acct->virtual_fields.
     print $svc_www->pvf($field)->widget('HTML', 'edit', 
-- 
cgit v1.2.1


From b59a412755582d30b4f7be2147b6ad32037e6f59 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Sep 2003 05:51:50 +0000
Subject: agents can be disabled (auto-sensing based on schema)

---
 httemplate/edit/agent.cgi     | 65 +++++++++++++++++++++++--------------------
 httemplate/edit/cust_main.cgi |  6 ++--
 2 files changed, 39 insertions(+), 32 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index 449456cdd..8a1cb2ae1 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -16,59 +16,64 @@ if ( $cgi->param('error') ) {
 my $action = $agent->agentnum ? 'Edit' : 'Add';
 my $hashref = $agent->hashref;
 
-print header("$action Agent", menubar(
+%>
+
+<%= header("$action Agent", menubar(
   'Main Menu' => $p,
   'View all agents' => $p. 'browse/agent.cgi',
-));
+)) %>
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
+<% if ( $cgi->param('error') ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
 
-print '<FORM ACTION="', popurl(1), 'process/agent.cgi" METHOD=POST>',
-      qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$hashref->{agentnum}">!,
-      "Agent #", $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)";
+<FORM ACTION="<%=popurl(1)%>process/agent.cgi" METHOD=POST>
+<INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $hashref->{agentnum} %>">
+Agent #<%= $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)" %>
 
-print &ntable("#cccccc", 2, ''), <<END;
+<%= &ntable("#cccccc", 2, '') %>
 <TR>
   <TH ALIGN="right">Agent</TH>
-  <TD><INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="$hashref->{agent}"></TD>
+  <TD><INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="<%= $hashref->{agent} %>"></TD>
 </TR>
 <TR>
   <TH ALIGN="right">Agent type</TH>
   <TD><SELECT NAME="typenum" SIZE=1>
-END
 
-foreach my $agent_type (qsearch('agent_type',{})) {
-  print "<OPTION VALUE=". $agent_type->typenum;
-  print " SELECTED"
-    if $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum );
-  print ">", $agent_type->getfield('typenum'), ": ",
-        $agent_type->getfield('atype'),"\n";
-}
+<% foreach my $agent_type (qsearch('agent_type',{})) { %>
+  <OPTION VALUE="<%= $agent_type->typenum %>"<%= ( $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum ) ) ? ' SELECTED' : '' %>>
+  <%= $agent_type->getfield('typenum') %>: <%= $agent_type->getfield('atype') %>
+<% } %>
 
-print <<END;
 </SELECT></TD>
 </TR>
+<% if ( dbdef->table('agent')->column('disabled') ) { %>
+  <TR>
+    <TD ALIGN="right">Disable</TD>
+    <TD><INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>></TD>
+  </TR>
+<% } %>
 <TR>
   <TD ALIGN="right"><!--Frequency--></TD>
-  <TD><INPUT TYPE="hidden" NAME="freq" VALUE="$hashref->{freq}"></TD>
+  <TD><INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>"></TD>
 </TR>
 <TR>
   <TD ALIGN="right"><!--Program--></TD>
-  <TD><INPUT TYPE="hidden" NAME="prog" VALUE="$hashref->{prog}"></TD>
+  <TD><INPUT TYPE="hidden" NAME="prog" VALUE="<%= $hashref->{prog} %>"></TD>
 </TR>
+<% if ( dbdef->table('agent')->column('username') ) { %>
+  <TR>
+    <TD ALIGN="right">Agent interface username</TD>
+    <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $hashref->{username} %>"></TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Agent interface password</TD>
+    <TD><INPUT TYPE="text" NAME="_password" VALUE="<%= $hashref->{_password} %>"></TD>
+  </TR>
+<% } %>
 </TABLE>
-END
 
-print qq!<BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{agentnum} ? "Apply changes" : "Add agent",
-      qq!">!;
-
-print <<END;
+<BR><INPUT TYPE="submit" VALUE="<%= $hashref->{agentnum} ? "Apply changes" : "Add agent" %>">
     </FORM>
   </BODY>
 </HTML>
-END
-
-%>
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index eeceed889..73a0eef49 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -75,9 +75,11 @@ print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
 
 my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
-my @agents = qsearch( 'agent', {} );
+my %agent_search = dbdef->table('agent')->column('disabled')
+                     ? ( 'disabled' => '' ) : ();
+my @agents = qsearch( 'agent', \%agent_search );
 #die "No agents created!" unless @agents;
-eidiot "You have not created any agents.  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
+eidiot "You have not created any agents (or all agents are disabled).  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
 my $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
 if ( scalar(@agents) == 1 ) {
   print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
-- 
cgit v1.2.1


From 56c771abafb2cad3430fee10deacba6e561933de Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Sep 2003 08:23:16 +0000
Subject: calendar popups!

---
 httemplate/edit/REAL_cust_pkg.cgi | 58 +++++++++++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 12 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index e44acba3c..4156b850b 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,6 +1,6 @@
 <!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.5 2003-04-01 01:22:24 ivan Exp $ -->
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.6 2003-09-30 08:21:56 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
@@ -30,6 +30,15 @@ print header('Package Edit'); #, menubar(
 #  'Main Menu' => popurl(2)
 #));
 
+%>
+
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
+
+<%
+
 #print info
 my($susp,$cancel,$expire)=(
   $cust_pkg->getfield('susp'),
@@ -45,6 +54,9 @@ print '<FORM NAME="formname" ACTION="process/REAL_cust_pkg.cgi" METHOD="POST">',
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>!
   if $error;
 
+#my $format = "%c %z (%Z)";
+my $format = "%m/%d/%Y %T %z (%Z)";
+
 print ntable("#cccccc",2),
       '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
       $pkgnum, '</TD></TR>',
@@ -55,23 +67,29 @@ print ntable("#cccccc",2),
       '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
       $otaker,  '</TD></TR>',
       '<TR><TD ALIGN="right">Setup date</TD><TD>'.
-      '<INPUT TYPE="text" NAME="setup" SIZE=32 VALUE="',
-      ( $setup ? time2str("%c %z (%Z)",$setup) : "" ), '"></TD></TR>';
+      '<INPUT TYPE="text" NAME="setup" SIZE=32 ID="setup_text" VALUE="',
+      ( $setup ? time2str($format, $setup) : "" ), '">'.
+      ' <IMG SRC="../images/calendar.png" ID="setup_button" STYLE="cursor: pointer" TITLE="Select date">'.
+      '</TD></TR>';
 
 print '<TR><TD ALIGN="right">Last bill date</TD><TD>',
-      '<INPUT TYPE="text" NAME="last_bill" SIZE=32 VALUE="',
+      '<INPUT TYPE="text" NAME="last_bill" SIZE=32 ID="last_bill_text" VALUE="',
       ( $cust_pkg->last_bill
-        ? time2str("%c %z (%Z)", $cust_pkg->last_bill)
+        ? time2str($format, $cust_pkg->last_bill)
         : ""                                          ),
-      '"></TD></TR>'
+      '">'.
+      ' <IMG SRC="../images/calendar.png" ID="last_bill_button" STYLE="cursor: pointer" TITLE="Select date">'.
+      '</TD></TR>'
   if $cust_pkg->dbdef_table->column('last_bill');
 
 print '<TR><TD ALIGN="right">Next bill date</TD><TD>',
-      '<INPUT TYPE="text" NAME="bill" SIZE=32 VALUE="',
-      ( $bill ? time2str("%c %z (%Z)",$bill) : "" ), '"></TD></TR>';
+      '<INPUT TYPE="text" NAME="bill" SIZE=32 ID="bill_text" VALUE="',
+      ( $bill ? time2str($format, $bill) : "" ), '">'.
+      ' <IMG SRC="../images/calendar.png" ID="bill_button" STYLE="cursor: pointer" TITLE="Select date">'.
+      '</TD></TR>';
 
 print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$susp), '</TD></TR>'
+       time2str($format, $susp), '</TD></TR>'
   if $susp;
 
 #print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
@@ -79,18 +97,34 @@ print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
 #  if $expire;
 print '<TR><TD ALIGN="right">Expiration date'.
       '</TD><TD>',
-      '<INPUT TYPE="text" NAME="expire" SIZE=32 VALUE="',
-      ( $expire ? time2str("%c %z (%Z)",$expire) : "" ), '">'.
+      '<INPUT TYPE="text" NAME="expire" SIZE=32 ID="expire_text" VALUE="',
+      ( $expire ? time2str($format, $expire) : "" ), '">'.
+      ' <IMG SRC="../images/calendar.png" ID="expire_button" STYLE="cursor: pointer" TITLE="Select date">'.
       '<BR><FONT SIZE=-1>(will <b>cancel</b> this package'.
       ' when the date is reached)</FONT>'.
       '</TD></TR>';
 
 print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$cancel), '</TD></TR>'
+       time2str($format, $cancel), '</TD></TR>'
   if $cancel;
 
 %>
 </TABLE>
+<SCRIPT TYPE="text/javascript">
+<%
+  my @cal = qw( setup bill expire );
+  push @cal, 'last_bill'
+    if $cust_pkg->dbdef_table->column('last_bill');
+  foreach my $cal (@cal) {
+%>
+  Calendar.setup({
+    inputField: "<%= $cal %>_text",
+    ifFormat:   "mm/dd/y",
+    button:     "<%= $cal %>_button",
+    align:      "BR"
+  });
+<% } %>
+</SCRIPT>
 <BR><INPUT TYPE="submit" VALUE="Apply Changes">
 </FORM>
 </BODY>
-- 
cgit v1.2.1


From 2b6242f9d8fe2d9afb3937e3eea03cd0ece1e5f8 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Thu, 2 Oct 2003 21:51:27 +0000
Subject: $field isn't a global.

---
 httemplate/edit/svc_broadband.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index 6828791c0..db27b3241 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -157,7 +157,7 @@ Service #<B><%=$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
 <% } %>
 
 <%
-foreach $field ($svc_broadband->virtual_fields) {
+foreach my $field ($svc_broadband->virtual_fields) {
   if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
     print $svc_broadband->pvf($field)->widget('HTML', 'edit',
         $svc_broadband->getfield($field));
-- 
cgit v1.2.1


From 9d0dd4b0c9017b18b634e3b6c62cfd0eda549f5c Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 15 Oct 2003 22:59:31 +0000
Subject: More changes that got lost in the merge somehow.

---
 httemplate/edit/router.cgi | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/router.cgi b/httemplate/edit/router.cgi
index 5c365a21e..a573c6504 100755
--- a/httemplate/edit/router.cgi
+++ b/httemplate/edit/router.cgi
@@ -22,6 +22,8 @@ print header("$action Router", menubar(
   'View all routers' => "${p}browse/router.cgi",
 ));
 
+my $p3 = popurl(3);
+
 if($cgi->param('error')) {
 %> <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT>
 <% } %>
@@ -31,6 +33,7 @@ if($cgi->param('error')) {
   <INPUT TYPE="hidden" NAME="redirect_ok" VALUE="<%=$p3%>/browse/router.cgi">
   <INPUT TYPE="hidden" NAME="redirect_error" VALUE="<%=$p3%>/edit/router.cgi">
   <INPUT TYPE="hidden" NAME="routernum" VALUE="<%=$routernum%>">
+  <INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$router->svcnum%>">
     Router #<%=$routernum or "(NEW)"%>
 
 <BR><BR>Name <INPUT TYPE="text" NAME="routername" SIZE=32 VALUE="<%=$router->routername%>">
@@ -49,12 +52,14 @@ foreach my $field ($router->virtual_fields) {
 </TABLE>
 
 
-
+<%
+unless ($router->svcnum) {
+%>
 <BR><BR>Select the service types available on this router<BR>
 <%
 
-foreach my $part_svc ( qsearch('part_svc', { svcdb    => 'svc_broadband',
-                                             disabled => '' }) ) {
+  foreach my $part_svc ( qsearch('part_svc', { svcdb    => 'svc_broadband',
+                                               disabled => '' }) ) {
   %>
   <BR>
   <INPUT TYPE="checkbox" NAME="svcpart_<%=$part_svc->svcpart%>"<%=
@@ -64,6 +69,8 @@ foreach my $part_svc ( qsearch('part_svc', { svcdb    => 'svc_broadband',
     <%=$part_svc->svcpart%>: <%=$part_svc->svc%></A>
   <% } %>
 
+<% } %>
+
   <BR><BR><INPUT TYPE="submit" VALUE="Apply changes">
   </FORM>
 </BODY></HTML>
-- 
cgit v1.2.1


From ea1d9968a9439272b58593e6b2ccbb3869002b20 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Oct 2003 04:25:18 +0000
Subject: daily/weekly billing

---
 httemplate/edit/part_pkg.cgi | 51 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 6 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index dee356250..daa5b7483 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -66,12 +66,51 @@ print '<FORM NAME="dummy">';
 #print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
 print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 
-print ntable("#cccccc",2), <<END;
-<TR><TD ALIGN="right">Package (customer-visible)</TD><TD><INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="$hashref->{pkg}"></TD></TR>
-<TR><TD ALIGN="right">Comment (customer-hidden)</TD><TD><INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="$hashref->{comment}"></TD></TR>
-<TR><TD ALIGN="right">Frequency (months) of recurring fee</TD><TD><INPUT TYPE="text" NAME="freq" VALUE="$hashref->{freq}" SIZE=3>&nbsp;&nbsp;<I>0=no recurring fee, 1=monthly, 3=quarterly, 12=yearly</TD></TR>
-<TR><TD ALIGN="right">Setup fee tax exempt</TD><TD>
-END
+my %freq;
+tie %freq, 'Tie::IxHash', 
+  '0'  => '(no recurring fee)',
+  '1d' => 'daily',
+  '1w' => 'weekly',
+  '2w' => 'biweekly (every 2 weeks)',
+  '1'  => 'monthly',
+  '2'  => 'bimonthly (every 2 months)',
+  '3'  => 'quarterly (every 3 months)',
+  '6'  => 'semiannually (every 6 months)',
+  '12' => 'annually',
+  '24' => 'biannually (every 2 years)',
+;
+if ( $part_pkg->dbdef_table->column('freq')->type =~ /(int)/i ) {
+  delete $freq{$_} foreach grep { ! /^\d+$/ } keys %freq;
+}
+
+%>
+<%= ntable("#cccccc",2) %>
+  <TR>
+    <TD ALIGN="right">Package (customer-visible)</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="<%= $part_pkg->pkg %>">
+    </TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Comment (customer-hidden)</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="<%=$part_pkg->comment%>">
+    </TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Recurring fee frequency </TD>
+    <TD>
+      <SELECT NAME="freq">
+        <% foreach my $freq ( keys %freq ) { %>
+          <OPTION VALUE="<%= $freq %>"<%= $freq eq $part_pkg->freq ? ' SELECTED' : '' %>><%= $freq{$freq} %>
+        <% } %>
+      </SELECT>
+    </TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Setup fee tax exempt</TD>
+    <TD>
+<%
 
 print '<INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y"';
 print ' CHECKED' if $hashref->{setuptax} eq "Y";
-- 
cgit v1.2.1


From f6c14a1aa55d317747e56d4c0d669b4c902018c4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Oct 2003 05:01:51 +0000
Subject: finish up weekly billing

---
 httemplate/edit/part_pkg.cgi | 1 +
 1 file changed, 1 insertion(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index daa5b7483..862e98ecf 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -66,6 +66,7 @@ print '<FORM NAME="dummy">';
 #print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
 print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
 
+#false laziness w/view/cust_main.cgi
 my %freq;
 tie %freq, 'Tie::IxHash', 
   '0'  => '(no recurring fee)',
-- 
cgit v1.2.1


From e5b08c9a31a68826e00b90b62249a57a24ebb9e3 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 22 Oct 2003 19:10:13 +0000
Subject: dbh is a global.

---
 httemplate/edit/process/router.cgi | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/router.cgi b/httemplate/edit/process/router.cgi
index 7e40c48a7..a2fa46dd9 100644
--- a/httemplate/edit/process/router.cgi
+++ b/httemplate/edit/process/router.cgi
@@ -1,8 +1,5 @@
 <%
 
-use FS::UID qw(dbh);
-
-my $dbh = dbh;
 local $FS::UID::AutoCommit=0;
 
 sub check {
@@ -10,7 +7,7 @@ sub check {
   if($error) {
     $cgi->param('error', $error);
     print $cgi->redirect(popurl(3) . "edit/router.cgi?". $cgi->query_string);
-    $dbh->rollback;
+    dbh->rollback;
     exit;
   }
 }
@@ -38,7 +35,7 @@ check($error);
 
 if ($old) {
   @old_psr = $old->part_svc_router;
-  foreach $psr (@old_psr) {
+  foreach my $psr (@old_psr) {
     if($cgi->param('svcpart_'.$psr->svcpart) eq 'ON') {
       # do nothing
     } else {
@@ -64,7 +61,7 @@ foreach($cgi->param) {
 
 
 # Yay, everything worked!
-$dbh->commit or die $dbh->errstr;
+dbh->commit or die dbh->errstr;
 print $cgi->redirect(popurl(3). "browse/router.cgi");
 
 %>
-- 
cgit v1.2.1


From f63c0e821610c885f9f49d301eeccf804e1ca6d3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 24 Oct 2003 19:30:44 +0000
Subject: cvv!

---
 httemplate/edit/cust_main.cgi         | 37 +++++++++++++++++++++++++++++++++--
 httemplate/edit/process/cust_main.cgi |  8 ++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 73a0eef49..1909b5438 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -39,6 +39,12 @@ if ( $cgi->param('error') ) {
   $query =~ /^(\d+)$/;
   $custnum=$1;
   $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
+  if ( $cust_main->dbdef_table->column('paycvv')
+       && length($cust_main->paycvv)             ) {
+    my $paycvv = $cust_main->paycvv;
+    $paycvv =~ s/./*/g;
+    $cust_main->paycvv($paycvv);
+  }
   $saved_pkgpart = 0;
   $username = '';
   $password = '';
@@ -61,7 +67,7 @@ my $action = $custnum ? 'Edit' : 'Add';
 # top
 
 my $p1 = popurl(1);
-print header("Customer $action", '');
+print header("Customer $action", '', ' onUnload="myclose()"');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
   if $error;
 
@@ -400,7 +406,19 @@ if ( $payby_default eq 'HIDE' ) {
   print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
 
   print "<TR><TD>Billing type</TD></TR>",
-        "</TABLE>",
+        "</TABLE>", '<script language="JavaScript"><!--
+                       var mywindow = -1;
+                       function myopen(filename,windowname,properties) {
+                         myclose();
+                         mywindow = window.open(filename,windowname,properties);
+                       }
+                       function myclose() {
+                         if ( mywindow != -1 )
+                           mywindow.close();
+                         mywindow = -1;
+                       }
+
+                     //--></script>',
         &table("#cccccc"), "<TR>";
 
   my($payinfo, $payname)=(
@@ -418,6 +436,12 @@ if ( $payby_default eq 'HIDE' ) {
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
 );
 
+  if ( $cust_main->dbdef_table->column('paycvv') ) {
+    foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 bs
+      $payby{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('../docs/cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="" SIZE=4 MAXLENGTH=4>!;
+    }
+  }
+
   my( $account, $aba ) = split('@', $payinfo);
 
   my %paybychecked = (
@@ -430,6 +454,15 @@ if ( $payby_default eq 'HIDE' ) {
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
 );
 
+  if ( $cust_main->dbdef_table->column('paycvv') ) {
+    my $paycvv = $cust_main->paycvv;
+
+    foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 bs
+      $paybychecked{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('../docs/cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="$paycvv" SIZE=4 MAXLENGTH=4>!;
+    }
+  }
+
+
   $cust_main->payby($payby_default) unless $cust_main->payby;
   for (qw(CARD DCRD CHEK DCHK LECB BILL COMP)) {
     print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 818382856..25c346e46 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -19,6 +19,8 @@ if ( $payby ) {
   $cgi->param('paydate',
     $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
   $cgi->param('payname', $cgi->param( $payby. '_payname' ) );
+  $cgi->param('paycvv', $cgi->param( $payby. '_paycvv' ) )
+    if defined $cgi->param( $payby. '_paycvv' );
 }
 
 $cgi->param('otaker', &getotaker );
@@ -27,6 +29,7 @@ my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
 push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
 $cgi->param('invoicing_list', join(',', @invoicing_list) );
 
+
 #create new record object
 
 my $new = new FS::cust_main ( {
@@ -113,6 +116,11 @@ if ( $new->custnum eq '' ) {
 } else { #create old record object
   my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
   $error ||= "Old record not found!" unless $old;
+  if ( defined dbdef->table('cust_main')->column('paycvv')
+       && length($old->paycvv)
+       && $new->paycvv =~ /^\s*\*+\s*$/ ) {
+    $new->paycvv($old->paycvv);
+  }
   $error ||= $new->replace($old, \@invoicing_list);
 }
 
-- 
cgit v1.2.1


From 36f038b92a2cc9c8f7bc52a2e11c00dbb7ed6ce0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Nov 2003 11:30:42 +0000
Subject: kludge around this so i can add service definitions for now

---
 httemplate/edit/part_svc.cgi | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 18319b341..e033a7b09 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -131,23 +131,25 @@ my %defs = (
   },
 );
 
-  foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
-    my $self = "FS::$svcdb"->new;
-    $vfields{$svcdb} = {};
-    foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them
-      my $pvf = $self->pvf($field);
-      my @list = $pvf->list;
-      if (scalar @list) {
-        $defs{$svcdb}->{$field} = { desc        => $pvf->label,
-                                    type        => 'select',
-                                    select_list => \@list };
-      } else {
-        $defs{$svcdb}->{$field} = $pvf->label;
-      } #endif
-      $vfields{$svcdb}->{$field} = $pvf;
-      warn "\$vfields{$svcdb}->{$field} = $pvf";
-    } #next $field
-  } #next $svcdb
+  #comment this out until it can be fixed, see bug#590
+  #
+  #foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
+  #  my $self = "FS::$svcdb"->new;
+  #  $vfields{$svcdb} = {};
+  #  foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them
+  #    my $pvf = $self->pvf($field);
+  #    my @list = $pvf->list;
+  #    if (scalar @list) {
+  #      $defs{$svcdb}->{$field} = { desc        => $pvf->label,
+  #                                  type        => 'select',
+  #                                  select_list => \@list };
+  #    } else {
+  #      $defs{$svcdb}->{$field} = $pvf->label;
+  #    } #endif
+  #    $vfields{$svcdb}->{$field} = $pvf;
+  #    warn "\$vfields{$svcdb}->{$field} = $pvf";
+  #  } #next $field
+  #} #next $svcdb
   
   my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
-- 
cgit v1.2.1


From 47c39af359fc93c777714a5c50a6183747b66da9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Nov 2003 11:42:32 +0000
Subject: does this fix Bug#590??

---
 httemplate/edit/part_svc.cgi | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index e033a7b09..18319b341 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -131,25 +131,23 @@ my %defs = (
   },
 );
 
-  #comment this out until it can be fixed, see bug#590
-  #
-  #foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
-  #  my $self = "FS::$svcdb"->new;
-  #  $vfields{$svcdb} = {};
-  #  foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them
-  #    my $pvf = $self->pvf($field);
-  #    my @list = $pvf->list;
-  #    if (scalar @list) {
-  #      $defs{$svcdb}->{$field} = { desc        => $pvf->label,
-  #                                  type        => 'select',
-  #                                  select_list => \@list };
-  #    } else {
-  #      $defs{$svcdb}->{$field} = $pvf->label;
-  #    } #endif
-  #    $vfields{$svcdb}->{$field} = $pvf;
-  #    warn "\$vfields{$svcdb}->{$field} = $pvf";
-  #  } #next $field
-  #} #next $svcdb
+  foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
+    my $self = "FS::$svcdb"->new;
+    $vfields{$svcdb} = {};
+    foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them
+      my $pvf = $self->pvf($field);
+      my @list = $pvf->list;
+      if (scalar @list) {
+        $defs{$svcdb}->{$field} = { desc        => $pvf->label,
+                                    type        => 'select',
+                                    select_list => \@list };
+      } else {
+        $defs{$svcdb}->{$field} = $pvf->label;
+      } #endif
+      $vfields{$svcdb}->{$field} = $pvf;
+      warn "\$vfields{$svcdb}->{$field} = $pvf";
+    } #next $field
+  } #next $svcdb
   
   my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
-- 
cgit v1.2.1


From 4eec09b9bb69dea116c0f8b5fa81862125aa587c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Nov 2003 12:21:09 +0000
Subject: fix jscalendar date ifFormat

---
 httemplate/edit/REAL_cust_pkg.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 4156b850b..d9b7579f6 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,6 +1,6 @@
 <!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.6 2003-09-30 08:21:56 ivan Exp $ -->
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.7 2003-11-19 12:21:09 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
@@ -119,7 +119,7 @@ print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
 %>
   Calendar.setup({
     inputField: "<%= $cal %>_text",
-    ifFormat:   "mm/dd/y",
+    ifFormat:   "%m/%d/%Y",
     button:     "<%= $cal %>_button",
     align:      "BR"
   });
-- 
cgit v1.2.1


From 24d7a586d33a5561b44ae0cfef07afb649b6fcbc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 24 Nov 2003 14:29:01 +0000
Subject: fix html quoting problems

---
 httemplate/edit/part_export.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index cc60f1aeb..4d0c7391f 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -68,9 +68,10 @@ my $widget = new HTML::Widgets::SelectLayers(
         $html .= '</SELECT>';
       } elsif ( $type eq 'textarea' ) {
         $html .= qq!<TEXTAREA NAME="$option" COLS=80 ROWS=8 WRAP="virtual">!.
-                 qq!$value</TEXTAREA>!;
+                 encode_entities($value). '</TEXTAREA>';
       } elsif ( $type eq 'text' ) {
-        $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
+        $html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="!.
+                 encode_entities($value). '" SIZE=64>';
       } elsif ( $type eq 'checkbox' ) {
         $html .= qq!<INPUT TYPE="checkbox" NAME="$option" VALUE="1"!;
         $html .= ' CHECKED' if $value;
-- 
cgit v1.2.1


From e294302d8bf2b12eec690d8c9f517fa81825c79a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Nov 2003 10:39:58 +0000
Subject: adding sql_generic price plan

---
 httemplate/edit/part_pkg.cgi | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 862e98ecf..b697a76b2 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -439,6 +439,41 @@ tie my %plans, 'Tie::IxHash',
     'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); push @details, \"Last month\\\'s excess data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\", \"Last month\\\'s excess time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; \' + what.recur_flat.value + \' + $hourscharge + \' + what.recur_input_charge.value + \' * $input + \' + what.recur_output_charge.value + \' * $output + $totalcharge ;\'',
   },
 
+  'sql_generic' => {
+    'name' => 'Base charge plus a metered rate from a configurable SQL query',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'recur_included' => { 'name' => 'Units included',
+                            'default' => 0,
+                          },
+      'recur_unit_charge' => { 'name' => 'Additional charge per unit',
+                               'default' => 0,
+                             },
+      'datasrc' => { 'name' => 'DBI data source',
+                     'default' => '',
+                   },
+      'db_username' => { 'name' => 'Database username',
+                         'default' => '',
+                       },
+      'db_password' => { 'name' => 'Database username',
+                         'default' => '',
+                       },
+      'query' => { 'name' => 'SQL query',
+                   'default' => '',
+                 },
+    },
+    'fieldorder' => [qw( setup_fee recur_flat recur_included recur_unit_charge datasrc db_username db_password query )],
+    'setup' => 'what.setup_fee.value',
+   # 'recur' => '\'my $dbh = DBI->connect(\"\' + what.datasrc.value + \'\", \"\' + what.db_username.value + \'\") or die $DBI::errstr; \'',
+   'recur' => '\'my $dbh = DBI->connect(\"\' + what.datasrc.value + \'\", \"\' + what.db_username.value + \'\", \"\' + what.db_password.value + \'\" ) or die $DBI::errstr; my $sth = $dbh->prepare(\"\' + what.query.value + \'\") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq \"svc_domain\" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge.value + \';\'',
+    #'recur' => '\'my $dbh = DBI->connect("\' + what.datasrc.value + \'", "\' + what.db_username.value + \'", "\' what.db_password.value + \'" ) or die $DBI::errstr; my $sth = $dbh->prepare("\' + what.query.value + \'") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_domain" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge + \';\'',
+  },
+
 ;
 
 my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-- 
cgit v1.2.1


From 31d6d0e8d0d624cd051440acf322cd8893c1026e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Dec 2003 02:36:38 +0000
Subject: add svc_external

---
 httemplate/edit/part_svc.cgi             |   7 ++-
 httemplate/edit/process/svc_external.cgi |  29 +++++++++
 httemplate/edit/svc_external.cgi         | 105 +++++++++++++++++++++++++++++++
 3 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100755 httemplate/edit/process/svc_external.cgi
 create mode 100644 httemplate/edit/svc_external.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 18319b341..10e89288f 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -53,6 +53,7 @@ Services are items you offer to your customers.
     <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
     <LI>svc_broadband - Broadband/High-speed Internet service
+    <LI>svc_external - Externally-tracked service
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
        <LI>svc_wo - Work orders (Partially unimplemented)
 -->
@@ -129,6 +130,10 @@ my %defs = (
     'ip_addr' => 'IP address.  Leave blank for automatic assignment.',
     'blocknum' => 'Address block.',
   },
+  'svc_external' => {
+    #'id' => '',
+    #'title' => '',
+  },
 );
 
   foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
@@ -151,7 +156,7 @@ my %defs = (
   
   my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
-             : qw( svc_acct svc_domain svc_forward svc_www svc_broadband );
+             : qw( svc_acct svc_domain svc_forward svc_www svc_broadband svc_external );
 
   tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } grep dbdef->table($_), @dbs;
   my $widget = new HTML::Widgets::SelectLayers(
diff --git a/httemplate/edit/process/svc_external.cgi b/httemplate/edit/process/svc_external.cgi
new file mode 100755
index 000000000..728cd2189
--- /dev/null
+++ b/httemplate/edit/process/svc_external.cgi
@@ -0,0 +1,29 @@
+<%
+
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+my $svcnum =$1;
+
+my $old = qsearchs('svc_external',{'svcnum'=>$svcnum}) if $svcnum;
+
+my $new = new FS::svc_external ( {
+  map {
+    ($_, scalar($cgi->param($_)));
+  } ( fields('svc_external'), qw( pkgnum svcpart ) )
+} );
+
+my $error = '';
+if ( $svcnum ) {
+  $error = $new->replace($old);
+} else {
+  $error = $new->insert;
+  $svcnum = $new->getfield('svcnum');
+} 
+
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_external.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_external.cgi?$svcnum");
+}
+
+%>
diff --git a/httemplate/edit/svc_external.cgi b/httemplate/edit/svc_external.cgi
new file mode 100644
index 000000000..bcfc85e3f
--- /dev/null
+++ b/httemplate/edit/svc_external.cgi
@@ -0,0 +1,105 @@
+<!-- mason kludge -->
+<%
+
+my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_external );
+if ( $cgi->param('error') ) {
+  $svc_external = new FS::svc_external ( {
+    map { $_, scalar($cgi->param($_)) } fields('svc_external')
+  } );
+  $svcnum = $svc_external->svcnum;
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+  die "No part_svc entry!" unless $part_svc;
+} else {
+  my($query) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) { #editing
+    $svcnum=$1;
+    $svc_external=qsearchs('svc_external',{'svcnum'=>$svcnum})
+      or die "Unknown (svc_external) svcnum!";
+
+    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+      or die "Unknown (cust_svc) svcnum!";
+
+    $pkgnum=$cust_svc->pkgnum;
+    $svcpart=$cust_svc->svcpart;
+  
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+  } else { #adding
+
+    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
+      $pkgnum=$1 if /^pkgnum(\d+)$/;
+      $svcpart=$1 if /^svcpart(\d+)$/;
+    }
+    $svc_external = new FS::svc_external { svcpart => $svcpart };
+
+    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+    die "No part_svc entry!" unless $part_svc;
+
+    $svcnum='';
+
+    #set fixed and default fields from part_svc
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      $svc_external->setfield( $part_svc_column->columnname,
+                               $part_svc_column->columnvalue,
+                             );
+    }
+
+  }
+}
+my $action = $svc_external->svcnum ? 'Edit' : 'Add';
+
+my $p1 = popurl(1);
+print header("External service $action", '');
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+
+print qq!<FORM ACTION="${p1}process/svc_external.cgi" METHOD=POST>!;
+
+#display
+ 
+
+#svcnum
+print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
+print qq!Service #<B>!, $svcnum ? $svcnum : "(NEW)", "</B><BR><BR>";
+
+#pkgnum
+print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+ 
+#svcpart
+print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
+
+my($id,$title)=(
+  $svc_external->id,
+  $svc_external->title,
+);
+
+print &ntable("#cccccc",2),
+      '<TR><TD ALIGN="right">External ID</TD><TD>'.
+      qq!<INPUT TYPE="text" NAME="id" VALUE="$id">!.
+      '</TD></TR>'.
+      '<TR><TD ALIGN="right">Title</TD><TD>'.
+      qq!<INPUT TYPE="text" NAME="title" VALUE="$title">!.
+      '</TD></TR>';
+
+foreach my $field ($svc_external->virtual_fields) {
+  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
+    # If the flag is X, it won't even show up in $svc_acct->virtual_fields.
+    print $svc_external->pvf($field)->widget('HTML', 'edit', 
+        $svc_external->getfield($field));
+  }
+}
+
+%>
+
+</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">
+    </FORM>
+  </BODY>
+</HTML>
+
-- 
cgit v1.2.1


From 89e8639b36b1b0fd474143c53d1664842405c29c Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 7 Jan 2004 06:10:01 +0000
Subject: Added billing plan sql_external for billing services in an external
 sql database.

---
 httemplate/edit/part_pkg.cgi | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index b697a76b2..f2f99b757 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -474,6 +474,36 @@ tie my %plans, 'Tie::IxHash',
     #'recur' => '\'my $dbh = DBI->connect("\' + what.datasrc.value + \'", "\' + what.db_username.value + \'", "\' what.db_password.value + \'" ) or die $DBI::errstr; my $sth = $dbh->prepare("\' + what.query.value + \'") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_domain" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge + \';\'',
   },
 
+
+
+  'sql_external' => {
+    'name' => 'Base charge plus additional fees for external services from a configurable SQL query',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'datasrc' => { 'name' => 'DBI data source',
+                     'default' => '',
+                   },
+      'db_username' => { 'name' => 'Database username',
+                         'default' => '',
+                       },
+      'db_password' => { 'name' => 'Database password',
+                         'default' => '',
+                       },
+      'query' => { 'name' => 'SQL query',
+                   'default' => '',
+                 },
+    },
+    'fieldorder' => [qw( setup_fee recur_flat datasrc db_username db_password query )],
+    'setup' => 'what.setup_fee.value',
+    'recur' => q!'my $dbh = DBI->connect("' + what.datasrc.value + '", "' + what.db_username.value + '", "' + what.db_password.value + '" ) or die $DBI::errstr; my $sth = $dbh->prepare("' + what.query.value + '") or die $dbh->errstr; my $price = ' + what.recur_flat.value + '; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_external" } $cust_pkg->cust_svc ){ my $id = $cust_svc->svc_x->id; $sth->execute($id) or die $sth->errstr; $price += $sth->fetchrow_arrayref->[0]; } $price;'!,
+
+  },
+
 ;
 
 my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-- 
cgit v1.2.1


From f0bcdae0719f2634df3c51bd3f21906de14817d4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 Jan 2004 03:50:59 +0000
Subject: fix UI: displaying "Add" on invoice event edits

---
 httemplate/edit/part_bill_event.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 6426eed93..48ed7916b 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -20,7 +20,7 @@ if ( $query && $query =~ /^(\d+)$/ ) {
 } else {
   $part_bill_event ||= new FS::part_bill_event {};
 }
-$action ||= $part_bill_event->pkgpart ? 'Edit' : 'Add';
+$action ||= $part_bill_event->eventpart ? 'Edit' : 'Add';
 my $hashref = $part_bill_event->hashref;
 
 print header("$action Invoice Event Definition", menubar(
-- 
cgit v1.2.1


From bceb76982c9a2516122d7996f2a4c2a30cd79a45 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 12 Jan 2004 20:40:28 +0000
Subject: Lists are just better sorted.

---
 httemplate/edit/part_virtual_field.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_virtual_field.cgi b/httemplate/edit/part_virtual_field.cgi
index 8bc84387f..fb10321e8 100644
--- a/httemplate/edit/part_virtual_field.cgi
+++ b/httemplate/edit/part_virtual_field.cgi
@@ -47,7 +47,7 @@ Field #<B><%=$vfieldpart or "(NEW)"%></B><BR><BR>
     <TD><% if ($action eq 'Add') { %>
       <SELECT SIZE=1 NAME="dbtable"><%
         my $dbdef = dbdef;  # ick
-        foreach my $dbtable ($dbdef->tables) {
+        foreach my $dbtable (sort { $a cmp $b } $dbdef->tables) {
           if ($dbtable !~ /^h_/
           and $dbdef->table($dbtable)->primary_key) { %>
             <OPTION VALUE="<%=$dbtable%>"><%=$dbtable%></OPTION><%
-- 
cgit v1.2.1


From 85be0d954dbe4a2c86841a37dc6a4df690dd5142 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Jan 2004 02:53:12 +0000
Subject: fix state default and set min year to this year, patch from
 <matthewd>, thanks!

---
 httemplate/edit/cust_main.cgi | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 1909b5438..bfe4a2d4f 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -191,8 +191,10 @@ END
 my $countrydefault = $conf->config('countrydefault') || 'US';
 $cust_main->country( $countrydefault ) unless $cust_main->country;
 
-$cust_main->state( $conf->config('statedefault') || 'CA' )
-  unless $cust_main->state || $cust_main->country ne 'US';
+my $statedefault = $conf->config('statedefault')
+                   || ($countrydefault eq 'US' ? 'CA' : '');
+$cust_main->state( $statedefault )
+  unless $cust_main->state || $cust_main->country ne $countrydefault;
 
 my($county_html, $state_html, $country_html) =
   FS::cust_main_county::regionselector( $cust_main->county,
@@ -343,7 +345,9 @@ sub expselect {
     $return .= ">$_";
   }
   $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
-  for ( 2001 .. 2037 ) {
+  my @t = localtime;
+  my $thisYear = $t[5] + 1900;
+  for ( ($thisYear > $y && $y > 0 ? $y : $thisYear) .. 2037 ) {
     $return .= "<OPTION";
     $return .= " SELECTED" if $_ == $y;
     $return .= ">$_";
-- 
cgit v1.2.1


From 24eb823f02d7681b052261dd321b3505ac970e61 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 23 Jan 2004 03:01:22 +0000
Subject: and the same for ship_

---
 httemplate/edit/cust_main.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index bfe4a2d4f..857e769a3 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -291,8 +291,9 @@ END
   #false laziness with regular state
   $cust_main->ship_country( $countrydefault ) unless $cust_main->ship_country;
 
-  $cust_main->ship_state( $conf->config('statedefault') || 'CA' )
-    unless $cust_main->ship_state || $cust_main->ship_country ne 'US';
+  $cust_main->ship_state( $statedefault )
+    unless $cust_main->ship_state
+           || $cust_main->ship_country ne $countrydefault;
 
   my($ship_county_html, $ship_state_html, $ship_country_html) =
     FS::cust_main_county::regionselector( $cust_main->ship_county,
-- 
cgit v1.2.1


From c7e637f35948396ca2bf760160f2a1a3081e0484 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 31 Jan 2004 06:33:40 +0000
Subject: add pkg_svc.primary_svc flag to enable an explicit first package flag

---
 httemplate/edit/part_pkg.cgi         | 30 ++++++++++++++++++++++--------
 httemplate/edit/process/part_pkg.cgi | 16 ++++++++++++----
 2 files changed, 34 insertions(+), 12 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index f2f99b757..8416b3546 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -152,9 +152,11 @@ print ' CHECKED' if $hashref->{disabled} eq "Y";
 print '>';
 print '</TD></TR></TABLE>';
 
-my $thead =  "\n\n". ntable('#cccccc', 2). <<END;
-<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH><TH BGCOLOR="#dcdcdc">Service</TH></TR>
-END
+my $thead =  "\n\n". ntable('#cccccc', 2).
+             '<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH>';
+$thead .=  '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Primary</FONT></TH>'
+  if dbdef->table('pkg_svc')->column('primary_svc');
+$thead .= '<TH BGCOLOR="#dcdcdc">Service</TH></TR>';
 
 #unless ( $cgi->param('clone') ) {
 #dunno why...
@@ -176,9 +178,10 @@ foreach my $part_svc ( @part_svc ) {
     'pkgpart'  => $pkgpart,
     'svcpart'  => $svcpart,
   } ) || new FS::pkg_svc ( {
-    'pkgpart'  => $pkgpart,
-    'svcpart'  => $svcpart,
-    'quantity' => 0,
+    'pkgpart'     => $pkgpart,
+    'svcpart'     => $svcpart,
+    'quantity'    => 0,
+    'primary_svc' => '',
   });
   #? #next unless $pkg_svc;
 
@@ -190,7 +193,13 @@ foreach my $part_svc ( @part_svc ) {
     print '<TR>'; # if $count == 0 ;
     print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=4 MAXLENGTH=3 VALUE="!,
           $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0,
-          qq!"></TD><TD><A HREF="part_svc.cgi?!,$part_svc->svcpart,
+          qq!"></TD>!;
+    if ( dbdef->table('pkg_svc')->column('primary_svc') ) {
+      print qq!<TD><INPUT TYPE="radio" NAME="pkg_svc_primary" VALUE="$svcpart"!;
+      print ' CHECKED' if $pkg_svc->primary_svc =~ /^Y/i;
+      print '></TD>';
+    }
+    print qq!<TD><A HREF="part_svc.cgi?!,$part_svc->svcpart,
           qq!">!, $part_svc->getfield('svc'), "</A></TD></TR>";
 #    print "</TABLE></TD><TD>$thead" if ++$count == int(scalar(@part_svc) / 2);
     $count+=1;
@@ -518,6 +527,10 @@ if ( $conf->exists('enable_taxclasses') ) {
   push @fixups, 'taxclass'; #hidden
 }
 
+my @form_radio = ();
+if ( dbdef->table('pkg_svc')->column('primary_svc') ) {
+  push @form_radio, 'pkg_svc_primary';
+}
 
 my $widget = new HTML::Widgets::SelectLayers(
   'selected_layer' => $part_pkg->plan,
@@ -526,7 +539,8 @@ my $widget = new HTML::Widgets::SelectLayers(
   'form_action'    => 'process/part_pkg.cgi',
   'form_text'      => [ qw(pkg comment freq clone pkgnum pkgpart), @fixups ],
   'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
-  'form_select'    => [ @form_select ],
+  'form_radio'     => \@form_radio,
+  'form_select'    => \@form_select,
   'fixup_callback' => sub {
                         #my $ = @_;
                         my $html = '';
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index d489426f9..7eada7bc8 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -62,16 +62,24 @@ if ( $error ) {
 
 foreach my $part_svc (qsearch('part_svc',{})) {
   my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
+  my $primary_svc =
+    $cgi->param('pkg_svc_primary') == $part_svc->svcpart ? 'Y' : '';
   my $old_pkg_svc = qsearchs('pkg_svc', {
     'pkgpart' => $pkgpart,
     'svcpart' => $part_svc->svcpart,
   } );
   my $old_quantity = $old_pkg_svc ? $old_pkg_svc->quantity : 0;
-  next unless $old_quantity != $quantity; #!here
+  my $old_primary_svc =
+    ( $old_pkg_svc && $old_pkg_svc->dbdef_table->column('primary_svc') )
+      ? $old_pkg_svc->primary_svc
+      : '';
+  next unless $old_quantity != $quantity || $old_primary_svc ne $primary_svc;
+
   my $new_pkg_svc = new FS::pkg_svc( {
-    'pkgpart'  => $pkgpart,
-    'svcpart'  => $part_svc->svcpart,
-    'quantity' => $quantity, 
+    'pkgpart'     => $pkgpart,
+    'svcpart'     => $part_svc->svcpart,
+    'quantity'    => $quantity, 
+    'primary_svc' => $primary_svc,
   } );
   if ( $old_pkg_svc ) {
     my $myerror = $new_pkg_svc->replace($old_pkg_svc);
-- 
cgit v1.2.1


From f4347a8f8e96f32125575704146bb23b422f9e6b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 13 Feb 2004 13:53:24 +0000
Subject: typo

---
 httemplate/edit/part_svc.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 10e89288f..6868ffd65 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -179,7 +179,7 @@ my %defs = (
       $html .= '<BR><BR>'. table().
                table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
       foreach my $part_export ( @part_export ) {
-        $html .= '<TD><INPUT TYPE="checbox"'.
+        $html .= '<TD><INPUT TYPE="checkbox"'.
                  ' NAME="exportnum'. $part_export->exportnum. '"  VALUE="1" ';
         $html .= 'CHECKED'
           if ( $clone || $part_svc->svcpart ) #null svcpart search causing error
-- 
cgit v1.2.1


From 395e0a932b6728326f8f5242f7f0a82e2dac919d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Feb 2004 10:37:22 +0000
Subject: fix up forward editing for new svc_forward.src field

---
 httemplate/edit/svc_forward.cgi | 104 ++++++++++++++++++++--------------------
 1 file changed, 51 insertions(+), 53 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 0d815b9e5..c323fa29e 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -58,20 +58,17 @@ if ( $cgi->param('error') ) {
 my $action = $svc_forward->svcnum ? 'Edit' : 'Add';
 
 my %email;
+
+#starting with those currently attached
+foreach my $method (qw( srcsvc_acct dstsvc_acct )) {
+  my $svc_acct = $svc_forward->$method();
+  $email{$svc_acct->svcnum} = $svc_acct->email if $svc_acct;
+}
+
 if ($pkgnum) {
 
   #find all possible user svcnums (and emails)
 
-  #starting with those currently attached
-  if ( $svc_forward->srcsvc ) {
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_forward->srcsvc } );
-    $email{$svc_forward->srcsvc} = $svc_acct->email;
-  }
-  if ( $svc_forward->dstsvc ) {
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $svc_forward->dstsvc } );
-    $email{$svc_forward->dstsvc} = $svc_acct->email;
-  }
-
   #and including the rest for this customer
   my($u_part_svc,@u_acct_svcparts);
   foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
@@ -98,15 +95,7 @@ if ($pkgnum) {
     }
   }
 
-} elsif ( $action eq 'Edit' ) {
-
-  my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$svc_forward->srcsvc});
-  $email{$svc_forward->srcsvc} = $svc_acct->email;
-
-  $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svc_forward->dstsvc});
-  $email{$svc_forward->dstsvc} = $svc_acct->email;
-
-} else {
+} elsif ( $action eq 'Add' ) {
   die "\$action eq Add, but \$pkgnum is null!\n";
 }
 
@@ -115,6 +104,7 @@ my($srcsvc,$dstsvc,$dst)=(
   $svc_forward->dstsvc,
   $svc_forward->dst,
 );
+my $src = $svc_forward->dbdef_table->column('src') ? $svc_forward->src : '';
 
 #display
 
@@ -130,46 +120,54 @@ my($srcsvc,$dstsvc,$dst)=(
 Service #<%= $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
 Service: <B><%= $part_svc->svc %></B><BR><BR>
 
-<FORM NAME="dummy">
+<FORM ACTION="process/svc_forward.cgi" METHOD="POST">
+<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
+
+<SCRIPT TYPE="text/javascript">
+function srcchanged(what) {
+  if ( what.options[what.selectedIndex].value == 0 ) {
+    what.form.src.disabled = false;
+  } else {
+    what.form.src.disabled = true;
+  }
+}
+function dstchanged(what) {
+  if ( what.options[what.selectedIndex].value == 0 ) {
+    what.form.dst.disabled = false;
+  } else {
+    what.form.dst.disabled = true;
+  }
+}
+</SCRIPT>
 
 <%= ntable("#cccccc",2) %>
-<TR><TD ALIGN="right">Email to</TD><TD><SELECT NAME="srcsvc" SIZE=1>
+<TR><TD ALIGN="right">Email to</TD>
+<TD><SELECT NAME="srcsvc" SIZE=1 onChange="srcchanged(this)">
 <% foreach $_ (keys %email) { %>
   <OPTION<%= $_ eq $srcsvc ? " SELECTED" : "" %> VALUE="<%= $_ %>"><%= $email{$_} %></OPTION>
 <% } %>
-</SELECT></TD></TR>
-
-<%
-  tie my %tied_email, 'Tie::IxHash',
-    ''  => 'SELECT DESTINATION',
-    %email,
-    '0' => '(other email address)';
-  my $widget = new HTML::Widgets::SelectLayers(
-    'selected_layer' => $dstsvc,
-    'options'        => \%tied_email,
-    'form_name'      => 'dummy',
-    'form_action'    => 'process/svc_forward.cgi',
-    'form_select'    => ['srcsvc'],
-    'html_between'   => '</TD></TR></TABLE>',
-    'layer_callback' => sub {
-      my $layer = shift;
-      my $html = qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!.
-                 qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!.
-                 qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!.
-                 qq!<INPUT TYPE="hidden" NAME="dstsvc" VALUE="$layer">!;
-      if ( $layer eq '0' ) {
-        $html .= ntable("#cccccc",2).
-                 '<TR><TD ALIGN="right">Destination email</TD>'.
-                 qq!<TD><INPUT TYPE="text" NAME="dst" VALUE="$dst"></TD>!.
-                 '</TR></TABLE>';
-      }
-      $html .= '<BR><INPUT TYPE="submit" VALUE="Submit">';
-      $html;
-    },
-  );
-%>
+<% if ( $svc_forward->dbdef_table->column('src') ) { %>
+  <OPTION <%= $src ? 'SELECTED' : '' %> VALUE="0">(other email address)</OPTION>
+<% } %>
+</SELECT>
+<% if ( $svc_forward->dbdef_table->column('src') ) { %>
+<INPUT TYPE="text" NAME="src" VALUE="<%= $src %>" <%= ( $src || !scalar(%email) ) ? '' : 'DISABLED' %>>
+<% } %>
+</TD></TR>
 
 <TR><TD ALIGN="right">Forwards to</TD>
-<TD><%= $widget->html %>
+<TD><SELECT NAME="dstsvc" SIZE=1 onChange="dstchanged(this)">
+<% foreach $_ (keys %email) { %>
+  <OPTION<%= $_ eq $dstsvc ? " SELECTED" : "" %> VALUE="<%= $_ %>"><%= $email{$_} %></OPTION>
+<% } %>
+<OPTION <%= $dst ? 'SELECTED' : '' %> VALUE="0">(other email address)</OPTION>
+</SELECT>
+<INPUT TYPE="text" NAME="dst" VALUE="<%= $dst %>" <%= ( $dst || !scalar(%email) ) ? '' : 'DISABLED' %>>
+</TD></TR>
+    </TABLE>
+<BR><INPUT TYPE="submit" VALUE="Submit">
+</FORM>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From 8d581f6199c27147f417f73cc9f58260efabf327 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Feb 2004 04:01:30 +0000
Subject: double quotes are not ASP

---
 httemplate/edit/svc_forward.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index c323fa29e..2e6c5f1a0 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -121,9 +121,9 @@ Service #<%= $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
 Service: <B><%= $part_svc->svc %></B><BR><BR>
 
 <FORM ACTION="process/svc_forward.cgi" METHOD="POST">
-<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
-<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
+<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%= $svcnum %>">
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%= $pkgnum %>">
+<INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $svcpart %>">
 
 <SCRIPT TYPE="text/javascript">
 function srcchanged(what) {
-- 
cgit v1.2.1


From 862e93b33e28428121a611ff5fda048cd9fbcd96 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 28 Feb 2004 22:40:17 +0000
Subject: new setuptax and recurtax fields

---
 httemplate/edit/process/cust_main_county.cgi | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index 6d80ad512..9287ed150 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -7,11 +7,15 @@ foreach ( grep { /^tax\d+$/ } $cgi->param ) {
     or die "Couldn't find taxnum $taxnum!";
   next unless    $old->tax           != $cgi->param("tax$taxnum")
               || $old->exempt_amount != $cgi->param("exempt_amount$taxnum")
-              || $old->taxname       ne $cgi->param("taxname$taxnum");
+              || $old->taxname       ne $cgi->param("taxname$taxnum")
+              || $old->setuptax      ne $cgi->param("setuptax$taxnum")
+              || $old->recurtax      ne $cgi->param("recurtax$taxnum");
   my %hash = $old->hash;
   $hash{tax} = $cgi->param("tax$taxnum");
   $hash{exempt_amount} = $cgi->param("exempt_amount$taxnum");
   $hash{taxname} = $cgi->param("taxname$taxnum");
+  $hash{setuptax} = $cgi->param("setuptax$taxnum");
+  $hash{recurtax} = $cgi->param("recurtax$taxnum");
   my $new = new FS::cust_main_county \%hash;
   my $error = $new->replace($old);
   if ( $error ) {
-- 
cgit v1.2.1


From 33979d5fd9923e2378bc2239f6c4e6857834fa3f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 28 Feb 2004 22:40:41 +0000
Subject: style

---
 httemplate/edit/process/cust_main_county-collapse.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/cust_main_county-collapse.cgi b/httemplate/edit/process/cust_main_county-collapse.cgi
index 8e67140a8..5da9dea80 100755
--- a/httemplate/edit/process/cust_main_county-collapse.cgi
+++ b/httemplate/edit/process/cust_main_county-collapse.cgi
@@ -3,8 +3,8 @@
 my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/ or die "Illegal taxnum!";
 my $taxnum = $1;
-my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
-  or die ("Unknown taxnum!");
+my $cust_main_county = qsearchs('cust_main_county', { 'taxnum' => $taxnum } )
+  or die "Unknown taxnum $taxnum";
 
 #really should do this in a .pm & start transaction
 
-- 
cgit v1.2.1


From f4247c22a77543afa76f4bc81281bdda71f776cf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Mar 2004 06:20:20 +0000
Subject: grey out inactive text boxes as well as disable them (IE doesn't grey
 out disabled text dialogs)

---
 httemplate/edit/svc_forward.cgi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 2e6c5f1a0..2b9d35ad1 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -129,15 +129,19 @@ Service: <B><%= $part_svc->svc %></B><BR><BR>
 function srcchanged(what) {
   if ( what.options[what.selectedIndex].value == 0 ) {
     what.form.src.disabled = false;
+    what.form.src.style.backgroundColor = "white";
   } else {
     what.form.src.disabled = true;
+    what.form.src.style.backgroundColor = "lightgrey";
   }
 }
 function dstchanged(what) {
   if ( what.options[what.selectedIndex].value == 0 ) {
     what.form.dst.disabled = false;
+    what.form.dst.style.backgroundColor = "white";
   } else {
     what.form.dst.disabled = true;
+    what.form.dst.style.backgroundColor = "lightgrey";
   }
 }
 </SCRIPT>
@@ -153,7 +157,7 @@ function dstchanged(what) {
 <% } %>
 </SELECT>
 <% if ( $svc_forward->dbdef_table->column('src') ) { %>
-<INPUT TYPE="text" NAME="src" VALUE="<%= $src %>" <%= ( $src || !scalar(%email) ) ? '' : 'DISABLED' %>>
+<INPUT TYPE="text" NAME="src" VALUE="<%= $src %>" <%= ( $src || !scalar(%email) ) ? '' : 'DISABLED STYLE="background-color: lightgrey"' %>>
 <% } %>
 </TD></TR>
 
@@ -164,7 +168,7 @@ function dstchanged(what) {
 <% } %>
 <OPTION <%= $dst ? 'SELECTED' : '' %> VALUE="0">(other email address)</OPTION>
 </SELECT>
-<INPUT TYPE="text" NAME="dst" VALUE="<%= $dst %>" <%= ( $dst || !scalar(%email) ) ? '' : 'DISABLED' %>>
+<INPUT TYPE="text" NAME="dst" VALUE="<%= $dst %>" <%= ( $dst || !scalar(%email) ) ? '' : 'DISABLED STYLE="background-color: lightgrey"' %>>
 </TD></TR>
     </TABLE>
 <BR><INPUT TYPE="submit" VALUE="Submit">
-- 
cgit v1.2.1


From 557b6397be9c5a92985b0cbac849e9dd72c54b43 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Wed, 10 Mar 2004 22:27:39 +0000
Subject: Excluded virtual fields weren't being properly masked on errors. The
 router/block select box wasn't being generated on errors.

---
 httemplate/edit/svc_broadband.cgi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index db27b3241..9e064c5c8 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -11,11 +11,11 @@ use Tie::IxHash;
 my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_broadband );
 if ( $cgi->param('error') ) {
   $svc_broadband = new FS::svc_broadband ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_broadband')
+    map { $_, scalar($cgi->param($_)) } fields('svc_broadband'), qw(svcpart)
   } );
   $svcnum = $svc_broadband->svcnum;
   $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $cgi->param('svcpart');
+  $svcpart = $svc_broadband->svcpart;
   $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
   die "No part_svc entry!" unless $part_svc;
 } else {
@@ -132,7 +132,9 @@ Service #<B><%=$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
       <TD BGCOLOR="#ffffff">
         <SELECT NAME="blocknum">
 <%
+  warn $svc_broadband->svcpart;
   foreach my $router ($svc_broadband->allowed_routers) {
+    warn $router->routername;
     foreach my $addr_block ($router->addr_block) {
 %>
         <OPTION VALUE="<%=$addr_block->blocknum%>"<%=($addr_block->blocknum eq $blocknum) ? ' SELECTED' : ''%>>
@@ -158,7 +160,8 @@ Service #<B><%=$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
 
 <%
 foreach my $field ($svc_broadband->virtual_fields) {
-  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
+  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' &&
+       $part_svc->part_svc_column($field)->columnflag ne 'X') {
     print $svc_broadband->pvf($field)->widget('HTML', 'edit',
         $svc_broadband->getfield($field));
   }
-- 
cgit v1.2.1


From e3f327b2af9e6a591bae41d315fda731ec7f5128 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Mar 2004 11:05:58 +0000
Subject: remove everything that links to package view also, closes: Bug#569

---
 httemplate/edit/process/REAL_cust_pkg.cgi  | 4 +++-
 httemplate/edit/process/quick-cust_pkg.cgi | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi
index 7f5c5e49c..3d697ddfd 100755
--- a/httemplate/edit/process/REAL_cust_pkg.cgi
+++ b/httemplate/edit/process/REAL_cust_pkg.cgi
@@ -16,7 +16,9 @@ if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "REAL_cust_pkg.cgi?". $cgi->query_string );
 } else { 
-  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?". $pkgnum);
+  my $custnum = $new->custnum;
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum".
+                       "#cust_pkg$pkgnum" );
 }
 
 %>
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index a8f5b1453..fd9e59472 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -17,7 +17,8 @@ if ($error) {
 <%
   eidiot($error);
 } else {
-  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?". $cust_pkg[0]->pkgnum );
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum".
+                       "#cust_pkg". $cust_pkg[0]->pkgnum );
 }
 
 %>
-- 
cgit v1.2.1


From 30a2ed5a5fa3de5ae0d79c4fa85aa2c36ae6b13b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Mar 2004 15:04:54 +0000
Subject: s/routing code/routing number/

---
 httemplate/edit/cust_main.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 857e769a3..3d5e861ba 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -434,8 +434,8 @@ if ( $payby_default eq 'HIDE' ) {
   my %payby = (
     'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
     'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
-    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
-    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE=""><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
+    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
     'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
@@ -452,8 +452,8 @@ if ( $payby_default eq 'HIDE' ) {
   my %paybychecked = (
     'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
     'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
-    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
-    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
+    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
     'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
-- 
cgit v1.2.1


From 1dc993241b373c27f019db21fdfea6a6466a3b45 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Mar 2004 17:13:22 +0000
Subject: add ACH help graphic

---
 httemplate/edit/cust_main.cgi | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 3d5e861ba..f9c80d82d 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -411,7 +411,7 @@ if ( $payby_default eq 'HIDE' ) {
   print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
 
   print "<TR><TD>Billing type</TD></TR>",
-        "</TABLE>", '<script language="JavaScript"><!--
+        "</TABLE>", '<SCRIPT>
                        var mywindow = -1;
                        function myopen(filename,windowname,properties) {
                          myclose();
@@ -422,8 +422,17 @@ if ( $payby_default eq 'HIDE' ) {
                            mywindow.close();
                          mywindow = -1;
                        }
-
-                     //--></script>',
+                       var achwindow = -1;
+                       function achopen(filename,windowname,properties) {
+                         achclose();
+                         achwindow = window.open(filename,windowname,properties);
+                       }
+                       function achclose() {
+                         if ( achwindow != -1 )
+                           achwindow.close();
+                         achwindow = -1;
+                       }
+                     </SCRIPT>',
         &table("#cccccc"), "<TR>";
 
   my($payinfo, $payname)=(
@@ -434,8 +443,8 @@ if ( $payby_default eq 'HIDE' ) {
   my %payby = (
     'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
     'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
-    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
-    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
+    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
     'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
@@ -452,8 +461,8 @@ if ( $payby_default eq 'HIDE' ) {
   my %paybychecked = (
     'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
     'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
-    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
-    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
+    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
     'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
     'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
     'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
-- 
cgit v1.2.1


From a44fcf8b6fb405c09a47de27b32fcb19f121dcae Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Mar 2004 15:38:48 +0000
Subject: catch misconfigured exports

---
 httemplate/edit/part_export.cgi | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 4d0c7391f..b3d42bd96 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -46,6 +46,8 @@ my $widget = new HTML::Widgets::SelectLayers(
 
     foreach my $option ( keys %{$exports->{$layer}{options}} ) {
       my $optinfo = $exports->{$layer}{options}{$option};
+      die "Retreived non-ref export info option from $layer export: $optinfo"
+        unless ref($optinfo);
       my $label = $optinfo->{label};
       my $type = defined($optinfo->{type}) ? $optinfo->{type} : 'text';
       my $value = $cgi->param($option)
-- 
cgit v1.2.1


From 2a3703dad2a512c709152c1a8d99acbe6c27b668 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 May 2004 22:18:24 +0000
Subject: show service name and fully-qualified address on service add

---
 httemplate/edit/svc_www.cgi | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index ec5169e05..e13bb44c0 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -53,7 +53,7 @@ if ( $cgi->param('error') ) {
 }
 my $action = $svc_www->svcnum ? 'Edit' : 'Add';
 
-my( %username, %arec );
+my( %svc_acct, %arec );
 if ($pkgnum) {
 
   my($u_part_svc,@u_acct_svcparts);
@@ -73,7 +73,8 @@ if ($pkgnum) {
       my($i_cust_svc);
       foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
         my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        $username{$svc_acct->getfield('svcnum')}=$svc_acct->getfield('username');
+        $svc_acct{$svc_acct->getfield('svcnum')}=
+          $svc_acct->part-svc->svc. ': '. $svc_acct->email;
       }  
     }
   }
@@ -161,9 +162,9 @@ foreach $_ (keys %arec) {
 print "</SELECT></TD></TR>";
 
 print '<TR><TD ALIGN="right">Username</TD><TD><SELECT NAME="usersvc" SIZE=1>';
-foreach $_ (keys %username) {
+foreach $_ (keys %svc_acct) {
   print "<OPTION", ($_ eq $usersvc) ? " SELECTED" : "",
-        qq! VALUE="$_">$username{$_}!;
+        qq! VALUE="$_">$svc_acct{$_}!;
 }
 print "</SELECT></TD></TR>";
 
-- 
cgit v1.2.1


From e520b9f7d88539634225560d462d03c7d2057d9d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 May 2004 22:34:14 +0000
Subject: tyop

---
 httemplate/edit/svc_www.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index e13bb44c0..313ebee0b 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -74,7 +74,7 @@ if ($pkgnum) {
       foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
         my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
         $svc_acct{$svc_acct->getfield('svcnum')}=
-          $svc_acct->part-svc->svc. ': '. $svc_acct->email;
+          $svc_acct->part_svc->svc. ': '. $svc_acct->email;
       }  
     }
   }
-- 
cgit v1.2.1


From 28f7684d096f8f5c97a68d04193bc9ba1d503ef5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 May 2004 22:37:13 +0000
Subject: brainfart

---
 httemplate/edit/svc_www.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index 313ebee0b..ebc4b1148 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -74,7 +74,7 @@ if ($pkgnum) {
       foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
         my($svc_acct)=qsearchs('svc_acct',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
         $svc_acct{$svc_acct->getfield('svcnum')}=
-          $svc_acct->part_svc->svc. ': '. $svc_acct->email;
+          $svc_acct->cust_svc->part_svc->svc. ': '. $svc_acct->email;
       }  
     }
   }
-- 
cgit v1.2.1


From a5be013b9a08af7adc28b56b45c04bb5c7592343 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 May 2004 11:19:11 +0000
Subject: one reasonable default and one kludge, to improve webhosting UI

---
 httemplate/edit/svc_www.cgi | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index ebc4b1148..fe7052292 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -56,9 +56,13 @@ my $action = $svc_www->svcnum ? 'Edit' : 'Add';
 my( %svc_acct, %arec );
 if ($pkgnum) {
 
-  my($u_part_svc,@u_acct_svcparts);
-  foreach $u_part_svc ( qsearch('part_svc',{'svcdb'=>'svc_acct'}) ) {
-    push @u_acct_svcparts,$u_part_svc->getfield('svcpart');
+  my @u_acct_svcparts;
+  foreach my $svcpart (
+    map { $_->svcpart } qsearch( 'part_svc', { 'svcdb' => 'svc_acct' } )
+  ) {
+    next if $conf->exists('svc_www-usersvc_svcpart')
+            && grep { $svcpart == $_ } $conf->config('svc_www-usersvc_svcpart');
+    push @u_acct_svcparts, $svcpart;
   }
 
   my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
@@ -92,25 +96,23 @@ if ($pkgnum) {
       my($i_cust_svc);
       foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
         my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
-        my $domain_rec;
-        foreach $domain_rec ( qsearch('domain_record',{
-            'svcnum'  => $svc_domain->svcnum,
-            'rectype' => 'A' } ),
-        qsearch('domain_record',{
-            'svcnum'  => $svc_domain->svcnum,
-            'rectype' => 'CNAME'
-            } ) ) {
-          $arec{$domain_rec->recnum} =
-            $domain_rec->reczone eq '@'
-              ? $svc_domain->domain
-              : $domain_rec->reczone. '.'. $svc_domain->domain;
+        if ( $conf->exists('svc_www-enable_subdomains') ) {
+          foreach my $domain_rec ( qsearch('domain_record',{
+              'svcnum'  => $svc_domain->svcnum,
+              'rectype' => 'A' } ),
+          qsearch('domain_record',{
+              'svcnum'  => $svc_domain->svcnum,
+              'rectype' => 'CNAME'
+              } ) ) {
+            $arec{$domain_rec->recnum} = $domain_rec->zone;
+          }
+          $arec{'www.'. $svc_domain->domain} = 'www.'. $svc_domain->domain
+            unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
+                                               reczone => 'www',            } );
         }
         $arec{'@.'. $svc_domain->domain} = $svc_domain->domain
           unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
                                              reczone => '@',                } );
-        $arec{'www.'. $svc_domain->domain} = 'www.'. $svc_domain->domain
-          unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
-                                             reczone => 'www',              } );
       }
     }
   }
-- 
cgit v1.2.1


From a5c64e8089d4e6c76ee070102e3a67baf1485181 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 May 2004 11:22:09 +0000
Subject: need to pull in $conf

---
 httemplate/edit/svc_www.cgi | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index fe7052292..b89672a52 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -1,6 +1,8 @@
 <!-- mason kludge -->
 <%
 
+my $conf = new FS::Conf;
+
 my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_www );
 if ( $cgi->param('error') ) {
   $svc_www = new FS::svc_www ( {
-- 
cgit v1.2.1


From af37880d5ac36f2b141b2eeeb1c7aa49a50d0c5b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 May 2004 11:52:02 +0000
Subject: clean this up a bit, fix svc_www-usersvc_svcpart and hopefully
 simplified zone select too

---
 httemplate/edit/svc_www.cgi | 73 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 52 insertions(+), 21 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index b89672a52..ed8d42501 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -63,7 +63,8 @@ if ($pkgnum) {
     map { $_->svcpart } qsearch( 'part_svc', { 'svcdb' => 'svc_acct' } )
   ) {
     next if $conf->exists('svc_www-usersvc_svcpart')
-            && grep { $svcpart == $_ } $conf->config('svc_www-usersvc_svcpart');
+            && ! grep { $svcpart == $_ }
+                      $conf->config('svc_www-usersvc_svcpart');
     push @u_acct_svcparts, $svcpart;
   }
 
@@ -91,31 +92,61 @@ if ($pkgnum) {
     push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
   }
 
-  foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
-    my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
-    my($acct_svcpart);
-    foreach $acct_svcpart (@d_acct_svcparts) {
-      my($i_cust_svc);
-      foreach $i_cust_svc ( qsearch('cust_svc',{'pkgnum'=>$cust_pkgnum,'svcpart'=>$acct_svcpart}) ) {
-        my($svc_domain)=qsearchs('svc_domain',{'svcnum'=>$i_cust_svc->getfield('svcnum')});
+  foreach $i_cust_pkg ( qsearch( 'cust_pkg', { 'custnum' => $custnum } ) ) {
+    my $cust_pkgnum = $i_cust_pkg->pkgnum;
+
+    foreach my $acct_svcpart (@d_acct_svcparts) {
+
+      foreach my $i_cust_svc (
+        qsearch( 'cust_svc', { 'pkgnum'  => $cust_pkgnum,
+                               'svcpart' => $acct_svcpart } )
+      ) {
+        my $svc_domain =
+          qsearchs( 'svc_domain', { 'svcnum' => $i_cust_svc->svcnum } );
+
+        my $extra_sql = "AND ( rectype = 'A' OR rectype = 'CNAME' )";
+        if ( $conf->exists('svc_www-enable_subdomains') ) {
+          my $domain = $
+          $extra_sql .= " AND ( reczone = '@' OR reczone = '".
+                        $svc_domain->domain. ".' )";
+        }
+
+        foreach my $domain_rec (
+          qsearch( 'domain_record',
+                   {
+                     'svcnum' => $svc_domain->svcnum,
+                   },
+                   '',
+                   $extra_sql,
+          )
+        ) {
+          $arec{$domain_rec->recnum} = $domain_rec->zone;
+        }
+
         if ( $conf->exists('svc_www-enable_subdomains') ) {
-          foreach my $domain_rec ( qsearch('domain_record',{
-              'svcnum'  => $svc_domain->svcnum,
-              'rectype' => 'A' } ),
-          qsearch('domain_record',{
-              'svcnum'  => $svc_domain->svcnum,
-              'rectype' => 'CNAME'
-              } ) ) {
-            $arec{$domain_rec->recnum} = $domain_rec->zone;
-          }
           $arec{'www.'. $svc_domain->domain} = 'www.'. $svc_domain->domain
-            unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
-                                               reczone => 'www',            } );
+            unless    qsearchs( 'domain_record', {
+                                  svcnum  => $svc_domain->svcnum,
+                                  reczone => 'www',
+                      } )
+                   || qsearchs( 'domain_record', {
+                                  svcnum  => $svc_domain->svcnum,
+                                  reczone => 'www.'.$svc-domain->domain.'.',
+                    } );
         }
+
         $arec{'@.'. $svc_domain->domain} = $svc_domain->domain
-          unless qsearchs('domain_record', { svcnum  => $svc_domain->svcnum,
-                                             reczone => '@',                } );
+          unless   qsearchs('domain_record', {
+                              svcnum  => $svc_domain->svcnum,
+                              reczone => '@',
+                   } )
+                || qsearchs('domain_record', {
+                              svcnum  => $svc_domain->svcnum,
+                              reczone => $svc_domain->domain.'.',
+                   } );
+
       }
+
     }
   }
 
-- 
cgit v1.2.1


From 20431ca2cc197c3d3a109d43318a0f96ea7e24d1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 May 2004 11:54:02 +0000
Subject: so close

---
 httemplate/edit/svc_www.cgi | 1 -
 1 file changed, 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index ed8d42501..cb58ce979 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -106,7 +106,6 @@ if ($pkgnum) {
 
         my $extra_sql = "AND ( rectype = 'A' OR rectype = 'CNAME' )";
         if ( $conf->exists('svc_www-enable_subdomains') ) {
-          my $domain = $
           $extra_sql .= " AND ( reczone = '@' OR reczone = '".
                         $svc_domain->domain. ".' )";
         }
-- 
cgit v1.2.1


From 29da3c125643b73cb6f6219b99eadb67673e4d6d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 May 2004 11:58:42 +0000
Subject: this has been an evening of logical negation

---
 httemplate/edit/svc_www.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index cb58ce979..a9b1ed348 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -105,7 +105,7 @@ if ($pkgnum) {
           qsearchs( 'svc_domain', { 'svcnum' => $i_cust_svc->svcnum } );
 
         my $extra_sql = "AND ( rectype = 'A' OR rectype = 'CNAME' )";
-        if ( $conf->exists('svc_www-enable_subdomains') ) {
+        unless ( $conf->exists('svc_www-enable_subdomains') ) {
           $extra_sql .= " AND ( reczone = '@' OR reczone = '".
                         $svc_domain->domain. ".' )";
         }
-- 
cgit v1.2.1


From a800fde5d31fb9b9cfe46b1ce2f68ea8e56bff53 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 May 2004 12:01:29 +0000
Subject: i'm not usually like this.

---
 httemplate/edit/svc_www.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index a9b1ed348..4989bb610 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -106,7 +106,7 @@ if ($pkgnum) {
 
         my $extra_sql = "AND ( rectype = 'A' OR rectype = 'CNAME' )";
         unless ( $conf->exists('svc_www-enable_subdomains') ) {
-          $extra_sql .= " AND ( reczone = '@' OR reczone = '".
+          $extra_sql .= " AND ( reczone = '\@' OR reczone = '".
                         $svc_domain->domain. ".' )";
         }
 
-- 
cgit v1.2.1


From e975ed0585280f4cbb90b02f57114dedc43f58be Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 14 May 2004 12:25:45 +0000
Subject: add per-agent invoice templates, add per-package suspend invoice
 events, fix automatic creation of invoice_latex alternate templates

---
 httemplate/edit/part_bill_event.cgi         | 60 +++++++++++++++++++++++++++++
 httemplate/edit/process/part_bill_event.cgi |  5 ++-
 2 files changed, 63 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 48ed7916b..d0fa973bf 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -68,6 +68,31 @@ print '<TR><TD ALIGN="right">Action</TD><TD>';
 
 #print ntable();
 
+sub select_pkgpart {
+  my $label = shift;
+  my $plandata = shift;
+  my %selected = map { $_=>1 } split(/,\s*/, $plandata->{$label});
+  qq(<SELECT NAME="$label" MULTIPLE>).
+  join("\n", map {
+    '<OPTION VALUE="'. $_->pkgpart. '"'.
+    ( $selected{$_->pkgpart} ? ' SELECTED' : '' ).
+    '>'. $_->pkg. ' - '. $_->comment
+  } qsearch('part_pkg', { 'disabled' => '' } ) ).
+  '</SELECT>';
+}
+
+sub select_agentnum {
+  my $plandata = shift;
+  my $agentnum = $plandata->{'agentnum'};
+  '<SELECT NAME="agentnum">'.
+  join("\n", map {
+    '<OPTION VALUE="'. $_->agentnum. '"'.
+    ( $_->agentnum == $agentnum ? ' SELECTED' : '' ).
+    '>'. $_->agent
+  } qsearch('agent', { 'disabled' => '' } ) ).
+  '</SELECT>';
+}
+
 #this is pretty kludgy right here.
 tie my %events, 'Tie::IxHash',
 
@@ -84,6 +109,18 @@ tie my %events, 'Tie::IxHash',
     'code'   => '$cust_main->suspend();',
     'weight' => 10,
   },
+  'suspend-if-pkgpart' => {
+    'name'   => 'Suspend packages',
+    'code'   => '$cust_main->suspend_if_pkgpart(%%%if_pkgpart%%%);',
+    'html'   => sub { &select_pkgpart('if_pkgpart', @_) },
+    'weight' => 10,
+  },
+  'suspend-unless-pkgpart' => {
+    'name'   => 'Suspend packages except',
+    'code'   => '$cust_main->suspend_unless_pkgpart(%%%unless_pkgpart%%%);',
+    'html'   => sub { &select_pkgpart('unless_pkgpart', @_) },
+    'weight' => 10,
+  },
   'cancel' => {
     'name'   => 'Cancel',
     'code'   => '$cust_main->cancel();',
@@ -140,6 +177,26 @@ tie my %events, 'Tie::IxHash',
     'weight' => 50,
   },
 
+  'send_agent' => {
+    'name' => 'Send invoice (email/print) ',
+    'code' => '$cust_bill->send(\'%%%agent_templatename%%%\', %%%agentnum%%%);',
+    'html' => sub {
+        '<TABLE BORDER=0>
+          <TR>
+            <TD ALIGN="right">only for agent </TD>
+            <TD>'. &select_agentnum(@_). '</TD>
+          </TR>
+          <TR>
+            <TD ALIGN="right">with template </TD>
+            <TD>
+              <INPUT TYPE="text" NAME="agent_templatename" VALUE="%%%agent_templatename%%%">
+            </TD>
+          </TR>
+        </TABLE>';
+    },
+    'weight' => 50,
+  },
+
   'send_csv_ftp' => {
     'name' => 'Upload CSV invoice data to an FTP server',
     'code' => '$cust_bill->send_csv( protocol => \'ftp\',
@@ -188,6 +245,9 @@ foreach my $event ( keys %events ) {
   my %plandata = map { /^(\w+) (.*)$/; ($1, $2); }
                    split(/\n/, $part_bill_event->plandata);
   my $html = $events{$event}{html};
+  if ( ref($html) eq 'CODE' ) {
+    $html = &{$html}(\%plandata);
+  }
   while ( $html =~ /%%%(\w+)%%%/ ) {
     my $field = $1;
     $html =~ s/%%%$field%%%/$plandata{$field}/;
diff --git a/httemplate/edit/process/part_bill_event.cgi b/httemplate/edit/process/part_bill_event.cgi
index e224bf634..77dcd242a 100755
--- a/httemplate/edit/process/part_bill_event.cgi
+++ b/httemplate/edit/process/part_bill_event.cgi
@@ -5,7 +5,7 @@ my $eventpart = $cgi->param('eventpart');
 my $old = qsearchs('part_bill_event',{'eventpart'=>$eventpart}) if $eventpart;
 
 #s/days/seconds/
-$cgi->param('seconds', $cgi->param('days') * 86400 );
+$cgi->param('seconds', int( $cgi->param('days') * 86400 ) );
 
 my $error;
 if ( ! $cgi->param('plan_weight_eventcode') ) {
@@ -21,7 +21,8 @@ if ( ! $cgi->param('plan_weight_eventcode') ) {
   my $plandata = '';
   while ( $eventcode =~ /%%%(\w+)%%%/ ) {
     my $field = $1;
-    my $value = $cgi->param($field);
+    my $value = join(', ', $cgi->param($field) );
+    $cgi->param($field, $value); #in case it errors out
     $eventcode =~ s/%%%$field%%%/$value/;
     $plandata .= "$field $value\n";
   }
-- 
cgit v1.2.1


From b377b1408398c471689e35dabb1bf14ef263a644 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 May 2004 12:28:53 +0000
Subject: make hours/input/output/total display on invoices conditional on
 there being any charge for overages

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 8416b3546..6c7d5dd23 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -445,7 +445,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); push @details, \"Last month\\\'s excess data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\", \"Last month\\\'s excess time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; \' + what.recur_flat.value + \' + $hourscharge + \' + what.recur_input_charge.value + \' * $input + \' + what.recur_output_charge.value + \' * $output + $totalcharge ;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $inputcharge = sprintf(\"%.2f\", \' + what.recur_input_charge.value + \' * $input); my $outputcharge = sprintf(\"%.2f\", \' + what.recur_output_charge.value + \' * $output); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + what.recur_input_charge.value + \' > 0 ) { push @details, \"Last month\\\'s download \". sprintf(\"%.1f\", $input). \" megs: \\\$$inputcharge\" } if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + whathorlly_charge.value + \' > 0 ) { push @details, \"Last month\\\'s time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; } \' + what.recur_flat.value + \' + $hourscharge + $inputcharge + $outputcharge + $totalcharge ;\'',
   },
 
   'sql_generic' => {
-- 
cgit v1.2.1


From 59d12a3144dfee010c84fb9df36b39d6330b89d3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 May 2004 12:30:15 +0000
Subject: finish making hours/input/output/total display on invoices
 conditional on there being any charge for overages

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 6c7d5dd23..86a49209c 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -445,7 +445,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $inputcharge = sprintf(\"%.2f\", \' + what.recur_input_charge.value + \' * $input); my $outputcharge = sprintf(\"%.2f\", \' + what.recur_output_charge.value + \' * $output); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + what.recur_input_charge.value + \' > 0 ) { push @details, \"Last month\\\'s download \". sprintf(\"%.1f\", $input). \" megs: \\\$$inputcharge\" } if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + whathorlly_charge.value + \' > 0 ) { push @details, \"Last month\\\'s time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; } \' + what.recur_flat.value + \' + $hourscharge + $inputcharge + $outputcharge + $totalcharge ;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $inputcharge = sprintf(\"%.2f\", \' + what.recur_input_charge.value + \' * $input); my $outputcharge = sprintf(\"%.2f\", \' + what.recur_output_charge.value + \' * $output); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + what.recur_input_charge.value + \' > 0 ) { push @details, \"Last month\\\'s download \". sprintf(\"%.1f\", $input). \" megs: \\\$$inputcharge\" } if ( \' + what.recur_output_charge.value + \' > 0 ) { push @details, \"Last month\\\'s upload \". sprintf(\"%.1f\", $output). \" megs: \\\$$outputcharge\" } if ( \' + whathorlly_charge.value + \' > 0 ) { push @details, \"Last month\\\'s time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; } \' + what.recur_flat.value + \' + $hourscharge + $inputcharge + $outputcharge + $totalcharge ;\'',
   },
 
   'sql_generic' => {
-- 
cgit v1.2.1


From 6b9a0a746535a142c95a5841f5cb5d9dc44d2f21 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 May 2004 12:31:02 +0000
Subject: continue making hours/input/output/total display on invoices
 conditional on there being any charge for overages

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 86a49209c..460f68b2c 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -445,7 +445,7 @@ tie my %plans, 'Tie::IxHash',
     },
     'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
     'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $inputcharge = sprintf(\"%.2f\", \' + what.recur_input_charge.value + \' * $input); my $outputcharge = sprintf(\"%.2f\", \' + what.recur_output_charge.value + \' * $output); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + what.recur_input_charge.value + \' > 0 ) { push @details, \"Last month\\\'s download \". sprintf(\"%.1f\", $input). \" megs: \\\$$inputcharge\" } if ( \' + what.recur_output_charge.value + \' > 0 ) { push @details, \"Last month\\\'s upload \". sprintf(\"%.1f\", $output). \" megs: \\\$$outputcharge\" } if ( \' + whathorlly_charge.value + \' > 0 ) { push @details, \"Last month\\\'s time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; } \' + what.recur_flat.value + \' + $hourscharge + $inputcharge + $outputcharge + $totalcharge ;\'',
+    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $inputcharge = sprintf(\"%.2f\", \' + what.recur_input_charge.value + \' * $input); my $outputcharge = sprintf(\"%.2f\", \' + what.recur_output_charge.value + \' * $output); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + what.recur_input_charge.value + \' > 0 ) { push @details, \"Last month\\\'s download \". sprintf(\"%.1f\", $input). \" megs: \\\$$inputcharge\" } if ( \' + what.recur_output_charge.value + \' > 0 ) { push @details, \"Last month\\\'s upload \". sprintf(\"%.1f\", $output). \" megs: \\\$$outputcharge\" } if ( \' + what.recur_hourly_charge.value + \' > 0 ) { push @details, \"Last month\\\'s time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; } \' + what.recur_flat.value + \' + $hourscharge + $inputcharge + $outputcharge + $totalcharge ;\'',
   },
 
   'sql_generic' => {
-- 
cgit v1.2.1


From fc0e102e2e843e991f919eba9aba3429c4602ccf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 1 Jun 2004 10:53:10 +0000
Subject: per-agent invoice_from addresses

---
 httemplate/edit/part_bill_event.cgi | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index d0fa973bf..3985eaf57 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -179,7 +179,7 @@ tie my %events, 'Tie::IxHash',
 
   'send_agent' => {
     'name' => 'Send invoice (email/print) ',
-    'code' => '$cust_bill->send(\'%%%agent_templatename%%%\', %%%agentnum%%%);',
+    'code' => '$cust_bill->send(\'%%%agent_templatename%%%\', %%%agentnum%%%, \'%%%agent_invoice_from%%%\');',
     'html' => sub {
         '<TABLE BORDER=0>
           <TR>
@@ -191,6 +191,10 @@ tie my %events, 'Tie::IxHash',
             <TD>
               <INPUT TYPE="text" NAME="agent_templatename" VALUE="%%%agent_templatename%%%">
             </TD>
+            <TD ALIGN="right">email From: </TD>
+            <TD>
+              <INPUT TYPE="text" NAME="agent_invoice_from" VALUE="%%%agent_invoice_from%%%">
+            </TD>
           </TR>
         </TABLE>';
     },
-- 
cgit v1.2.1


From 31f55d8223d14807ce7648657502552f69dc9ad4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 1 Jun 2004 10:56:26 +0000
Subject: html table fix

---
 httemplate/edit/part_bill_event.cgi | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 3985eaf57..2f99ca58f 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -191,6 +191,8 @@ tie my %events, 'Tie::IxHash',
             <TD>
               <INPUT TYPE="text" NAME="agent_templatename" VALUE="%%%agent_templatename%%%">
             </TD>
+          </TR>
+          <TR>
             <TD ALIGN="right">email From: </TD>
             <TD>
               <INPUT TYPE="text" NAME="agent_invoice_from" VALUE="%%%agent_invoice_from%%%">
-- 
cgit v1.2.1


From 157e8bdba110b7aac022bd2c2f7b377d3c5b2f85 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 29 Jun 2004 04:02:45 +0000
Subject: add cust_pay_refund table to refund payments

---
 httemplate/edit/cust_bill_pay.cgi         |  8 ++++----
 httemplate/edit/process/cust_bill_pay.cgi | 24 ++++++++++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index 8cdf4509a..24bce308a 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -59,10 +59,10 @@ foreach my $cust_bill ( @cust_bill ) {
 END
 }
 
-#  if ( cust_bill == "Refund" ) {
-#    what.form.amount.value = "$credited";
-#  }
 print <<END;
+  if ( cust_bill == "Refund" ) {
+    what.form.amount.value = "$unapplied";
+  }
 }
 </SCRIPT>
 END
@@ -75,7 +75,7 @@ foreach my $cust_bill ( @cust_bill ) {
         ' -  '. time2str("%D",$cust_bill->_date).
         ' - $'. $cust_bill->owed;
 }
-#print qq!<OPTION VALUE="Refund">Refund!;
+print qq!<OPTION VALUE="Refund">Refund!;
 print "</SELECT>";
 
 print qq!<BR>Amount \$<INPUT TYPE="text" NAME="amount" VALUE="$amount" SIZE=8 MAXLENGTH=8>!;
diff --git a/httemplate/edit/process/cust_bill_pay.cgi b/httemplate/edit/process/cust_bill_pay.cgi
index 0c33506a8..0025b16b5 100755
--- a/httemplate/edit/process/cust_bill_pay.cgi
+++ b/httemplate/edit/process/cust_bill_pay.cgi
@@ -11,12 +11,24 @@ my $cust_main = qsearchs('cust_main', { 'custnum' => $cust_pay->custnum } )
 
 my $custnum = $cust_main->custnum;
 
-my $new = new FS::cust_bill_pay ( {
-  map {
-    $_, scalar($cgi->param($_));
-  #} qw(custnum _date amount invnum)
-  } fields('cust_bill_pay')
-} );
+my $new;
+if ($cgi->param('invnum') =~ /^Refund$/) {
+  $new = new FS::cust_refund ( {
+    'reason'  => 'Refunding payment', #enter reason in UI
+    'refund'  => $cgi->param('amount'),
+    'payby'   => 'BILL',
+    #'_date'   => $cgi->param('_date'),
+    'payinfo' => 'Cash', #enter payinfo in UI
+    'paynum' => $paynum,
+  } );
+} else {
+  $new = new FS::cust_bill_pay ( {
+    map {
+      $_, scalar($cgi->param($_));
+    #} qw(custnum _date amount invnum)
+    } fields('cust_bill_pay')
+  } );
+}
 
 my $error = $new->insert;
 
-- 
cgit v1.2.1


From 4ae85517a9c3a8a2f61e87bc27a74eb616e396a4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Jul 2004 17:26:02 +0000
Subject: payment voiding part deux & credit card refunds!

---
 httemplate/edit/cust_refund.cgi         | 93 +++++++++++++++++++++++++++++++++
 httemplate/edit/process/cust_credit.cgi |  4 --
 httemplate/edit/process/cust_refund.cgi | 37 +++++++++++++
 3 files changed, 130 insertions(+), 4 deletions(-)
 create mode 100755 httemplate/edit/cust_refund.cgi
 create mode 100755 httemplate/edit/process/cust_refund.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_refund.cgi b/httemplate/edit/cust_refund.cgi
new file mode 100755
index 000000000..425c17738
--- /dev/null
+++ b/httemplate/edit/cust_refund.cgi
@@ -0,0 +1,93 @@
+<!-- mason kludge -->
+<%
+
+my $conf = new FS::Conf;
+my $custnum = $cgi->param('custnum');
+my $refund  = $cgi->param('refund');
+my $payby   = $cgi->param('payby');
+my $reason  = $cgi->param('reason');
+
+my( $paynum, $cust_pay ) = ( '', '' );
+if ( $cgi->param('paynum') =~ /^(\d+)$/ ) {
+  $paynum = $1;
+  $cust_pay = qsearchs('cust_pay', { paynum=>$paynum } )
+    or die "unknown payment # $paynum";
+  $refund ||= $cust_pay->unrefunded;
+  if ( $custnum ) {
+    die "payment # $paynum is not for specified customer # $custnum"
+      unless $custnum == $cust_pay->custnum;
+  } else {
+    $custnum = $cust_pay->custnum;
+  }
+}
+die "no custnum or paynum specified!" unless $custnum;
+
+my $_date = time;
+
+my $p1 = popurl(1);
+
+print header('Refund '. ucfirst(lc($payby)). ' payment', '');
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
+print <<END, small_custview($custnum, $conf->config('countrydefault'));
+    <FORM ACTION="${p1}process/cust_refund.cgi" METHOD=POST>
+    <INPUT TYPE="hidden" NAME="refundnum" VALUE="">
+    <INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">
+    <INPUT TYPE="hidden" NAME="paynum" VALUE="$paynum">
+    <INPUT TYPE="hidden" NAME="_date" VALUE="$_date">
+    <INPUT TYPE="hidden" NAME="payby" VALUE="$payby">
+    <INPUT TYPE="hidden" NAME="payinfo" VALUE="">
+    <INPUT TYPE="hidden" NAME="paybatch" VALUE="">
+    <INPUT TYPE="hidden" NAME="credited" VALUE="">
+    <BR>
+END
+
+if ( $cust_pay ) {
+
+  #false laziness w/FS/FS/cust_pay.pm
+  my $payby = $cust_pay->payby;
+  my $payinfo = $cust_pay->payinfo;
+  $payby =~ s/^BILL$/Check/ if $payinfo;
+  $payinfo = $cust_pay->payinfo_masked if $payby eq 'CARD';
+
+  print '<BR>Payment'. ntable("#cccccc", 2).
+        '<TR><TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">$'.
+          $cust_pay->paid. '</TD></TR>'.
+        '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
+          time2str("%D",$cust_pay->_date). '</TD></TR>'.
+        '<TR><TD ALIGN="right">Method</TD><TD BGCOLOR="#ffffff">'.
+          ucfirst(lc($payby)). ' # '. $payinfo. '</TD></TR>';
+  #false laziness w/FS/FS/cust_main::realtime_refund_bop
+  if ( $cust_pay->paybatch =~ /^(\w+):(\w+)(:(\w+))?$/ ) {
+    my ( $processor, $auth, $order_number ) = ( $1, $2, $4 );
+    print '<TR><TD ALIGN="right">Processor</TD><TD BGCOLOR="#ffffff">'.
+          $processor. '</TD></TR>';
+    print '<TR><TD ALIGN="right">Authorization</TD><TD BGCOLOR="#ffffff">'.
+          $auth. '</TD></TR>'
+      if length($auth);
+    print '<TR><TD ALIGN="right">Order number</TD><TD BGCOLOR="#ffffff">'.
+          $order_number. '</TD></TR>'
+      if length($order_number);
+  }
+  print '</TABLE>';
+}
+
+print '<BR>Refund'. ntable("#cccccc", 2).
+      '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
+      time2str("%D",$_date). '</TD></TR>';
+
+print qq!<TR><TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">\$<INPUT TYPE="text" NAME="refund" VALUE="$refund" SIZE=8 MAXLENGTH=8></TD></TR>!;
+
+print qq!<TR><TD ALIGN="right">Reason</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="reason" VALUE="$reason"></TD></TR>!;
+
+print <<END;
+</TABLE>
+<BR>
+<INPUT TYPE="submit" VALUE="Post refund">
+    </FORM>
+  </BODY>
+</HTML>
+END
+
+%>
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index ac92631f8..85bfd4489 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -3,12 +3,9 @@
 $cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
 my $custnum = $1;
 
-$cgi->param('otaker',getotaker);
-
 my $new = new FS::cust_credit ( {
   map {
     $_, scalar($cgi->param($_));
-  #} qw(custnum _date amount otaker reason)
   } fields('cust_credit')
 } );
 
@@ -26,5 +23,4 @@ if ( $error ) {
   print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 }
 
-
 %>
diff --git a/httemplate/edit/process/cust_refund.cgi b/httemplate/edit/process/cust_refund.cgi
new file mode 100755
index 000000000..fc1635781
--- /dev/null
+++ b/httemplate/edit/process/cust_refund.cgi
@@ -0,0 +1,37 @@
+<%
+
+$cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
+my $custnum = $1;
+my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+  or die "unknown custnum $custnum";
+
+my $error = '';
+if ( $cgi->param('payby') eq 'CARD' ) { 
+  $cgi->param('refund') =~ /^(\d*)(\.\d{2})?$/
+    or die "illegal refund amount ". $cgi->param('refund');
+  my $refund = "$1$2";
+  $cgi->param('paynum') =~ /^(\d*)$/ or die "Illegal paynum!";
+  my $paynum = $1;
+  my $reason = $cgi->param('reason');
+  $error = $cust_main->realtime_refund_bop( 'CC', 'amount' => $refund,
+                                                  'paynum' => $paynum,
+                                                  'reason' => $reason, );
+} else {
+  die 'unimplemented';
+  #my $new = new FS::cust_refund ( {
+  #  map {
+  #    $_, scalar($cgi->param($_));
+  #  } ( fields('cust_refund'), 'paynum' )
+  #} );
+  #$error = $new->insert;
+}
+
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_refund.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+}
+
+%>
-- 
cgit v1.2.1


From db69a9fb0dd93bf13b8b7501ef4829a568d2f6d8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Jul 2004 11:15:19 +0000
Subject: don't change otaker when just editing account, closes: Bug#921

---
 httemplate/edit/process/cust_main.cgi | 2 --
 1 file changed, 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 25c346e46..0b13ba96b 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -23,8 +23,6 @@ if ( $payby ) {
     if defined $cgi->param( $payby. '_paycvv' );
 }
 
-$cgi->param('otaker', &getotaker );
-
 my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
 push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
 $cgi->param('invoicing_list', join(',', @invoicing_list) );
-- 
cgit v1.2.1


From 918bbc9ce36a3dc5943f521e26751ea94a5a5539 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 30 Jul 2004 04:54:41 +0000
Subject: svcpart changes now trigger all necessary export actions, manual
 svcpart changing on svc_acct view, linking changes svcpart if you ask it to,
 closes: Bug#671, Bug#644

---
 httemplate/edit/process/cust_svc.cgi | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 httemplate/edit/process/cust_svc.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/cust_svc.cgi b/httemplate/edit/process/cust_svc.cgi
new file mode 100644
index 000000000..187ede5e5
--- /dev/null
+++ b/httemplate/edit/process/cust_svc.cgi
@@ -0,0 +1,30 @@
+<%
+
+my $svcnum = $cgi->param('svcnum');
+
+my $old = qsearchs('cust_svc',{'svcnum'=>$svcnum}) if $svcnum;
+
+my $new = new FS::cust_svc ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('cust_svc')
+} );
+
+my $error;
+if ( $svcnum ) {
+  $error=$new->replace($old);
+} else {
+  $error=$new->insert;
+  $svcnum=$new->getfield('svcnum');
+}
+
+if ( $error ) {
+  #$cgi->param('error', $error);
+  #print $cgi->redirect(popurl(2). "cust_svc.cgi?". $cgi->query_string );
+  eidiot($error);
+} else { 
+  my $svcdb = $new->part_svc->svcdb;
+  print $cgi->redirect(popurl(3). "view/$svcdb.cgi?$svcnum");
+}
+
+
-- 
cgit v1.2.1


From aef8e9696491331ed26197f43eb351ed4d416336 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 19 Aug 2004 10:53:32 +0000
Subject: shell field is now a dropdown of legal shells, closes: Bug#118

---
 httemplate/edit/part_svc.cgi | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 6868ffd65..72fffaeb8 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -71,6 +71,7 @@ my %vfields;
 
 #these might belong somewhere else for other user interfaces 
 #pry need to eventually create stuff that's shared amount UIs
+my $conf = new FS::Conf;
 my %defs = (
   'svc_acct' => {
     'dir'       => 'Home directory',
@@ -91,7 +92,11 @@ my %defs = (
     'quota'     => '',
     '_password' => 'Password',
     'gid'       => 'GID (when blank, defaults to UID)',
-    'shell'     => 'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
+    'shell'     => {
+                     desc =>'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
+                     type =>'select',
+                     select_list => [ $conf->config('shells') ],
+                   },
     'finger'    => 'GECOS',
     'domsvc'    => {
                      desc =>'svcnum from svc_domain',
-- 
cgit v1.2.1


From 89aa808693d199a28e04e5cef360282a3ea668f6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 5 Sep 2004 23:21:44 +0000
Subject: fixed duplicate checking will catch it, but add client-side
 protection against double-submission also.

---
 httemplate/edit/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index f9c80d82d..4a8f70540 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -71,7 +71,7 @@ print header("Customer $action", '', ' onUnload="myclose()"');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
   if $error;
 
-print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1">!,
+print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1" onSubmit="document.form1.submit.disabled=true">!,
       qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
       qq!Customer # !, ( $custnum ? "<B>$custnum</B>" : " (NEW)" ),
       
@@ -564,7 +564,7 @@ END
 
 my $otaker = $cust_main->otaker;
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
-      qq!<BR><INPUT TYPE="submit" VALUE="!,
+      qq!<BR><INPUT NAME="submit" TYPE="submit" VALUE="!,
       $custnum ?  "Apply Changes" : "Add Customer", qq!">!,
       "</FORM></BODY></HTML>",
 ;
-- 
cgit v1.2.1


From c70c1b17103b5bd20adb3c8a7c23ca2238fca73d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 Sep 2004 12:04:53 +0000
Subject: rework edit/part_svc.cgi so it doesn't use a separate process/ file,
 this allows large error messages to be displayed properly

---
 httemplate/edit/part_svc.cgi         | 105 ++++++++++++++++++++++++-----------
 httemplate/edit/process/part_svc.cgi |  62 ---------------------
 2 files changed, 74 insertions(+), 93 deletions(-)
 delete mode 100755 httemplate/edit/process/part_svc.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 72fffaeb8..89f75a5f4 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,33 +1,74 @@
-<!-- mason kludge -->
-<% 
-   my $part_svc;
-   my $clone = '';
-   if ( $cgi->param('error') ) { #error
-     $part_svc = new FS::part_svc ( {
-       map { $_, scalar($cgi->param($_)) } fields('part_svc')
-     } );
-   } elsif ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {#clone
-     #$cgi->param('clone') =~ /^(\d+)$/ or die "malformed query: $query";
-     $part_svc = qsearchs('part_svc', { 'svcpart'=>$1 } )
-       or die "unknown svcpart: $1";
-     $clone = $part_svc->svcpart;
-     $part_svc->svcpart('');
-   } elsif ( $cgi->keywords ) { #edit
-     my($query) = $cgi->keywords;
-     $query =~ /^(\d+)$/ or die "malformed query: $query";
-     $part_svc=qsearchs('part_svc', { 'svcpart'=>$1 } )
-       or die "unknown svcpart: $1";
-   } else { #adding
-     $part_svc = new FS::part_svc {};
-   }
-   my $action = $part_svc->svcpart ? 'Edit' : 'Add';
-   my $hashref = $part_svc->hashref;
+<%
+my $part_svc;
+my $clone = '';
+my $error = '';
+if ( $cgi->param('magic') eq 'process' ) {
+
+  my $svcpart = $cgi->param('svcpart');
+  my $old = qsearchs('part_svc', { 'svcpart' => $svcpart }) if $svcpart;
+  
+  $cgi->param( 'svc_acct__usergroup',
+               join(',', $cgi->param('svc_acct__usergroup') ) );
+  
+  my $new = new FS::part_svc ( {
+    map {
+      $_, scalar($cgi->param($_));
+  #  } qw(svcpart svc svcdb)
+    } ( fields('part_svc'),
+        map { my $svcdb = $_;
+              my @fields = fields($svcdb);
+              push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
+              map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  } @fields;
+            } grep defined( $FS::Record::dbdef->table($_) ),
+                   qw( svc_acct svc_domain svc_forward svc_www svc_broadband )
+      )
+  } );
+  
+  my %exportnums =
+    map { $_->exportnum => $cgi->param('exportnum'.$_->exportnum) }
+        qsearch('part_export', {} );
+  
+  if ( $svcpart ) {
+    $error = $new->replace($old, '1.3-COMPAT', [ 'usergroup' ], \%exportnums );
+  } else {
+    $error = $new->insert( [ 'usergroup' ], \%exportnums );
+    $svcpart = $new->getfield('svcpart');
+  }
+
+  unless ( $error ) { #no error, redirect
+    #print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
+    print $cgi->redirect("${p}browse/part_svc.cgi");
+    myexit;
+  }
+
+  $part_svc = $new; #??
+  #$part_svc = new FS::part_svc ( {
+  #  map { $_, scalar($cgi->param($_)) } fields('part_svc')
+  #} );
+
+} elsif ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {#clone
+  #$cgi->param('clone') =~ /^(\d+)$/ or die "malformed query: $query";
+  $part_svc = qsearchs('part_svc', { 'svcpart'=>$1 } )
+    or die "unknown svcpart: $1";
+  $clone = $part_svc->svcpart;
+  $part_svc->svcpart('');
+} elsif ( $cgi->keywords ) { #edit
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/ or die "malformed query: $query";
+  $part_svc=qsearchs('part_svc', { 'svcpart'=>$1 } )
+    or die "unknown svcpart: $1";
+} else { #adding
+  $part_svc = new FS::part_svc {};
+}
+
+my $action = $part_svc->svcpart ? 'Edit' : 'Add';
+my $hashref = $part_svc->hashref;
 #   my $p_svcdb = $part_svc->svcdb || 'svc_acct';
 
 
            #" onLoad=\"visualize()\""
 %>
-
+<!-- mason kludge -->
 <%= header("$action Service Definition",
            menubar( 'Main Menu'         => $p,
                     'View all service definitions' => "${p}browse/part_svc.cgi"
@@ -35,8 +76,8 @@
            )
 %>
 
-<% if ( $cgi->param('error') ) { %>
-<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% if ( $error ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $error %></FONT>
 <% } %>
 
 <FORM NAME="dummy">
@@ -45,6 +86,7 @@
 <BR><BR>
 Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>"><BR>
 Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>><BR>
+<INPUT TYPE="hidden" NAME="magic" VALUE="process">
 <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
 <BR>
 Services are items you offer to your customers.
@@ -169,8 +211,9 @@ my %defs = (
     'selected_layer' => $hashref->{svcdb} || 'svc_acct',
     'options'        => \%svcdb,
     'form_name'      => 'dummy',
-    'form_action'    => 'process/part_svc.cgi',
-    'form_text'      => [ qw( svc svcpart ) ],
+    #'form_action'    => 'process/part_svc.cgi',
+    'form_action'    => 'part_svc.cgi', #self
+    'form_text'      => [ qw( magic svc svcpart ) ],
     'form_checkbox'  => [ 'disabled' ],
     'layer_callback' => sub {
       my $layer = shift;
@@ -207,10 +250,10 @@ my %defs = (
       $part_svc->svcpart($clone) if $clone; #haha, undone below
       foreach my $field (@fields) {
         my $part_svc_column = $part_svc->part_svc_column($field);
-        my $value = $cgi->param('error')
+        my $value = $error
                       ? $cgi->param("${layer}__${field}")
                       : $part_svc_column->columnvalue;
-        my $flag = $cgi->param('error')
+        my $flag = $error
                      ? $cgi->param("${layer}__${field}_flag")
                      : $part_svc_column->columnflag;
         my $def = $defs{$layer}{$field};
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
deleted file mode 100755
index 9633fabdf..000000000
--- a/httemplate/edit/process/part_svc.cgi
+++ /dev/null
@@ -1,62 +0,0 @@
-<%
-
-my $svcpart = $cgi->param('svcpart');
-
-my $old = qsearchs('part_svc',{'svcpart'=>$svcpart}) if $svcpart;
-
-$cgi->param( 'svc_acct__usergroup',
-             join(',', $cgi->param('svc_acct__usergroup') ) );
-
-my $new = new FS::part_svc ( {
-  map {
-    $_, scalar($cgi->param($_));
-#  } qw(svcpart svc svcdb)
-  } ( fields('part_svc'),
-      map { my $svcdb = $_;
-            my @fields = fields($svcdb);
-            push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
-            map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  } @fields;
-          } grep defined( $FS::Record::dbdef->table($_) ),
-                 qw( svc_acct svc_domain svc_forward svc_www svc_broadband )
-    )
-} );
-
-my $error;
-if ( $svcpart ) {
-  $error = $new->replace($old, '1.3-COMPAT', [ 'usergroup' ] );
-} else {
-  $error = $new->insert( [ 'usergroup' ] );
-  $svcpart=$new->getfield('svcpart');
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "part_svc.cgi?". $cgi->query_string );
-} else {
-
-  #false laziness w/ edit/process/agent_type.cgi
-  foreach my $part_export (qsearch('part_export',{})) {
-    my $exportnum = $part_export->exportnum;
-    my $export_svc = qsearchs('export_svc', {
-      'exportnum' => $part_export->exportnum,
-      'svcpart'   => $new->svcpart,
-    } );
-    if ( $export_svc && ! $cgi->param("exportnum". $part_export->exportnum) ) {
-      $error = $export_svc->delete;
-      die $error if $error;
-    } elsif ( $cgi->param("exportnum". $part_export->exportnum)
-              && ! $export_svc ) {
-      $export_svc = new FS::export_svc ( {
-        'exportnum' => $part_export->exportnum,
-        'svcpart'   => $new->svcpart,
-      } );
-      $error = $export_svc->insert;
-      die $error if $error;
-    }
-
-  }
-
-  print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
-}
-
-%>
-- 
cgit v1.2.1


From b3e85cf7a5a514f185c7d9c5ba50550c759c9ab5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 14 Sep 2004 13:00:47 +0000
Subject: echeck/ACH refunds

---
 httemplate/edit/cust_refund.cgi         | 1 +
 httemplate/edit/process/cust_refund.cgi | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_refund.cgi b/httemplate/edit/cust_refund.cgi
index 425c17738..8955c7cee 100755
--- a/httemplate/edit/cust_refund.cgi
+++ b/httemplate/edit/cust_refund.cgi
@@ -49,6 +49,7 @@ if ( $cust_pay ) {
   my $payby = $cust_pay->payby;
   my $payinfo = $cust_pay->payinfo;
   $payby =~ s/^BILL$/Check/ if $payinfo;
+  $payby =~ s/^CHEK$/Electronic check/;
   $payinfo = $cust_pay->payinfo_masked if $payby eq 'CARD';
 
   print '<BR>Payment'. ntable("#cccccc", 2).
diff --git a/httemplate/edit/process/cust_refund.cgi b/httemplate/edit/process/cust_refund.cgi
index fc1635781..7055d8ea6 100755
--- a/httemplate/edit/process/cust_refund.cgi
+++ b/httemplate/edit/process/cust_refund.cgi
@@ -6,14 +6,19 @@ my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
   or die "unknown custnum $custnum";
 
 my $error = '';
-if ( $cgi->param('payby') eq 'CARD' ) { 
+if ( $cgi->param('payby') =~ /^(CARD|CHEK)$/ ) { 
+  my %payby2bop = (
+  'CARD' => 'CC',
+  'CHEK' => 'ECHECK',
+  );
+  my $bop = $payby2bop{$1};
   $cgi->param('refund') =~ /^(\d*)(\.\d{2})?$/
     or die "illegal refund amount ". $cgi->param('refund');
   my $refund = "$1$2";
   $cgi->param('paynum') =~ /^(\d*)$/ or die "Illegal paynum!";
   my $paynum = $1;
   my $reason = $cgi->param('reason');
-  $error = $cust_main->realtime_refund_bop( 'CC', 'amount' => $refund,
+  $error = $cust_main->realtime_refund_bop( $bop, 'amount' => $refund,
                                                   'paynum' => $paynum,
                                                   'reason' => $reason, );
 } else {
-- 
cgit v1.2.1


From 8fa7d60799d6d49bfe054e07b7b982c33772fb83 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 16 Sep 2004 13:22:51 +0000
Subject: add uid to mass duplicate checking on export changes, fix bug in new
 export editing, error message includes the number of duplicate customers also

---
 httemplate/edit/part_svc.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 89f75a5f4..befd9b24a 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -25,9 +25,9 @@ if ( $cgi->param('magic') eq 'process' ) {
   } );
   
   my %exportnums =
-    map { $_->exportnum => $cgi->param('exportnum'.$_->exportnum) }
+    map { $_->exportnum => ( $cgi->param('exportnum'.$_->exportnum) || '') }
         qsearch('part_export', {} );
-  
+
   if ( $svcpart ) {
     $error = $new->replace($old, '1.3-COMPAT', [ 'usergroup' ], \%exportnums );
   } else {
-- 
cgit v1.2.1


From 6fe8172b11d0369d0b1274d6825ec0c57afe8001 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Oct 2004 11:26:35 +0000
Subject: modular price plans!

---
 httemplate/edit/part_pkg.cgi | 425 +++++++------------------------------------
 1 file changed, 66 insertions(+), 359 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 460f68b2c..546e07113 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -42,20 +42,24 @@ unless ( $part_pkg->plan ) { #backwards-compat
 $action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
 my $hashref = $part_pkg->hashref;
 
+%>
 
-print header("$action Package Definition", menubar(
+<%= header("$action Package Definition", menubar(
   'Main Menu' => popurl(2),
   'View all packages' => popurl(2). 'browse/part_pkg.cgi',
-));
-#), ' onLoad="visualize()"');
+)) %>
+
+<% #), ' onLoad="visualize()"'); %>
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
 
-#print '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
-print '<FORM NAME="dummy">';
+<% #print '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>'; %>
 
+<FORM NAME="dummy">
+
+<%
 #if ( $cgi->param('clone') ) {
 #  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
 #}
@@ -64,28 +68,19 @@ print '<FORM NAME="dummy">';
 #}
 #
 #print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
-print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
-
-#false laziness w/view/cust_main.cgi
-my %freq;
-tie %freq, 'Tie::IxHash', 
-  '0'  => '(no recurring fee)',
-  '1d' => 'daily',
-  '1w' => 'weekly',
-  '2w' => 'biweekly (every 2 weeks)',
-  '1'  => 'monthly',
-  '2'  => 'bimonthly (every 2 months)',
-  '3'  => 'quarterly (every 3 months)',
-  '6'  => 'semiannually (every 6 months)',
-  '12' => 'annually',
-  '24' => 'biannually (every 2 years)',
-;
-if ( $part_pkg->dbdef_table->column('freq')->type =~ /(int)/i ) {
-  delete $freq{$_} foreach grep { ! /^\d+$/ } keys %freq;
-}
-
 %>
+
+<%= itable('',8,1) %><TR><TD VALIGN="top">
+
+Package information
+
 <%= ntable("#cccccc",2) %>
+  <TR>
+    <TD ALIGN="right">Package Definition #</TD>
+    <TD BGCOLOR="#ffffff">
+      <%= $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)" %>
+    </TD>
+  </TR>
   <TR>
     <TD ALIGN="right">Package (customer-visible)</TD>
     <TD>
@@ -98,16 +93,20 @@ if ( $part_pkg->dbdef_table->column('freq')->type =~ /(int)/i ) {
       <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="<%=$part_pkg->comment%>">
     </TD>
   </TR>
+
   <TR>
-    <TD ALIGN="right">Recurring fee frequency </TD>
+    <TD ALIGN="right">Disable new orders</TD>
     <TD>
-      <SELECT NAME="freq">
-        <% foreach my $freq ( keys %freq ) { %>
-          <OPTION VALUE="<%= $freq %>"<%= $freq eq $part_pkg->freq ? ' SELECTED' : '' %>><%= $freq{$freq} %>
-        <% } %>
-      </SELECT>
+      <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>
     </TD>
   </TR>
+
+</TABLE>
+
+</TD><TD VALIGN="top">
+
+Tax information
+<%= ntable("#cccccc", 2) %>
   <TR>
     <TD ALIGN="right">Setup fee tax exempt</TD>
     <TD>
@@ -146,11 +145,13 @@ if ( $conf->exists('enable_taxclasses') ) {
     '<INPUT TYPE="hidden" NAME="taxclass" VALUE="'. $hashref->{taxclass}. '">';
 }
 
-print '<TR><TD ALIGN="right">Disable new orders</TD><TD>';
-print '<INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"';
-print ' CHECKED' if $hashref->{disabled} eq "Y";
-print '>';
-print '</TD></TR></TABLE>';
+%>
+
+</TABLE>
+
+</TD></TR></TABLE>
+
+<%
 
 my $thead =  "\n\n". ntable('#cccccc', 2).
              '<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH>';
@@ -162,8 +163,8 @@ $thead .= '<TH BGCOLOR="#dcdcdc">Service</TH></TR>';
 #dunno why...
 unless ( 0 ) {
   #print <<END, $thead;
-  print <<END, itable(), '<TR><TD VALIGN="top">', $thead;
-<BR><BR>Enter the quantity of each service this package includes.<BR><BR>
+  print <<END, itable('', 4, 1), '<TR><TD VALIGN="top">', $thead;
+<BR><BR>Services included
 END
 }
 
@@ -226,294 +227,7 @@ foreach my $f ( qw( clone pkgnum ) ) {
 print '<INPUT TYPE="hidden" NAME="pkgpart" VALUE="'. $part_pkg->pkgpart. '">';
 
 # prolly should be in database
-tie my %plans, 'Tie::IxHash',
-  'flat' => {
-    'name' => 'Flat rate (anniversary billing)',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                      },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => 'what.recur_fee.value',
-  },
-
-  'flat_delayed' => {
-    'name' => 'Free for X days, then flat rate (anniversary billing)',
-    'fields' =>  {
-      'free_days' => { 'name' => 'Initial free days',
-                       'default' => 0,
-                     },
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                      },
-    },
-    'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee' ],
-    'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
-    'recur' => 'what.recur_fee.value',
-  },
-
-  'prorate' => {
-    'name' => 'First partial month pro-rated, then flat-rate (1st of month billing)',
-    'fields' =>  {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                      },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'',
-  },
-
-  'subscription' => {
-    'name' => 'First partial month full charge, then flat-rate (1st of month billing)',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                      },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,1,$mon,$year); \' + what.recur_fee.value',
-  },
-
-  'flat_comission_cust' => {
-    'name' => 'Flat rate with recurring commission per active customer',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                     },
-      'comission_amount' => { 'name' => 'Commission amount per month (per active customer)',
-                              'default' => 0,
-                            },
-      'comission_depth'  => { 'name' => 'Number of layers',
-                              'default' => 1,
-                            },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_main_ncancelled(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
-  },
-
-  'flat_comission' => {
-    'name' => 'Flat rate with recurring commission per (any) active package',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                     },
-      'comission_amount' => { 'name' => 'Commission amount per month (per active package)',
-                              'default' => 0,
-                            },
-      'comission_depth'  => { 'name' => 'Number of layers',
-                              'default' => 1,
-                            },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
-  },
-
-  'flat_comission_pkg' => {
-    'name' => 'Flat rate with recurring commission per (selected) active package',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                     },
-      'comission_amount' => { 'name' => 'Commission amount per month (per uncancelled package)',
-                              'default' => 0,
-                            },
-      'comission_depth'  => { 'name' => 'Number of layers',
-                              'default' => 1,
-                            },
-      'comission_pkgpart' => { 'name' => 'Applicable packages<BR><FONT SIZE="-1">(hold <b>ctrl</b> to select multiple packages)</FONT>',
-                               'type' => 'select_multiple',
-                               'select_table' => 'part_pkg',
-                               'select_hash'  => { 'disabled' => '' } ,
-                               'select_key'   => 'pkgpart',
-                               'select_label' => 'pkg',
-                             },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount', 'comission_pkgpart' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '""; var pkgparts = ""; for ( var c=0; c < document.flat_comission_pkg.comission_pkgpart.options.length; c++ ) { if (document.flat_comission_pkg.comission_pkgpart.options[c].selected) { pkgparts = pkgparts + document.flat_comission_pkg.comission_pkgpart.options[c].value + \', \'; } } what.recur.value = \'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar( grep { my $pkgpart = $_->pkgpart; grep { $_ == $pkgpart } ( \' + pkgparts + \'  ) } $cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
-  },
-
-
-
-  'sesmon_hour' => {
-    'name' => 'Base charge plus charge per-hour from the session monitor',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_flat' => { 'name' => 'Base monthly charge for this package',
-                        'default' => 0,
-                      },
-      'recur_included_hours' => { 'name' => 'Hours included',
-                                  'default' => 0,
-                                },
-      'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
-                                 'default' => 0,
-                               },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
-  },
-
-  'sesmon_minute' => {
-    'name' => 'Base charge plus charge per-minute from the session monitor',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_flat' => { 'name' => 'Base monthly charge for this package',
-                        'default' => 0,
-                      },
-      'recur_included_min' => { 'name' => 'Minutes included',
-                                'default' => 0,
-                                },
-      'recur_minly_charge' => { 'name' => 'Additional charge per minute',
-                                'default' => 0,
-                              },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_min', 'recur_minly_charge' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
-
-  },
-
-  'sqlradacct_hour' => {
-    'name' => 'Base charge plus charge per-hour (and for data) from an external sqlradius radacct table',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_flat' => { 'name' => 'Base monthly charge for this package',
-                        'default' => 0,
-                      },
-      'recur_included_hours' => { 'name' => 'Hours included',
-                                  'default' => 0,
-                                },
-      'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
-                                 'default' => 0,
-                               },
-      'recur_included_input' => { 'name' => 'Input megabytes included',
-                                  'default' => 0,
-                                },
-      'recur_input_charge' => { 'name' =>
-                                        'Additional charge per input megabyte',
-                                'default' => 0,
-                              },
-      'recur_included_output' => { 'name' => 'Output megabytes included',
-                                   'default' => 0,
-                                },
-      'recur_output_charge' => { 'name' =>
-                                       'Additional charge per output megabyte',
-                                'default' => 0,
-                              },
-      'recur_included_total' => { 'name' =>
-                                       'Total input+output megabytes included',
-                                  'default' => 0,
-                                },
-      'recur_total_charge' => { 'name' =>
-                                 'Additional charge per input+output megabyte',
-                                'default' => 0,
-                              },
-    },
-    'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $inputcharge = sprintf(\"%.2f\", \' + what.recur_input_charge.value + \' * $input); my $outputcharge = sprintf(\"%.2f\", \' + what.recur_output_charge.value + \' * $output); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + what.recur_input_charge.value + \' > 0 ) { push @details, \"Last month\\\'s download \". sprintf(\"%.1f\", $input). \" megs: \\\$$inputcharge\" } if ( \' + what.recur_output_charge.value + \' > 0 ) { push @details, \"Last month\\\'s upload \". sprintf(\"%.1f\", $output). \" megs: \\\$$outputcharge\" } if ( \' + what.recur_hourly_charge.value + \' > 0 ) { push @details, \"Last month\\\'s time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; } \' + what.recur_flat.value + \' + $hourscharge + $inputcharge + $outputcharge + $totalcharge ;\'',
-  },
-
-  'sql_generic' => {
-    'name' => 'Base charge plus a metered rate from a configurable SQL query',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_flat' => { 'name' => 'Base monthly charge for this package',
-                        'default' => 0,
-                      },
-      'recur_included' => { 'name' => 'Units included',
-                            'default' => 0,
-                          },
-      'recur_unit_charge' => { 'name' => 'Additional charge per unit',
-                               'default' => 0,
-                             },
-      'datasrc' => { 'name' => 'DBI data source',
-                     'default' => '',
-                   },
-      'db_username' => { 'name' => 'Database username',
-                         'default' => '',
-                       },
-      'db_password' => { 'name' => 'Database username',
-                         'default' => '',
-                       },
-      'query' => { 'name' => 'SQL query',
-                   'default' => '',
-                 },
-    },
-    'fieldorder' => [qw( setup_fee recur_flat recur_included recur_unit_charge datasrc db_username db_password query )],
-    'setup' => 'what.setup_fee.value',
-   # 'recur' => '\'my $dbh = DBI->connect(\"\' + what.datasrc.value + \'\", \"\' + what.db_username.value + \'\") or die $DBI::errstr; \'',
-   'recur' => '\'my $dbh = DBI->connect(\"\' + what.datasrc.value + \'\", \"\' + what.db_username.value + \'\", \"\' + what.db_password.value + \'\" ) or die $DBI::errstr; my $sth = $dbh->prepare(\"\' + what.query.value + \'\") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq \"svc_domain\" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge.value + \';\'',
-    #'recur' => '\'my $dbh = DBI->connect("\' + what.datasrc.value + \'", "\' + what.db_username.value + \'", "\' what.db_password.value + \'" ) or die $DBI::errstr; my $sth = $dbh->prepare("\' + what.query.value + \'") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_domain" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge + \';\'',
-  },
-
-
-
-  'sql_external' => {
-    'name' => 'Base charge plus additional fees for external services from a configurable SQL query',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_flat' => { 'name' => 'Base monthly charge for this package',
-                        'default' => 0,
-                      },
-      'datasrc' => { 'name' => 'DBI data source',
-                     'default' => '',
-                   },
-      'db_username' => { 'name' => 'Database username',
-                         'default' => '',
-                       },
-      'db_password' => { 'name' => 'Database password',
-                         'default' => '',
-                       },
-      'query' => { 'name' => 'SQL query',
-                   'default' => '',
-                 },
-    },
-    'fieldorder' => [qw( setup_fee recur_flat datasrc db_username db_password query )],
-    'setup' => 'what.setup_fee.value',
-    'recur' => q!'my $dbh = DBI->connect("' + what.datasrc.value + '", "' + what.db_username.value + '", "' + what.db_password.value + '" ) or die $DBI::errstr; my $sth = $dbh->prepare("' + what.query.value + '") or die $dbh->errstr; my $price = ' + what.recur_flat.value + '; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_external" } $cust_pkg->cust_svc ){ my $id = $cust_svc->svc_x->id; $sth->execute($id) or die $sth->errstr; $price += $sth->fetchrow_arrayref->[0]; } $price;'!,
-
-  },
-
-;
+tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() };
 
 my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
                     split("\n", $part_pkg->plandata );
@@ -532,30 +246,40 @@ if ( dbdef->table('pkg_svc')->column('primary_svc') ) {
   push @form_radio, 'pkg_svc_primary';
 }
 
+tie my %freq, 'Tie::IxHash', %FS::part_pkg::freq;
+if ( $part_pkg->dbdef_table->column('freq')->type =~ /(int)/i ) {
+  delete $freq{$_} foreach grep { ! /^\d+$/ } keys %freq;
+}
+
 my $widget = new HTML::Widgets::SelectLayers(
   'selected_layer' => $part_pkg->plan,
   'options'        => \%options,
   'form_name'      => 'dummy',
   'form_action'    => 'process/part_pkg.cgi',
-  'form_text'      => [ qw(pkg comment freq clone pkgnum pkgpart), @fixups ],
+  'form_text'      => [ qw(pkg comment clone pkgnum pkgpart), @fixups ],
   'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
   'form_radio'     => \@form_radio,
   'form_select'    => \@form_select,
-  'fixup_callback' => sub {
-                        #my $ = @_;
-                        my $html = '';
-                        for my $p ( keys %plans ) {
-                          $html .= "if ( what.plan.value == \"$p\" ) {
-                                      what.setup.value = $plans{$p}->{setup} ;
-                                      what.recur.value = $plans{$p}->{recur} ;
-                                    }\n";
-                        }
-                        $html;
-                      },
   'layer_callback' => sub {
     my $layer = shift;
     my $html = qq!<INPUT TYPE="hidden" NAME="plan" VALUE="$layer">!.
                ntable("#cccccc",2);
+    $html .= '
+      <TR>
+        <TD ALIGN="right">Recurring fee frequency </TD>
+        <TD><SELECT NAME="freq">
+    ';
+
+    my @freq = keys %freq;
+    @freq = grep { /^\d+$/ } @freq
+      if exists($plans{$layer}->{'freq'}) && $plans{$layer}->{'freq'} eq 'm';
+    foreach my $freq ( @freq ) {
+      $html .= qq(<OPTION VALUE="$freq");
+      $html .= ' SELECTED' if $freq eq $part_pkg->freq;
+      $html .= ">$freq{$freq}";
+    }
+    $html .= '</SELECT></TD></TR>';
+
     my $href = $plans{$layer}->{'fields'};
     foreach my $field ( exists($plans{$layer}->{'fieldorder'})
                           ? @{$plans{$layer}->{'fieldorder'}}
@@ -598,22 +322,6 @@ my $widget = new HTML::Widgets::SelectLayers(
              ( $hashref->{pkgpart} ? "Apply changes" : "Add package" ).
              '" onClick="fchanged(this)">';
 
-    $html .= '<BR><BR>don\'t edit this unless you know what you\'re doing '.
-             '<INPUT TYPE="button" VALUE="refresh expressions" '.
-               'onClick="fchanged(this)">'.
-             ntable("#cccccc",2).
-             '<TR><TD>'.
-             '<FONT SIZE="1">Setup expression<BR>'.
-             '<INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="'.
-               encode_entities($hashref->{setup}). '" onLoad="fchanged(this)">'.
-             '</FONT><BR>'.
-             '<FONT SIZE="1">Recurring espression<BR>'.
-             '<INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="'.
-               encode_entities($hashref->{recur}). '" onLoad="fchanged(this)">'.
-             '</FONT>'.
-             '</TR></TD>'.
-             '</TABLE>';
-
     $html;
 
   },
@@ -621,7 +329,6 @@ my $widget = new HTML::Widgets::SelectLayers(
 
 %>
 
-<BR>
-Price plan <%= $widget->html %>
+<BR><BR>Price plan <%= $widget->html %>
   </BODY>
 </HTML>
-- 
cgit v1.2.1


From 3544d031fc03d9efcae02755718cb63a96ece5db Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Nov 2004 13:19:14 +0000
Subject: fix package options to be sticky on clone-ing (customize package)

---
 httemplate/edit/part_pkg.cgi | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 546e07113..cd07ac3f5 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -20,11 +20,11 @@ if ( $cgi->param('error') ) {
     map { $_, scalar($cgi->param($_)) } fields('part_pkg')
   } );
 }
+my $clone_part_pkg = '';
 if ( $cgi->param('clone') ) {
-  $action='Custom Pricing';
-  my $old_part_pkg =
-    qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
-  $part_pkg ||= $old_part_pkg->clone;
+  $action = 'Custom Pricing';
+  $clone_part_pkg= qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
+  $part_pkg ||= $clone_part_pkg->clone;
   $part_pkg->disabled('Y');
 } elsif ( $query && $query =~ /^(\d+)$/ ) {
   $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
@@ -230,7 +230,8 @@ print '<INPUT TYPE="hidden" NAME="pkgpart" VALUE="'. $part_pkg->pkgpart. '">';
 tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() };
 
 my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-                    split("\n", $part_pkg->plandata );
+                    split("\n", ($clone_part_pkg||$part_pkg)->plandata );
+warn join("\n", map { "$_: $plandata{$_}" } keys %plandata ). "\n";
 
 tie my %options, 'Tie::IxHash', map { $_=>$plans{$_}->{'name'} } keys %plans;
 
-- 
cgit v1.2.1


From 59c328d950e0d5275a1b5cf3357729212dd0e26a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Nov 2004 13:22:55 +0000
Subject: #debugging cruft

---
 httemplate/edit/part_pkg.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index cd07ac3f5..6a06c3525 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -231,7 +231,7 @@ tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() };
 
 my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
                     split("\n", ($clone_part_pkg||$part_pkg)->plandata );
-warn join("\n", map { "$_: $plandata{$_}" } keys %plandata ). "\n";
+#warn join("\n", map { "$_: $plandata{$_}" } keys %plandata ). "\n";
 
 tie my %options, 'Tie::IxHash', map { $_=>$plans{$_}->{'name'} } keys %plans;
 
-- 
cgit v1.2.1


From 48ba2845d0119c56971d5b724661aa37e73b49dd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 20 Nov 2004 17:26:56 +0000
Subject: first pass at VoIP rating

---
 httemplate/edit/part_pkg.cgi            |   7 +-
 httemplate/edit/process/rate.cgi        |  37 +++++++++++
 httemplate/edit/process/rate_region.cgi |  51 ++++++++++++++
 httemplate/edit/rate.cgi                |  94 ++++++++++++++++++++++++++
 httemplate/edit/rate_region.cgi         | 114 ++++++++++++++++++++++++++++++++
 5 files changed, 301 insertions(+), 2 deletions(-)
 create mode 100755 httemplate/edit/process/rate.cgi
 create mode 100755 httemplate/edit/process/rate_region.cgi
 create mode 100644 httemplate/edit/rate.cgi
 create mode 100644 httemplate/edit/rate_region.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 6a06c3525..dc2992459 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -295,8 +295,11 @@ my $widget = new HTML::Widgets::SelectLayers(
                      ? $plandata{$field}
                      : $href->{$field}{'default'} ).
                  qq!" onChange="fchanged(this)">!;
-      } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) {
-        $html .= qq!<SELECT MULTIPLE NAME="$field" onChange="fchanged(this)">!;
+      } elsif ( $href->{$field}{'type'} =~ /^select/ ) {
+        $html .= '<SELECT';
+        $html .= ' MULTIPLE'
+          if $href->{$field}{'type'} eq 'select_multiple';
+        $html .= qq! NAME="$field" onChange="fchanged(this)">!;
         foreach my $record (
           qsearch( $href->{$field}{'select_table'},
                    $href->{$field}{'select_hash'}   )
diff --git a/httemplate/edit/process/rate.cgi b/httemplate/edit/process/rate.cgi
new file mode 100755
index 000000000..04ff5f8f7
--- /dev/null
+++ b/httemplate/edit/process/rate.cgi
@@ -0,0 +1,37 @@
+<%
+
+my $ratenum = $cgi->param('ratenum');
+
+my $old = qsearchs('rate', { 'ratenum' => $ratenum } ) if $ratenum;
+
+my @rate_detail = map {
+  my $regionnum = $_->regionnum;
+  new FS::rate_detail {
+    'dest_regionnum'  => $regionnum,
+    map { $_ => $cgi->param("$_$regionnum") }
+        qw( min_included min_charge sec_granularity )
+  };
+} qsearch('rate_region', {} );
+
+my $new = new FS::rate ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('rate')
+} );
+
+my $error;
+if ( $ratenum ) {
+  $error = $new->replace($old, 'rate_detail' => \@rate_detail );
+} else {
+  $error = $new->insert( 'rate_detail' => \@rate_detail );
+  $ratenum = $new->getfield('ratenum');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "rate.cgi?". $cgi->query_string );
+} else { 
+  print $cgi->redirect(popurl(3). "browse/rate.cgi");
+}
+
+%>
diff --git a/httemplate/edit/process/rate_region.cgi b/httemplate/edit/process/rate_region.cgi
new file mode 100755
index 000000000..09d3d2c42
--- /dev/null
+++ b/httemplate/edit/process/rate_region.cgi
@@ -0,0 +1,51 @@
+<%
+
+my $regionnum = $cgi->param('regionnum');
+
+my $old = qsearchs('rate_region', { 'regionnum' => $regionnum } ) if $regionnum;
+
+my $new = new FS::rate_region ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } ( fields('rate_region') )
+} );
+
+my $countrycode = $cgi->param('countrycode');
+my @npa = split(/\s*,\s*/, $cgi->param('npa'));
+$npa[0] = '' unless @npa;
+my @rate_prefix = map {
+                        new FS::rate_prefix {
+                          'countrycode' => $countrycode,
+                          'npa'         => $_,
+                        }
+                      } @npa;
+
+my @dest_detail = map {
+  my $ratenum = $_->ratenum;
+  new FS::rate_detail {
+    'ratenum'  => $ratenum,
+    map { $_ => $cgi->param("$_$ratenum") }
+        qw( min_included min_charge sec_granularity )
+  };
+} qsearch('rate', {} );
+
+
+my $error;
+if ( $regionnum ) {
+  $error = $new->replace($old, 'rate_prefix' => \@rate_prefix,
+                               'dest_detail' => \@dest_detail, );
+} else {
+  $error = $new->insert( 'rate_prefix' => \@rate_prefix,
+                         'dest_detail' => \@dest_detail, );
+  $regionnum = $new->getfield('regionnum');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "rate_region.cgi?". $cgi->query_string );
+} else { 
+  #print $cgi->redirect(popurl(3). "browse/rate_region.cgi");
+  print $cgi->redirect(popurl(3). "browse/rate.cgi");
+}
+
+%>
diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
new file mode 100644
index 000000000..83a89c475
--- /dev/null
+++ b/httemplate/edit/rate.cgi
@@ -0,0 +1,94 @@
+<!-- mason kludge -->
+<%
+
+my $rate;
+if ( $cgi->param('error') ) {
+  $rate = new FS::rate ( {
+    map { $_, scalar($cgi->param($_)) } fields('rate')
+  } );
+} elsif ( $cgi->keywords ) {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $rate = qsearchs( 'rate', { 'ratenum' => $1 } );
+} else { #adding
+  $rate = new FS::rate {};
+}
+my $action = $rate->ratenum ? 'Edit' : 'Add';
+
+my $p1 = popurl(1);
+
+my %granularity = (
+  '6'  => '6 second',
+  '60' => 'minute',
+);
+
+%>
+
+<%= header("$action Rate plan", menubar(
+      'Main Menu' => $p,
+      'View all rate plans' => "${p}browse/rate.cgi",
+    ))
+%>
+
+<% if ( $cgi->param('error') ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT><BR>
+<% } %>
+
+<FORM ACTION="<%=$p1%>process/rate.cgi" METHOD=POST>
+
+<INPUT TYPE="hidden" NAME="ratenum" VALUE="<%= $rate->ratenum %>">
+
+Rate plan
+<INPUT TYPE="text" NAME="ratename" SIZE=32 VALUE="<%= $rate->ratename %>">
+<BR><BR>
+
+<%= table() %>
+<TR>
+  <TH>Region</TH>
+  <TH>Prefix(es)</TH>
+  <TH><FONT SIZE=-1>Included<BR>minutes</FONT></TH>
+  <TH><FONT SIZE=-1>Charge per<BR>minute</FONT></TH>
+  <TH><FONT SIZE=-1>Granularity</FONT></TH>
+</TR>
+
+<% foreach my $rate_region (
+     qsearch('rate_region', {}, '', 'ORDER BY regionname' )
+   ) {
+     my $n = $rate_region->regionnum;
+     my $rate_detail =
+       $rate->dest_detail($rate_region)
+       || new FS::rate_region { 'min_included'    => 0,
+                                'min_charge'      => 0,
+                                'sec_granularity' => '60'
+                              };
+%>
+  <TR>
+    <TD><A HREF="<%=$p%>edit/rate_region.cgi?<%= $rate_region->regionnum %>"><%= $rate_region->regionname %></A></TD>
+    <TD><%= $rate_region->prefixes_short %></TD>
+    <TD><INPUT TYPE="text" SIZE=5 NAME="min_included<%=$n%>" VALUE="<%= $cgi->param("min_included$n") || $rate_detail->min_included %>"></TD>
+    <TD>$<INPUT TYPE="text" SIZE=4 NAME="min_charge<%=$n%>" VALUE="<%= sprintf('%.2f', $cgi->param("min_charge$n") || $rate_detail->min_charge ) %>"></TD>
+    <TD>
+      <SELECT NAME="sec_granularity<%=$n%>">
+        <% foreach my $granularity ( keys %granularity ) { %>
+          <OPTION VALUE="<%=$granularity%>"<%= $granularity == ( $cgi->param("sec_granularity$n") || $rate_detail->sec_granularity ) ? ' SELECTED' : '' %>><%=$granularity{$granularity}%>
+        <% } %>
+      </SELECT>
+  </TR>
+<% } %>
+
+<TR>
+  <TD COLSPAN=5 ALIGN="center">
+    <A HREF="<%=$p%>edit/rate_region.cgi"><I>Add a region</I></A>
+  </TD>
+</TR>
+
+</TABLE>
+
+<BR><INPUT TYPE="submit" VALUE="<%= 
+  $rate->ratenum ? "Apply changes" : "Add rate plan"
+%>">
+
+    </FORM>
+  </BODY>
+</HTML>
+
diff --git a/httemplate/edit/rate_region.cgi b/httemplate/edit/rate_region.cgi
new file mode 100644
index 000000000..cc14dd37d
--- /dev/null
+++ b/httemplate/edit/rate_region.cgi
@@ -0,0 +1,114 @@
+<!-- mason kludge -->
+<%
+
+my $rate_region;
+if ( $cgi->param('error') ) {
+  $rate_region = new FS::rate_region ( {
+    map { $_, scalar($cgi->param($_)) } fields('rate_region')
+  } );
+} elsif ( $cgi->keywords ) {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $rate_region = qsearchs( 'rate_region', { 'regionnum' => $1 } );
+} else { #adding
+  $rate_region = new FS::rate_region {};
+}
+my $action = $rate_region->regionnum ? 'Edit' : 'Add';
+
+my $p1 = popurl(1);
+
+my %granularity = (
+  '6'  => '6 second',
+  '60' => 'minute',
+);
+
+my @rate_prefix = $rate_region->rate_prefix;
+my $countrycode = '';
+if ( @rate_prefix ) {
+  $countrycode = $rate_prefix[0]->countrycode;
+  foreach my $rate_prefix ( @rate_prefix ) {
+    eidiot 'multiple country codes per region not yet supported by web UI'
+      unless $rate_prefix->countrycode eq $countrycode;
+  }
+}
+
+%>
+
+<%= header("$action Region", menubar(
+      'Main Menu' => $p,
+      #'View all regions' => "${p}browse/rate_region.cgi",
+    ))
+%>
+
+<% if ( $cgi->param('error') ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT><BR>
+<% } %>
+
+<FORM ACTION="<%=$p1%>process/rate_region.cgi" METHOD=POST>
+
+<INPUT TYPE="hidden" NAME="regionnum" VALUE="<%= $rate_region->regionnum %>">
+
+<%= ntable('#cccccc') %>
+<TR>
+  <TH ALIGN="right">Region name</TH>
+  <TD><INPUT TYPE="text" NAME="regionname" SIZE=32 VALUE="<%= $rate_region->regionname %>"></TR>
+</TR>
+
+<TR>
+  <TH ALIGN="right">Country code</TH>
+  <TD><INPUT TYPE="text" NAME="countrycode" SIZE=4 MAXLENGTH=3 VALUE="<%= $countrycode %>"></TR>
+</TR>
+
+
+<TR>
+  <TH ALIGN="right">Prefixes</TH>
+  <TD>
+    <TEXTAREA NAME="npa" WRAP=SOFT><%= join(', ', map $_->npa, @rate_prefix ) %></TEXTAREA>
+  </TD>
+</TR>
+
+</TABLE>
+
+<BR>
+<%= table() %>
+<TR>
+  <TH>Rate plan</TH>
+  <TH><FONT SIZE=-1>Included<BR>minutes</FONT></TH>
+  <TH><FONT SIZE=-1>Charge per<BR>minute</FONT></TH>
+  <TH><FONT SIZE=-1>Granularity</FONT></TH>
+</TR>
+
+<% foreach my $rate ( qsearch('rate', {}) ) {
+
+  my $n = $rate->ratenum;
+  my $rate_detail = $rate->dest_detail($rate_region)
+                    || new FS::rate_region { 'min_included'    => 0,
+                                             'min_charge'      => 0,
+                                             'sec_granularity' => '60'
+                                           };
+
+%>
+  <TR>
+    <TD><A HREF="<%=$p%>edit/rate.cgi?<%= $rate->ratenum %>"><%= $rate->ratename %></TD>
+    <TD><INPUT TYPE="text" SIZE=5 NAME="min_included<%=$n%>" VALUE="<%= $cgi->param("min_included$n") || $rate_detail->min_included %>"></TD>
+    <TD>$<INPUT TYPE="text" SIZE=4 NAME="min_charge<%=$n%>" VALUE="<%= sprintf('%.2f', $cgi->param("min_charge$n") || $rate_detail->min_charge ) %>"></TD>
+    <TD>
+      <SELECT NAME="sec_granularity<%=$n%>">
+        <% foreach my $granularity ( keys %granularity ) { %>
+          <OPTION VALUE="<%=$granularity%>"<%= $granularity == ( $cgi->param("sec_granularity$n") || $rate_detail->sec_granularity ) ? ' SELECTED' : '' %>><%=$granularity{$granularity}%>
+        <% } %>
+      </SELECT>
+  </TR>
+<% } %>
+
+</TABLE>
+
+<BR><BR><INPUT TYPE="submit" VALUE="<%= 
+  $rate_region->regionnum ? "Apply changes" : "Add region"
+%>">
+
+    </FORM>
+  </BODY>
+</HTML>
+
+
-- 
cgit v1.2.1


From a5a258c91c5dc78897d16627b8092385ceb4c4d2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Nov 2004 18:20:21 +0000
Subject: promo codes and separate signup addresses for hdn

---
 httemplate/edit/cust_main.cgi | 22 ++++++++++++----------
 httemplate/edit/part_pkg.cgi  | 11 +++++++++--
 2 files changed, 21 insertions(+), 12 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 4a8f70540..f5826f31b 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -168,8 +168,8 @@ print "<BR><BR>Billing address", &itable("#cccccc"), <<END;
 END
 
 print <<END;
-<INPUT TYPE="text" NAME="last" VALUE="$last"> , 
-<INPUT TYPE="text" NAME="first" VALUE="$first">
+<INPUT TYPE="text" NAME="last" VALUE="$last" onChange="changed(this)"> , 
+<INPUT TYPE="text" NAME="first" VALUE="$first" onChange="changed(this)">
 </TD>
 END
 
@@ -181,10 +181,10 @@ if ( $conf->exists('show_ss') ) {
 
 print <<END;
 </TR>
-<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70></TD></TR>
-<TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70></TD></TR>
-<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70></TD></TR>
-<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State</TH><TD>
+<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70 onChange="changed(this)"></TD></TR>
+<TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70 onChange="changed(this)"></TD></TR>
+<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70 onChange="changed(this)"></TD></TR>
+<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city" onChange="changed(this)"></TD><TH ALIGN="right">${r}State</TH><TD>
 END
 
 #false laziness with ship state
@@ -203,12 +203,14 @@ my($county_html, $state_html, $country_html) =
 
 print "$county_html $state_html";
 
-print qq!</TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10></TD></TR>!;
+print qq!</TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10 onChange="changed(this)"></TD></TR>!;
 
 my($daytime,$night,$fax)=(
   $cust_main->daytime,
   $cust_main->night,
   $cust_main->fax,
+  '',
+  'changed(this)',
 );
 
 my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
@@ -216,9 +218,9 @@ my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
 
 print <<END;
 <TR><TH ALIGN="right">${r}Country</TH><TD>$country_html</TD></TR>
-<TR><TD ALIGN="right">$daytime_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18></TD></TR>
-<TR><TD ALIGN="right">$night_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18></TD></TR>
-<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12></TD></TR>
+<TR><TD ALIGN="right">$daytime_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18 onChange="changed(this)"></TD></TR>
+<TR><TD ALIGN="right">$night_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18 onChange="changed(this)"></TD></TR>
+<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12 onChange="changed(this)"></TD></TR>
 END
 
 print "</TABLE>${r}required fields<BR>";
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index dc2992459..b3c389c9d 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -93,7 +93,12 @@ Package information
       <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="<%=$part_pkg->comment%>">
     </TD>
   </TR>
-
+  <TR>
+    <TD ALIGN="right">Promotional code</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="promo_code" SIZE=32 VALUE="<%=$part_pkg->promo_code%>">
+    </TD>
+  </TR>
   <TR>
     <TD ALIGN="right">Disable new orders</TD>
     <TD>
@@ -257,7 +262,9 @@ my $widget = new HTML::Widgets::SelectLayers(
   'options'        => \%options,
   'form_name'      => 'dummy',
   'form_action'    => 'process/part_pkg.cgi',
-  'form_text'      => [ qw(pkg comment clone pkgnum pkgpart), @fixups ],
+  'form_text'      => [ qw(pkg comment promo_code clone pkgnum pkgpart),
+                        @fixups
+                      ],
   'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
   'form_radio'     => \@form_radio,
   'form_select'    => \@form_select,
-- 
cgit v1.2.1


From 0613949cb9bf987f49114a42a74a9d8b68a31fc1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Nov 2004 10:28:24 +0000
Subject: fix redundant too-early checks which are causing an error

---
 httemplate/edit/process/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 0b13ba96b..a1d36986d 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -80,7 +80,7 @@ if ( $new->custnum eq '' ) {
       #later         'custnum' => $custnum,
       'pkgpart' => $pkgpart,
     } );
-    $error ||= $cust_pkg->check;
+    #$error ||= $cust_pkg->check;
 
     #$cust_svc = new FS::cust_svc ( { 'svcpart' => $svcpart } );
 
@@ -101,7 +101,7 @@ if ( $new->custnum eq '' ) {
     $svc_acct->_password($cgi->param('_password'));
     $svc_acct->popnum($cgi->param('popnum'));
 
-    $error ||= $svc_acct->check;
+    #$error ||= $svc_acct->check;
 
   } elsif ( $cgi->param('username') ) { #good thing to catch
     $error = "Can't assign username without a package!";
-- 
cgit v1.2.1


From 0250c1ca0ee37edc0370b91b86848c85260a77a6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Nov 2004 08:51:52 +0000
Subject: move part_pkg transactional stuff from web interface to part_pkg.pm,
 bumps Bug#18 to 1.5

---
 httemplate/edit/process/part_pkg.cgi | 96 ++++++------------------------------
 1 file changed, 16 insertions(+), 80 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 7eada7bc8..5ff3e6f17 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -23,95 +23,31 @@ my $new = new FS::part_pkg ( {
   } fields('part_pkg')
 } );
 
-#warn "setuptax: ". $new->setuptax;
-#warn "recurtax: ". $new->recurtax;
-
-#most of the stuff below should move to part_pkg.pm
-
-foreach my $part_svc ( qsearch('part_svc', {} ) ) {
-  my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
-  unless ( $quantity =~ /^(\d+)$/ ) {
-    $cgi->param('error', "Illegal quantity" );
-    print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
-    myexit();
-  }
-}
-
-local $SIG{HUP} = 'IGNORE';
-local $SIG{INT} = 'IGNORE';
-local $SIG{QUIT} = 'IGNORE';
-local $SIG{TERM} = 'IGNORE';
-local $SIG{TSTP} = 'IGNORE';
-local $SIG{PIPE} = 'IGNORE';
-
-local $FS::UID::AutoCommit = 0;
+my %pkg_svc = map { $_ => $cgi->param("pkg_svc$_") }
+              map { $_->svcpart }
+              qsearch('part_svc', {} );
 
 my $error;
+my $custnum = '';
 if ( $pkgpart ) {
-  $error = $new->replace($old);
+  $error = $new->replace( $old, 'pkg_svc'     => \%pkg_svc,
+                                'primary_svc' => $cgi->param('pkg_svc_primary'),
+                        );
 } else {
-  $error = $new->insert;
-  $pkgpart=$new->pkgpart;
+  $error = $new->insert( 'pkg_svc'     => \%pkg_svc,
+                         'primary_svc' => $cgi->param('pkg_svc_primary'),
+                         'cust_pkg'    => $cgi->param('pkgnum'),
+                         'custnum_ref' => \$custnum,
+                       );
+  $pkgpart = $new->pkgpart;
 }
 if ( $error ) {
-  $dbh->rollback;
   $cgi->param('error', $error );
   print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
-  myexit();
-}
-
-foreach my $part_svc (qsearch('part_svc',{})) {
-  my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
-  my $primary_svc =
-    $cgi->param('pkg_svc_primary') == $part_svc->svcpart ? 'Y' : '';
-  my $old_pkg_svc = qsearchs('pkg_svc', {
-    'pkgpart' => $pkgpart,
-    'svcpart' => $part_svc->svcpart,
-  } );
-  my $old_quantity = $old_pkg_svc ? $old_pkg_svc->quantity : 0;
-  my $old_primary_svc =
-    ( $old_pkg_svc && $old_pkg_svc->dbdef_table->column('primary_svc') )
-      ? $old_pkg_svc->primary_svc
-      : '';
-  next unless $old_quantity != $quantity || $old_primary_svc ne $primary_svc;
-
-  my $new_pkg_svc = new FS::pkg_svc( {
-    'pkgpart'     => $pkgpart,
-    'svcpart'     => $part_svc->svcpart,
-    'quantity'    => $quantity, 
-    'primary_svc' => $primary_svc,
-  } );
-  if ( $old_pkg_svc ) {
-    my $myerror = $new_pkg_svc->replace($old_pkg_svc);
-    if ( $myerror ) {
-      $dbh->rollback;
-      die $myerror;
-    }
-  } else {
-    my $myerror = $new_pkg_svc->insert;
-    if ( $myerror ) {
-      $dbh->rollback;
-      die $myerror;
-    }
-  }
-}
-
-unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
-  $dbh->commit or die $dbh->errstr;
-  print $cgi->redirect(popurl(3). "browse/part_pkg.cgi");
+} elsif ( $custnum )  {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 } else {
-  my($old_cust_pkg) = qsearchs( 'cust_pkg', { 'pkgnum' => $1 } );
-  my %hash = $old_cust_pkg->hash;
-  $hash{'pkgpart'} = $pkgpart;
-  my($new_cust_pkg) = new FS::cust_pkg \%hash;
-  my $myerror = $new_cust_pkg->replace($old_cust_pkg);
-  if ( $myerror ) {
-    $dbh->rollback;
-    die "Error modifying cust_pkg record: $myerror\n";
-  }
-
-  $dbh->commit or die $dbh->errstr;
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new_cust_pkg->custnum);
+  print $cgi->redirect(popurl(3). "browse/part_pkg.cgi");
 }
 
 %>
-- 
cgit v1.2.1


From 08d3918e91ee3438af37345c94a002dec77fe9bb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Dec 2004 20:41:38 +0000
Subject: add 'send_if_newest' invoice event, closes: Bug#977

---
 httemplate/edit/part_bill_event.cgi | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 2f99ca58f..59a20cecf 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -177,6 +177,14 @@ tie my %events, 'Tie::IxHash',
     'weight' => 50,
   },
 
+  'send_if_newest' => {
+    'name' => 'Send invoice (email/print) with alternate template, if it is still the newest invoice (useful for late notices)',
+    'code' => '$cust_bill->send_if_newest(\'%%%if_newest_templatename%%%\');',
+    'html' =>
+        '<INPUT TYPE="text" NAME="if_newest_templatename" VALUE="%%%if_newest_templatename%%%">',
+    'weight' => 50,
+  },
+
   'send_agent' => {
     'name' => 'Send invoice (email/print) ',
     'code' => '$cust_bill->send(\'%%%agent_templatename%%%\', %%%agentnum%%%, \'%%%agent_invoice_from%%%\');',
-- 
cgit v1.2.1


From 860e50d09b48f37579117e58b0f7574daf4b7be8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Dec 2004 20:42:27 +0000
Subject: add 'send_if_newest' invoice event, closes: Bug#977

---
 httemplate/edit/part_bill_event.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 59a20cecf..99bc2609f 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -178,7 +178,7 @@ tie my %events, 'Tie::IxHash',
   },
 
   'send_if_newest' => {
-    'name' => 'Send invoice (email/print) with alternate template, if it is still the newest invoice (useful for late notices)',
+    'name' => 'Send invoice (email/print) with alternate template, if it is still the newest invoice (useful for late notices - set to 31 days or later)',
     'code' => '$cust_bill->send_if_newest(\'%%%if_newest_templatename%%%\');',
     'html' =>
         '<INPUT TYPE="text" NAME="if_newest_templatename" VALUE="%%%if_newest_templatename%%%">',
-- 
cgit v1.2.1


From 0715590a107d7e17a37b2f4235b6c8a540783d1e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 22 Dec 2004 14:06:45 +0000
Subject: warn and require confirmation when editing next bill dates to a date
 in the past, closes; Bug#430

---
 httemplate/edit/REAL_cust_pkg.cgi         |  9 ++++++++-
 httemplate/edit/process/REAL_cust_pkg.cgi | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index d9b7579f6..9cbab2a16 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,12 +1,19 @@
 <!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.7 2003-11-19 12:21:09 ivan Exp $ -->
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.8 2004-12-22 14:06:45 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
 if ( $cgi->param('error') ) {
   $error = $cgi->param('error');
   $pkgnum = $cgi->param('pkgnum');
+  if ( $error eq '_bill_areyousure' ) {
+    my $bill = $cgi->param('bill');
+    $error = "You are attempting to set the next bill date to $bill, which is
+              in the past.  This will charge the customer for the interval
+              from $bill until now.  Are you sure you want to do this? ".
+           '<INPUT TYPE="checkbox" NAME="bill_areyousure" VALUE="1">';
+  }
 } else {
   my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/ or die "no pkgnum";
diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi
index 3d697ddfd..84d0cc129 100755
--- a/httemplate/edit/process/REAL_cust_pkg.cgi
+++ b/httemplate/edit/process/REAL_cust_pkg.cgi
@@ -8,9 +8,19 @@ $hash{'bill'} = $cgi->param('bill') ? str2time($cgi->param('bill')) : '';
 $hash{'last_bill'} =
   $cgi->param('last_bill') ? str2time($cgi->param('last_bill')) : '';
 $hash{'expire'} = $cgi->param('expire') ? str2time($cgi->param('expire')) : '';
-my $new = new FS::cust_pkg \%hash;
 
-my $error = $new->replace($old);
+my $new;
+my $error;
+if ( $hash{'bill'} != $old->bill        # if the next bill date was changed
+     && $hash{'bill'} < time            # to a date in the past
+     && ! $cgi->param('bill_areyousure') # and it wasn't confirmed
+   )
+{
+  $error = '_bill_areyousure';
+} else {
+  $new = new FS::cust_pkg \%hash;
+  $error = $new->replace($old);
+}
 
 if ( $error ) {
   $cgi->param('error', $error);
-- 
cgit v1.2.1


From 584caeef2ac90ab10fc028a7928b9ebc53e8b33a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 23 Dec 2004 07:28:53 +0000
Subject: hide US regions for now, we don't currently need them for rating just
 invoice/session display and the web pages are so giant they're timing out

---
 httemplate/edit/rate.cgi | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index 83a89c475..4fdc837bb 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -22,6 +22,13 @@ my %granularity = (
   '60' => 'minute',
 );
 
+my $nous = <<END;
+  WHERE 0 < ( SELECT COUNT(*) FROM rate_prefix
+               WHERE rate_region.regionnum = rate_prefix.regionnum
+                 AND countrycode != '1'
+            )
+END
+
 %>
 
 <%= header("$action Rate plan", menubar(
@@ -52,7 +59,11 @@ Rate plan
 </TR>
 
 <% foreach my $rate_region (
-     qsearch('rate_region', {}, '', 'ORDER BY regionname' )
+     qsearch( 'rate_region',
+              {},
+              '',
+              "$nous ORDER BY regionname",
+            )
    ) {
      my $n = $rate_region->regionnum;
      my $rate_detail =
-- 
cgit v1.2.1


From e9e81be2ffe4c08e52ccd9609838ffddab0ed6f2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 23 Dec 2004 09:15:16 +0000
Subject: fix bug with custom pricing packages when no primary service is
 selected

---
 httemplate/edit/process/part_pkg.cgi | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 5ff3e6f17..2d6b34432 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -30,14 +30,15 @@ my %pkg_svc = map { $_ => $cgi->param("pkg_svc$_") }
 my $error;
 my $custnum = '';
 if ( $pkgpart ) {
-  $error = $new->replace( $old, 'pkg_svc'     => \%pkg_svc,
-                                'primary_svc' => $cgi->param('pkg_svc_primary'),
+  $error = $new->replace( $old,
+                          pkg_svc     => \%pkg_svc,
+                          primary_svc => scalar($cgi->param('pkg_svc_primary')),
                         );
 } else {
-  $error = $new->insert( 'pkg_svc'     => \%pkg_svc,
-                         'primary_svc' => $cgi->param('pkg_svc_primary'),
-                         'cust_pkg'    => $cgi->param('pkgnum'),
-                         'custnum_ref' => \$custnum,
+  $error = $new->insert(  pkg_svc     => \%pkg_svc,
+                          primary_svc => scalar($cgi->param('pkg_svc_primary')),
+                          cust_pkg    => $cgi->param('pkgnum'),
+                          custnum_ref => \$custnum,
                        );
   $pkgpart = $new->pkgpart;
 }
-- 
cgit v1.2.1


From 74d770e94f656d69ae156903360238822a8baa45 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 23 Dec 2004 11:39:19 +0000
Subject: fix typo that manifests when using svc_www-enable_subdomains config
 option

---
 httemplate/edit/svc_www.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index 4989bb610..02fa64c07 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -130,7 +130,7 @@ if ($pkgnum) {
                       } )
                    || qsearchs( 'domain_record', {
                                   svcnum  => $svc_domain->svcnum,
-                                  reczone => 'www.'.$svc-domain->domain.'.',
+                                  reczone => 'www.'.$svc_domain->domain.'.',
                     } );
         }
 
-- 
cgit v1.2.1


From e84dda39cd83ef67dd2debd7d06d97d1a124b598 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 24 Dec 2004 02:54:12 +0000
Subject: add ability to set payment date manually

---
 httemplate/edit/cust_pay.cgi         | 132 +++++++++++++++++++++--------------
 httemplate/edit/process/cust_pay.cgi |   5 +-
 2 files changed, 82 insertions(+), 55 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index f6ae7b299..755050bd8 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -3,51 +3,61 @@
 
 my $conf = new FS::Conf;
 
-my($link, $linknum, $paid, $payby, $payinfo, $quickpay); 
+my($link, $linknum, $paid, $payby, $payinfo, $quickpay, $_date); 
 if ( $cgi->param('error') ) {
-  $link = $cgi->param('link');
-  $linknum = $cgi->param('linknum');
-  $paid = $cgi->param('paid');
-  $payby = $cgi->param('payby');
-  $payinfo = $cgi->param('payinfo');
+  $link     = $cgi->param('link');
+  $linknum  = $cgi->param('linknum');
+  $paid     = $cgi->param('paid');
+  $payby    = $cgi->param('payby');
+  $payinfo  = $cgi->param('payinfo');
   $quickpay = $cgi->param('quickpay');
+  $_date    = $cgi->param('_date') ? str2time($cgi->param('_date')) : time;
 } elsif ($cgi->keywords) {
   my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
-  $link = 'invnum';
-  $linknum = $1;
-  $paid = '';
-  $payby = 'BILL';
-  $payinfo = "";
+  $link     = 'invnum';
+  $linknum  = $1;
+  $paid     = '';
+  $payby    = 'BILL';
+  $payinfo  = "";
   $quickpay = '';
+  $_date    = time;
 } elsif ( $cgi->param('custnum')  =~ /^(\d+)$/ ) {
-  $link = 'custnum';
-  $linknum = $1;
-  $paid = '';
-  $payby = 'BILL';
-  $payinfo = '';
+  $link     = 'custnum';
+  $linknum  = $1;
+  $paid     = '';
+  $payby    = 'BILL';
+  $payinfo  = '';
   $quickpay = $cgi->param('quickpay');
+  $_date    = time;
 } else {
   die "illegal query ". $cgi->keywords;
 }
-my $_date = time;
 
 my $paybatch = "webui-$_date-$$-". rand() * 2**32;
 
-my $p1 = popurl(1);
-print header("Post payment", '');
+%>
+
+<%=  header("Post payment", '') %>
+
+<% if ( $cgi->param('error') ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<BR><BR>
+<% } %>
+
+<%= ntable("#cccccc",2) %>
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT><BR><BR>"
-  if $cgi->param('error');
+<LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+<SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
 
-print <<END, ntable("#cccccc",2);
-    <FORM ACTION="${p1}process/cust_pay.cgi" METHOD=POST>
-    <INPUT TYPE="hidden" NAME="link" VALUE="$link">
-    <INPUT TYPE="hidden" NAME="linknum" VALUE="$linknum">
-    <INPUT TYPE="hidden" NAME="quickpay" VALUE="$quickpay">
-END
+<FORM ACTION="<%= popurl(1) %>process/cust_pay.cgi" METHOD=POST>
+<INPUT TYPE="hidden" NAME="link" VALUE="<%= $link %>">
+<INPUT TYPE="hidden" NAME="linknum" VALUE="<%= $linknum %>">
+<INPUT TYPE="hidden" NAME="quickpay" VALUE="<%= $quickpay %>">
 
+<% 
 my $custnum;
 if ( $link eq 'invnum' ) {
 
@@ -94,36 +104,50 @@ if ( $link eq 'invnum' ) {
 } elsif ( $link eq 'custnum' ) {
   $custnum = $linknum;
 }
+%>
 
-print small_custview($custnum, $conf->config('countrydefault'));
-
-print qq!<INPUT TYPE="hidden" NAME="_date" VALUE="$_date">!;
-print qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$payby">!;
-
-print '<BR><BR>Payment'. ntable("#cccccc", 2).
-      '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
-      time2str("%D",$_date).  '</TD></TR>';
-
-print qq!<TR><TD ALIGN="right">Amount</TD><TD BGCOLOR="#ffffff">\$<INPUT TYPE="text" NAME="paid" VALUE="$paid" SIZE=8 MAXLENGTH=8></TD></TR>!;
-
-print qq!<TR><TD ALIGN="right">Payby</TD><TD BGCOLOR="#ffffff">$payby</TD></TR>!;
-
-#payinfo (check # now as payby="BILL" hardcoded.. what to do later?)
-print qq!<TR><TD ALIGN="right">Check #</TD><TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="payinfo" VALUE="$payinfo"></TD></TR>!;
-
-print qq!<TR><TD ALIGN="right">Auto-apply<BR>to invoices</TD><TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>!;
-
-print "</TABLE>";
-
-#paybatch
-print qq!<INPUT TYPE="hidden" NAME="paybatch" VALUE="$paybatch">!;
+<%= small_custview($custnum, $conf->config('countrydefault')) %>
+
+<INPUT TYPE="hidden" NAME="payby" VALUE="<%= $payby %>">
+
+<BR><BR>
+Payment
+<%= ntable("#cccccc", 2) %>
+<TR>
+  <TD ALIGN="right">Date</TD>
+  <TD COLSPAN=2>
+    <INPUT TYPE="text" NAME="_date" ID="_date_text" VALUE="<%= time2str("%m/%d/%Y %r",$_date) %>">
+    <IMG SRC="../images/calendar.png" ID="_date_button" STYLE="cursor: pointer" TITLE="Select date">
+  </TD>
+</TR>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "_date_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "_date_button",
+    align:      "BR"
+  });
+</SCRIPT>
+<TR>
+  <TD ALIGN="right">Amount</TD>
+  <TD BGCOLOR="#ffffff" ALIGN="right">$</TD>
+  <TD><INPUT TYPE="text" NAME="paid" VALUE="<%= $paid %>" SIZE=8 MAXLENGTH=8></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Check #</TD>
+  <TD COLSPAN=2><INPUT TYPE="text" NAME="payinfo" VALUE="<%= $payinfo %>" SIZE=10></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Auto-apply<BR>to invoices</TD>
+  <TD COLSPAN=2><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>
+</TR>
+
+</TABLE>
+
+<INPUT TYPE="hidden" NAME="paybatch" VALUE="<%= $paybatch %>">
 
-print <<END;
 <BR>
 <INPUT TYPE="submit" VALUE="Post payment">
     </FORM>
   </BODY>
 </HTML>
-END
-
-%>
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index 82442ae00..87d6011e7 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -8,11 +8,14 @@ $cgi->param('link') =~ /^(custnum|invnum)$/
   or die "Illegal link: ". $cgi->param('link');
 my $link = $1;
 
+my $_date = str2time($cgi->param('_date'));
+
 my $new = new FS::cust_pay ( {
   $link => $linknum,
+  _date => $_date,
   map {
     $_, scalar($cgi->param($_));
-  } qw(paid _date payby payinfo paybatch)
+  } qw(paid payby payinfo paybatch)
   #} fields('cust_pay')
 } );
 
-- 
cgit v1.2.1


From e6b0e9237c4bbc31c820b06ece0029f75166506d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 27 Dec 2004 09:23:23 +0000
Subject: UI: rework shipping address javascript, closes: Bug#1085

---
 httemplate/edit/cust_main.cgi          | 258 ++++++++++-----------------------
 httemplate/edit/cust_main/contact.html | 113 +++++++++++++++
 2 files changed, 189 insertions(+), 182 deletions(-)
 create mode 100644 httemplate/edit/cust_main/contact.html

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index f5826f31b..a18114c9d 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -64,20 +64,23 @@ if ( $cgi->param('error') ) {
 $cgi->delete_all();
 my $action = $custnum ? 'Edit' : 'Add';
 
-# top
+%>
 
-my $p1 = popurl(1);
-print header("Customer $action", '', ' onUnload="myclose()"');
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
-  if $error;
+<!-- top -->
 
-print qq!<FORM ACTION="${p1}process/cust_main.cgi" METHOD=POST NAME="form1" onSubmit="document.form1.submit.disabled=true">!,
-      qq!<INPUT TYPE="hidden" NAME="custnum" VALUE="$custnum">!,
-      qq!Customer # !, ( $custnum ? "<B>$custnum</B>" : " (NEW)" ),
-      
-;
+<%= header("Customer $action", '', ' onUnload="myclose()"') %>
+
+<% if ( $error ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $error %></FONT>
+<% } %>
+
+<FORM ACTION="<%= popurl(1) %>process/cust_main.cgi" METHOD=POST NAME="form1" onSubmit="document.form1.submit.disabled=true">
+<INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $custnum %>">
+ustomer # <%= $custnum ? "<B>$custnum</B>" : " (NEW)" %>
 
-# agent
+<!-- agent -->
+
+<%
 
 my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
@@ -87,21 +90,22 @@ my @agents = qsearch( 'agent', \%agent_search );
 #die "No agents created!" unless @agents;
 eidiot "You have not created any agents (or all agents are disabled).  You must create at least one agent before adding a customer.  Go to ". popurl(2). "browse/agent.cgi and create one or more agents." unless @agents;
 my $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
-if ( scalar(@agents) == 1 ) {
-  print qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!;
-} else {
-  print qq!<BR><BR>${r}Agent <SELECT NAME="agentnum" SIZE="1">!;
-  my $agent;
-  foreach $agent (sort {
-    $a->agent cmp $b->agent;
-  } @agents) {
-      print '<OPTION VALUE="', $agent->agentnum, '"',
-      " SELECTED"x($agent->agentnum==$agentnum),
-      ">". $agent->agent;
-      #">", $agent->agentnum,": ", $agent->agent;
-  }
-  print "</SELECT>";
-}
+
+%>
+
+<% if ( scalar(@agents) == 1 ) { %>
+  <INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agentnum %>">
+<% } else { %>
+  <BR><BR><%=$r%>Agent <SELECT NAME="agentnum" SIZE="1">
+  <% foreach my $agent (sort { $a->agent cmp $b->agent; } @agents) { %>
+    <OPTION VALUE="<%= $agent->agentnum %>"<%= " SELECTED"x($agent->agentnum==$agentnum) %>><%= $agent->agent %>
+  <% } %>
+  </SELECT>
+<% } %>
+
+<%
+
+# (referral and referring customer still need to be "template"ized)
 
 #referral
 
@@ -150,110 +154,54 @@ if ( $cust_main->referral_custnum
   print '<INPUT TYPE="hidden" NAME="referral_custnum" VALUE="">';
 }
 
-# contact info
-
-my($last,$first,$ss,$company,$address1,$address2,$city,$zip)=(
-  $cust_main->last,
-  $cust_main->first,
-  $cust_main->ss,
-  $cust_main->company,
-  $cust_main->address1,
-  $cust_main->address2,
-  $cust_main->city,
-  $cust_main->zip,
-);
-
-print "<BR><BR>Billing address", &itable("#cccccc"), <<END;
-<TR><TH ALIGN="right">${r}Contact&nbsp;name<BR>(last,&nbsp;first)</TH><TD COLSPAN=3>
-END
-
-print <<END;
-<INPUT TYPE="text" NAME="last" VALUE="$last" onChange="changed(this)"> , 
-<INPUT TYPE="text" NAME="first" VALUE="$first" onChange="changed(this)">
-</TD>
-END
-
-if ( $conf->exists('show_ss') ) {
-  print qq!<TD ALIGN="right">SS#</TD><TD><INPUT TYPE="text" NAME="ss" VALUE="$ss" SIZE=11></TD>!;
-} else {
-  print qq!<TD><INPUT TYPE="hidden" NAME="ss" VALUE="$ss"></TD>!;
-}
-
-print <<END;
-</TR>
-<TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="company" VALUE="$company" SIZE=70 onChange="changed(this)"></TD></TR>
-<TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="address1" VALUE="$address1" SIZE=70 onChange="changed(this)"></TD></TR>
-<TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="address2" VALUE="$address2" SIZE=70 onChange="changed(this)"></TD></TR>
-<TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city" onChange="changed(this)"></TD><TH ALIGN="right">${r}State</TH><TD>
-END
-
-#false laziness with ship state
-my $countrydefault = $conf->config('countrydefault') || 'US';
-$cust_main->country( $countrydefault ) unless $cust_main->country;
-
-my $statedefault = $conf->config('statedefault')
-                   || ($countrydefault eq 'US' ? 'CA' : '');
-$cust_main->state( $statedefault )
-  unless $cust_main->state || $cust_main->country ne $countrydefault;
-
-my($county_html, $state_html, $country_html) =
-  FS::cust_main_county::regionselector( $cust_main->county,
-                                        $cust_main->state,
-                                        $cust_main->country );
-
-print "$county_html $state_html";
-
-print qq!</TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="zip" VALUE="$zip" SIZE=10 onChange="changed(this)"></TD></TR>!;
-
-my($daytime,$night,$fax)=(
-  $cust_main->daytime,
-  $cust_main->night,
-  $cust_main->fax,
-  '',
-  'changed(this)',
-);
-
-my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
-my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
+%>
 
-print <<END;
-<TR><TH ALIGN="right">${r}Country</TH><TD>$country_html</TD></TR>
-<TR><TD ALIGN="right">$daytime_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="$daytime" SIZE=18 onChange="changed(this)"></TD></TR>
-<TR><TD ALIGN="right">$night_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="$night" SIZE=18 onChange="changed(this)"></TD></TR>
-<TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="$fax" SIZE=12 onChange="changed(this)"></TD></TR>
-END
+<!-- contact info -->
 
-print "</TABLE>${r}required fields<BR>";
+<BR><BR>
+Billing address
+<%= include('cust_main/contact.html', $cust_main, '', 'bill_changed(this)', '' ) %>
 
-# service address
+<!-- service address -->
 
-if ( defined $cust_main->dbdef_table->column('ship_last') ) {
+<% if ( defined $cust_main->dbdef_table->column('ship_last') ) { %>
 
-  print "\n", <<END;
-  <SCRIPT>
-  function changed(what) {
-    what.form.same.checked = false;
+<SCRIPT>
+function bill_changed(what) {
+  if ( what.form.same.checked ) {
+<% for (qw( last first company address1 address2 city zip daytime night fax )) { %>
+    what.form.ship_<%=$_%>.value = what.form.<%=$_%>.value;
+<% } %>
+    what.form.ship_country.selectedIndex = what.form.country.selectedIndex;
+    ship_country_changed(what.form.ship_country);
+    what.form.ship_state.selectedIndex = what.form.state.selectedIndex;
+    ship_state_changed(what.form.ship_state);
+    what.form.ship_county.selectedIndex = what.form.county.selectedIndex;
   }
-  function samechanged(what) {
-    if ( what.checked ) {
-END
-print "      what.form.ship_$_.value = what.form.$_.value;\n"
-  for (qw( last first company address1 address2 city zip daytime night fax ));
-print <<END;
-      what.form.ship_country.selectedIndex = what.form.country.selectedIndex;
-      ship_country_changed(what.form.ship_country);
-      what.form.ship_state.selectedIndex = what.form.state.selectedIndex;
-      ship_state_changed(what.form.ship_state);
-      what.form.ship_county.selectedIndex = what.form.county.selectedIndex;
-    }
+}
+function samechanged(what) {
+  if ( what.checked ) {
+    bill_changed(what);
+<% for (qw( last first company address1 address2 city county state zip country daytime night fax )) { %>
+    what.form.ship_<%=$_%>.disabled = true;
+    what.form.ship_<%=$_%>.style.backgroundColor = '#dddddd';
+<% } %>
+  } else {
+<% for (qw( last first company address1 address2 city county state zip country daytime night fax )) { %>
+    what.form.ship_<%=$_%>.disabled = false;
+    what.form.ship_<%=$_%>.style.backgroundColor = '#ffffff';
+<% } %>
   }
-  </SCRIPT>
-END
+}
+</SCRIPT>
 
-  print '<BR>Service address ',
-        '(<INPUT TYPE="checkbox" NAME="same" VALUE="Y" onClick="samechanged(this)"';
+<%
+  my $checked = '';
+  my $disabled = '';
+  my $disabledselect = '';
   unless ( $cust_main->ship_last && $cgi->param('same') ne 'Y' ) {
-    print ' CHECKED';
+    $checked = 'CHECKED';
+    $disabled = 'DISABLED style="background-color: #dddddd"';
     foreach (
       qw( last first company address1 address2 city county state zip country
           daytime night fax )
@@ -261,70 +209,16 @@ END
       $cust_main->set("ship_$_", $cust_main->get($_) );
     }
   }
-  print '>same as billing address)<BR>';
-
-  my($ship_last,$ship_first,$ship_company,$ship_address1,$ship_address2,$ship_city,$ship_zip)=(
-    $cust_main->ship_last,
-    $cust_main->ship_first,
-    $cust_main->ship_company,
-    $cust_main->ship_address1,
-    $cust_main->ship_address2,
-    $cust_main->ship_city,
-    $cust_main->ship_zip,
-  );
-
-  print &itable("#cccccc"), <<END;
-  <TR><TH ALIGN="right">${r}Contact&nbsp;name<BR>(last,&nbsp;first)</TH><TD COLSPAN=5>
-END
-
-  print <<END;
-  <INPUT TYPE="text" NAME="ship_last" VALUE="$ship_last" onChange="changed(this)"> , 
-  <INPUT TYPE="text" NAME="ship_first" VALUE="$ship_first" onChange="changed(this)">
-END
-
-  print <<END;
-  </TD></TR>
-  <TR><TD ALIGN="right">Company</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_company" VALUE="$ship_company" SIZE=70 onChange="changed(this)"></TD></TR>
-  <TR><TH ALIGN="right">${r}Address</TH><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_address1" VALUE="$ship_address1" SIZE=70 onChange="changed(this)"></TD></TR>
-  <TR><TD ALIGN="right">&nbsp;</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_address2" VALUE="$ship_address2" SIZE=70 onChange="changed(this)"></TD></TR>
-  <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="ship_city" VALUE="$ship_city" onChange="changed(this)"></TD><TH ALIGN="right">${r}State</TH><TD>
-END
-
-  #false laziness with regular state
-  $cust_main->ship_country( $countrydefault ) unless $cust_main->ship_country;
-
-  $cust_main->ship_state( $statedefault )
-    unless $cust_main->ship_state
-           || $cust_main->ship_country ne $countrydefault;
-
-  my($ship_county_html, $ship_state_html, $ship_country_html) =
-    FS::cust_main_county::regionselector( $cust_main->ship_county,
-                                          $cust_main->ship_state,
-                                          $cust_main->ship_country,
-                                          'ship_',
-                                          'changed(this)', );
-
-  print "$ship_county_html $ship_state_html";
-
-  print qq!</TD><TH>${r}Zip</TH><TD><INPUT TYPE="text" NAME="ship_zip" VALUE="$ship_zip" SIZE=10 onChange="changed(this)"></TD></TR>!;
-
-  my($ship_daytime,$ship_night,$ship_fax)=(
-    $cust_main->ship_daytime,
-    $cust_main->ship_night,
-    $cust_main->ship_fax,
-  );
-
-  print <<END;
-  <TR><TH ALIGN="right">${r}Country</TH><TD>$ship_country_html</TD></TR>
-  <TR><TD ALIGN="right">$daytime_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_daytime" VALUE="$ship_daytime" SIZE=18 onChange="changed(this)"></TD></TR>
-  <TR><TD ALIGN="right">$night_label</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_night" VALUE="$ship_night" SIZE=18 onChange="changed(this)"></TD></TR>
-  <TR><TD ALIGN="right">Fax</TD><TD COLSPAN=5><INPUT TYPE="text" NAME="ship_fax" VALUE="$ship_fax" SIZE=12 onChange="changed(this)"></TD></TR>
-END
+%>
 
-  print "</TABLE>${r}required fields<BR>";
+<BR>
+Service address 
+(<INPUT TYPE="checkbox" NAME="same" VALUE="Y" onClick="samechanged(this)" <%=$checked%>>same as billing address)
+<%= include('cust_main/contact.html', $cust_main, 'ship_', '', $disabled ) %>
 
-}
+<% } %>
 
+<%
 # billing info
 
 sub expselect {
diff --git a/httemplate/edit/cust_main/contact.html b/httemplate/edit/cust_main/contact.html
new file mode 100644
index 000000000..7b88ccbcb
--- /dev/null
+++ b/httemplate/edit/cust_main/contact.html
@@ -0,0 +1,113 @@
+<%
+
+my( $cust_main, $pre, $onchange, $disabled ) = @_;
+my $conf = new FS::Conf;
+
+#false laziness with ship state
+my $countrydefault = $conf->config('countrydefault') || 'US';
+$cust_main->set($pre.'country', $countrydefault )
+  unless $cust_main->get($pre.'country');
+
+my $statedefault = $conf->config('statedefault')
+                   || ($countrydefault eq 'US' ? 'CA' : '');
+$cust_main->set($pre.'state', $statedefault )
+  unless $cust_main->get($pre.'state')
+         || $cust_main->get($pre.'country') ne $countrydefault;
+
+my($county_html, $state_html, $country_html) =
+  FS::cust_main_county::regionselector( $cust_main->get($pre.'county'),
+                                        $cust_main->get($pre.'state'),
+                                        $cust_main->get($pre.'country'),
+                                        $pre,
+                                        $onchange,
+                                        $disabled,
+                                      );
+
+my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
+my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
+
+my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
+
+%>
+
+<%= &itable("#cccccc") %>
+
+<TR>
+  <TH ALIGN="right"><%=$r%>Contact&nbsp;name<BR>(last,&nbsp;first)</TH>
+  <TD COLSPAN=3>
+    <INPUT TYPE="text" NAME="<%=$pre%>last" VALUE="<%= $cust_main->get($pre.'last') %>" onChange="<%= $onchange %>" <%=$disabled%>> , 
+    <INPUT TYPE="text" NAME="<%=$pre%>first" VALUE="<%= $cust_main->get($pre.'first') %>" onChange="<%= $onchange %>" <%=$disabled%>>
+  </TD>
+
+<% if ( $conf->exists('show_ss') && !$pre ) { %>
+  <TD ALIGN="right">SS#</TD>
+  <TD><INPUT TYPE="text" NAME="ss" VALUE="<%= $cust_main->ss %>" SIZE=11></TD>
+<% } else { %>
+  <TD><INPUT TYPE="hidden" NAME="ss" VALUE="<%= $cust_main->ss %>"></TD>
+<% } %>
+
+</TR>
+
+<TR>
+  <TD ALIGN="right">Company</TD>
+  <TD COLSPAN=5>
+    <INPUT TYPE="text" NAME="<%=$pre%>company" VALUE="<%= $cust_main->get($pre.'company') %>" SIZE=70 onChange="<%= $onchange %>" <%=$disabled%>>
+  </TD>
+</TR>
+
+<TR>
+  <TH ALIGN="right"><%=$r%>Address</TH>
+  <TD COLSPAN=5>
+    <INPUT TYPE="text" NAME="<%=$pre%>address1" VALUE="<%= $cust_main->get($pre.'address1') %>" SIZE=70 onChange="<%= $onchange %>" <%=$disabled%>>
+  </TD>
+</TR>
+
+<TR>
+  <TD ALIGN="right">&nbsp;</TD>
+  <TD COLSPAN=5>
+    <INPUT TYPE="text" NAME="<%=$pre%>address2" VALUE="<%= $cust_main->get($pre.'address2') %>" SIZE=70 onChange="<%= $onchange %>" <%=$disabled%>>
+  </TD>
+</TR>
+
+<TR>
+  <TH ALIGN="right"><%=$r%>City</TH>
+  <TD>
+    <INPUT TYPE="text" NAME="<%=$pre%>city" VALUE="<%= $cust_main->get($pre.'city') %>" onChange="<%= $onchange %>" <%=$disabled%>>
+  </TD>
+  <TH ALIGN="right"><%=$r%>State</TH>
+  <TD><%= $county_html. $state_html %></TD>
+  <TH><%=$r%>Zip</TH>
+  <TD>
+    <INPUT TYPE="text" NAME="<%=$pre%>zip" VALUE="<%= $cust_main->get($pre.'zip') %>" SIZE=10 onChange="<%= $onchange %>" <%=$disabled%>>
+  </TD>
+</TR>
+
+<TR>
+  <TH ALIGN="right"><%=$r%>Country</TH>
+  <TD><%= $country_html %></TD>
+</TR>
+
+<TR>
+  <TD ALIGN="right"><%= $daytime_label %></TD>
+  <TD COLSPAN=5>
+    <INPUT TYPE="text" NAME="<%=$pre%>daytime" VALUE="<%= $cust_main->get($pre.'daytime') %>" SIZE=18 onChange="<%= $onchange %>" <%=$disabled%>>
+  </TD>
+</TR>
+
+<TR>
+  <TD ALIGN="right"><%= $night_label %></TD>
+  <TD COLSPAN=5>
+    <INPUT TYPE="text" NAME="<%=$pre%>night" VALUE="<%= $cust_main->get($pre.'night') %>" SIZE=18 onChange="<%= $onchange %>" <%=$disabled%>>
+  </TD>
+</TR>
+
+<TR>
+  <TD ALIGN="right">Fax</TD>
+  <TD COLSPAN=5>
+    <INPUT TYPE="text" NAME="<%=$pre%>fax" VALUE="<%= $cust_main->get($pre.'fax') %>" SIZE=12 onChange="<%= $onchange %>" <%=$disabled%>>
+  </TD>
+</TR>
+
+</TABLE>
+<%=$r%>required fields<BR>
+
-- 
cgit v1.2.1


From 658e271baebcdf077e5756735204f8f10567a0ad Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 31 Dec 2004 08:47:08 +0000
Subject: add ignore_unrateable flag to voip price plan

---
 httemplate/edit/part_pkg.cgi | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index b3c389c9d..1790cdfeb 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -302,6 +302,12 @@ my $widget = new HTML::Widgets::SelectLayers(
                      ? $plandata{$field}
                      : $href->{$field}{'default'} ).
                  qq!" onChange="fchanged(this)">!;
+      } elsif ( $href->{$field}{'type'} eq 'checkbox' ) {
+        $html .= qq!<INPUT TYPE="checkbox" NAME="$field" VALUE=1 !.
+                 ( exists($plandata{$field}) && $plandata{$field}
+                   ? ' CHECKED'
+                   : ''
+                 ). '>';
       } elsif ( $href->{$field}{'type'} =~ /^select/ ) {
         $html .= '<SELECT';
         $html .= ' MULTIPLE'
-- 
cgit v1.2.1


From 2f41d7382dac4f151de86ce06ad9846c89f56791 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 7 Jan 2005 22:16:50 +0000
Subject: remove separate file for rate processing, causing problems with giant
 query string, kludge in the non-displayed US-rates, and disable the submit
 button when pressed

---
 httemplate/edit/process/rate.cgi | 37 ------------------------
 httemplate/edit/rate.cgi         | 62 +++++++++++++++++++++++++++++++++-------
 2 files changed, 52 insertions(+), 47 deletions(-)
 delete mode 100755 httemplate/edit/process/rate.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/rate.cgi b/httemplate/edit/process/rate.cgi
deleted file mode 100755
index 04ff5f8f7..000000000
--- a/httemplate/edit/process/rate.cgi
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-
-my $ratenum = $cgi->param('ratenum');
-
-my $old = qsearchs('rate', { 'ratenum' => $ratenum } ) if $ratenum;
-
-my @rate_detail = map {
-  my $regionnum = $_->regionnum;
-  new FS::rate_detail {
-    'dest_regionnum'  => $regionnum,
-    map { $_ => $cgi->param("$_$regionnum") }
-        qw( min_included min_charge sec_granularity )
-  };
-} qsearch('rate_region', {} );
-
-my $new = new FS::rate ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('rate')
-} );
-
-my $error;
-if ( $ratenum ) {
-  $error = $new->replace($old, 'rate_detail' => \@rate_detail );
-} else {
-  $error = $new->insert( 'rate_detail' => \@rate_detail );
-  $ratenum = $new->getfield('ratenum');
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "rate.cgi?". $cgi->query_string );
-} else { 
-  print $cgi->redirect(popurl(3). "browse/rate.cgi");
-}
-
-%>
diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index 4fdc837bb..4a4b70ea3 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -1,11 +1,51 @@
-<!-- mason kludge -->
 <%
 
-my $rate;
-if ( $cgi->param('error') ) {
+my($rate, $error);
+
+if ( $cgi->param('magic') eq 'process' ) {
+
+  my $ratenum = $cgi->param('ratenum');
+  
+  my $old = qsearchs('rate', { 'ratenum' => $ratenum } ) if $ratenum;
+  
+  my @rate_detail = map {
+    my $regionnum = $_->regionnum;
+    if ( $cgi->param("sec_granularity$regionnum") ) {
+      new FS::rate_detail {
+        'dest_regionnum'  => $regionnum,
+        map { $_ => scalar($cgi->param("$_$regionnum")) }
+            qw( min_included min_charge sec_granularity )
+      };
+    } else {
+      new FS::rate_detail {
+        'dest_regionnum'  => $regionnum,
+        'min_included'    => 0,
+        'min_charge'      => 0,
+        'sec_granularity' => '60'
+      };
+    }
+  } qsearch('rate_region', {} );
+  
   $rate = new FS::rate ( {
-    map { $_, scalar($cgi->param($_)) } fields('rate')
+    map {
+      $_, scalar($cgi->param($_));
+    } fields('rate')
   } );
+  
+  if ( $ratenum ) {
+    warn "$rate replacing $old ($ratenum)\n";
+    $error = $rate->replace($old, 'rate_detail' => \@rate_detail );
+  } else {
+    warn "inserting $rate\n";
+    $error = $rate->insert( 'rate_detail' => \@rate_detail );
+    $ratenum = $rate->getfield('ratenum');
+  }
+
+  unless ( $error ) {
+    print $cgi->redirect("${p}browse/rate.cgi");
+    myexit;
+  }
+  
 } elsif ( $cgi->keywords ) {
   my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
@@ -37,12 +77,12 @@ END
     ))
 %>
 
-<% if ( $cgi->param('error') ) { %>
-<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT><BR>
+<% if ( $error ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $error %></FONT><BR>
 <% } %>
 
-<FORM ACTION="<%=$p1%>process/rate.cgi" METHOD=POST>
-
+<FORM ACTION="<%=$p1%>rate.cgi" NAME="OneTrueForm" METHOD=POST onSubmit="document.OneTrueForm.submit.disabled=true">
+<INPUT TYPE="hidden" NAME="magic" VALUE="process">
 <INPUT TYPE="hidden" NAME="ratenum" VALUE="<%= $rate->ratenum %>">
 
 Rate plan
@@ -68,7 +108,7 @@ Rate plan
      my $n = $rate_region->regionnum;
      my $rate_detail =
        $rate->dest_detail($rate_region)
-       || new FS::rate_region { 'min_included'    => 0,
+       || new FS::rate_detail { 'min_included'    => 0,
                                 'min_charge'      => 0,
                                 'sec_granularity' => '60'
                               };
@@ -95,9 +135,11 @@ Rate plan
 
 </TABLE>
 
-<BR><INPUT TYPE="submit" VALUE="<%= 
+<BR><INPUT NAME="submit" TYPE="submit" VALUE="<%= 
   $rate->ratenum ? "Apply changes" : "Add rate plan"
 %>">
+Please be patient, <%= $rate->ratenum ? 'editing' : 'adding' %>
+a rate plan can take a few minutes...
 
     </FORM>
   </BODY>
-- 
cgit v1.2.1


From 6cf964d0dc008621fb30fd2da28e2c44f29c6364 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Jan 2005 10:21:18 +0000
Subject: DHTML progress bar for glacial rate adding and editing, closes:
 Bug#1100

---
 httemplate/edit/process/rate.cgi |  4 ++
 httemplate/edit/rate.cgi         | 97 +++++++++++++++++-----------------------
 2 files changed, 45 insertions(+), 56 deletions(-)
 create mode 100755 httemplate/edit/process/rate.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/rate.cgi b/httemplate/edit/process/rate.cgi
new file mode 100755
index 000000000..df7c4672e
--- /dev/null
+++ b/httemplate/edit/process/rate.cgi
@@ -0,0 +1,4 @@
+<%
+my $server = new FS::rate::JSRPC;
+$server->process;
+%>
diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index 4a4b70ea3..3443f81d4 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -1,52 +1,7 @@
 <%
 
-my($rate, $error);
-
-if ( $cgi->param('magic') eq 'process' ) {
-
-  my $ratenum = $cgi->param('ratenum');
-  
-  my $old = qsearchs('rate', { 'ratenum' => $ratenum } ) if $ratenum;
-  
-  my @rate_detail = map {
-    my $regionnum = $_->regionnum;
-    if ( $cgi->param("sec_granularity$regionnum") ) {
-      new FS::rate_detail {
-        'dest_regionnum'  => $regionnum,
-        map { $_ => scalar($cgi->param("$_$regionnum")) }
-            qw( min_included min_charge sec_granularity )
-      };
-    } else {
-      new FS::rate_detail {
-        'dest_regionnum'  => $regionnum,
-        'min_included'    => 0,
-        'min_charge'      => 0,
-        'sec_granularity' => '60'
-      };
-    }
-  } qsearch('rate_region', {} );
-  
-  $rate = new FS::rate ( {
-    map {
-      $_, scalar($cgi->param($_));
-    } fields('rate')
-  } );
-  
-  if ( $ratenum ) {
-    warn "$rate replacing $old ($ratenum)\n";
-    $error = $rate->replace($old, 'rate_detail' => \@rate_detail );
-  } else {
-    warn "inserting $rate\n";
-    $error = $rate->insert( 'rate_detail' => \@rate_detail );
-    $ratenum = $rate->getfield('ratenum');
-  }
-
-  unless ( $error ) {
-    print $cgi->redirect("${p}browse/rate.cgi");
-    myexit;
-  }
-  
-} elsif ( $cgi->keywords ) {
+my $rate;
+if ( $cgi->keywords ) {
   my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $rate = qsearchs( 'rate', { 'ratenum' => $1 } );
@@ -77,12 +32,41 @@ END
     ))
 %>
 
-<% if ( $error ) { %>
-<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $error %></FONT><BR>
-<% } %>
+<!-- <FORM ACTION="<%=$p1%>rate.cgi" NAME="OneTrueForm" METHOD=POST onSubmit="document.OneTrueForm.submit.disabled=true"> -->
+
+<SCRIPT TYPE="text/javascript" SRC="../elements/jsrsClient.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript">
+function process () {
+  document.OneTrueForm.submit.disabled=true;
+
+  var Hash = new Array();
+  var x = 0;
+  var fieldName;
+  for (var i = 0; i<document.OneTrueForm.elements.length; i++) {
+    fieldName = document.OneTrueForm.elements[i].name;
+    if (    (fieldName.indexOf('rate') > -1)
+         || (fieldName.indexOf('min_') > -1) 
+         || (fieldName.indexOf('sec_') > -1) 
+       )
+    {
+        Hash[x++] = fieldName;
+        Hash[x++] = document.OneTrueForm.elements[i].value;
+    }
+  }
+
+  jsrsPOST = true;
+  jsrsExecute( 'process/rate.cgi', myCallback, 'process_rate', Hash );
+
+  function myCallback( jobnum ) {
+    var progressWindow = window.open('../../misc/progress.html?jobnum=' + jobnum + ';url=<%=$p%>browse/rate.cgi', 'progressWindow', 'toolbar=no,location=no,directories=no,scrollbars=no,menubar=no,status=no,width=420,height=128');
+    progressWindow.opener = self;
+    //progressWindow.opener = document;
+  }
+
+}
+</SCRIPT>
 
-<FORM ACTION="<%=$p1%>rate.cgi" NAME="OneTrueForm" METHOD=POST onSubmit="document.OneTrueForm.submit.disabled=true">
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
+<FORM NAME="OneTrueForm">
 <INPUT TYPE="hidden" NAME="ratenum" VALUE="<%= $rate->ratenum %>">
 
 Rate plan
@@ -135,11 +119,12 @@ Rate plan
 
 </TABLE>
 
-<BR><INPUT NAME="submit" TYPE="submit" VALUE="<%= 
+<BR><INPUT NAME="submit" TYPE="button" VALUE="<%= 
   $rate->ratenum ? "Apply changes" : "Add rate plan"
-%>">
-Please be patient, <%= $rate->ratenum ? 'editing' : 'adding' %>
-a rate plan can take a few minutes...
+%>" onClick="document.OneTrueForm.submit.disabled=true; process();">
+Please make sure to allow popups from this site in order to view the progress window.
+<!-- Please be patient, <%= $rate->ratenum ? 'editing' : 'adding' %>
+a rate plan can take a few minutes... -->
 
     </FORM>
   </BODY>
-- 
cgit v1.2.1


From 55a68e4aabe10db4d9c3ab1bb8befd2f9f4b9008 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Jan 2005 12:34:12 +0000
Subject: registration codes

---
 httemplate/edit/process/reg_code.cgi | 41 ++++++++++++++++++++++++++++++++++++
 httemplate/edit/reg_code.cgi         | 36 +++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 httemplate/edit/process/reg_code.cgi
 create mode 100644 httemplate/edit/reg_code.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/reg_code.cgi b/httemplate/edit/process/reg_code.cgi
new file mode 100644
index 000000000..581ede893
--- /dev/null
+++ b/httemplate/edit/process/reg_code.cgi
@@ -0,0 +1,41 @@
+<%
+
+$cgi->param('agentnum') =~ /^(\d+)$/
+  or eidiot 'illegal agentnum '. $cgi->param('agentnum');
+my $agentnum = $1;
+my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
+
+my $error = '';
+
+my $num = 0;
+if ( $cgi->param('num') =~ /^\s*(\d+)\s*$/ ) {
+  $num = $1;
+} else {
+  $error = 'Illegal number of codes: '. $cgi->param('num');
+}
+
+my @pkgparts = 
+  map  { /^pkgpart(.*)$/; $1 }
+  grep { $cgi->param($_) }
+  grep { /^pkgpart/ }
+  $cgi->param;
+
+$error ||= $agent->generate_reg_codes($num, \@pkgparts);
+
+unless ( ref($error) ) { %><%=
+  $cgi->redirect(popurl(3). "edit/reg_code.cgi?". $cgi->query_string )
+%><% } else { %>
+
+<%= header("$num registration codes generated for ". $agent->agent, menubar(
+  'View all agents' => popurl(3). 'browse/agent.cgi',
+) ) %>
+
+<PRE><FONT SIZE="+1">
+<% foreach my $code ( @$error ) { %>
+  <%= $code %>
+<% } %>
+
+</FONT></PRE>
+
+</BODY></HTML>
+<% } %>
diff --git a/httemplate/edit/reg_code.cgi b/httemplate/edit/reg_code.cgi
new file mode 100644
index 000000000..899d1ec45
--- /dev/null
+++ b/httemplate/edit/reg_code.cgi
@@ -0,0 +1,36 @@
+<%
+my $agentnum = $cgi->param('agentnum');
+$agentnum =~ /^(\d+)$/ or eidiot "illegal agentnum $agentnum";
+$agentnum = $1;
+my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
+
+%>
+
+<%= header('Generate registration codes for '. $agent->agent, menubar(
+      'Main Menu' => $p,
+    ))
+%>
+
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#FF0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
+
+<FORM ACTION="<%=popurl(1)%>process/reg_code.cgi" METHOD="POST" NAME="OneTrueForm" onSubmit="document.OneTrueForm.submit.disabled=true">
+<INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agent->agentnum %>">
+
+Generate
+<INPUT TYPE="text" NAME="num" VALUE="<%= $cgi->param('num') %>" SIZE=5 MAXLENGTH=4>
+registration codes for <B><%= $agent->agent %></B> allowing the following packages:
+<BR><BR>
+
+<% foreach my $part_pkg ( qsearch('part_pkg', { 'disabled' => '' } ) ) { %>
+  <INPUT TYPE="checkbox" NAME="pkgpart<%= $part_pkg->pkgpart %>">
+  <%= $part_pkg->pkg %> - <%= $part_pkg->comment %>
+  <BR>
+<% } %>
+
+<BR>
+<INPUT TYPE="submit" NAME="submit" VALUE="Generate">
+
+</FORM></BODY></HTML>
+
-- 
cgit v1.2.1


From 9bf9c7f1e8ecf26f45dab7928ebf4399a8eb2b2b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Feb 2005 10:38:15 +0000
Subject: typo

---
 httemplate/edit/cust_main.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index a18114c9d..3910b4b84 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -76,7 +76,7 @@ my $action = $custnum ? 'Edit' : 'Add';
 
 <FORM ACTION="<%= popurl(1) %>process/cust_main.cgi" METHOD=POST NAME="form1" onSubmit="document.form1.submit.disabled=true">
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $custnum %>">
-ustomer # <%= $custnum ? "<B>$custnum</B>" : " (NEW)" %>
+Customer # <%= $custnum ? "<B>$custnum</B>" : " (NEW)" %>
 
 <!-- agent -->
 
-- 
cgit v1.2.1


From 3bc7d019313160a918a55cca6ab530f58db3673d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 11 Feb 2005 06:44:27 +0000
Subject: generalize progressbar code in preparation for using it wherever
 needed

---
 httemplate/edit/process/rate.cgi | 5 ++++-
 httemplate/edit/rate.cgi         | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/rate.cgi b/httemplate/edit/process/rate.cgi
index df7c4672e..031f8d14e 100755
--- a/httemplate/edit/process/rate.cgi
+++ b/httemplate/edit/process/rate.cgi
@@ -1,4 +1,7 @@
 <%
-my $server = new FS::rate::JSRPC;
+#my $server = new FS::rate::JSRPC;
+#$server->process;
+my $server = new FS::UI::Web::JSRPC 'FS::rate::process';
+###wtf###$server->start_job;
 $server->process;
 %>
diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index 3443f81d4..4a0294033 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -55,7 +55,8 @@ function process () {
   }
 
   jsrsPOST = true;
-  jsrsExecute( 'process/rate.cgi', myCallback, 'process_rate', Hash );
+  //jsrsExecute( 'process/rate.cgi', myCallback, 'process_rate', Hash );
+  jsrsExecute( 'process/rate.cgi', myCallback, 'start_job', Hash );
 
   function myCallback( jobnum ) {
     var progressWindow = window.open('../../misc/progress.html?jobnum=' + jobnum + ';url=<%=$p%>browse/rate.cgi', 'progressWindow', 'toolbar=no,location=no,directories=no,scrollbars=no,menubar=no,status=no,width=420,height=128');
-- 
cgit v1.2.1


From f825243847bdac17837fec1bdbbc27577424b4ea Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Feb 2005 03:02:48 +0000
Subject: transaction not necessary here

---
 httemplate/edit/process/svc_broadband.cgi | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/svc_broadband.cgi b/httemplate/edit/process/svc_broadband.cgi
index 4912a3a9f..a009ba218 100644
--- a/httemplate/edit/process/svc_broadband.cgi
+++ b/httemplate/edit/process/svc_broadband.cgi
@@ -1,11 +1,5 @@
 <%
 
-# If it's stupid but it works, it's not stupid.
-# -- U.S. Army
-
-local $FS::UID::AutoCommit = 0;
-my $dbh = FS::UID::dbh;
-
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my $svcnum = $1;
 
@@ -31,14 +25,11 @@ if ( $svcnum ) {
   $svcnum = $new->svcnum;
 }
 
-
 if ( $error ) {
   $cgi->param('error', $error);
   $cgi->param('ip_addr', $new->ip_addr);
-  $dbh->rollback;
   print $cgi->redirect(popurl(2). "svc_broadband.cgi?". $cgi->query_string );
 } else {
-  $dbh->commit or die $dbh->errstr;
   print $cgi->redirect(popurl(3). "view/svc_broadband.cgi?" . $svcnum );
 }
 
-- 
cgit v1.2.1


From d5de3968350034bfc4b9e1c3fb163e6ee1ca5fb5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Feb 2005 01:37:02 +0000
Subject: generalize progressbar code in preparation for using it wherever
 needed

---
 httemplate/edit/process/rate.cgi | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/rate.cgi b/httemplate/edit/process/rate.cgi
index 031f8d14e..005caf90a 100755
--- a/httemplate/edit/process/rate.cgi
+++ b/httemplate/edit/process/rate.cgi
@@ -1,7 +1,4 @@
 <%
-#my $server = new FS::rate::JSRPC;
-#$server->process;
 my $server = new FS::UI::Web::JSRPC 'FS::rate::process';
-###wtf###$server->start_job;
 $server->process;
 %>
-- 
cgit v1.2.1


From 9e1ec0694dff61d375af8c0ef0e3895a7f1e07fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Feb 2005 08:44:17 +0000
Subject: generalize progressbar code in preparation for using it wherever
 needed

---
 httemplate/edit/rate.cgi | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index 4a0294033..1c5d61dc5 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -58,13 +58,14 @@ function process () {
   //jsrsExecute( 'process/rate.cgi', myCallback, 'process_rate', Hash );
   jsrsExecute( 'process/rate.cgi', myCallback, 'start_job', Hash );
 
-  function myCallback( jobnum ) {
-    var progressWindow = window.open('../../misc/progress.html?jobnum=' + jobnum + ';url=<%=$p%>browse/rate.cgi', 'progressWindow', 'toolbar=no,location=no,directories=no,scrollbars=no,menubar=no,status=no,width=420,height=128');
-    progressWindow.opener = self;
-    //progressWindow.opener = document;
-  }
+}
 
+function myCallback( jobnum ) {
+  var progressWindow = window.open('../../misc/progress.html?jobnum=' + jobnum + ';url=<%=$p%>browse/rate.cgi', 'progressWindow', 'toolbar=no,location=no,directories=no,scrollbars=no,menubar=no,status=no,width=420,height=128');
+  progressWindow.opener = self;
+  //progressWindow.opener = document;
 }
+
 </SCRIPT>
 
 <FORM NAME="OneTrueForm">
-- 
cgit v1.2.1


From d6047391feb3236374e16fd73240d9821d77fe06 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 20 Feb 2005 08:44:40 +0000
Subject: use a javascript layer instead of a browser popup (popup blockers),
 really generalize the progressbar code to make it easy to use as a component

---
 httemplate/edit/rate.cgi | 46 +++++++---------------------------------------
 1 file changed, 7 insertions(+), 39 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index 1c5d61dc5..ce56768d1 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -32,42 +32,13 @@ END
     ))
 %>
 
-<!-- <FORM ACTION="<%=$p1%>rate.cgi" NAME="OneTrueForm" METHOD=POST onSubmit="document.OneTrueForm.submit.disabled=true"> -->
-
-<SCRIPT TYPE="text/javascript" SRC="../elements/jsrsClient.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript">
-function process () {
-  document.OneTrueForm.submit.disabled=true;
-
-  var Hash = new Array();
-  var x = 0;
-  var fieldName;
-  for (var i = 0; i<document.OneTrueForm.elements.length; i++) {
-    fieldName = document.OneTrueForm.elements[i].name;
-    if (    (fieldName.indexOf('rate') > -1)
-         || (fieldName.indexOf('min_') > -1) 
-         || (fieldName.indexOf('sec_') > -1) 
-       )
-    {
-        Hash[x++] = fieldName;
-        Hash[x++] = document.OneTrueForm.elements[i].value;
-    }
-  }
-
-  jsrsPOST = true;
-  //jsrsExecute( 'process/rate.cgi', myCallback, 'process_rate', Hash );
-  jsrsExecute( 'process/rate.cgi', myCallback, 'start_job', Hash );
-
-}
-
-function myCallback( jobnum ) {
-  var progressWindow = window.open('../../misc/progress.html?jobnum=' + jobnum + ';url=<%=$p%>browse/rate.cgi', 'progressWindow', 'toolbar=no,location=no,directories=no,scrollbars=no,menubar=no,status=no,width=420,height=128');
-  progressWindow.opener = self;
-  //progressWindow.opener = document;
-}
-
-</SCRIPT>
-
+<%= include('/elements/progress-init.html',
+              'OneTrueForm',
+              [ 'rate', 'min_', 'sec_' ],
+              'process/rate.cgi',
+              $p.'browse/rate.cgi',
+           )
+%>
 <FORM NAME="OneTrueForm">
 <INPUT TYPE="hidden" NAME="ratenum" VALUE="<%= $rate->ratenum %>">
 
@@ -124,9 +95,6 @@ Rate plan
 <BR><INPUT NAME="submit" TYPE="button" VALUE="<%= 
   $rate->ratenum ? "Apply changes" : "Add rate plan"
 %>" onClick="document.OneTrueForm.submit.disabled=true; process();">
-Please make sure to allow popups from this site in order to view the progress window.
-<!-- Please be patient, <%= $rate->ratenum ? 'editing' : 'adding' %>
-a rate plan can take a few minutes... -->
 
     </FORM>
   </BODY>
-- 
cgit v1.2.1


From 69dc4d8ce9a688f3ba602f3342b05c936a66aaf9 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Tue, 22 Feb 2005 18:26:01 +0000
Subject: Alphabetize/clean-up package list to make it easier to find packages
 in large lists.

---
 httemplate/edit/cust_pkg.cgi | 61 +++++++++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 24 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index 485d601eb..ce1c86612 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -45,23 +45,24 @@ my @cust_pkg = qsearch('cust_pkg',{ 'custnum' => $custnum, 'cancel' => '' } );
 if (@cust_pkg) {
   print <<END;
 Current packages - select to remove (services are moved to a new package below)
+<TABLE>
+  <TR STYLE="background-color: #cccccc;">
+    <TH COLSPAN="2">Pkg #</TH>
+    <TH>Package description</TH>
+  </TR>
 <BR><BR>
 END
 
-  my $count = 0 ;
-  print qq!<TABLE>! ;
-  foreach (@cust_pkg) {
-    print '<TR>' if $count == 0;
+  foreach (sort { $all_pkg{$a->getfield('pkgpart')} cmp $all_pkg{$b->getfield('pkgpart')} } @cust_pkg) {
     my($pkgnum,$pkgpart)=( $_->getfield('pkgnum'), $_->getfield('pkgpart') );
-    print qq!<TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="$pkgnum"!;
-    print " CHECKED" if $remove_pkg{$pkgnum};
-    print qq!>$pkgnum: $all_pkg{$pkgpart} - $all_comment{$pkgpart}</TD>\n!;
-    $count ++ ;
-    if ($count == 2)
-    {
-      $count = 0 ;
-      print qq!</TR>\n! ;
-    }
+    my $checked = $remove_pkg{$pkgnum} ? ' CHECKED' : '';
+    print <<END;
+  <TR>
+    <TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="$pkgnum"${checked}></TD>
+    <TD ALIGN="right">$pkgnum:</TD>\n
+    <TD>$all_pkg{$pkgpart} - $all_comment{$pkgpart}</TD>
+  </TR>
+END
   }
   print qq!</TABLE><BR><BR>!;
 }
@@ -73,25 +74,37 @@ END
 my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 my $agent = qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
 
+my %agent_pkgs = map { ( $_->pkgpart , $all_pkg{$_->pkgpart} ) }
+                     qsearch('type_pkgs',{'typenum'=> $agent->typenum });
+
 my $count = 0;
 my $pkgparts = 0;
-print qq!<TABLE>!;
-foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+print <<END;
+<TABLE>
+  <TR STYLE="background-color: #cccccc;">
+    <TH>Qty.</TH>
+    <TH COLSPAN="2">Package Description</TH>
+  </TR>
+END
+#foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
+foreach my $pkgpart ( sort { $agent_pkgs{$a} cmp $agent_pkgs{$b} }
+                             keys(%agent_pkgs) ) {
   $pkgparts++;
-  my($pkgpart)=$type_pkgs->pkgpart;
   next unless exists $pkg{$pkgpart}; #skip disabled ones
-  print qq!<TR>! if ( $count == 0 );
+  #print qq!<TR>! if ( $count == 0 );
   my $value = $cgi->param("pkg$pkgpart") || 0;
   print <<END;
-  <TD>
-  <INPUT TYPE="text" NAME="pkg$pkgpart" VALUE="$value" SIZE="2" MAXLENGTH="2">
-  $pkgpart: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n
+  <TR>
+    <TD><INPUT TYPE="text" NAME="pkg$pkgpart" VALUE="$value" SIZE="2" MAXLENGTH="2"></TD>
+    <TD ALIGN="right">$pkgpart:</TD>
+    <TD>$pkg{$pkgpart} - $comment{$pkgpart}</TD>
+  </TR>
 END
   $count ++ ;
-  if ( $count == 2 ) {
-    print qq!</TR>\n! ;
-    $count = 0;
-  }
+  #if ( $count == 2 ) {
+  #  print qq!</TR>\n! ;
+  #  $count = 0;
+  #}
 }
 print qq!</TABLE>!;
 
-- 
cgit v1.2.1


From 4d599c8ce382f51d7bfbb4172cdc73a2c8bd400d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Feb 2005 14:24:07 +0000
Subject: add progressbar to service definition add - duplicate checking can
 take a while, closes: Bug#1126

---
 httemplate/edit/part_svc.cgi         | 79 +++++++++---------------------------
 httemplate/edit/process/part_svc.cgi |  4 ++
 2 files changed, 23 insertions(+), 60 deletions(-)
 create mode 100755 httemplate/edit/process/part_svc.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index befd9b24a..bc38c34bd 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,52 +1,7 @@
 <%
 my $part_svc;
 my $clone = '';
-my $error = '';
-if ( $cgi->param('magic') eq 'process' ) {
-
-  my $svcpart = $cgi->param('svcpart');
-  my $old = qsearchs('part_svc', { 'svcpart' => $svcpart }) if $svcpart;
-  
-  $cgi->param( 'svc_acct__usergroup',
-               join(',', $cgi->param('svc_acct__usergroup') ) );
-  
-  my $new = new FS::part_svc ( {
-    map {
-      $_, scalar($cgi->param($_));
-  #  } qw(svcpart svc svcdb)
-    } ( fields('part_svc'),
-        map { my $svcdb = $_;
-              my @fields = fields($svcdb);
-              push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
-              map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  } @fields;
-            } grep defined( $FS::Record::dbdef->table($_) ),
-                   qw( svc_acct svc_domain svc_forward svc_www svc_broadband )
-      )
-  } );
-  
-  my %exportnums =
-    map { $_->exportnum => ( $cgi->param('exportnum'.$_->exportnum) || '') }
-        qsearch('part_export', {} );
-
-  if ( $svcpart ) {
-    $error = $new->replace($old, '1.3-COMPAT', [ 'usergroup' ], \%exportnums );
-  } else {
-    $error = $new->insert( [ 'usergroup' ], \%exportnums );
-    $svcpart = $new->getfield('svcpart');
-  }
-
-  unless ( $error ) { #no error, redirect
-    #print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
-    print $cgi->redirect("${p}browse/part_svc.cgi");
-    myexit;
-  }
-
-  $part_svc = $new; #??
-  #$part_svc = new FS::part_svc ( {
-  #  map { $_, scalar($cgi->param($_)) } fields('part_svc')
-  #} );
-
-} elsif ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {#clone
+if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {#clone
   #$cgi->param('clone') =~ /^(\d+)$/ or die "malformed query: $query";
   $part_svc = qsearchs('part_svc', { 'svcpart'=>$1 } )
     or die "unknown svcpart: $1";
@@ -76,17 +31,12 @@ my $hashref = $part_svc->hashref;
            )
 %>
 
-<% if ( $error ) { %>
-<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $error %></FONT>
-<% } %>
-
 <FORM NAME="dummy">
 
       Service Part #<%= $part_svc->svcpart ? $part_svc->svcpart : "(NEW)" %>
 <BR><BR>
 Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>"><BR>
 Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>><BR>
-<INPUT TYPE="hidden" NAME="magic" VALUE="process">
 <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
 <BR>
 Services are items you offer to your customers.
@@ -213,10 +163,11 @@ my %defs = (
     'form_name'      => 'dummy',
     #'form_action'    => 'process/part_svc.cgi',
     'form_action'    => 'part_svc.cgi', #self
-    'form_text'      => [ qw( magic svc svcpart ) ],
+    'form_text'      => [ qw( svc svcpart ) ],
     'form_checkbox'  => [ 'disabled' ],
     'layer_callback' => sub {
       my $layer = shift;
+      
       my $html = qq!<INPUT TYPE="hidden" NAME="svcdb" VALUE="$layer">!;
 
       my $columns = 3;
@@ -250,12 +201,8 @@ my %defs = (
       $part_svc->svcpart($clone) if $clone; #haha, undone below
       foreach my $field (@fields) {
         my $part_svc_column = $part_svc->part_svc_column($field);
-        my $value = $error
-                      ? $cgi->param("${layer}__${field}")
-                      : $part_svc_column->columnvalue;
-        my $flag = $error
-                     ? $cgi->param("${layer}__${field}_flag")
-                     : $part_svc_column->columnflag;
+        my $value = $part_svc_column->columnvalue;
+        my $flag = $part_svc_column->columnflag;
         my $def = $defs{$layer}{$field};
         my $desc = ref($def) ? $def->{desc} : $def;
         
@@ -317,8 +264,20 @@ my %defs = (
       $part_svc->svcpart('') if $clone; #undone
       $html .= "</TABLE>";
 
-      $html .= '<BR><INPUT TYPE="submit" VALUE="'.
-               ($hashref->{svcpart} ? 'Apply changes' : 'Add service'). '">';
+      $html .= include('/elements/progress-init.html',
+                         $layer, #form name
+                         [ qw(svc svcpart disabled exportnum), @fields ],
+                         'process/part_svc.cgi',
+                         $p.'browse/part_svc.cgi',
+                         $layer,
+                      );
+      $html .= '<BR><INPUT NAME="submit" TYPE="button" VALUE="'.
+               ($hashref->{svcpart} ? 'Apply changes' : 'Add service'). '" '.
+               ' onClick="document.'. "$layer.submit.disabled=true; ".
+               "fixup(document.$layer); $layer". 'process();">';
+
+      #$html .= '<BR><INPUT TYPE="submit" VALUE="'.
+      #         ($hashref->{svcpart} ? 'Apply changes' : 'Add service'). '">';
 
       $html;
 
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
new file mode 100755
index 000000000..664e5212a
--- /dev/null
+++ b/httemplate/edit/process/part_svc.cgi
@@ -0,0 +1,4 @@
+<%
+my $server = new FS::UI::Web::JSRPC 'FS::part_svc::process';
+$server->process;
+%>
-- 
cgit v1.2.1


From bf6ef40361d05b0c1604b58c8f249486962d1838 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 27 Feb 2005 11:05:35 +0000
Subject: fix last bill date stickiness on errors

---
 httemplate/edit/REAL_cust_pkg.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 9cbab2a16..2f6be7cad 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,6 +1,6 @@
 <!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.8 2004-12-22 14:06:45 ivan Exp $ -->
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.9 2005-02-27 11:05:35 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
@@ -29,6 +29,7 @@ if ( $error ) {
   #$cust_pkg->$_(str2time($cgi->param($_)) foreach qw(setup bill);
   $cust_pkg->setup(str2time($cgi->param('setup')));
   $cust_pkg->bill(str2time($cgi->param('bill')));
+  $cust_pkg->last_bill(str2time($cgi->param('last_bill')));
 }
 
 #my $custnum = $cust_pkg->getfield('custnum');
-- 
cgit v1.2.1


From aa8abee96e4c9a915ebbbd1d987c8dec23f9ae70 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Mar 2005 08:58:02 +0000
Subject: fixes package editing problem with extraneous services showing up,
 closes: Bug#1170

---
 httemplate/edit/part_pkg.cgi         | 15 +++++++++++++--
 httemplate/edit/process/part_pkg.cgi |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 1790cdfeb..fd2aa2bfc 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -176,7 +176,16 @@ END
 my @fixups = ();
 my $count = 0;
 my $columns = 3;
-my @part_svc = qsearch( 'part_svc', { 'disabled' => '' } );
+my @part_svc = qsearch(
+  'part_svc',
+  {},
+  '',
+  "WHERE disabled IS NULL OR disabled = ''
+      OR 0 < ( SELECT quantity FROM pkg_svc
+                WHERE pkg_svc.svcpart = part_svc.svcpart
+                  AND pkgpart = 72
+             )"
+);
 foreach my $part_svc ( @part_svc ) {
   my $svcpart = $part_svc->svcpart;
   my $pkgpart = $cgi->param('clone') || $part_pkg->pkgpart;
@@ -206,7 +215,9 @@ foreach my $part_svc ( @part_svc ) {
       print '></TD>';
     }
     print qq!<TD><A HREF="part_svc.cgi?!,$part_svc->svcpart,
-          qq!">!, $part_svc->getfield('svc'), "</A></TD></TR>";
+          qq!">!, $part_svc->getfield('svc'), '</A>';
+    print ' (DISABLED)' if $part_svc->disabled =~ /^Y/i;
+    print '</TD></TR>';
 #    print "</TABLE></TD><TD>$thead" if ++$count == int(scalar(@part_svc) / 2);
     $count+=1;
     foreach ( 1 .. $columns-1 ) {
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 2d6b34432..1a7f52838 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -19,11 +19,11 @@ foreach (qw( setuptax recurtax disabled )) {
 
 my $new = new FS::part_pkg ( {
   map {
-    $_, scalar($cgi->param($_));
+    $_ => scalar($cgi->param($_));
   } fields('part_pkg')
 } );
 
-my %pkg_svc = map { $_ => $cgi->param("pkg_svc$_") }
+my %pkg_svc = map { $_ => scalar($cgi->param("pkg_svc$_")) }
               map { $_->svcpart }
               qsearch('part_svc', {} );
 
-- 
cgit v1.2.1


From b5fbaadb1cb2893660e460a1d4a3cabe02774de7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 12 Mar 2005 14:31:50 +0000
Subject: - bring prepaid support into this century (close: Bug#1124) - finally
 get rid of fs_signup (everything is in fs_selfservice now) (Bug#413) -
 organize main menu sysadmin section so it is slightly less confusing

---
 httemplate/edit/prepay_credit.cgi         | 56 +++++++++++++++++++++++++++++++
 httemplate/edit/process/prepay_credit.cgi | 51 ++++++++++++++++++++++++++++
 httemplate/edit/process/reg_code.cgi      |  5 ++-
 3 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 httemplate/edit/prepay_credit.cgi
 create mode 100644 httemplate/edit/process/prepay_credit.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/prepay_credit.cgi b/httemplate/edit/prepay_credit.cgi
new file mode 100644
index 000000000..9cf0fc6e1
--- /dev/null
+++ b/httemplate/edit/prepay_credit.cgi
@@ -0,0 +1,56 @@
+<%
+my $agent = '';
+my $agentnum = '';
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+  $agent = qsearchs('agent', { 'agentnum' => $agentnum=$1 } );
+}
+
+tie my %multiplier, 'Tie::IxHash',
+  1    => 'seconds',
+  60   => 'minutes',
+  3600 => 'hours',
+;
+
+$cgi->param('multiplier', '60') unless $cgi->param('multiplier');
+
+%>
+
+<%= header('Generate prepaid cards'. ($agent ? ' for '. $agent->agent : ''),
+           menubar( 'Main Menu' => $p, ))
+%>
+
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#FF0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
+
+<FORM ACTION="<%=popurl(1)%>process/prepay_credit.cgi" METHOD="POST" NAME="OneTrueForm" onSubmit="document.OneTrueForm.submit.disabled=true">
+
+Generate
+<INPUT TYPE="text" NAME="num" VALUE="<%= $cgi->param('num') || '(quantity)' %>" SIZE=10 MAXLENGTH=10 onFocus="if ( this.value == '(quantity)' ) { this.value = ''; }">
+<SELECT NAME="type">
+<% foreach (qw(alpha alphanumeric numeric)) { %>
+  <OPTION<%= $cgi->param('type') eq $_ ? ' SELECTED' : '' %>><%= $_ %>
+<% } %>
+</SELECT>
+ prepaid cards
+
+<BR>for <SELECT NAME="agentnum"><OPTION>(any agent)
+<% foreach my $opt_agent ( qsearch('agent', { 'disabled' => '' } ) ) { %>
+  <OPTION VALUE="<%= $opt_agent->agentnum %>"<%= $opt_agent->agentnum == $agentnum ? ' SELECTED' : '' %>><%= $opt_agent->agent %>
+<% } %>
+</SELECT>
+
+<BR>Value: 
+$<INPUT TYPE="text" NAME="amount" SIZE=8 MAXLENGTH=7 VALUE="<%= $cgi->param('amount') %>">
+and/or
+<INPUT TYPE="text" NAME="seconds" SIZE=6 MAXLENGTH=5 VALUE="<%= $cgi->param('seconds') %>">
+<SELECT NAME="multiplier">
+<% foreach my $multiplier ( keys %multiplier ) { %>
+  <OPTION VALUE="<%= $multiplier %>"<%= $cgi->param('multiplier') eq $multiplier ? ' SELECTED' : '' %>><%= $multiplier{$multiplier} %>
+<% } %>
+</SELECT>
+<BR><BR>
+<INPUT TYPE="submit" NAME="submit" VALUE="Generate" onSubmit="this.disabled = true">
+
+</FORM></BODY></HTML>
+
diff --git a/httemplate/edit/process/prepay_credit.cgi b/httemplate/edit/process/prepay_credit.cgi
new file mode 100644
index 000000000..25ecbe079
--- /dev/null
+++ b/httemplate/edit/process/prepay_credit.cgi
@@ -0,0 +1,51 @@
+<%
+my $hashref = {};
+
+my $agent = '';
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+  $agent = qsearchs('agent', { 'agentnum' => $hashref->{agentnum}=$1 } );
+}
+
+my $error = '';
+
+my $num = 0;
+if ( $cgi->param('num') =~ /^\s*(\d+)\s*$/ ) {
+  $num = $1;
+} else {
+  $error = 'Illegal number of prepaid cards: '. $cgi->param('num');
+}
+
+$hashref->{amount} = $cgi->param('amount');
+$hashref->{seconds} = $cgi->param('seconds') * $cgi->param('multiplier');
+
+$error ||= FS::prepay_credit::generate( $num,
+                                        scalar($cgi->param('type')), 
+                                        $hashref
+                                      );
+
+unless ( ref($error) ) {
+  $cgi->param('error', $error );
+%><%=
+  $cgi->redirect(popurl(3). "edit/prepay_credit.cgi?". $cgi->query_string )
+%><% } else { %>
+
+<%= header( "$num prepaid cards generated".
+              ( $agent ? ' for '.$agent->agent : '' ),
+            menubar( 'Main menu' => popurl(3) )
+          )
+%>
+
+<FONT SIZE="+1">
+<% foreach my $card ( @$error ) { %>
+  <code><%= $card %></code>
+  -
+  <%= $hashref->{amount} ? sprintf('$%.2f', $hashref->{amount} ) : '' %>
+  <%= $hashref->{amount} && $hashref->{seconds} ? 'and' : '' %>
+  <%= $hashref->{seconds} ? duration_exact($hashref->{seconds}) : '' %>
+  <br>
+<% } %>
+
+</FONT>
+
+</BODY></HTML>
+<% } %>
diff --git a/httemplate/edit/process/reg_code.cgi b/httemplate/edit/process/reg_code.cgi
index 581ede893..4658257f3 100644
--- a/httemplate/edit/process/reg_code.cgi
+++ b/httemplate/edit/process/reg_code.cgi
@@ -22,11 +22,14 @@ my @pkgparts =
 
 $error ||= $agent->generate_reg_codes($num, \@pkgparts);
 
-unless ( ref($error) ) { %><%=
+unless ( ref($error) ) {
+  $cgi->param('error'. $error );
+%><%=
   $cgi->redirect(popurl(3). "edit/reg_code.cgi?". $cgi->query_string )
 %><% } else { %>
 
 <%= header("$num registration codes generated for ". $agent->agent, menubar(
+  'Main menu'       => popurl(3),
   'View all agents' => popurl(3). 'browse/agent.cgi',
 ) ) %>
 
-- 
cgit v1.2.1


From 18c025613fa052cf4ba8d484f1296cc2a1719a24 Mon Sep 17 00:00:00 2001
From: khoff <khoff>
Date: Mon, 21 Mar 2005 22:13:39 +0000
Subject: Added support for FAX invoice destinations using a HylaFAX server.
 Faxing plain text invoices is not supported.

---
 httemplate/edit/cust_main.cgi         | 7 +++++--
 httemplate/edit/process/cust_main.cgi | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 3910b4b84..61468f382 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -302,8 +302,11 @@ if ( $payby_default eq 'HIDE' ) {
   print qq! CHECKED!
     if ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
        || grep { $_ eq 'POST' } @invoicing_list;
-  print qq!>Postal mail invoice</TD></TR>!;
-  my $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
+  print qq!>Postal mail invoice</TD></TR><TR><TD>!;
+  print qq!<INPUT TYPE="checkbox" NAME="invoicing_list_FAX" VALUE="FAX"!;
+  print qq! CHECKED! if (grep { $_ eq 'FAX' } @invoicing_list);
+  print qq!>FAX invoice</TD></TR>!;
+  my $invoicing_list = join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list );
   print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
 
   print "<TR><TD>Billing type</TD></TR>",
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index a1d36986d..d2773a60e 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -25,6 +25,7 @@ if ( $payby ) {
 
 my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
 push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
+push @invoicing_list, 'FAX' if $cgi->param('invoicing_list_FAX');
 $cgi->param('invoicing_list', join(',', @invoicing_list) );
 
 
-- 
cgit v1.2.1


From ca1b5151cb9093fcb49de2ffd885754e1a5d5d48 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 13 Apr 2005 12:31:30 +0000
Subject: get rid of some super ancient assumptions about slipip and uid
 meaning exporting to RADIUS and shell respectively

---
 httemplate/edit/part_svc.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index bc38c34bd..3540a421e 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -67,8 +67,8 @@ my $conf = new FS::Conf;
 my %defs = (
   'svc_acct' => {
     'dir'       => 'Home directory',
-    'uid'       => 'UID (set to fixed and blank for dial-only)',
-    'slipip'    => 'IP address (Set to fixed and blank to disable dialin, or, set a value to be exported to RADIUS Framed-IP-Address.  Use the special value <code>0e0</code> [zero e zero] to enable export to RADIUS without a Framed-IP-Address.)',
+    'uid'       => 'UID (set to fixed and blank for no UIDs)',
+    'slipip'    => 'IP address',
 #    'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
     'popnum'    => {
                      desc => 'Access number',
@@ -85,7 +85,7 @@ my %defs = (
     '_password' => 'Password',
     'gid'       => 'GID (when blank, defaults to UID)',
     'shell'     => {
-                     desc =>'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
+                     desc =>'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file, set to blank for no shell tracking)',
                      type =>'select',
                      select_list => [ $conf->config('shells') ],
                    },
-- 
cgit v1.2.1


From 328223d69a72ceaf25597410f581d006351222cb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 16 Apr 2005 22:26:49 +0000
Subject: use money_char on enter payment screen instead of hardcoding $

---
 httemplate/edit/cust_pay.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 755050bd8..90f1f0026 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -58,6 +58,7 @@ my $paybatch = "webui-$_date-$$-". rand() * 2**32;
 <INPUT TYPE="hidden" NAME="quickpay" VALUE="<%= $quickpay %>">
 
 <% 
+my $money_char = $conf->config('money_char') || '$';
 my $custnum;
 if ( $link eq 'invnum' ) {
 
@@ -130,7 +131,7 @@ Payment
 </SCRIPT>
 <TR>
   <TD ALIGN="right">Amount</TD>
-  <TD BGCOLOR="#ffffff" ALIGN="right">$</TD>
+  <TD BGCOLOR="#ffffff" ALIGN="right"><%= $money_char %></TD>
   <TD><INPUT TYPE="text" NAME="paid" VALUE="<%= $paid %>" SIZE=8 MAXLENGTH=8></TD>
 </TR>
 <TR>
-- 
cgit v1.2.1


From 5ea1794ffed0a5956302394300e26a46d32609c2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 May 2005 03:45:10 +0000
Subject: 72?!

---
 httemplate/edit/part_pkg.cgi | 1 -
 1 file changed, 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index fd2aa2bfc..1885e8e6b 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -183,7 +183,6 @@ my @part_svc = qsearch(
   "WHERE disabled IS NULL OR disabled = ''
       OR 0 < ( SELECT quantity FROM pkg_svc
                 WHERE pkg_svc.svcpart = part_svc.svcpart
-                  AND pkgpart = 72
              )"
 );
 foreach my $part_svc ( @part_svc ) {
-- 
cgit v1.2.1


From 0327e2c7c79a11ec950a58e518f8f36cd0f85302 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 May 2005 19:16:59 +0000
Subject: make svc_www.usersvc optional

---
 httemplate/edit/svc_www.cgi | 1 +
 1 file changed, 1 insertion(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index 02fa64c07..3cb752850 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -196,6 +196,7 @@ foreach $_ (keys %arec) {
 print "</SELECT></TD></TR>";
 
 print '<TR><TD ALIGN="right">Username</TD><TD><SELECT NAME="usersvc" SIZE=1>';
+print '<OPTION VALUE="">(none)';
 foreach $_ (keys %svc_acct) {
   print "<OPTION", ($_ eq $usersvc) ? " SELECTED" : "",
         qq! VALUE="$_">$svc_acct{$_}!;
-- 
cgit v1.2.1


From 99769d0392773aaa9f7aadab78a77e42155ca273 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 31 May 2005 23:32:42 +0000
Subject: ack, this should finally fix the package editing problem

---
 httemplate/edit/part_pkg.cgi | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 1885e8e6b..4c0d98901 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -13,21 +13,26 @@ if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
 }
 
 my ($query) = $cgi->keywords;
-my $action = '';
+
 my $part_pkg = '';
 if ( $cgi->param('error') ) {
   $part_pkg = new FS::part_pkg ( {
     map { $_, scalar($cgi->param($_)) } fields('part_pkg')
   } );
 }
+
+my $action = '';
 my $clone_part_pkg = '';
+my $pkgpart = '';
 if ( $cgi->param('clone') ) {
+  $pkgpart = $cgi->param('clone');
   $action = 'Custom Pricing';
   $clone_part_pkg= qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
   $part_pkg ||= $clone_part_pkg->clone;
   $part_pkg->disabled('Y');
 } elsif ( $query && $query =~ /^(\d+)$/ ) {
   $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
+  $pkgpart = $part_pkg->pkgpart;
 } else {
   unless ( $part_pkg ) {
     $part_pkg = new FS::part_pkg {};
@@ -173,21 +178,19 @@ unless ( 0 ) {
 END
 }
 
+
+my $where =  "WHERE disabled IS NULL OR disabled = ''";
+if ( $pkgpart ) {
+  $where .=  "   OR 0 < ( SELECT quantity FROM pkg_svc
+                           WHERE pkg_svc.svcpart = part_svc.svcpart
+                             AND pkgpart = $pkgpart
+                        )";
+}
 my @fixups = ();
 my $count = 0;
 my $columns = 3;
-my @part_svc = qsearch(
-  'part_svc',
-  {},
-  '',
-  "WHERE disabled IS NULL OR disabled = ''
-      OR 0 < ( SELECT quantity FROM pkg_svc
-                WHERE pkg_svc.svcpart = part_svc.svcpart
-             )"
-);
-foreach my $part_svc ( @part_svc ) {
+foreach my $part_svc ( qsearch('part_svc', {}, '', $where) ) {
   my $svcpart = $part_svc->svcpart;
-  my $pkgpart = $cgi->param('clone') || $part_pkg->pkgpart;
   my $pkg_svc = $pkgpart && qsearchs( 'pkg_svc', {
     'pkgpart'  => $pkgpart,
     'svcpart'  => $svcpart,
-- 
cgit v1.2.1


From a4bc36f66381cb5e83d76b9d05f67b71dafad051 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 1 Jun 2005 02:39:16 +0000
Subject: really. *sigh*

---
 httemplate/edit/part_pkg.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 4c0d98901..128775619 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -186,10 +186,12 @@ if ( $pkgpart ) {
                              AND pkgpart = $pkgpart
                         )";
 }
+my @part_svc = qsearch('part_svc', {}, '', $where);
+
 my @fixups = ();
 my $count = 0;
 my $columns = 3;
-foreach my $part_svc ( qsearch('part_svc', {}, '', $where) ) {
+foreach my $part_svc ( @part_svc ) {
   my $svcpart = $part_svc->svcpart;
   my $pkg_svc = $pkgpart && qsearchs( 'pkg_svc', {
     'pkgpart'  => $pkgpart,
-- 
cgit v1.2.1


From 6cd950830fa622fa6cbe87895dc58fb1c9868eef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 Jun 2005 05:34:07 +0000
Subject: add multiple agent selection to agent-specific invoicing

---
 httemplate/edit/part_bill_event.cgi | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 99bc2609f..06bdaf647 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -83,11 +83,12 @@ sub select_pkgpart {
 
 sub select_agentnum {
   my $plandata = shift;
-  my $agentnum = $plandata->{'agentnum'};
-  '<SELECT NAME="agentnum">'.
+  #my $agentnum = $plandata->{'agentnum'};
+  my %agentnums = map { $_=>1 } split(/,\s*/, $plandata->{'agentnum'});
+  '<SELECT NAME="agentnum" MULTIPLE>'.
   join("\n", map {
     '<OPTION VALUE="'. $_->agentnum. '"'.
-    ( $_->agentnum == $agentnum ? ' SELECTED' : '' ).
+    ( $agentnums{$_->agentnum} ? ' SELECTED' : '' ).
     '>'. $_->agent
   } qsearch('agent', { 'disabled' => '' } ) ).
   '</SELECT>';
@@ -187,11 +188,11 @@ tie my %events, 'Tie::IxHash',
 
   'send_agent' => {
     'name' => 'Send invoice (email/print) ',
-    'code' => '$cust_bill->send(\'%%%agent_templatename%%%\', %%%agentnum%%%, \'%%%agent_invoice_from%%%\');',
+    'code' => '$cust_bill->send(\'%%%agent_templatename%%%\', [ %%%agentnum%%% ], \'%%%agent_invoice_from%%%\');',
     'html' => sub {
         '<TABLE BORDER=0>
           <TR>
-            <TD ALIGN="right">only for agent </TD>
+            <TD ALIGN="right">only for agent(s) </TD>
             <TD>'. &select_agentnum(@_). '</TD>
           </TR>
           <TR>
-- 
cgit v1.2.1


From a4c0576ff77b5932e337a48e56a6e02ff59964f5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 9 Jul 2005 10:55:18 +0000
Subject: get rid of the godawful halfass "invoice" on the post payment screen
 when posting against a specific invoice, replace with having useless
 "Auto-apply to invoices" box actually show the payment will be applied to one
 invoice only...  closes: Bug#1241

---
 httemplate/edit/cust_pay.cgi | 50 ++++++++++----------------------------------
 1 file changed, 11 insertions(+), 39 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 90f1f0026..c0a679b03 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -36,9 +36,12 @@ if ( $cgi->param('error') ) {
 
 my $paybatch = "webui-$_date-$$-". rand() * 2**32;
 
+my $title = 'Post payment';
+$title .= " against Invoice #$linknum" if $link eq 'invnum';
+
 %>
 
-<%=  header("Post payment", '') %>
+<%=  header($title, '') %>
 
 <% if ( $cgi->param('error') ) { %>
 <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
@@ -61,47 +64,9 @@ my $paybatch = "webui-$_date-$$-". rand() * 2**32;
 my $money_char = $conf->config('money_char') || '$';
 my $custnum;
 if ( $link eq 'invnum' ) {
-
   my $cust_bill = qsearchs('cust_bill', { 'invnum' => $linknum } )
     or die "unknown invnum $linknum";
-  print "Invoice #<B>$linknum</B>". ntable("#cccccc",2).
-        '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
-        time2str("%D", $cust_bill->_date). '</TD></TR>'.
-        '<TR><TD ALIGN="right" VALIGN="top">Items</TD><TD BGCOLOR="#ffffff">';
-  foreach ( $cust_bill->cust_bill_pkg ) { #false laziness with FS::cust_bill
-    if ( $_->pkgnum ) {
-
-      my($cust_pkg)=qsearchs('cust_pkg', { 'pkgnum', $_->pkgnum } );
-      my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart});
-      my($pkg)=$part_pkg->pkg;
-
-      if ( $_->setup != 0 ) {
-        print "$pkg Setup<BR>"; # $money_char. sprintf("%10.2f",$_->setup);
-        print join('<BR>',
-          map { "  ". $_->[0]. ": ". $_->[1] } $cust_pkg->labels
-        ). '<BR>';
-      }
-
-      if ( $_->recur != 0 ) {
-        print
-          "$pkg (" . time2str("%x",$_->sdate) . " - " .
-                                time2str("%x",$_->edate) . ")<BR>";
-          #$money_char. sprintf("%10.2f",$_->recur)
-        print join('<BR>',
-          map { '--->'. $_->[0]. ": ". $_->[1] } $cust_pkg->labels
-        ). '<BR>';
-      }
-
-    } else { #pkgnum Tax
-      print "Tax<BR>" # $money_char. sprintf("%10.2f",$_->setup)
-        if $_->setup != 0;
-    }
-
-  }
-  print '</TD></TR></TABLE><BR><BR>';
-
   $custnum = $cust_bill->custnum;
-
 } elsif ( $link eq 'custnum' ) {
   $custnum = $linknum;
 }
@@ -138,9 +103,16 @@ Payment
   <TD ALIGN="right">Check #</TD>
   <TD COLSPAN=2><INPUT TYPE="text" NAME="payinfo" VALUE="<%= $payinfo %>" SIZE=10></TD>
 </TR>
+
 <TR>
+<% if ( $link eq 'custnum' ) { %>
   <TD ALIGN="right">Auto-apply<BR>to invoices</TD>
   <TD COLSPAN=2><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>
+<% } elsif ( $link eq 'invnum' ) { %>
+  <TD ALIGN="right">Apply to</TD>
+  <TD COLSPAN=2 BGCOLOR="#ffffff">Invoice #<B><%= $linknum %></B> only</TD>
+  <INPUT TYPE="hidden" NAME="apply" VALUE="no">
+<% } %>
 </TR>
 
 </TABLE>
-- 
cgit v1.2.1


From 1c7f3b811c8ab9c7ebe89ff080c333cbdf99d78a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Jul 2005 09:22:18 +0000
Subject: <rjbs> This patch is part of my continuing effort to avoid using SQL
 and qsearch from templates to find the pkg_svc records for a package.

---
 httemplate/edit/part_pkg.cgi | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 128775619..e6e10e73f 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -187,22 +187,20 @@ if ( $pkgpart ) {
                         )";
 }
 my @part_svc = qsearch('part_svc', {}, '', $where);
+my %pkg_svc = map { $_->svcpart => $_ } $part_pkg->pkg_svc;
 
 my @fixups = ();
 my $count = 0;
 my $columns = 3;
 foreach my $part_svc ( @part_svc ) {
   my $svcpart = $part_svc->svcpart;
-  my $pkg_svc = $pkgpart && qsearchs( 'pkg_svc', {
-    'pkgpart'  => $pkgpart,
-    'svcpart'  => $svcpart,
-  } ) || new FS::pkg_svc ( {
-    'pkgpart'     => $pkgpart,
-    'svcpart'     => $svcpart,
-    'quantity'    => 0,
-    'primary_svc' => '',
-  });
-  #? #next unless $pkg_svc;
+  my $pkg_svc = $pkg_svc{$svcpart}
+             || new FS::pkg_svc ( {
+                                   'pkgpart'     => $pkgpart,
+                                   'svcpart'     => $svcpart,
+                                   'quantity'    => 0,
+                                   'primary_svc' => '',
+                                } );
 
   push @fixups, "pkg_svc$svcpart";
 
-- 
cgit v1.2.1


From feef0e4c2b4bd6b776b25f5a1bd6fdbf63fd08b2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Aug 2005 22:23:46 +0000
Subject: infrastructure for easier schema changes, and: add payment_gateway,
 payment_gateway_option and agent_payment_gateway tables, add paystart_month,
 paystart_year, payissue and payip fields to cust_main, add preliminary
 gateway and gateway override editing to web UI, use payment gateway override
 when processing payments (card type, not taxclass yet)

---
 httemplate/edit/agent_payment_gateway.html |  64 +++++++++++++++++
 httemplate/edit/payment_gateway.html       | 108 +++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+)
 create mode 100644 httemplate/edit/agent_payment_gateway.html
 create mode 100644 httemplate/edit/payment_gateway.html

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent_payment_gateway.html b/httemplate/edit/agent_payment_gateway.html
new file mode 100644
index 000000000..61d29e0e9
--- /dev/null
+++ b/httemplate/edit/agent_payment_gateway.html
@@ -0,0 +1,64 @@
+<%
+
+$cgi->param('agentnum') =~ /(\d+)$/ or die "illegal agentnum";
+my $agent = qsearchs('agent', { 'agentnum' => $1 } );
+die "agentnum $1 not found" unless $agent;
+
+#my @agent_payment_gateway;
+if ( $cgi->param('error') ) {
+}
+
+my $action = 'Add';
+
+%>
+
+<%= header("$action payment gateway override for ". $agent->agent,  menubar(
+  'Main Menu' => $p,
+  #'View all payment gateways' => $p. 'browse/payment_gateway.html',
+  'View all agents' => $p. 'browse/agent.html',
+)) %>
+
+<% if ( $cgi->param('error') ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
+
+<FORM ACTION="<%=popurl(1)%>process/agent_payment_gateway.html" METHOD=POST>
+<INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agent->agentnum %>">
+
+Use gateway <SELECT NAME="gatewaynum">
+<% foreach my $payment_gateway (
+      qsearch('payment_gateway', { 'disabled' => '' } )
+    ) {
+%>
+  <OPTION VALUE="<%= $payment_gateway->gatewaynum %>"><%= $payment_gateway->gateway_module %> (<%= $payment_gateway->gateway_username %>)
+<% } %>
+</SELECT>
+<BR><BR>
+
+for <SELECT NAME="cardtype" MULTIPLE>
+<% foreach my $cardtype (
+  "",
+  "VISA card",
+  "MasterCard",
+  "Discover card",
+  "American Express card",
+  "Diner's Club/Carte Blanche",
+  "enRoute",
+  "JCB",
+  "BankCard",
+  "Switch",
+  "Solo",
+  'ACH',
+) { %>
+  <OPTION VALUE="<%= $cardtype %>"><%= $cardtype || '(Default fallback)' %>
+<% } %>
+</SELECT>
+<BR><BR>
+
+(optional) when invoice contains only items of taxclass <INPUT TYPE="text" NAME="taxclass">
+<BR><BR>
+
+<INPUT TYPE="submit" VALUE="Add gateway override">
+</FORM>
+</BODY>
+</HTML>
diff --git a/httemplate/edit/payment_gateway.html b/httemplate/edit/payment_gateway.html
new file mode 100644
index 000000000..837d0c408
--- /dev/null
+++ b/httemplate/edit/payment_gateway.html
@@ -0,0 +1,108 @@
+<%
+
+my $payment_gateway;
+if ( $cgi->param('error') ) {
+  $payment_gateway = new FS::payment_gateway ( {
+    map { $_, scalar($cgi->param($_)) } fields('payment_gateway')
+  } );
+} elsif ( $cgi->keywords ) {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
+  $payment_gateway = qsearchs( 'payment_gateway', { 'gatewaynum' => $1 } );
+} else { #adding
+  $payment_gateway = new FS::payment_gateway {};
+}
+my $action = $payment_gateway->gatewaynum ? 'Edit' : 'Add';
+#my $hashref = $payment_gateway->hashref;
+
+%>
+
+<%= header("$action Payment gateway", menubar(
+  'Main Menu' => $p,
+  'View all payment gateways' => $p. 'browse/payment_gateway.html',
+)) %>
+
+<% if ( $cgi->param('error') ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
+
+<FORM ACTION="<%=popurl(1)%>process/payment_gateway.html" METHOD=POST>
+<INPUT TYPE="hidden" NAME="gatewaynum" VALUE="<%= $payment_gateway->gatewaynum %>">
+Gateway #<%= $payment_gateway->gatewaynum || "(NEW)" %>
+
+<%= ntable('#cccccc', 2, '') %>
+
+<TR>
+  <TH ALIGN="right">Gateway: </TH>
+  <TD><SELECT NAME="gateway_module" SIZE=1>
+    <% foreach my $module ( qw(
+         2CheckOut
+         AuthorizeNet
+         BankOfAmerica
+         Beanstream
+         Capstone
+         Cardstream
+         CashCow
+         CyberSource
+         eSec
+         eSelectPlus
+         Exact
+         iAuthorizer
+         IPaymentTPG
+         Jettis
+         LinkPoint
+         MerchantCommerce
+         Network1Financial
+         OCV
+         OpenECHO
+         PayConnect
+         PayflowPro
+         PaymentsGateway
+         PXPost
+         SecureHostingUPG
+         Skipjack
+         StGeorge
+         SurePay
+         TCLink
+         VirtualNet
+       ) ) {
+    %>
+      <OPTION VALUE="<%= $module %>"><%= $module %>
+    <% } %>
+    </SELECT>
+  </TD>
+</TR>
+
+<TR>
+  <TH ALIGN="right">Username: </TH>
+  <TD><INPUT TYPE="text" NAME="gateway_username"></TD>
+</TR>
+
+<TR>
+  <TH ALIGN="right">Password: </TH>
+  <TD><INPUT TYPE="text" NAME="gateway_password"></TD>
+</TR>
+
+<TR>
+  <TH ALIGN="right">Action: </TH>
+  <TD>
+    <SELECT NAME="gateway_action" SIZE=1>
+      <OPTION VALUE="Normal Authorization">Normal Authorization
+      <OPTION VALUE="Authorization Only">Authorization Only
+      <OPTION VALUE="Authorization Only, Post Authorization">Authorization Only, Post Authorization
+    </SELECT>
+  </TD>
+</TR>
+
+<TR>
+  <TH ALIGN="right">Options: </TH>
+  <TD><TEXTAREA ROWS="5" NAME="gateway_options"></TEXTAREA></TD>
+</TR>
+
+</TABLE>
+
+<BR><INPUT TYPE="submit" VALUE="<%= $payment_gateway->gatewaynum ? "Apply changes" : "Add gateway" %>">
+    </FORM>
+  </BODY>
+</HTML>
+
-- 
cgit v1.2.1


From e74b34488a2a8a192ee2bea7030ecde462645290 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 18 Aug 2005 05:12:02 +0000
Subject: oops another missing file

---
 httemplate/edit/process/payment_gateway.html | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 httemplate/edit/process/payment_gateway.html

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/payment_gateway.html b/httemplate/edit/process/payment_gateway.html
new file mode 100644
index 000000000..0fc5b66c6
--- /dev/null
+++ b/httemplate/edit/process/payment_gateway.html
@@ -0,0 +1,28 @@
+<%
+
+my $gatewaynum = $cgi->param('gatewaynum');
+
+my $old = qsearchs('payment_gateway',{'gatewaynum'=>$gatewaynum}) if $gatewaynum;
+
+my $new = new FS::payment_gateway ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('payment_gateway')
+} );
+
+my $error;
+if ( $gatewaynum ) {
+  $error=$new->replace($old);
+} else {
+  $error=$new->insert;
+  $gatewaynum=$new->getfield('gatewaynum');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "payment_gateway.html?". $cgi->query_string );
+} else { 
+  print $cgi->redirect(popurl(3). "browse/payment_gateway.html");
+}
+
+%>
-- 
cgit v1.2.1


From a63d357ca795791aa47e1ed6b3954e5774af70ec Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 18 Aug 2005 05:41:24 +0000
Subject: hopefully this is the last missing file

---
 httemplate/edit/process/agent_payment_gateway.html | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 httemplate/edit/process/agent_payment_gateway.html

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/agent_payment_gateway.html b/httemplate/edit/process/agent_payment_gateway.html
new file mode 100644
index 000000000..c306bfa3f
--- /dev/null
+++ b/httemplate/edit/process/agent_payment_gateway.html
@@ -0,0 +1,25 @@
+<%
+
+$cgi->param('agentnum') =~ /(\d+)$/ or die "illegal agentnum";
+my $agent = qsearchs('agent', { 'agentnum' => $1 } );
+die "agentnum $1 not found" unless $agent;
+
+#my $old
+
+my @new = map {
+                my $cardtype = $_;
+                new FS::agent_payment_gateway {
+                  ( map { $_ => scalar($cgi->param($_)) }
+                                    fields('agent_payment_gateway')
+                  ),
+                  'cardtype' => $cardtype,
+                };
+              }
+              $cgi->param('cardtype');
+
+foreach my $new (@new) {
+  my $error = $new->insert;
+  die $error if $error;
+}
+
+%><%= $cgi->redirect(popurl(3). "browse/agent.cgi") %>
-- 
cgit v1.2.1


From 9eb89294e2909ca9a8043b05f2492b7018b14adb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 23 Aug 2005 12:38:55 +0000
Subject: fix bug with service editing caused by moving dbdef stuff around

---
 httemplate/edit/part_svc.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 3540a421e..ea429678d 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -194,7 +194,7 @@ my %defs = (
 
       $html .=  table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>";
       #yucky kludge
-      my @fields = defined( $FS::Record::dbdef->table($layer) )
+      my @fields = defined( dbdef->table($layer) )
                       ? grep { $_ ne 'svcnum' } fields($layer)
                       : ();
       push @fields, 'usergroup' if $layer eq 'svc_acct'; #kludge
-- 
cgit v1.2.1


From 2b49cbe76b94c6c1561aa2bf37beba7d47591190 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Aug 2005 13:22:27 +0000
Subject: customer edit: abstract out billing info to billing.html, re-do
 payment type selection with HTML::Widgets::SelectLayers, add
 Switch/Solo/Maestro support for start date & issue #.  customer view:
 re-order fields for consistency.  selfservice API: support paystart_month,
 paystart_year, payissue and payip in MyAccount::process_payment and
 ::edit_info and Signup::new_customer, FS::cust_main::realtime_bop: support
 paystart_month paystart_year payissue payip fields

---
 httemplate/edit/cust_main.cgi          | 276 ++++++++++--------------
 httemplate/edit/cust_main/billing.html | 374 +++++++++++++++++++++++++++++++++
 httemplate/edit/cust_main/contact.html |   4 +-
 httemplate/edit/process/cust_main.cgi  |  24 ++-
 4 files changed, 505 insertions(+), 173 deletions(-)
 create mode 100644 httemplate/edit/cust_main/billing.html

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 61468f382..2911fc1e7 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
   #for misplaced logic below
@@ -18,6 +17,7 @@ my $conf = new FS::Conf;
 my $error = '';
 my($custnum, $username, $password, $popnum, $cust_main, $saved_pkgpart);
 my(@invoicing_list);
+my $same = '';
 if ( $cgi->param('error') ) {
   $error = $cgi->param('error');
   $cust_main = new FS::cust_main ( {
@@ -34,6 +34,7 @@ if ( $cgi->param('error') ) {
   $password = $cgi->param('_password');
   $popnum = $cgi->param('popnum');
   @invoicing_list = split( /\s*,\s*/, $cgi->param('invoicing_list') );
+  $same = $cgi->param('same');
 } elsif ( $cgi->keywords ) { #editing
   my( $query ) = $cgi->keywords;
   $query =~ /^(\d+)$/;
@@ -74,7 +75,7 @@ my $action = $custnum ? 'Edit' : 'Add';
 <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $error %></FONT>
 <% } %>
 
-<FORM ACTION="<%= popurl(1) %>process/cust_main.cgi" METHOD=POST NAME="form1" onSubmit="document.form1.submit.disabled=true">
+<FORM NAME="topform" STYLE="margin-bottom: 0">
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $custnum %>">
 Customer # <%= $custnum ? "<B>$custnum</B>" : " (NEW)" %>
 
@@ -199,7 +200,7 @@ function samechanged(what) {
   my $checked = '';
   my $disabled = '';
   my $disabledselect = '';
-  unless ( $cust_main->ship_last && $cgi->param('same') ne 'Y' ) {
+  unless ( $cust_main->ship_last && $same ne 'Y' ) {
     $checked = 'CHECKED';
     $disabled = 'DISABLED style="background-color: #dddddd"';
     foreach (
@@ -218,184 +219,133 @@ Service address
 
 <% } %>
 
-<%
-# billing info
-
-sub expselect {
-  my $prefix = shift;
-  my( $m, $y ) = (0, 0);
-  if ( scalar(@_) ) {
-    my $date = shift || '01-2000';
-    if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
-      ( $m, $y ) = ( $2, $1 );
-    } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-      ( $m, $y ) = ( $1, $3 );
-    } else {
-      die "unrecognized expiration date format: $date";
-    }
-  }
-
-  my $return = qq!<SELECT NAME="$prefix!. qq!_month" SIZE="1">!;
-  for ( 1 .. 12 ) {
-    $return .= "<OPTION";
-    $return .= " SELECTED" if $_ == $m;
-    $return .= ">$_";
-  }
-  $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
-  my @t = localtime;
-  my $thisYear = $t[5] + 1900;
-  for ( ($thisYear > $y && $y > 0 ? $y : $thisYear) .. 2037 ) {
-    $return .= "<OPTION";
-    $return .= " SELECTED" if $_ == $y;
-    $return .= ">$_";
-  }
-  $return .= "</SELECT>";
-
-  $return;
-}
-
-my $payby_default = $conf->config('payby-default');
+<!-- billing info -->
 
-if ( $payby_default eq 'HIDE' ) {
+<%= include('cust_main/billing.html', $cust_main ) %>
 
-  $cust_main->payby('BILL') unless $cust_main->payby;
+<SCRIPT>
+function bottomfixup(what) {
 
-  foreach my $field (qw( tax payby )) {
-    print qq!<INPUT TYPE="hidden" NAME="$field" VALUE="!.
-          $cust_main->getfield($field). '">';
-  }
+  var topvars = new Array(
+    'custnum', 'agentnum', 'refnum', 'referral_custnum',
 
-  print qq!<INPUT TYPE="hidden" NAME="invoicing_list" VALUE="!.
-        join(', ', $cust_main->invoicing_list). '">';
+    'last', 'first', 'ss', 'company',
+    'address1', 'address2', 'city',
+    'county', 'state', 'zip', 'country',
+    'daytime', 'night', 'fax',
 
-  foreach my $payby (qw( CARD DCRD CHEK DCHK LECB BILL COMP )) {
-    foreach my $field (qw( payinfo payname )) {
-      print qq!<INPUT TYPE="hidden" NAME="${payby}_$field" VALUE="!.
-            $cust_main->getfield($field). '">';
-    }
+    'same',
 
-    #false laziness w/expselect
-    my( $m, $y );
-    my $date = $cust_main->paydate || '12-2037';
-    if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
-      ( $m, $y ) = ( $2, $1 );
-    } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-      ( $m, $y ) = ( $1, $3 );
-    } else {
-      die "unrecognized expiration date format: $date";
-    }
+    'ship_last', 'ship_first', 'ship_company',
+    'ship_address1', 'ship_address2', 'ship_city',
+    'ship_county', 'ship_state', 'ship_zip', 'ship_country',
+    'ship_daytime','ship_night', 'ship_fax',
 
-    print qq!<INPUT TYPE="hidden" NAME="${payby}_month" VALUE="$m">!.
-          qq!<INPUT TYPE="hidden" NAME="${payby}_year"  VALUE="$y">!;
-
-  }
+    'select' // XXX key
+  );
 
-} else {
+  var layervars = new Array(
+    'payauto',
+    'payinfo', 'payinfo1', 'payinfo2',
+    'exp_month', 'exp_year', 'paycvv',
+    'paystart_month', 'paystart_year', 'payissue',
+    'payip'
+  );
 
-  print "<BR>Billing information", &itable("#cccccc"),
-        qq!<TR><TD><INPUT TYPE="checkbox" NAME="tax" VALUE="Y"!;
-  print qq! CHECKED! if $cust_main->tax eq "Y";
-  print qq!>Tax Exempt</TD></TR><TR><TD>!.
-        qq!<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
-
-  #my @invoicing_list = $cust_main->invoicing_list;
-  print qq! CHECKED!
-    if ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
-       || grep { $_ eq 'POST' } @invoicing_list;
-  print qq!>Postal mail invoice</TD></TR><TR><TD>!;
-  print qq!<INPUT TYPE="checkbox" NAME="invoicing_list_FAX" VALUE="FAX"!;
-  print qq! CHECKED! if (grep { $_ eq 'FAX' } @invoicing_list);
-  print qq!>FAX invoice</TD></TR>!;
-  my $invoicing_list = join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list );
-  print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
-
-  print "<TR><TD>Billing type</TD></TR>",
-        "</TABLE>", '<SCRIPT>
-                       var mywindow = -1;
-                       function myopen(filename,windowname,properties) {
-                         myclose();
-                         mywindow = window.open(filename,windowname,properties);
-                       }
-                       function myclose() {
-                         if ( mywindow != -1 )
-                           mywindow.close();
-                         mywindow = -1;
-                       }
-                       var achwindow = -1;
-                       function achopen(filename,windowname,properties) {
-                         achclose();
-                         achwindow = window.open(filename,windowname,properties);
-                       }
-                       function achclose() {
-                         if ( achwindow != -1 )
-                           achwindow.close();
-                         achwindow = -1;
-                       }
-                     </SCRIPT>',
-        &table("#cccccc"), "<TR>";
-
-  my($payinfo, $payname)=(
-    $cust_main->payinfo,
-    $cust_main->payname,
+  var billing_bottomvars = new Array(
+    'tax',
+    'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX'
   );
 
-  my %payby = (
-    'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
-    'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
-    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
-    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
-    'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
-    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
-    'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
-);
-
-  if ( $cust_main->dbdef_table->column('paycvv') ) {
-    foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 bs
-      $payby{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('../docs/cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="" SIZE=4 MAXLENGTH=4>!;
-    }
+  for ( f=0; f < topvars.length; f++ ) {
+    var field = topvars[f];
+    copyelement( document.topform.elements[field],
+                 document.bottomform.elements[field]
+               );
   }
 
-  my( $account, $aba ) = split('@', $payinfo);
-
-  my %paybychecked = (
-    'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
-    'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
-    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
-    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
-    'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
-    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
-    'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
-);
-
-  if ( $cust_main->dbdef_table->column('paycvv') ) {
-    my $paycvv = $cust_main->paycvv;
+  var layerform = document.topform.select.options[document.topform.select.selectedIndex].value;
+  for ( f=0; f < layervars.length; f++ ) {
+    var field = layervars[f];
+    copyelement( document.forms[layerform].elements[field],
+                 document.bottomform.elements[field]
+               );
+  }
 
-    foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 bs
-      $paybychecked{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('../docs/cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="$paycvv" SIZE=4 MAXLENGTH=4>!;
-    }
+  for ( f=0; f < billing_bottomvars.length; f++ ) {
+    var field = billing_bottomvars[f];
+    copyelement( document.billing_bottomform.elements[field],
+                 document.bottomform.elements[field]
+               );
   }
 
+}
 
-  $cust_main->payby($payby_default) unless $cust_main->payby;
-  for (qw(CARD DCRD CHEK DCHK LECB BILL COMP)) {
-    print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
-    if ($cust_main->payby eq "$_") {
-      print qq! CHECKED> $paybychecked{$_}</TD>!;
+function copyelement(from, to) {
+  if ( from == undefined ) {
+    to.value = '';
+  } else if ( from.type == 'select-one' ) {
+    to.value = from.options[from.selectedIndex].value;
+    //alert(from + " (" + from.type + "): " + to.name + " => (" + from.selectedIndex + ") " + to.value);
+  } else if ( from.type == 'checkbox' ) {
+    if ( from.checked ) {
+      to.value = from.value;
     } else {
-      print qq!> $payby{$_}</TD>!;
+      to.value = '';
+    }
+  } else {
+    if ( from.value == undefined ) {
+      to.value = '';
+    } else {
+      to.value = from.value;
     }
   }
+  //alert(from + ": " + to.name + " => " + to.value);
+}
 
-  print "</TR></TABLE>$r required fields for each billing type";
+</SCRIPT>
 
-}
+<FORM ACTION="<%= popurl(1) %>process/cust_main.cgi" METHOD=POST NAME="bottomform" onSubmit="document.bottomform.submit.disabled=true; bottomfixup(this.form);" STYLE="margin-top: 0; margin-bottom: 0">
+
+<% foreach my $hidden (
+     'custnum', 'agentnum', 'refnum', 'referral_custnum',
+     'last', 'first', 'ss', 'company',
+     'address1', 'address2', 'city',
+     'county', 'state', 'zip', 'country',
+     'daytime', 'night', 'fax',
+     
+     'same',
+     
+     'ship_last', 'ship_first', 'ship_company',
+     'ship_address1', 'ship_address2', 'ship_city',
+     'ship_county', 'ship_state', 'ship_zip', 'ship_country',
+     'ship_daytime','ship_night', 'ship_fax',
+     
+     'select', #XXX key
+
+     'payauto',
+     'payinfo', 'payinfo1', 'payinfo2',
+     'exp_month', 'exp_year', 'paycvv',
+     'paystart_month', 'paystart_year', 'payissue',
+     'payip',
+     
+     'tax',
+     'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX'
+   ) {
+%>
+  <INPUT TYPE="hidden" NAME="<%= $hidden %>" VALUE="">
+<% } %>
 
-if ( defined $cust_main->dbdef_table->column('comments') ) {
-    print "<BR><BR>Comments", &itable("#cccccc"),
-          qq!<TR><TD><TEXTAREA COLS=80 ROWS=5 WRAP="HARD" NAME="comments">!,
-          $cust_main->comments, "</TEXTAREA>",
-          "</TD></TR></TABLE>";
-}
+<BR>Comments
+<%= &ntable("#cccccc") %>
+  <TR>
+    <TD>
+      <TEXTAREA COLS=80 ROWS=5 WRAP="HARD" NAME="comments"><%= $cust_main->comments %></TEXTAREA>
+    </TD>
+  </TR>
+</TABLE>
+
+<%
 
 unless ( $custnum ) {
   # pry the wrong place for this logic.  also pretty expensive
@@ -425,7 +375,7 @@ unless ( $custnum ) {
 
 #    print "<BR><BR>First package", &itable("#cccccc", "0 ALIGN=LEFT"),
 #apiabuse & undesirable wrapping
-    print "<BR><BR>First package", &itable("#cccccc"),
+    print "<BR>First package", &ntable("#cccccc"),
           qq!<TR><TD COLSPAN=2><SELECT NAME="pkgpart_svcpart">!;
 
     print qq!<OPTION VALUE="">(none)!;
@@ -453,7 +403,7 @@ unless ( $custnum ) {
 (blank to generate)</TD></TR>
 END
 
-    print '<TR><TD ALIGN="right">Access number</TD><TD WIDTH="100%">'
+    print '<TR><TD ALIGN="right">Access number</TD><TD>'
           .
           &FS::svc_acct_pop::popselector($popnum).
           '</TD></TR></TABLE>'
@@ -463,9 +413,9 @@ END
 
 my $otaker = $cust_main->otaker;
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
-      qq!<BR><INPUT NAME="submit" TYPE="submit" VALUE="!,
-      $custnum ?  "Apply Changes" : "Add Customer", qq!">!,
-      "</FORM></BODY></HTML>",
+      qq!<BR><INPUT TYPE="submit" NAME="submit" VALUE="!,
+      $custnum ?  "Apply Changes" : "Add Customer", qq!"><BR>!,
+      "</FORM></DIV></BODY></HTML>",
 ;
 
 %>
diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
new file mode 100644
index 000000000..65cca0ad8
--- /dev/null
+++ b/httemplate/edit/cust_main/billing.html
@@ -0,0 +1,374 @@
+<%
+
+my( $cust_main ) = @_;
+my $conf = new FS::Conf;
+my $payby_default = $conf->config('payby-default');
+
+if ( $payby_default eq 'HIDE' ) {
+
+  $cust_main->payby('BILL') unless $cust_main->payby;
+
+%>
+
+  <INPUT TYPE="hidden" NAME="select" VALUE="<%= $cust_main->payby %>">
+
+  </FORM>
+
+  <FORM NAME="<%= $cust_main->payby %>" STYLE="margin-top: 0; margin-bottom: 0"> <% # XXX key %>
+
+  <% foreach my $field (qw( payinfo payname paycvv paystart_month paystart_year payissue payip )) { %>
+
+    <INPUT TYPE="hidden" NAME="<%= $field %>" VALUE="<%= $cust_main->getfield($field) %>">
+
+  <% } %>
+
+  <%
+  #false laziness w/elements/select-month_year.html & view/cust_main/billing.html
+  my( $mon, $year );
+  my $date = $cust_main->paydate || '12-2037';
+  if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
+    ( $mon, $year ) = ( $2, $1 );
+  } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+    ( $mon, $year ) = ( $1, $3 );
+  } else {
+    die "unrecognized expiration date format: $date";
+  }
+  %>
+
+  <INPUT TYPE="hidden" NAME="exp_month" VALUE="<%= $mon %>">
+  <INPUT TYPE="hidden" NAME="exp_year"  VALUE="<%= $year %>">
+
+  </FORM>
+
+  <FORM NAME="billing_bottomform" STYLE="margin-top: 0; margin-bottom: 0">
+
+  <INPUT TYPE="hidden" NAME="tax" VALUE="<%= $cust_main->tax %>">
+
+  <INPUT TYPE="hidden" NAME="invoicing_list" VALUE="<%= join(', ', $cust_main->invoicing_list) %>">
+
+  </FORM>
+
+<% } else {
+
+  my @invoicing_list = $cust_main->invoicing_list;
+
+  my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
+
+%>
+
+  <BR>Billing information
+  <%= &ntable("#cccccc") %>
+
+    <TR>
+      <TD ALIGN="right" WIDTH="200"><%=$r%>Billing type</TD>
+
+  <SCRIPT>
+
+    var mywindow = -1;
+    function myopen(filename,windowname,properties) {
+      myclose();
+      mywindow = window.open(filename,windowname,properties);
+    }
+    function myclose() {
+      if ( mywindow != -1 )
+        mywindow.close();
+      mywindow = -1;
+    }
+
+    var achwindow = -1;
+    function achopen(filename,windowname,properties) {
+      achclose();
+      achwindow = window.open(filename,windowname,properties);
+    }
+    function achclose() {
+      if ( achwindow != -1 )
+        achwindow.close();
+      achwindow = -1;
+    }
+
+    function card_changed(what) {
+      if (
+             what.form.payinfo.value.substring(0, 4) == '4093' 
+          || what.form.payinfo.value.substring(0, 4) == '4911' 
+          || what.form.payinfo.value.substring(0, 4) == '4936' 
+          || what.form.payinfo.value.substring(0, 6) == '564132' 
+          || what.form.payinfo.value.substring(0, 2) == '63' 
+          || what.form.payinfo.value.substring(0, 2) == '67' 
+         )
+      {
+        what.form.paystart_month.disabled = false;
+        what.form.paystart_year.disabled = false;
+        what.form.payissue.disabled = false;
+        what.form.paystart_month.style.backgroundColor = '#ffffff';
+        what.form.paystart_year.style.backgroundColor = '#ffffff';
+        what.form.payissue.style.backgroundColor = '#ffffff';
+        document.getElementById('paystart_label').style.color = '#000000';
+        document.getElementById('payissue_label').style.color = '#000000';
+      } else {
+        what.form.paystart_month.disabled = true;
+        what.form.paystart_year.disabled = true;
+        what.form.payissue.disabled = true;
+        what.form.paystart_month.style.backgroundColor = '#dddddd';
+        what.form.paystart_year.style.backgroundColor = '#dddddd';
+        what.form.payissue.style.backgroundColor = '#dddddd';
+        document.getElementById('paystart_label').style.color = '#999999';
+        document.getElementById('payissue_label').style.color = '#999999';
+      }
+      return true;
+    }
+
+  </SCRIPT>
+
+  <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
+  <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
+  <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
+  <SCRIPT TYPE="text/javascript">
+  function OLiframeContent(src, width, height, name) {
+    return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
+     +(name?' name="'+name+'" id="'+name+'"':'')+' scrolling="auto">'
+     +'<div>[iframe not supported]</div></iframe>');
+  }
+  </SCRIPT>
+
+  <%
+
+  my($payby, $payinfo, $payname)=(
+    $cust_main->payby,
+    $cust_main->payinfo,
+    $cust_main->payname,
+  );
+  my( $account, $aba ) = split('@', $payinfo);
+
+  my $disabled = 'DISABLED style="background-color: #dddddd"';
+  my $text_disabled = 'style="color: #999999"';
+  if ( $payby =~ /^(CARD|DCRD)$/ && cardtype($payinfo) =~ /^(Switch|Solo)$/ ) {
+    $disabled = 'style="background-color: #ffffff"';
+    $text_disabled = 'style="color: #000000";'
+  }
+
+  my %payby = (
+
+    'CARD' =>
+
+      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
+
+        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Card number </TD>!.
+          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payinfo" VALUE="!. ( $payby =~ /^(CARD|DCRD)$/ ? $payinfo : '' ). qq!" MAXLENGTH=19 onChange="card_changed(this)" onKeyUp="card_changed(this)"></TD></TR>!.
+
+        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Expiration </TD>!.
+          '<TD WIDTH="408">'.
+
+          include('/elements/select-month_year.html',
+                    'prefix' => 'exp',
+                    'selected_date' =>
+                      ( $payby =~ /^(CARD|DCRD)$/ ? $cust_main->paydate : '' ),
+                 ).
+
+          '</TD></TR>'.
+
+        qq!<TR><TD ALIGN="right" WIDTH="200">CVV2&nbsp;!.
+
+          qq!(<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/cvv2.html', 472, 308, 'cvv2_popup' ), CAPTION, 'CVV2 Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">help</A>)!.
+          qq!</TD>!.
+          '<TD WIDTH="408"><INPUT TYPE="text" NAME="paycvv" VALUE="'. ( $payby =~ /^(CARD|DCRD)$/ ? $cust_main->paycvv : '' ). '" SIZE=4 MAXLENGTH=4>'.
+
+
+        qq!<TR><TD ALIGN="right" WIDTH="200"><SPAN ID="paystart_label" $text_disabled>Start date </SPAN></TD>!.
+          '<TD WIDTH="408">'.
+
+          include('/elements/select-month_year.html',
+                    'prefix' => 'paystart',
+                    'disabled' => $disabled,
+                    'empty_option' => 1,
+                    'start_year' => 2000,
+                    'end_year'   => (localtime())[5] + 1900,
+                    'selected_date' => (
+                      ( $payby =~ /^(CARD|DCRD)$/
+                        && cardtype($payinfo) =~ /^(Switch|Solo)$/ )
+                          ? $cust_main->paystart_month. '-'.
+                            $cust_main->paystart_year 
+                          : ''
+                    )
+                 ).
+
+        qq!<SPAN ID="payissue_label" $text_disabled> or Issue number </SPAN>!.
+          '<INPUT TYPE="text" NAME="payissue" VALUE="'. ( $payby =~ /^(CARD|DCRD)$/ ? $cust_main->payissue : '' ). qq!" SIZE=3 MAXLENGTH=2 $disabled></TD></TR>!.
+
+        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Exact name on card </TD>!.
+          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payname" VALUE="!. ( $payby =~ /^(CARD|DCRD)$/ ? $cust_main->payname : '' ). qq!"></TD></TR>!.
+
+        qq!<TR><TD COLSPAN=2 WIDTH="608"><INPUT TYPE="checkbox" NAME="payauto" !. ( $payby eq 'DCRD' ? '' : 'CHECKED' ). '> Charge future payments to this card automatically</TD></TR>'.
+
+      '</TABLE>',
+
+    'CHEK' => 
+
+      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
+
+        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Account number </TD>!.
+          qq!<TD WIDTH="408"><INPUT TYPE="text" SIZE=10 NAME="payinfo1" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $account : '' ). '"></TD></TR>'.
+
+        qq!<TR><TD ALIGN="right" WIDTH="200">${r}ABA/Routing number </TD>!.
+          qq!<TD WIDTH="408"><INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="payinfo2" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $aba : '' ). qq!" SIZE=10 MAXLENGTH=9> !.
+          qq!(<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/ach.html', 380, 240, 'ach_popup' ), CAPTION, 'ACH Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">help</A>)!.
+          qq!</TD></TR>!.
+
+        qq!<INPUT TYPE="hidden" NAME="exp_month" VALUE="12">!.
+        qq!<INPUT TYPE="hidden" NAME="exp_year" VALUE="2037">!.
+
+        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Bank name </TD>!.
+          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payname" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $cust_main->payname : '' ). qq!"></TD></TR>!.
+
+        qq!<TR><TD COLSPAN=2 WIDTH="608"><INPUT TYPE="checkbox" NAME="payauto" !. ( $payby eq 'DCHK' ? '' : 'CHECKED' ). '> Charge future payments to this electronic check automatically</TD></TR>'.
+
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+
+      '</TABLE>',
+
+    'LECB' =>  
+
+      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
+
+        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Phone number </TD>!.
+          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payinfo" VALUE="!. ( $payby eq 'LECB' ? $cust_main->payinfo : '' ). qq!" MAXLENGTH=15 SIZE=16></TD></TR>!.
+
+        qq!<INPUT TYPE="hidden" NAME="exp_month" VALUE="12">!.
+        qq!<INPUT TYPE="hidden" NAME="exp_year" VALUE="2037">!.
+        qq!<INPUT TYPE="hidden" NAME="payname" VALUE="">!.
+
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+
+      '</TABLE>',
+
+    'BILL' =>  
+
+      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
+
+        qq!<TR><TD ALIGN="right" WIDTH="200">P.O. </TD>!.
+          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payinfo" VALUE="!. ( $payby eq 'BILL' ? $cust_main->payinfo : '' ). qq!"></TD></TR>!.
+
+        qq!<INPUT TYPE="hidden" NAME="exp_month" VALUE="12">!.
+        qq!<INPUT TYPE="hidden" NAME="exp_year" VALUE="2037">!.
+
+        qq!<TR><TD ALIGN="right" WIDTH="200">Attention </TD>!.
+          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payname" VALUE="!. ( $payby eq 'BILL' ? $cust_main->payname : '' ). qq!"></TD></TR>!.
+
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+
+      '</TABLE>',
+
+    'COMP' =>   
+
+      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
+
+        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Approved by </TD>!.
+          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payinfo" VALUE=""></TD></TR>!.
+
+        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Expiration </TD>!.
+          '<TD WIDTH="408">'.
+
+          include('/elements/select-month_year.html',
+                    'prefix' => 'exp',
+                    'selected_date' =>
+                      ( $payby eq 'COMP' ? $cust_main->paydate : '' ),
+                 ).
+
+          '</TD></TR>'.
+
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+
+      '</TABLE>',
+
+  );
+
+  tie my %options, 'Tie::IxHash',
+    'CARD' => 'Credit card',
+    'CHEK' => 'Electronic check',
+    'LECB' => 'Phone bill billing',
+    'BILL' => 'Billing',
+    'COMP' => 'Complimentary',
+  ;
+  my %payby2option = (
+    ( map { $_ => $_ } keys %options ),
+    'DCRD' => 'CARD',
+    'DCHK' => 'CHEK',
+  );
+
+  my $widget = new HTML::Widgets::SelectLayers(
+    'options'        => \%options,
+    #'form_name'      => 'dummy',
+    #'form_action'    => 'nothingyet',
+    #chops bottom of page in IE# 'under_position' => 'absolute',
+    'html_between'   => '</TD></TR></TABLE>',
+    'selected_layer' => $payby2option{$payby} || 'CARD',
+    'layer_callback' => sub { my $layer = shift; $payby{$layer}; },
+  );
+
+  %>
+
+  <TD WIDTH="408"><%= $widget->html %>
+
+  <FORM NAME="billing_bottomform" STYLE="margin-top: 0; margin-bottom: 0">
+
+  <%= &ntable("#cccccc") %>
+
+    <TR><TD>&nbsp;</TD></TR>
+
+    <TR>
+      <TD WIDTH="608" COLSPAN="2"><INPUT TYPE="checkbox" NAME="tax" VALUE="Y" <%= $cust_main->tax eq "Y" ? 'CHECKED' : '' %>> Tax Exempt</TD>
+    </TR>
+
+    <TR>
+      <TD WIDTH="608" COLSPAN="2"><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST" <%=
+
+        ( ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
+          || grep { $_ eq 'POST' } @invoicing_list                     )
+
+          ? 'CHECKED'
+          : ''
+
+        %>> Postal mail invoice
+
+      </TD>
+    </TR>
+
+    <TR>
+      <TD WIDTH="608" COLSPAN="2"><INPUT TYPE="checkbox" NAME="invoicing_list_FAX" VALUE="FAX" <%=
+
+        ( grep { $_ eq 'FAX' } @invoicing_list )
+          ? 'CHECKED'
+          : ''
+
+        %>> Fax invoice
+
+      </TD>
+    </TR>
+
+    <TR>
+      <TD ALIGN="right" WIDTH="200">Email invoice </TD>
+      <TD WIDTH="408"><INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) %>"></TD>
+    </TR>
+
+  </TABLE>
+
+  </FORM>
+
+  <%= $r %> required fields
+
+<% } %>
+
diff --git a/httemplate/edit/cust_main/contact.html b/httemplate/edit/cust_main/contact.html
index 7b88ccbcb..d3b7b167f 100644
--- a/httemplate/edit/cust_main/contact.html
+++ b/httemplate/edit/cust_main/contact.html
@@ -30,7 +30,7 @@ my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
 %>
 
-<%= &itable("#cccccc") %>
+<%= &ntable("#cccccc") %>
 
 <TR>
   <TH ALIGN="right"><%=$r%>Contact&nbsp;name<BR>(last,&nbsp;first)</TH>
@@ -42,7 +42,7 @@ my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 <% if ( $conf->exists('show_ss') && !$pre ) { %>
   <TD ALIGN="right">SS#</TD>
   <TD><INPUT TYPE="text" NAME="ss" VALUE="<%= $cust_main->ss %>" SIZE=11></TD>
-<% } else { %>
+<% } elsif ( !$pre ) { %>
   <TD><INPUT TYPE="hidden" NAME="ss" VALUE="<%= $cust_main->ss %>"></TD>
 <% } %>
 
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index d2773a60e..85dbb9775 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,5 +1,7 @@
 <%
 
+warn join('', map { "$_ => ". $cgi->param($_). "\n" } $cgi->param );
+
 my $error = '';
 
 #unmunge stuff
@@ -8,19 +10,25 @@ $cgi->param('tax','') unless defined $cgi->param('tax');
 
 $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
 
-my $payby = $cgi->param('payby');
+#my $payby = $cgi->param('payby');
+my $payby = $cgi->param('select'); # XXX key
+
+my %noauto = (
+  'CARD' => 'DCRD',
+  'CHEK' => 'DCHK',
+);
+$payby = $noauto{$payby}
+  if ! $cgi->param('payauto') && exists $noauto{$payby};
+
+$cgi->param('payby', $payby);
+
 if ( $payby ) {
   if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
     $cgi->param('payinfo',
-      $cgi->param($payby. '_payinfo1'). '@'. $cgi->param($payby. '_payinfo2') );
-  } else {
-    $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
+      $cgi->param('payinfo1'). '@'. $cgi->param('payinfo2') );
   }
   $cgi->param('paydate',
-    $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
-  $cgi->param('payname', $cgi->param( $payby. '_payname' ) );
-  $cgi->param('paycvv', $cgi->param( $payby. '_paycvv' ) )
-    if defined $cgi->param( $payby. '_paycvv' );
+    $cgi->param( 'exp_month' ). '-'. $cgi->param( 'exp_year' ) );
 }
 
 my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
-- 
cgit v1.2.1


From 6b303b560caf53f3aed83602faf9d03602fe64b2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Aug 2005 13:47:09 +0000
Subject: fix size of cvv2 help popup

---
 httemplate/edit/cust_main/billing.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 65cca0ad8..17b1b0cc9 100644
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -168,7 +168,7 @@ if ( $payby_default eq 'HIDE' ) {
 
         qq!<TR><TD ALIGN="right" WIDTH="200">CVV2&nbsp;!.
 
-          qq!(<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/cvv2.html', 472, 308, 'cvv2_popup' ), CAPTION, 'CVV2 Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">help</A>)!.
+          qq!(<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/cvv2.html', 480, 352, 'cvv2_popup' ), CAPTION, 'CVV2 Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">help</A>)!.
           qq!</TD>!.
           '<TD WIDTH="408"><INPUT TYPE="text" NAME="paycvv" VALUE="'. ( $payby =~ /^(CARD|DCRD)$/ ? $cust_main->paycvv : '' ). '" SIZE=4 MAXLENGTH=4>'.
 
-- 
cgit v1.2.1


From 7740fe6ad808f8dd9b3ed157735a768073547a70 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Sep 2005 12:44:59 +0000
Subject: fix silly bug sizing username field when adding an account (and
 username max is not set)

---
 httemplate/edit/svc_acct.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index f1b8b800b..57227d4bc 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -97,7 +97,7 @@ if ( $svc_acct->_password ) {
 }
 
 my $ulen = $conf->config('usernamemax')
-           || $svc_acct->dbdef_table->column('username')->length;
+           || dbdef->table('svc_acct')->column('username')->length;
 my $ulen2 = $ulen+2;
 
 my $pmax = $conf->config('passwordmax') || 8;
-- 
cgit v1.2.1


From 598102bce2442157492847c7bf43abf8140edf9f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Sep 2005 12:48:24 +0000
Subject: fix silly bug sizing username field when adding an account (and
 usernamemax is not set)

---
 httemplate/edit/svc_acct.cgi | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 57227d4bc..a730531f5 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -96,8 +96,10 @@ if ( $svc_acct->_password ) {
   $password = '';
 }
 
-my $ulen = $conf->config('usernamemax')
-           || dbdef->table('svc_acct')->column('username')->length;
+my $ulen = 
+  $conf->exists('usernamemax')
+  ? $conf->config('usernamemax')
+  : dbdef->table('svc_acct')->column('username')->length;
 my $ulen2 = $ulen+2;
 
 my $pmax = $conf->config('passwordmax') || 8;
-- 
cgit v1.2.1


From f1da1afefb2501e1514d267612fafa87f0ac8108 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Sep 2005 08:50:29 +0000
Subject: fix dropping of payname

---
 httemplate/edit/cust_main.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 2911fc1e7..a8f202fbb 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -247,7 +247,7 @@ function bottomfixup(what) {
   var layervars = new Array(
     'payauto',
     'payinfo', 'payinfo1', 'payinfo2',
-    'exp_month', 'exp_year', 'paycvv',
+    'payname', 'exp_month', 'exp_year', 'paycvv',
     'paystart_month', 'paystart_year', 'payissue',
     'payip'
   );
@@ -325,7 +325,7 @@ function copyelement(from, to) {
 
      'payauto',
      'payinfo', 'payinfo1', 'payinfo2',
-     'exp_month', 'exp_year', 'paycvv',
+     'payname', 'exp_month', 'exp_year', 'paycvv',
      'paystart_month', 'paystart_year', 'payissue',
      'payip',
      
-- 
cgit v1.2.1


From 9e342300c380e29af1b9678f1a9604609e0061b6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 Sep 2005 14:50:57 +0000
Subject: ajax-style xmlhttprequest state/county/country selector!

---
 httemplate/edit/cust_main.cgi                 | 14 +++--
 httemplate/edit/cust_main/contact.html        | 32 +++++++---
 httemplate/edit/cust_main/select-country.html | 68 +++++++++++++++++++++
 httemplate/edit/cust_main/select-county.html  | 87 +++++++++++++++++++++++++++
 httemplate/edit/cust_main/select-state.html   | 27 +++++++++
 5 files changed, 214 insertions(+), 14 deletions(-)
 create mode 100644 httemplate/edit/cust_main/select-country.html
 create mode 100644 httemplate/edit/cust_main/select-county.html
 create mode 100644 httemplate/edit/cust_main/select-state.html

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index a8f202fbb..d10b21a4a 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -173,11 +173,17 @@ function bill_changed(what) {
 <% for (qw( last first company address1 address2 city zip daytime night fax )) { %>
     what.form.ship_<%=$_%>.value = what.form.<%=$_%>.value;
 <% } %>
+
     what.form.ship_country.selectedIndex = what.form.country.selectedIndex;
-    ship_country_changed(what.form.ship_country);
-    what.form.ship_state.selectedIndex = what.form.state.selectedIndex;
-    ship_state_changed(what.form.ship_state);
-    what.form.ship_county.selectedIndex = what.form.county.selectedIndex;
+    function fix_ship_state() {
+      what.form.ship_state.selectedIndex = what.form.state.selectedIndex;
+    }
+    ship_country_changed(what.form.ship_country, fix_ship_state );
+
+    function fix_ship_county() {
+      what.form.ship_county.selectedIndex = what.form.county.selectedIndex;
+    }
+    ship_state_changed(what.form.ship_state, fix_ship_county );
   }
 }
 function samechanged(what) {
diff --git a/httemplate/edit/cust_main/contact.html b/httemplate/edit/cust_main/contact.html
index d3b7b167f..e0cd06f56 100644
--- a/httemplate/edit/cust_main/contact.html
+++ b/httemplate/edit/cust_main/contact.html
@@ -14,14 +14,23 @@ $cust_main->set($pre.'state', $statedefault )
   unless $cust_main->get($pre.'state')
          || $cust_main->get($pre.'country') ne $countrydefault;
 
-my($county_html, $state_html, $country_html) =
-  FS::cust_main_county::regionselector( $cust_main->get($pre.'county'),
-                                        $cust_main->get($pre.'state'),
-                                        $cust_main->get($pre.'country'),
-                                        $pre,
-                                        $onchange,
-                                        $disabled,
-                                      );
+#my($county_html, $state_html, $country_html) =
+#  FS::cust_main_county::regionselector( $cust_main->get($pre.'county'),
+#                                        $cust_main->get($pre.'state'),
+#                                        $cust_main->get($pre.'country'),
+#                                        $pre,
+#                                        $onchange,
+#                                        $disabled,
+#                                      );
+
+my %select_hash = (
+  'county'   => $cust_main->get($pre.'county'),
+  'state'    => $cust_main->get($pre.'state'),
+  'country'  => $cust_main->get($pre.'country'),
+  'prefix'   => $pre,
+  'onchange' => $onchange,
+  'disabled' => $disabled,
+);
 
 my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
 my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
@@ -75,7 +84,10 @@ my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
     <INPUT TYPE="text" NAME="<%=$pre%>city" VALUE="<%= $cust_main->get($pre.'city') %>" onChange="<%= $onchange %>" <%=$disabled%>>
   </TD>
   <TH ALIGN="right"><%=$r%>State</TH>
-  <TD><%= $county_html. $state_html %></TD>
+  <TD>
+    <%= include('select-county.html', %select_hash ) %>
+    <%= include('select-state.html', %select_hash ) %>
+  </TD>
   <TH><%=$r%>Zip</TH>
   <TD>
     <INPUT TYPE="text" NAME="<%=$pre%>zip" VALUE="<%= $cust_main->get($pre.'zip') %>" SIZE=10 onChange="<%= $onchange %>" <%=$disabled%>>
@@ -84,7 +96,7 @@ my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
 <TR>
   <TH ALIGN="right"><%=$r%>Country</TH>
-  <TD><%= $country_html %></TD>
+  <TD><%= include('select-country.html', %select_hash ) %></TD>
 </TR>
 
 <TR>
diff --git a/httemplate/edit/cust_main/select-country.html b/httemplate/edit/cust_main/select-country.html
new file mode 100644
index 000000000..44f4f0a55
--- /dev/null
+++ b/httemplate/edit/cust_main/select-country.html
@@ -0,0 +1,68 @@
+<%
+
+  my %opt = @_;
+  foreach my $opt (qw( county state country prefix onchange disabled )) {
+    $opt{$_} = '' unless exists($opt{$_}) && defined($opt{$_});
+  }
+
+  my $conf = new FS::Conf;
+  my $countrydefault = $conf->config('countrydefault') || 'US';
+
+%>
+
+<%= include('/elements/xmlhttp.html', $p.'misc/states.cgi', $opt{'prefix'}. 'get_states') %>
+
+<SCRIPT TYPE="text/javascript">
+
+  function opt(what,value,text) {
+    var optionName = new Option(text, value, false, false);
+    var length = what.length;
+    what.options[length] = optionName;
+  }
+
+  function <%= $opt{'prefix'} %>country_changed(what, callback) {
+
+    country = what.options[what.selectedIndex].text;
+
+    function <%= $opt{'prefix'} %>update_states(states) {
+
+      // blank the current state list
+      for ( var i = what.form.<%= $opt{'prefix'} %>state.length; i >= 0; i-- )
+          what.form.<%= $opt{'prefix'} %>state.options[i] = null;
+
+      // add the new states
+      var statesArray = eval('(' + states + ')' );
+      for ( var s = 0; s < statesArray.length; s++ ) {
+          var stateLabel = statesArray[s];
+          if ( stateLabel == "" )
+              stateLabel = '(n/a)';
+          opt(what.form.<%= $opt{'prefix'} %>state, statesArray[s], stateLabel);
+      }
+
+      //run the callback
+      if ( callback != null ) 
+        callback();
+    }
+
+    // go get the new states
+    <%= $opt{'prefix'} %>get_states( country, <%= $opt{'prefix'} %>update_states );
+
+  }
+
+</SCRIPT>
+
+<SELECT NAME="<%= $opt{'prefix'} %>country" onChange="<%= $opt{'prefix'} %>country_changed(this); <%= $opt{'onchange'} %>" <%= $opt{'disabled'} %>>
+
+<% foreach my $country (
+     sort { ($b eq $countrydefault) <=> ($a eq $countrydefault) or $a cmp $b }
+     map { $_->country }
+     qsearch( 'cust_main_county',{}, 'DISTINCT ON ( country ) *', )
+   ) {
+%>
+
+  <OPTION VALUE="<%= $country %>"<%= $country eq $opt{'country'} ? ' SELECTED' : '' %>><%= $country %>
+
+<% } %>
+
+</SELECT>
+
diff --git a/httemplate/edit/cust_main/select-county.html b/httemplate/edit/cust_main/select-county.html
new file mode 100644
index 000000000..70a8f9477
--- /dev/null
+++ b/httemplate/edit/cust_main/select-county.html
@@ -0,0 +1,87 @@
+<%
+
+  my %opt = @_;
+  foreach my $opt (qw( county state country prefix onchange disabled )) {
+    $opt{$_} = '' unless exists($opt{$_}) && defined($opt{$_});
+  }
+
+  my $sql = "SELECT COUNT(*) FROM cust_main_county".
+            " WHERE county IS NOT NULL AND county != ''";
+  my $sth = dbh->prepare($sql) or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
+  my $countyflag = $sth->fetchrow_arrayref->[0];
+
+%>
+
+<% if ( $countyflag ) { %>
+
+  <%= include('/elements/xmlhttp.html', $p.'misc/counties.cgi', $opt{'prefix'}. 'get_counties' ) %>
+  
+  <SCRIPT TYPE="text/javascript">
+  
+    function opt(what,value,text) {
+      var optionName = new Option(text, value, false, false);
+      var length = what.length;
+      what.options[length] = optionName;
+    }
+  
+    function <%= $opt{'prefix'} %>state_changed(what, callback) {
+
+      state = what.options[what.selectedIndex].text;
+      country = what.form.<%= $opt{'prefix'} %>country.options[what.form.<%= $opt{'prefix'} %>country.selectedIndex].text;
+  
+      function <%= $opt{'prefix'} %>update_counties(counties) {
+
+        // blank the current county list
+        for ( var i = what.form.<%= $opt{'prefix'} %>county.length; i >= 0; i-- )
+            what.form.<%= $opt{'prefix'} %>county.options[i] = null;
+  
+        // add the new counties
+        var countiesArray = eval('(' + counties + ')' );
+        for ( var s = 0; s < countiesArray.length; s++ ) {
+            var countyLabel = countiesArray[s];
+            if ( countyLabel == "" )
+                countyLabel = '(n/a)';
+            opt(what.form.<%= $opt{'prefix'} %>county, countiesArray[s], countyLabel);
+        }
+
+        //run the callback
+        if ( callback != null ) 
+          callback();
+      }
+  
+      // go get the new counties
+      <%= $opt{'prefix'} %>get_counties( state, country, <%= $opt{'prefix'} %>update_counties );
+  
+    }
+  
+  </SCRIPT>
+
+  <SELECT NAME="<%= $opt{'prefix'} %>county" onChange="<%= $opt{'onchange'} %>" <%= $opt{'disabled'} %>>
+
+  <% foreach my $county (
+       sort
+       map { $_->county }
+       qsearch('cust_main_county', { 'state'   => $opt{'state'},
+                                     'country' => $opt{'country'},
+                                   }
+              )
+     ) {
+  %>
+
+    <OPTION VALUE="<%= $county %>"<%= $county eq $opt{'county'} ? ' SELECTED' : '' %>><%= $county %>
+
+  <% } %>
+
+  </SELECT>
+
+<% } else { %>
+
+  <SCRIPT TYPE="text/javascript">
+    function <%= $opt{'prefix'} %>state_changed(what) {
+    }
+  </SCRIPT>
+
+  <INPUT TYPE="hidden" NAME="<%= $opt{'prefix'} %>county" VALUE="<%= $opt{'county'} %>">
+
+<% } %>
diff --git a/httemplate/edit/cust_main/select-state.html b/httemplate/edit/cust_main/select-state.html
new file mode 100644
index 000000000..98e685ab8
--- /dev/null
+++ b/httemplate/edit/cust_main/select-state.html
@@ -0,0 +1,27 @@
+<%
+
+  my %opt = @_;
+  foreach my $opt (qw( county state country prefix onchange disabled )) {
+    $opt{$_} = '' unless exists($opt{$_}) && defined($opt{$_});
+  }
+
+%>
+
+<SELECT NAME="<%= $opt{'prefix'} %>state" onChange="<%= $opt{'prefix'} %>state_changed(this); <%= $opt{'onchange'} %>" <%= $opt{'disabled'} %>>
+
+<% foreach my $state (
+     sort
+     map { $_->state }
+     qsearch( 'cust_main_county',
+              { 'country' => $opt{'country'} },
+              'DISTINCT ON ( state ) *',
+            )
+   ) {
+%>
+
+  <OPTION VALUE="<%= $state %>"<%= $state eq $opt{'state'} ? ' SELECTED' : '' %>><%= $state || '(n/a)' %>
+
+<% } %>
+
+</SELECT>
+
-- 
cgit v1.2.1


From 0186436eb38e70da0a015e49dab67cec5f1a3467 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Sep 2005 12:49:51 +0000
Subject: add prepaid support which sets RADIUS Expiration attribute, update
 customer view package UI

---
 httemplate/edit/REAL_cust_pkg.cgi | 162 ++++++++++++++++++++++++--------------
 1 file changed, 101 insertions(+), 61 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 2f6be7cad..78dd0fafa 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,6 +1,4 @@
-<!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.9 2005-02-27 11:05:35 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
@@ -33,17 +31,20 @@ if ( $error ) {
 }
 
 #my $custnum = $cust_pkg->getfield('custnum');
-print header('Package Edit'); #, menubar(
+%>
+
+<%= header('Customer package - Edit dates') %>
+<%
+#, menubar(
 #  "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
 #  'Main Menu' => popurl(2)
 #));
-
 %>
 
-    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
+<LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+<SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
 
 <%
 
@@ -57,67 +58,106 @@ my($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
 my($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
 my $otaker = $cust_pkg->getfield('otaker');
 
-print '<FORM NAME="formname" ACTION="process/REAL_cust_pkg.cgi" METHOD="POST">',      qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
+%>
+
+<FORM NAME="formname" ACTION="process/REAL_cust_pkg.cgi" METHOD="POST">
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%= $pkgnum %>">
+
+<% if ( $error ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $error %></FONT>
+<% } %>
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>!
-  if $error;
+<%
 
 #my $format = "%c %z (%Z)";
 my $format = "%m/%d/%Y %T %z (%Z)";
 
-print ntable("#cccccc",2),
-      '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
-      $pkgnum, '</TD></TR>',
-      '<TR><TD ALIGN="right">Package</TD><TD BGCOLOR="#ffffff">',
-      $pkg,  '</TD></TR>',
-      '<TR><TD ALIGN="right">Comment</TD><TD BGCOLOR="#ffffff">',
-      $comment,  '</TD></TR>',
-      '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
-      $otaker,  '</TD></TR>',
-      '<TR><TD ALIGN="right">Setup date</TD><TD>'.
-      '<INPUT TYPE="text" NAME="setup" SIZE=32 ID="setup_text" VALUE="',
-      ( $setup ? time2str($format, $setup) : "" ), '">'.
-      ' <IMG SRC="../images/calendar.png" ID="setup_button" STYLE="cursor: pointer" TITLE="Select date">'.
-      '</TD></TR>';
-
-print '<TR><TD ALIGN="right">Last bill date</TD><TD>',
-      '<INPUT TYPE="text" NAME="last_bill" SIZE=32 ID="last_bill_text" VALUE="',
-      ( $cust_pkg->last_bill
-        ? time2str($format, $cust_pkg->last_bill)
-        : ""                                          ),
-      '">'.
-      ' <IMG SRC="../images/calendar.png" ID="last_bill_button" STYLE="cursor: pointer" TITLE="Select date">'.
-      '</TD></TR>'
-  if $cust_pkg->dbdef_table->column('last_bill');
-
-print '<TR><TD ALIGN="right">Next bill date</TD><TD>',
-      '<INPUT TYPE="text" NAME="bill" SIZE=32 ID="bill_text" VALUE="',
-      ( $bill ? time2str($format, $bill) : "" ), '">'.
-      ' <IMG SRC="../images/calendar.png" ID="bill_button" STYLE="cursor: pointer" TITLE="Select date">'.
-      '</TD></TR>';
-
-print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
-       time2str($format, $susp), '</TD></TR>'
-  if $susp;
-
-#print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
-#       time2str("%D",$expire), '</TD></TR>'
-#  if $expire;
-print '<TR><TD ALIGN="right">Expiration date'.
-      '</TD><TD>',
-      '<INPUT TYPE="text" NAME="expire" SIZE=32 ID="expire_text" VALUE="',
-      ( $expire ? time2str($format, $expire) : "" ), '">'.
-      ' <IMG SRC="../images/calendar.png" ID="expire_button" STYLE="cursor: pointer" TITLE="Select date">'.
-      '<BR><FONT SIZE=-1>(will <b>cancel</b> this package'.
-      ' when the date is reached)</FONT>'.
-      '</TD></TR>';
-
-print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
-       time2str($format, $cancel), '</TD></TR>'
-  if $cancel;
+#false laziness w/view/cust_main/packages.html
+#my( $billed_or_prepaid,
+my( $last_bill_or_renewed, $next_bill_or_prepaid_until );
+unless ( $part_pkg->is_prepaid ) {
+  #$billed_or_prepaid = 'billed';
+  $last_bill_or_renewed = 'Last bill';
+  $next_bill_or_prepaid_until = 'Next bill';
+} else {
+  #$billed_or_prepaid = 'prepaid';
+  $last_bill_or_renewed = 'Renewed';
+  $next_bill_or_prepaid_until = 'Prepaid until';
+}
 
 %>
+
+<%= ntable("#cccccc",2) %>
+
+  <TR>
+    <TD ALIGN="right">Package number</TD>
+    <TD BGCOLOR="#ffffff"><%= $pkgnum %></TD>
+  </TR>
+
+  <TR>
+    <TD ALIGN="right">Package</TD>
+    <TD BGCOLOR="#ffffff"><%= $pkg %></TD>
+  </TR>
+
+  <TR>
+    <TD ALIGN="right">Comment</TD>
+    <TD BGCOLOR="#ffffff"><%= $comment %></TD>
+  </TR>
+
+  <TR>
+    <TD ALIGN="right">Order taker</TD>
+    <TD BGCOLOR="#ffffff"><%= $otaker %></TD>
+  </TR>
+
+  <TR>
+    <TD ALIGN="right">Setup date</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="setup" SIZE=32 ID="setup_text" VALUE="<%= ( $setup ? time2str($format, $setup) : "" ) %>">
+      <IMG SRC="../images/calendar.png" ID="setup_button" STYLE="cursor: pointer" TITLE="Select date">
+    </TD>
+  </TR>
+
+  <TR>
+    <TD ALIGN="right"><%= $last_bill_or_renewed %> date</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="last_bill" SIZE=32 ID="last_bill_text" VALUE="<%= ( $cust_pkg->last_bill ? time2str($format, $cust_pkg->last_bill) : "" ) %>">
+      <IMG SRC="../images/calendar.png" ID="last_bill_button" STYLE="cursor: pointer" TITLE="Select date">
+    </TD>
+  </TR>
+
+  <TR>
+    <TD ALIGN="right"><%= $next_bill_or_prepaid_until %> date</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="bill" SIZE=32 ID="bill_text" VALUE="<%= ( $bill ? time2str($format, $bill) : "" ) %>">
+      <IMG SRC="../images/calendar.png" ID="bill_button" STYLE="cursor: pointer" TITLE="Select date">
+    </TD>
+  </TR>
+
+  <% if ( $susp ) { %>
+    <TR>
+      <TD ALIGN="right">Suspension date</TD>
+      <TD BGCOLOR="#ffffff"><%= time2str($format, $susp) %></TD>
+    </TR>
+  <% } %>
+
+  <TR>
+    <TD ALIGN="right">Expiration date</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="expire" SIZE=32 ID="expire_text" VALUE="<%= ( $expire ? time2str($format, $expire) : "" ) %>">
+      <IMG SRC="../images/calendar.png" ID="expire_button" STYLE="cursor: pointer" TITLE="Select date">
+      <BR><FONT SIZE=-1>(will <b>cancel</b> this package when the date is reached)</FONT>
+    </TD>
+  </TR>
+
+  <% if ( $cancel ) { %>
+    <TR>
+      <TD ALIGN="right">Cancellation date</TD>
+      <TD BGCOLOR="#ffffff"><%= time2str($format, $cancel) %></TD>
+    </TR>
+  <% } %>
+
 </TABLE>
+
 <SCRIPT TYPE="text/javascript">
 <%
   my @cal = qw( setup bill expire );
-- 
cgit v1.2.1


From 76161f1a2ae0f96470bed4089b00eff5abb16cff Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 25 Sep 2005 08:13:36 +0000
Subject: get rid of JSRS iframe foo for progress bar, use XMLHTTPRequest
 instead.  really should have done that in the first place.  JSON will wait
 until another day...

---
 httemplate/edit/cust_main/select-country.html | 6 +++++-
 httemplate/edit/cust_main/select-county.html  | 6 +++++-
 httemplate/edit/process/part_svc.cgi          | 5 ++---
 httemplate/edit/process/rate.cgi              | 5 ++---
 4 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main/select-country.html b/httemplate/edit/cust_main/select-country.html
index 44f4f0a55..014effd66 100644
--- a/httemplate/edit/cust_main/select-country.html
+++ b/httemplate/edit/cust_main/select-country.html
@@ -10,7 +10,11 @@
 
 %>
 
-<%= include('/elements/xmlhttp.html', $p.'misc/states.cgi', $opt{'prefix'}. 'get_states') %>
+<%= include('/elements/xmlhttp.html',
+              'url'  => $p.'misc/states.cgi',
+              'subs' => [ $opt{'prefix'}. 'get_states' ],
+           )
+%>
 
 <SCRIPT TYPE="text/javascript">
 
diff --git a/httemplate/edit/cust_main/select-county.html b/httemplate/edit/cust_main/select-county.html
index 70a8f9477..3de380b31 100644
--- a/httemplate/edit/cust_main/select-county.html
+++ b/httemplate/edit/cust_main/select-county.html
@@ -15,7 +15,11 @@
 
 <% if ( $countyflag ) { %>
 
-  <%= include('/elements/xmlhttp.html', $p.'misc/counties.cgi', $opt{'prefix'}. 'get_counties' ) %>
+  <%= include('/elements/xmlhttp.html',
+                'url'  => $p.'misc/counties.cgi',
+                'subs' => [ $opt{'prefix'}. 'get_counties' ],
+             )
+%>
   
   <SCRIPT TYPE="text/javascript">
   
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
index 664e5212a..b92b62739 100755
--- a/httemplate/edit/process/part_svc.cgi
+++ b/httemplate/edit/process/part_svc.cgi
@@ -1,4 +1,3 @@
 <%
-my $server = new FS::UI::Web::JSRPC 'FS::part_svc::process';
-$server->process;
-%>
+  my $server = new FS::UI::Web::JSRPC 'FS::part_svc::process', $cgi;
+%><%= $server->process %>
diff --git a/httemplate/edit/process/rate.cgi b/httemplate/edit/process/rate.cgi
index 005caf90a..0030b5754 100755
--- a/httemplate/edit/process/rate.cgi
+++ b/httemplate/edit/process/rate.cgi
@@ -1,4 +1,3 @@
 <%
-my $server = new FS::UI::Web::JSRPC 'FS::rate::process';
-$server->process;
-%>
+  my $server = new FS::UI::Web::JSRPC 'FS::rate::process';
+%><%= $server->process %>
-- 
cgit v1.2.1


From a5bbbed61e09dffffc5d7022cddb3f9ff62a955a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 3 Oct 2005 01:42:22 +0000
Subject: update account view and edit: convert to proper templates, make sure
 usage information displays for any usage-capable export, add ability to edit
 uid/gid

---
 httemplate/edit/svc_acct.cgi | 449 ++++++++++++++++++++++++++++---------------
 1 file changed, 297 insertions(+), 152 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index a730531f5..bc5d96aab 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
@@ -6,6 +5,7 @@ my @shells = $conf->config('shells');
 
 my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct, @groups);
 if ( $cgi->param('error') ) {
+
   $svc_acct = new FS::svc_acct ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_acct')
   } );
@@ -15,7 +15,9 @@ if ( $cgi->param('error') ) {
   $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
   die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
   @groups = $cgi->param('radius_usergroup');
+
 } else {
+
   my($query) = $cgi->keywords;
   if ( $query =~ /^(\d+)$/ ) { #editing
     $svcnum=$1;
@@ -46,35 +48,43 @@ if ( $cgi->param('error') ) {
 
     $svcnum='';
 
-    #set gecos
-    my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-    if ($cust_pkg) {
-      my($cust_main)=qsearchs('cust_main',{'custnum'=> $cust_pkg->custnum } );
-      unless ( $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
-        $svc_acct->setfield('finger',
-          $cust_main->getfield('first') . " " . $cust_main->getfield('last')
-        );
-      }
-    }
+  }
+}
+
+my( $cust_pkg, $cust_main ) = ( '', '' );
+if ( $pkgnum ) {
+  $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
+  $cust_main = $cust_pkg->cust_main;
+}
+
+unless ( $svcnum || $cgi->param('error') ) { #adding
 
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      if ( $part_svc_column->columnname eq 'usergroup' ) {
-        @groups = split(',', $part_svc_column->columnvalue);
-      } else {
-        $svc_acct->setfield( $part_svc_column->columnname,
-                             $part_svc_column->columnvalue,
-                           );
-      }
+  #set gecos
+  if ($cust_main) {
+    unless ( $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
+      $svc_acct->setfield('finger',
+        $cust_main->getfield('first') . " " . $cust_main->getfield('last')
+      );
     }
+  }
 
+  #set fixed and default fields from part_svc
+  foreach my $part_svc_column (
+    grep { $_->columnflag } $part_svc->all_part_svc_column
+  ) {
+    if ( $part_svc_column->columnname eq 'usergroup' ) {
+      @groups = split(',', $part_svc_column->columnvalue);
+    } else {
+      $svc_acct->setfield( $part_svc_column->columnname,
+                           $part_svc_column->columnvalue,
+                         );
+    }
   }
+
 }
 
 #fixed radius groups always override & display
-if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
+if ( $part_svc->part_svc_column('usergroup')->columnflag eq 'F' ) {
   @groups = split(',', $part_svc->part_svc_column('usergroup')->columnvalue);
 }
 
@@ -106,47 +116,81 @@ my $pmax = $conf->config('passwordmax') || 8;
 my $pmax2 = $pmax+2;
 
 my $p1 = popurl(1);
-print header("$action $svc account");
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT><BR><BR>"
-  if $cgi->param('error');
-
-print 'Service # '. ( $svcnum ? "<B>$svcnum</B>" : " (NEW)" ). '<BR>'.
-      'Service: <B>'. $part_svc->svc. '</B><BR><BR>'.
-      <<END;
-    <FORM NAME="OneTrueForm" ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
-      <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
-      <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-      <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
-END
-
-print &ntable("#cccccc",2), <<END;
-<TR><TD ALIGN="right">Username</TD>
-<TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
-<TR><TD ALIGN="right">Password</TD>
-<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=$pmax2 MAXLENGTH=$pmax>
-(blank to generate)</TD>
+
+%>
+
+<%= header("$action $svc account") %>
+
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+  <BR><BR>
+<% } %>
+
+<% if ( $cust_main ) { %>
+  <%= include( '/elements/small_custview.html', $cust_main, '', 1 ) %>
+  <BR>
+<% } %>
+
+<FORM NAME="OneTrueForm" ACTION="<%= $p1 %>process/svc_acct.cgi" METHOD=POST>
+<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%= $svcnum %>">
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%= $pkgnum %>">
+<INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $svcpart %>">
+
+Service # <%= $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
+
+<%= ntable("#cccccc",2) %>
+
+<TR>
+  <TD ALIGN="right">Service</TD>
+  <TD BGCOLOR="#eeeeee"><%= $part_svc->svc %></TD>
+</TR>
+
+<TR>
+  <TD ALIGN="right">Username</TD>
+  <TD>
+    <INPUT TYPE="text" NAME="username" VALUE="<%= $username %>" SIZE=<%= $ulen2 %> MAXLENGTH=<%= $ulen %>>
+  </TD>
+</TR>
+
+<TR>
+  <TD ALIGN="right">Password</TD>
+  <TD>
+    <INPUT TYPE="text" NAME="_password" VALUE="<%= $password %>" SIZE=<%= $pmax2 %> MAXLENGTH=<%= $pmax %>>
+    (blank to generate)
+  </TD>
 </TR>
-END
 
+
+<%
 my $sec_phrase = $svc_acct->sec_phrase;
 if ( $conf->exists('security_phrase') ) {
-  print <<END;
-  <TR><TD ALIGN="right">Security phrase</TD>
-  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase" SIZE=32>
-    (for forgotten passwords)</TD>
+%>
+
+  <TR>
+    <TD ALIGN="right">Security phrase</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="sec_phrase" VALUE="<%= $sec_phrase %>" SIZE=32>
+      (for forgotten passwords)
+    </TD>
   </TD>
-END
-} else {
-  print qq!<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="$sec_phrase">!;
-}
 
+<% } else { %>
+
+  <INPUT TYPE="hidden" NAME="sec_phrase" VALUE="<%= $sec_phrase %>">
+
+<% } %>
+
+
+<%
 #domain
 my $domsvc = $svc_acct->domsvc || 0;
 if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
-  print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
-} else { 
+%>
+
+  <INPUT TYPE="hidden" NAME="domsvc" VALUE="<%= $domsvc %>">
+
+<% } else { 
+
   my %svc_domain = ();
 
   if ( $domsvc ) {
@@ -170,7 +214,6 @@ if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
     }
   }
 
-  my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
   if ($cust_pkg && !$conf->exists('svc_acct-alldomains') ) {
     my @cust_svc =
       map { qsearch('cust_svc', { 'pkgnum' => $_->pkgnum } ) }
@@ -183,121 +226,223 @@ if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
   } else {
     %svc_domain = map { $_->svcnum => $_ } qsearch('svc_domain', {} );
   }
-  print qq!<TR><TD ALIGN="right">Domain</TD>!.
-        qq!<TD><SELECT NAME="domsvc" SIZE=1>\n!;
-  foreach my $svcnum (
-    sort { $svc_domain{$a}->domain cmp $svc_domain{$b}->domain }
-      keys %svc_domain
-  ) {
-    my $svc_domain = $svc_domain{$svcnum};
-    print qq!<OPTION VALUE="!. $svc_domain->svcnum. qq!"!.
-          ( $svc_domain->svcnum == $domsvc ? ' SELECTED' : '' ).
-          '>'. $svc_domain->domain. "\n" ;
-  }
-  print "</SELECT></TD></TR>";
-}
 
+%>
+
+  <TR>
+    <TD ALIGN="right">Domain</TD>
+    <TD>
+      <SELECT NAME="domsvc" SIZE=1>
+
+        <% foreach my $svcnum (
+             sort { $svc_domain{$a}->domain cmp $svc_domain{$b}->domain }
+                  keys %svc_domain
+           ) {
+             my $svc_domain = $svc_domain{$svcnum};
+        %>
+
+             <OPTION VALUE="<%= $svc_domain->svcnum %>" <%= $svc_domain->svcnum == $domsvc ? ' SELECTED' : '' %>><%= $svc_domain->domain %>
+
+       <% } %>
+      </SELECT>
+    </TD>
+  </TR>
+
+<% } %>
+
+
+<%
 #pop
 my $popnum = $svc_acct->popnum || 0;
-if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
-  print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$popnum">!;
-} else { 
-  print qq!<TR><TD ALIGN="right">Access number</TD>!.
-        qq!<TD>!. FS::svc_acct_pop::popselector($popnum). '</TD></TR>';
-}
+if ( $part_svc->part_svc_column('popnum')->columnflag eq 'F' ) {
+%>
 
-my($uid,$gid,$finger,$dir)=(
-  $svc_acct->uid,
-  $svc_acct->gid,
-  $svc_acct->finger,
-  $svc_acct->dir,
-);
+  <INPUT TYPE="hidden" NAME="popnum" VALUE="<%= $popnum %>">
 
-print <<END;
-<INPUT TYPE="hidden" NAME="uid" VALUE="$uid">
-<INPUT TYPE="hidden" NAME="gid" VALUE="$gid">
-END
 
-if ( !$finger && $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
-  print '<INPUT TYPE="hidden" NAME="finger" VALUE="">';
-} else {
-  print '<TR><TD ALIGN="right">GECOS</TD>'.
-        qq!<TD><INPUT TYPE="text" NAME="finger" VALUE="$finger"></TD></TR>!;
-}
-print qq!<INPUT TYPE="hidden" NAME="dir" VALUE="$dir">!;
+<% } else { %>
+
+  <TR>
+    <TD ALIGN="right">Access number</TD>
+    <TD><%= FS::svc_acct_pop::popselector($popnum) %></TD>
+  </TR>
+
+<% } %>
+
 
+<% #uid/gid %>
+<% foreach my $xid (qw( uid gid )) { %>
+
+  <%
+  if ( $part_svc->part_svc_column($xid)->columnflag eq 'F'
+       || ! $conf->exists("svc_acct-edit_$xid")
+     ) {
+  %>
+  
+    <% if ( length($svc_acct->$xid()) ) { %>
+  
+      <TR>
+        <TD ALIGN="right"><%= uc($xid) %></TD>
+          <TD BGCOLOR="#eeeeee"><%= $svc_acct->$xid() %></TD>
+        <TD>
+        </TD>
+      </TR>
+  
+    <% } else { %>
+  
+      <INPUT TYPE="hidden" NAME="<%= $xid %>" VALUE="<%= $svc_acct->$xid() %>">
+  
+    <% } %>
+  
+  <% } else { %>
+  
+    <TR>
+      <TD ALIGN="right"><%= uc($xid) %></TD>
+      <TD>
+        <INPUT TYPE="text" NAME="<%= $xid %>" SIZE=8 MAXLENGTH=6 VALUE="<%= $svc_acct->$xid() %>">
+      </TD>
+    </TR>
+  
+  <% } %>
+
+<% } %>
+
+
+<%
+#finger
+if ( $part_svc->part_svc_column('uid')->columnflag eq 'F'
+     && ! $svc_acct->finger ) { 
+%>
+
+  <INPUT TYPE="hidden" NAME="finger" VALUE="">
+
+<% } else { %>
+
+  <TR>
+    <TD ALIGN="right">GECOS</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="finger" VALUE="<%= $svc_acct->finger %>">
+    </TD>
+  </TR>
+
+<% } %>
+
+
+<INPUT TYPE="hidden" NAME="dir" VALUE="<%= $svc_acct->dir %>">
+
+
+<%
+#shell
 my $shell = $svc_acct->shell;
-if ( $part_svc->part_svc_column('shell')->columnflag eq "F"
+if ( $part_svc->part_svc_column('shell')->columnflag eq 'F'
      || ( !$shell && $part_svc->part_svc_column('uid')->columnflag eq 'F' )
    ) {
-  print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
-} else {
-  print qq!<TR><TD ALIGN="right">Shell</TD><TD><SELECT NAME="shell" SIZE=1>!;
-  my($etc_shell);
-  foreach $etc_shell (@shells) {
-    print "<OPTION", $etc_shell eq $shell ? ' SELECTED' : '', ">",
-          $etc_shell, "\n";
-  }
-  print "</SELECT></TD></TR>";
-}
+%>
 
-my($quota,$slipip)=(
-  $svc_acct->quota,
-  $svc_acct->slipip,
-);
+  <INPUT TYPE="hidden" NAME="shell" VALUE="<%= $shell %>">
 
-if ( $part_svc->part_svc_column('quota')->columnflag eq "F" )
-{
-  print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
-} else {
-  print <<END;
-    <TR><TD ALIGN="right">Quota:</TD>
-        <TD> <INPUT TYPE="text" NAME="quota" VALUE="$quota" ></TD>
-    </TR>
-END
-}
+<% } else { %>
+
+  <TR>
+    <TD ALIGN="right">Shell</TD>
+    <TD>
+      <SELECT NAME="shell" SIZE=1>
+
+        <%
+           my($etc_shell);
+           foreach $etc_shell (@shells) {
+        %>
+
+          <OPTION<%= $etc_shell eq $shell ? ' SELECTED' : '' %>><%= $etc_shell %>
+
+        <% } %>
+
+      </SELECT>
+    </TD>
+  </TR>
+
+<% } %>
+
+
+<% if ( $part_svc->part_svc_column('quota')->columnflag eq 'F' ) { %>
+
+  <INPUT TYPE="hidden" NAME="quota" VALUE="<%= $svc_acct->quota %>">
+
+<% } else { %>
+
+  <TR>
+    <TD ALIGN="right">Quota:</TD>
+    <TD><INPUT TYPE="text" NAME="quota" VALUE="<%= $svc_acct->quota %>"></TD>
+  </TR>
+  
+<% } %>
 
-if ( $part_svc->part_svc_column('slipip')->columnflag eq "F" ) {
-  print qq!<INPUT TYPE="hidden" NAME="slipip" VALUE="$slipip">!;
-} else {
-  print qq!<TR><TD ALIGN="right">IP</TD><TD><INPUT TYPE="text" NAME="slipip" VALUE="$slipip"></TD></TR>!;
-}
 
+<% if ( $part_svc->part_svc_column('slipip')->columnflag eq 'F' ) { %>
+
+  <INPUT TYPE="hidden" NAME="slipip" VALUE="<%= $svc_acct->slipip %>">
+
+<% } else { %>
+
+  <TR>
+    <TD ALIGN="right">IP</TD>
+    <TD><INPUT TYPE="text" NAME="slipip" VALUE="<%= $svc_acct->slipip %>"></TD>
+  </TR>
+
+<% } %>
+
+
+<%
 foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
   $r =~ /^^r(adius|[cr])_(.+)$/ or next; #?
   my $a = $2;
-  if ( $part_svc->part_svc_column($r)->columnflag eq 'F' ) {
-    print qq!<INPUT TYPE="hidden" NAME="$r" VALUE="!.
-          $svc_acct->getfield($r). '">';
-  } else {
-    print qq!<TR><TD ALIGN="right">$FS::raddb::attrib{$a}</TD><TD><INPUT TYPE="text" NAME="$r" VALUE="!.
-          $svc_acct->getfield($r). '"></TD></TR>';
-  }
-}
+%>
 
-print '<TR><TD ALIGN="right">RADIUS groups</TD>';
-if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
-  print '<TD BGCOLOR="#ffffff">'. join('<BR>', @groups);
-} else {
-  print '<TD>'. &FS::svc_acct::radius_usergroup_selector( \@groups );
-}
-print '</TD></TR>';
+  <% if ( $part_svc->part_svc_column($r)->columnflag eq 'F' ) { %>
 
-foreach my $field ($svc_acct->virtual_fields) {
-  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
-    # If the flag is X, it won't even show up in $svc_acct->virtual_fields.
-    print $svc_acct->pvf($field)->widget('HTML', 'edit', 
-        $svc_acct->getfield($field));
-  }
-}
+    <INPUT TYPE="hidden" NAME="<%= $r %>" VALUE="<%= $svc_acct->getfield($r) %>">
+
+  <% } else { %>
+
+    <TR>
+      <TD ALIGN="right"><%= $FS::raddb::attrib{$a} %></TD>
+      <TD><INPUT TYPE="text" NAME="<%= $r %>" VALUE="<%= $svc_acct->getfield($r) %>"></TD>
+    </TR>
+
+  <% } %>
+
+<% } %>
+
+
+<TR>
+  <TD ALIGN="right">RADIUS groups</TD>
+
+  <% if ( $part_svc->part_svc_column('usergroup')->columnflag eq 'F' ) { %>
+
+    <TD BGCOLOR="#eeeeee"><%= join('<BR>', @groups) %></TD>
+
+  <% } else { %>
+
+    <TD><%= FS::svc_acct::radius_usergroup_selector( \@groups ) %></TD>
+
+  <% } %>
+
+</TR>
+
+<% foreach my $field ($svc_acct->virtual_fields) { %>
+
+  <% # If the flag is X, it won't even show up in $svc_acct->virtual_fields. %>
+  <% if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) { %>
+
+    <%= $svc_acct->pvf($field)->widget('HTML', 'edit', $svc_acct->getfield($field)) %>
+
+  <% } %>
+
+<% } %>
   
-#submit
-print qq!</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">!; 
+</TABLE>
+<BR>
 
-print <<END;
-    </FORM>
-  </BODY>
-</HTML>
-END
+<INPUT TYPE="submit" VALUE="Submit">
 
-%>
+</FORM></BODY></HTML>
-- 
cgit v1.2.1


From a25c3f9493bf910a5e8bfe586c66c1ba5d6c8210 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Oct 2005 01:40:35 +0000
Subject: fix bug with IE and advertising sources (refnum) - needed to make
 sure the SELECT OPTIONs have explicitly specified VALUEs

---
 httemplate/edit/cust_main.cgi | 88 +++++++++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 41 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index d10b21a4a..bfd396881 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -104,59 +104,65 @@ my $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
   </SELECT>
 <% } %>
 
+<!-- referral (advertising source) -->
+
 <%
+my $refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
+if ( $custnum && ! $conf->exists('editreferrals') ) {
+%>
 
-# (referral and referring customer still need to be "template"ized)
+  <INPUT TYPE="hidden" NAME="refnum" VALUE="<%= $refnum %>">
 
-#referral
+<%
+ } else {
 
-my $refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
-if ( $custnum && ! $conf->exists('editreferrals') ) {
-  print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
-} else {
-  my(@referrals) = qsearch('part_referral',{});
-  if ( scalar(@referrals) == 0 ) {
-    eidiot "You have not created any advertising sources.  You must create at least one advertising source before adding a customer.  Go to ". popurl(2). "browse/part_referral.cgi and create one or more advertising sources.";
-  } elsif ( scalar(@referrals) == 1 ) {
-    $refnum ||= $referrals[0]->refnum;
-    print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
-  } else {
-    print qq!<BR><BR>${r}Advertising source <SELECT NAME="refnum" SIZE="1">!;
-    print "<OPTION> " unless $refnum;
-    my($referral);
-    foreach $referral (sort {
-      $a->refnum <=> $b->refnum;
-    } @referrals) {
-      print "<OPTION" . " SELECTED"x($referral->refnum==$refnum),
-      ">", $referral->refnum, ": ", $referral->referral;
-    }
-    print "</SELECT>";
-  }
-}
+   my(@referrals) = qsearch('part_referral',{});
+   if ( scalar(@referrals) == 0 ) {
+     eidiot "You have not created any advertising sources.  You must create at least one advertising source before adding a customer.  Go to ". popurl(2). "browse/part_referral.cgi and create one or more advertising sources.";
+   } elsif ( scalar(@referrals) == 1 ) {
+     $refnum ||= $referrals[0]->refnum;
+%>
+
+     <INPUT TYPE="hidden" NAME="refnum" VALUE="<%= $refnum %>">
+
+<% } else { %>
 
-#referring customer
+     <BR><BR><%=$r%>Advertising source 
+     <SELECT NAME="refnum" SIZE="1">
+       <%= $refnum ? '' : '<OPTION VALUE="">' %>
+       <% foreach my $referral (sort { $a->refnum <=> $b->refnum } @referrals) { %>
+         <OPTION VALUE="<%= $referral->refnum %>" <%= $referral->refnum == $refnum ? 'SELECTED' : '' %>><%= $referral->refnum %>: <%= $referral->referral %>
+       <% } %>
+     </SELECT>
+<% } %>
+
+<% } %>
+
+<!-- referring customer -->
 
-#print qq!<BR><BR>Referring Customer: !;
+<%
 my $referring_cust_main = '';
 if ( $cust_main->referral_custnum
      and $referring_cust_main =
            qsearchs('cust_main', { custnum => $cust_main->referral_custnum } )
 ) {
-  print '<BR><BR>Referring Customer: <A HREF="'. popurl(1). '/cust_main.cgi?'.
-        $cust_main->referral_custnum. '">'.
-        $cust_main->referral_custnum. ': '.
-        ( $referring_cust_main->company
-          || $referring_cust_main->last. ', '. $referring_cust_main->first ).
-        '</A><INPUT TYPE="hidden" NAME="referral_custnum" VALUE="'.
-        $cust_main->referral_custnum. '">';
-} elsif ( ! $conf->exists('disable_customer_referrals') ) {
-  print '<BR><BR>Referring customer number: <INPUT TYPE="text" NAME="referral_custnum" VALUE="">';
-} else {
-  print '<INPUT TYPE="hidden" NAME="referral_custnum" VALUE="">';
-}
-
 %>
 
+  <BR><BR>Referring Customer: 
+  <A HREF="<%= popurl(1) %>/cust_main.cgi?<%= $cust_main->referral_custnum %>"><%= $cust_main->referral_custnum %>: <%= $referring_cust_main->name %></A>
+  <INPUT TYPE="hidden" NAME="referral_custnum" VALUE="<%= $cust_main->referral_custnum %>">
+
+<% } elsif ( ! $conf->exists('disable_customer_referrals') ) { %>
+
+  <BR><BR>Referring customer number: 
+  <INPUT TYPE="text" NAME="referral_custnum" VALUE="">
+
+<% } else { %>
+
+  <INPUT TYPE="hidden" NAME="referral_custnum" VALUE="">
+
+<% } %>
+
 <!-- contact info -->
 
 <BR><BR>
@@ -306,7 +312,7 @@ function copyelement(from, to) {
       to.value = from.value;
     }
   }
-  //alert(from + ": " + to.name + " => " + to.value);
+  //alert(from + " (" + from.type + "): " + to.name + " => " + to.value);
 }
 
 </SCRIPT>
-- 
cgit v1.2.1


From 7a97ed31c38e975c6548083039ff2ce31c6d8cf3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 7 Oct 2005 02:25:41 +0000
Subject: add require_taxclasses config flag

---
 httemplate/edit/process/quick-charge.cgi | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi
index 477f58508..9d9aa980a 100644
--- a/httemplate/edit/process/quick-charge.cgi
+++ b/httemplate/edit/process/quick-charge.cgi
@@ -9,15 +9,24 @@ $cgi->param('amount') =~ /^\s*(\d+(\.\d{1,2})?)\s*$/
   or die 'illegal amount '. $cgi->param('amount');
 my $amount = $1;
 
-my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
-  or die "unknown custnum $custnum";
-
-my $error = $cust_main->charge(
-  $amount,
-  $cgi->param('pkg'),
-  '$'. sprintf("%.2f",$amount),
-  $cgi->param('taxclass')
-);
+my( $error, $cust_main);
+if ( $cgi->param('taxclass') eq '(select)' ) {
+
+
+ $error = "Must select a tax class";
+} else {
+
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or die "unknown custnum $custnum";
+
+  $error = $cust_main->charge(
+    $amount,
+    $cgi->param('pkg'),
+    '$'. sprintf("%.2f",$amount),
+    $cgi->param('taxclass')
+  );
+
+}
 
 if ($error) {
 %>
-- 
cgit v1.2.1


From d1a885c65ac10e19bed0333a380dafeb42c2cef1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 8 Oct 2005 00:47:20 +0000
Subject: fix tax class selection in package add/edit too

---
 httemplate/edit/part_pkg.cgi             | 52 ++++++++++++--------------------
 httemplate/edit/process/part_pkg.cgi     |  9 +++++-
 httemplate/edit/process/quick-charge.cgi |  2 +-
 3 files changed, 29 insertions(+), 34 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index e6e10e73f..2c3808fe1 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
@@ -120,42 +119,31 @@ Tax information
   <TR>
     <TD ALIGN="right">Setup fee tax exempt</TD>
     <TD>
-<%
-
-print '<INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y"';
-print ' CHECKED' if $hashref->{setuptax} eq "Y";
-print '>';
+      <INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y" <%= $hashref->{setuptax} eq 'Y' ? ' CHECKED' : '' %>>
+    </TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right">Recurring fee tax exempt</TD>
+    <TD>
+      <INPUT TYPE="checkbox" NAME="recurtax" VALUE="Y" <%= $hashref->{recurtax} eq 'Y' ? ' CHECKED' : '' %>>
+    </TD>
+  </TR>
 
-print <<END;
-</TD></TR>
-<TR><TD ALIGN="right">Recurring fee tax exempt</TD><TD>
-END
+<% my $conf = new FS::Conf; %>
+<% if ( $conf->exists('enable_taxclasses') ) { %>
 
-print '<INPUT TYPE="checkbox" NAME="recurtax" VALUE="Y"';
-print ' CHECKED' if $hashref->{recurtax} eq "Y";
-print '>';
+  <TR>
+    <TD align="right">Tax class</TD>
+    <TD>
+      <%= include('/elements/select-taxclass.html', $hashref->{taxclass} ) %>
+    </TD>
+  </TR>
 
-print '</TD></TR>';
+<% } else { %>
 
-my $conf = new FS::Conf;
-#false laziness w/ view/cust_main.cgi quick order
-if ( $conf->exists('enable_taxclasses') ) {
-  print '<TR><TD ALIGN="right">Tax class</TD><TD><SELECT NAME="taxclass">';
-  my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
-    or die dbh->errstr;
-  $sth->execute or die $sth->errstr;
-  foreach my $taxclass ( map $_->[0], @{$sth->fetchall_arrayref} ) {
-    print qq!<OPTION VALUE="$taxclass"!;
-    print ' SELECTED' if $taxclass eq $hashref->{taxclass};
-    print qq!>$taxclass</OPTION>!;
-  }
-  print '</SELECT></TD></TR>';
-} else {
-  print
-    '<INPUT TYPE="hidden" NAME="taxclass" VALUE="'. $hashref->{taxclass}. '">';
-}
+  <%= include('/elements/select-taxclass.html', $hashref->{taxclass} ) %>
 
-%>
+<% } %>
 
 </TABLE>
 
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 1a7f52838..0d0a13491 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -29,12 +29,18 @@ my %pkg_svc = map { $_ => scalar($cgi->param("pkg_svc$_")) }
 
 my $error;
 my $custnum = '';
-if ( $pkgpart ) {
+if ( $cgi->param('taxclass') eq '(select)' ) {
+
+  $error = 'Must select a tax class';
+
+} elsif ( $pkgpart ) {
+
   $error = $new->replace( $old,
                           pkg_svc     => \%pkg_svc,
                           primary_svc => scalar($cgi->param('pkg_svc_primary')),
                         );
 } else {
+
   $error = $new->insert(  pkg_svc     => \%pkg_svc,
                           primary_svc => scalar($cgi->param('pkg_svc_primary')),
                           cust_pkg    => $cgi->param('pkgnum'),
@@ -42,6 +48,7 @@ if ( $pkgpart ) {
                        );
   $pkgpart = $new->pkgpart;
 }
+
 if ( $error ) {
   $cgi->param('error', $error );
   print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi
index 9d9aa980a..928e3daad 100644
--- a/httemplate/edit/process/quick-charge.cgi
+++ b/httemplate/edit/process/quick-charge.cgi
@@ -13,7 +13,7 @@ my( $error, $cust_main);
 if ( $cgi->param('taxclass') eq '(select)' ) {
 
 
- $error = "Must select a tax class";
+ $error = 'Must select a tax class';
 } else {
 
   my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
-- 
cgit v1.2.1


From 48d3428579044bda9a8471c31fa8f48b738e4ce1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Oct 2005 09:51:31 +0000
Subject: fix package customize losing services

---
 httemplate/edit/part_pkg.cgi | 101 ++++++++++++++++++-------------------------
 1 file changed, 42 insertions(+), 59 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 2c3808fe1..60365f628 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -28,7 +28,7 @@ if ( $cgi->param('clone') ) {
   $action = 'Custom Pricing';
   $clone_part_pkg= qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
   $part_pkg ||= $clone_part_pkg->clone;
-  $part_pkg->disabled('Y');
+  $part_pkg->disabled('Y'); #isn't sticky on errors
 } elsif ( $query && $query =~ /^(\d+)$/ ) {
   $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
   $pkgpart = $part_pkg->pkgpart;
@@ -59,21 +59,8 @@ my $hashref = $part_pkg->hashref;
   <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
 <% } %>
 
-<% #print '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>'; %>
-
 <FORM NAME="dummy">
 
-<%
-#if ( $cgi->param('clone') ) {
-#  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
-#}
-#if ( $cgi->param('pkgnum') ) {
-#  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
-#}
-#
-#print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
-%>
-
 <%= itable('',8,1) %><TR><TD VALIGN="top">
 
 Package information
@@ -157,15 +144,13 @@ $thead .=  '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Primary</FONT></TH>'
   if dbdef->table('pkg_svc')->column('primary_svc');
 $thead .= '<TH BGCOLOR="#dcdcdc">Service</TH></TR>';
 
-#unless ( $cgi->param('clone') ) {
-#dunno why...
-unless ( 0 ) {
-  #print <<END, $thead;
-  print <<END, itable('', 4, 1), '<TR><TD VALIGN="top">', $thead;
+%>
+
+<%= itable('', 4, 1) %><TR><TD VALIGN="top">
 <BR><BR>Services included
-END
-}
+<%= $thead %>
 
+<%
 
 my $where =  "WHERE disabled IS NULL OR disabled = ''";
 if ( $pkgpart ) {
@@ -175,7 +160,8 @@ if ( $pkgpart ) {
                         )";
 }
 my @part_svc = qsearch('part_svc', {}, '', $where);
-my %pkg_svc = map { $_->svcpart => $_ } $part_pkg->pkg_svc;
+my $q_part_pkg = $clone_part_pkg || $part_pkg;
+my %pkg_svc = map { $_->svcpart => $_ } $q_part_pkg->pkg_svc;
 
 my @fixups = ();
 my $count = 0;
@@ -192,45 +178,42 @@ foreach my $part_svc ( @part_svc ) {
 
   push @fixups, "pkg_svc$svcpart";
 
-  #unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
-  #dunno why...
-  unless ( 0 ) {
-    print '<TR>'; # if $count == 0 ;
-    print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=4 MAXLENGTH=3 VALUE="!,
-          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0,
-          qq!"></TD>!;
-    if ( dbdef->table('pkg_svc')->column('primary_svc') ) {
-      print qq!<TD><INPUT TYPE="radio" NAME="pkg_svc_primary" VALUE="$svcpart"!;
-      print ' CHECKED' if $pkg_svc->primary_svc =~ /^Y/i;
-      print '></TD>';
-    }
-    print qq!<TD><A HREF="part_svc.cgi?!,$part_svc->svcpart,
-          qq!">!, $part_svc->getfield('svc'), '</A>';
-    print ' (DISABLED)' if $part_svc->disabled =~ /^Y/i;
-    print '</TD></TR>';
-#    print "</TABLE></TD><TD>$thead" if ++$count == int(scalar(@part_svc) / 2);
-    $count+=1;
-    foreach ( 1 .. $columns-1 ) {
-      print "</TABLE></TD><TD VALIGN=\"top\">$thead"
-        if $count == int( $_ * scalar(@part_svc) / $columns );
-    }
-  } else {
-    print qq!<INPUT TYPE="hidden" NAME="pkg_svc$svcpart" VALUE="!,
-          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0, qq!">\n!;
-  }
-}
+%>
 
-#unless ( $cgi->param('clone') ) {
-#dunno why...
-unless ( 0 ) {
-  print "</TR></TABLE></TD></TR></TABLE>";
-  #print "</TR></TABLE>";
-}
+  <TR>
+    <TD>
+      <INPUT TYPE="text" NAME="pkg_svc<%= $svcpart %>" SIZE=4 MAXLENGTH=3 VALUE="<%= $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0 %>">
+    </TD>
+   
+    <TD>
+      <INPUT TYPE="radio" NAME="pkg_svc_primary" VALUE="<%= $svcpart %>" <%= $pkg_svc->primary_svc =~ /^Y/i ? ' CHECKED' : '' %>>
+    </TD>
 
-foreach my $f ( qw( clone pkgnum ) ) {
-  print qq!<INPUT TYPE="hidden" NAME="$f" VALUE="!. $cgi->param($f). '">';
-}
-print '<INPUT TYPE="hidden" NAME="pkgpart" VALUE="'. $part_pkg->pkgpart. '">';
+    <TD>
+      <A HREF="part_svc.cgi?<%= $part_svc->svcpart %>"><%= $part_svc->svc %></A>      <%= $part_svc->disabled =~ /^Y/i ? ' (DISABLED' : '' %>
+    </TD>
+  </TR>
+
+  <% $count++;
+     foreach ( 1 .. $columns-1 ) {
+       if ( $count == int( $_ * scalar(@part_svc) / $columns ) ) { 
+  %>
+         </TABLE></TD><TD VALIGN="top"><%= $thead %>
+
+  <%   }
+     }
+  %>
+
+<% } %>
+
+</TR></TABLE></TD></TR></TABLE>
+
+<% foreach my $f ( qw( clone pkgnum ) ) { %>
+  <INPUT TYPE="hidden" NAME="<%= $f %>" VALUE="<%= $cgi->param($f) %>">
+<% } %>
+<INPUT TYPE="hidden" NAME="pkgpart" VALUE="<%= $part_pkg->pkgpart %>">
+
+<%
 
 # prolly should be in database
 tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() };
-- 
cgit v1.2.1


From 591613cf1c861505335646fff3ffb4a705e011bf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 13 Oct 2005 21:17:18 +0000
Subject: Fix 'can't change uid' error when the account *has* a uid but
 svc_acct-edit_uid isn't turned on

---
 httemplate/edit/svc_acct.cgi | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index bc5d96aab..e74d84d53 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -288,12 +288,10 @@ if ( $part_svc->part_svc_column('popnum')->columnflag eq 'F' ) {
         </TD>
       </TR>
   
-    <% } else { %>
-  
-      <INPUT TYPE="hidden" NAME="<%= $xid %>" VALUE="<%= $svc_acct->$xid() %>">
-  
     <% } %>
   
+    <INPUT TYPE="hidden" NAME="<%= $xid %>" VALUE="<%= $svc_acct->$xid() %>">
+  
   <% } else { %>
   
     <TR>
-- 
cgit v1.2.1


From 4b4b3ca9cb0b7336293b759549b78fc903a7d8c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Oct 2005 11:29:54 +0000
Subject: agent option to select RT queue

---
 httemplate/edit/agent.cgi | 80 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 55 insertions(+), 25 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index 8a1cb2ae1..f8d0edc1a 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 my $agent;
@@ -16,6 +15,8 @@ if ( $cgi->param('error') ) {
 my $action = $agent->agentnum ? 'Edit' : 'Add';
 my $hashref = $agent->hashref;
 
+my $conf = new FS::Conf;
+
 %>
 
 <%= header("$action Agent", menubar(
@@ -32,45 +33,74 @@ my $hashref = $agent->hashref;
 Agent #<%= $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)" %>
 
 <%= &ntable("#cccccc", 2, '') %>
+
 <TR>
   <TH ALIGN="right">Agent</TH>
   <TD><INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="<%= $hashref->{agent} %>"></TD>
 </TR>
-<TR>
-  <TH ALIGN="right">Agent type</TH>
-  <TD><SELECT NAME="typenum" SIZE=1>
-
-<% foreach my $agent_type (qsearch('agent_type',{})) { %>
-  <OPTION VALUE="<%= $agent_type->typenum %>"<%= ( $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum ) ) ? ' SELECTED' : '' %>>
-  <%= $agent_type->getfield('typenum') %>: <%= $agent_type->getfield('atype') %>
-<% } %>
 
-</SELECT></TD>
-</TR>
-<% if ( dbdef->table('agent')->column('disabled') ) { %>
+  <TR>
+    <TH ALIGN="right">Agent type</TH>
+    <TD><SELECT NAME="typenum" SIZE=1>
+  
+  <% foreach my $agent_type (qsearch('agent_type',{})) { %>
+    <OPTION VALUE="<%= $agent_type->typenum %>"<%= ( $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum ) ) ? ' SELECTED' : '' %>>
+    <%= $agent_type->getfield('typenum') %>: <%= $agent_type->getfield('atype') %>
+  <% } %>
+  
+  </SELECT></TD>
+  </TR>
+  
   <TR>
     <TD ALIGN="right">Disable</TD>
     <TD><INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>></TD>
   </TR>
-<% } %>
-<TR>
-  <TD ALIGN="right"><!--Frequency--></TD>
-  <TD><INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right"><!--Program--></TD>
-  <TD><INPUT TYPE="hidden" NAME="prog" VALUE="<%= $hashref->{prog} %>"></TD>
-</TR>
-<% if ( dbdef->table('agent')->column('username') ) { %>
+  
+  <TR>
+    <TD ALIGN="right"><!--Frequency--></TD>
+    <TD><INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>"></TD>
+  </TR>
+  
+  <TR>
+    <TD ALIGN="right"><!--Program--></TD>
+    <TD><INPUT TYPE="hidden" NAME="prog" VALUE="<%= $hashref->{prog} %>"></TD>
+  </TR>
+
+  <% if ( $conf->config('ticket_system') ) {
+    my $default_queueid = $conf->config('ticket_system-default_queueid');
+    my $default_queue = FS::TicketSystem->queue($default_queueid);
+    $default_queue = "(default) $default_queueid: $default_queue"
+      if $default_queueid;
+    my %queues = FS::TicketSystem->queues();
+    my @queueids = sort { $a <=> $b } keys %queues;
+  %>
+    <TR>
+      <TD ALIGN="right">Ticketing</TD>
+      <TD>
+        <SELECT NAME="ticketing_queueid">
+          <OPTION VALUE=""><%= $default_queue %>
+          <% foreach my $queueid ( @queueids ) { %>
+            <OPTION VALUE="<%= $queueid %>" <%= $agent->ticketing_queueid == $queueid ? ' SELECTED' : '' %>><%= $queueid %>: <%= $queues{$queueid} %>
+          <% } %>
+        </SELECT>
+      </TD>
+    </TR>
+  <% } %>
+  
   <TR>
     <TD ALIGN="right">Agent interface username</TD>
-    <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $hashref->{username} %>"></TD>
+    <TD>
+      <INPUT TYPE="text" NAME="username" VALUE="<%= $hashref->{username} %>">
+    </TD>
   </TR>
+  
   <TR>
     <TD ALIGN="right">Agent interface password</TD>
-    <TD><INPUT TYPE="text" NAME="_password" VALUE="<%= $hashref->{_password} %>"></TD>
+    <TD>
+      <INPUT TYPE="text" NAME="_password" VALUE="<%= $hashref->{_password} %>">
+    </TD>
   </TR>
-<% } %>
+
 </TABLE>
 
 <BR><INPUT TYPE="submit" VALUE="<%= $hashref->{agentnum} ? "Apply changes" : "Add agent" %>">
-- 
cgit v1.2.1


From 83e2b55b1a2b69788bfb8b066192c4846a9f817f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 17 Oct 2005 06:03:59 +0000
Subject: fix RADIUS usergroup editing

---
 httemplate/edit/part_svc.cgi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index ea429678d..9749fc12d 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -23,7 +23,6 @@ my $hashref = $part_svc->hashref;
 
            #" onLoad=\"visualize()\""
 %>
-<!-- mason kludge -->
 <%= header("$action Service Definition",
            menubar( 'Main Menu'         => $p,
                     'View all service definitions' => "${p}browse/part_svc.cgi"
@@ -98,7 +97,7 @@ my %defs = (
                      select_label => 'domain',
                    },
     'usergroup' => {
-                     desc =>'ICRADIUS/FreeRADIUS groups',
+                     desc =>'RADIUS groups',
                      type =>'radius_usergroup_selector',
                    },
   },
-- 
cgit v1.2.1


From cccd0b7cd38a88c131e19981be38434f87abe194 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Oct 2005 15:21:37 +0000
Subject: add CASH and WEST payment types (payments only, not cust_main.payby)

---
 httemplate/edit/cust_main.cgi          |  5 +++-
 httemplate/edit/cust_main/billing.html | 54 ++++++++++++++++++++++++++++++++--
 httemplate/edit/cust_pay.cgi           | 46 +++++++++++++++++------------
 httemplate/edit/process/cust_main.cgi  |  3 ++
 4 files changed, 86 insertions(+), 22 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index bfd396881..e10c85f01 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -35,6 +35,7 @@ if ( $cgi->param('error') ) {
   $popnum = $cgi->param('popnum');
   @invoicing_list = split( /\s*,\s*/, $cgi->param('invoicing_list') );
   $same = $cgi->param('same');
+  $cust_main->setfield('paid' => $cgi->param('paid')) if $cgi->param('paid');
 } elsif ( $cgi->keywords ) { #editing
   my( $query ) = $cgi->keywords;
   $query =~ /^(\d+)$/;
@@ -261,7 +262,8 @@ function bottomfixup(what) {
     'payinfo', 'payinfo1', 'payinfo2',
     'payname', 'exp_month', 'exp_year', 'paycvv',
     'paystart_month', 'paystart_year', 'payissue',
-    'payip'
+    'payip',
+    'paid'
   );
 
   var billing_bottomvars = new Array(
@@ -340,6 +342,7 @@ function copyelement(from, to) {
      'payname', 'exp_month', 'exp_year', 'paycvv',
      'paystart_month', 'paystart_year', 'payissue',
      'payip',
+     'paid',
      
      'tax',
      'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX'
diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 17b1b0cc9..caac3a956 100644
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -4,6 +4,11 @@ my( $cust_main ) = @_;
 my $conf = new FS::Conf;
 my $payby_default = $conf->config('payby-default');
 
+my @payby = $conf->config('payby');
+#@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP ))
+@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP ))
+  unless grep /\w/, @payby;
+
 if ( $payby_default eq 'HIDE' ) {
 
   $cust_main->payby('BILL') unless $cust_main->payby;
@@ -294,15 +299,60 @@ if ( $payby_default eq 'HIDE' ) {
 
       '</TABLE>',
 
+    'CASH' =>
+
+      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
+
+        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Amount </TD>!.
+          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="paid" VALUE="!. ( $payby eq 'CASH' ? $cust_main->paid : '' ). qq!"></TD></TR>!.
+
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+
+      '</TABLE>',
+
+    'WEST' =>
+
+      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
+
+        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Amount </TD>!.
+          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="paid" VALUE="!. ( $payby eq 'WEST' ? $cust_main->paid : '' ). qq!"></TD></TR>!.
+
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+
+      '</TABLE>',
+
   );
 
-  tie my %options, 'Tie::IxHash',
+
+  my %allopt = (
     'CARD' => 'Credit card',
     'CHEK' => 'Electronic check',
     'LECB' => 'Phone bill billing',
     'BILL' => 'Billing',
+    'CASH' => 'Cash', # initial payment, then billing',
+    'WEST' => 'Western Union', # initial payment, then billing',
     'COMP' => 'Complimentary',
-  ;
+  );
+  if ( $cust_main->custnum ) { #don't offer CASH and WEST initial payment types
+                               # when editing customer
+    delete $allopt{$_} for qw(CASH WEST);
+  }
+  
+  tie my %options, 'Tie::IxHash',
+    map  { $_ => $allopt{$_} }
+    grep { exists $allopt{$_} }
+         @payby;
+
   my %payby2option = (
     ( map { $_ => $_ } keys %options ),
     'DCRD' => 'CARD',
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index c0a679b03..b2f3f55ff 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,8 +1,13 @@
-<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
 
+my %payby = (
+  'BILL' => 'Check',
+  'CASH' => 'Cash',
+  'WEST' => 'Western Union',
+);
+
 my($link, $linknum, $paid, $payby, $payinfo, $quickpay, $_date); 
 if ( $cgi->param('error') ) {
   $link     = $cgi->param('link');
@@ -12,31 +17,29 @@ if ( $cgi->param('error') ) {
   $payinfo  = $cgi->param('payinfo');
   $quickpay = $cgi->param('quickpay');
   $_date    = $cgi->param('_date') ? str2time($cgi->param('_date')) : time;
-} elsif ($cgi->keywords) {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $link     = 'invnum';
-  $linknum  = $1;
-  $paid     = '';
-  $payby    = 'BILL';
-  $payinfo  = "";
-  $quickpay = '';
-  $_date    = time;
-} elsif ( $cgi->param('custnum')  =~ /^(\d+)$/ ) {
+} elsif ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
   $link     = 'custnum';
   $linknum  = $1;
   $paid     = '';
-  $payby    = 'BILL';
+  $payby    = $cgi->param('payby') || 'BILL';
   $payinfo  = '';
   $quickpay = $cgi->param('quickpay');
   $_date    = time;
+} elsif ( $cgi->param('invnum') =~ /^(\d+)$/ ) {
+  $link     = 'invnum';
+  $linknum  = $1;
+  $paid     = '';
+  $payby    = $cgi->param('payby') || 'BILL';
+  $payinfo  = "";
+  $quickpay = '';
+  $_date    = time;
 } else {
   die "illegal query ". $cgi->keywords;
 }
 
 my $paybatch = "webui-$_date-$$-". rand() * 2**32;
 
-my $title = 'Post payment';
+my $title = 'Post '. $payby{$payby}. ' payment';
 $title .= " against Invoice #$linknum" if $link eq 'invnum';
 
 %>
@@ -97,13 +100,18 @@ Payment
 <TR>
   <TD ALIGN="right">Amount</TD>
   <TD BGCOLOR="#ffffff" ALIGN="right"><%= $money_char %></TD>
-  <TD><INPUT TYPE="text" NAME="paid" VALUE="<%= $paid %>" SIZE=8 MAXLENGTH=8></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Check #</TD>
-  <TD COLSPAN=2><INPUT TYPE="text" NAME="payinfo" VALUE="<%= $payinfo %>" SIZE=10></TD>
+  <TD><INPUT TYPE="text" NAME="paid" VALUE="<%= $paid %>" SIZE=8 MAXLENGTH=8> by <B><%= $payby{$payby} %></B></TD>
 </TR>
 
+<% if ( $payby eq 'BILL' ) { %>
+
+  <TR>
+    <TD ALIGN="right">Check #</TD>
+    <TD COLSPAN=2><INPUT TYPE="text" NAME="payinfo" VALUE="<%= $payinfo %>" SIZE=10></TD>
+  </TR>
+
+<% } %>
+
 <TR>
 <% if ( $link eq 'custnum' ) { %>
   <TD ALIGN="right">Auto-apply<BR>to invoices</TD>
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 85dbb9775..d77aa2fdd 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -55,6 +55,9 @@ if ( defined($cgi->param('same')) && $cgi->param('same') eq "Y" ) {
   );
 }
 
+$new->setfield('paid', $cgi->param('paid') )
+  if $cgi->param('paid');
+
 #perhaps this stuff should go to cust_main.pm
 my $cust_pkg = '';
 my $svc_acct = '';
-- 
cgit v1.2.1


From fbff7663ff6fb115bcd4dae2eb991b90339bf68d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 24 Oct 2005 11:56:35 +0000
Subject: fix rate plan editing with new xmlhttp progressbar - use POST instead
 of GET.  also optimize SQL on rate search screen

---
 httemplate/edit/process/rate.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/rate.cgi b/httemplate/edit/process/rate.cgi
index 0030b5754..87c082d64 100755
--- a/httemplate/edit/process/rate.cgi
+++ b/httemplate/edit/process/rate.cgi
@@ -1,3 +1,3 @@
 <%
-  my $server = new FS::UI::Web::JSRPC 'FS::rate::process';
+  my $server = new FS::UI::Web::JSRPC 'FS::rate::process', $cgi;
 %><%= $server->process %>
-- 
cgit v1.2.1


From c758e7dbbea040445a7c9a6f4b095b33678f56bb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 24 Oct 2005 11:59:37 +0000
Subject: optimize SQL on rate edit screen

---
 httemplate/edit/rate.cgi | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index ce56768d1..1771f0105 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -17,12 +17,12 @@ my %granularity = (
   '60' => 'minute',
 );
 
-my $nous = <<END;
-  WHERE 0 < ( SELECT COUNT(*) FROM rate_prefix
-               WHERE rate_region.regionnum = rate_prefix.regionnum
-                 AND countrycode != '1'
-            )
-END
+#my $nous = <<END;
+#  WHERE 0 < ( SELECT COUNT(*) FROM rate_prefix
+#               WHERE rate_region.regionnum = rate_prefix.regionnum
+#                 AND countrycode != '1'
+#            )
+#END
 
 %>
 
@@ -56,11 +56,17 @@ Rate plan
 </TR>
 
 <% foreach my $rate_region (
-     qsearch( 'rate_region',
-              {},
-              '',
-              "$nous ORDER BY regionname",
-            )
+     sort { lc($a->regionname) cmp lc($b->regionname) }
+     qsearch({
+               'select'    => 'DISTINCT ON ( regionnum ) rate_region.*',
+               'table'     => 'rate_region',
+               'addl_from' => 'INNER JOIN rate_prefix USING ( regionnum )',
+               'hashref'   => {},
+               'extra_sql' => "WHERE countrycode != '1'",
+                              # 'ORDER BY regionname'
+                              # ERROR: SELECT DISTINCT ON expressions must
+                              #        match initial ORDER BY expressions
+            })
    ) {
      my $n = $rate_region->regionnum;
      my $rate_detail =
@@ -70,6 +76,7 @@ Rate plan
                                 'sec_granularity' => '60'
                               };
 %>
+
   <TR>
     <TD><A HREF="<%=$p%>edit/rate_region.cgi?<%= $rate_region->regionnum %>"><%= $rate_region->regionname %></A></TD>
     <TD><%= $rate_region->prefixes_short %></TD>
@@ -82,6 +89,7 @@ Rate plan
         <% } %>
       </SELECT>
   </TR>
+
 <% } %>
 
 <TR>
-- 
cgit v1.2.1


From 172c50ae6b9bef1e72c9f454d0c3621aabe210fb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 1 Nov 2005 03:15:32 +0000
Subject: add billco format option to FTP invoice send, add invoice event to
 spool one giant (pair of) CSV files in addition to FTPing them individually

---
 httemplate/edit/part_bill_event.cgi | 45 ++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 6 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 06bdaf647..e60cc87e9 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -214,13 +214,26 @@ tie my %events, 'Tie::IxHash',
 
   'send_csv_ftp' => {
     'name' => 'Upload CSV invoice data to an FTP server',
-    'code' => '$cust_bill->send_csv( protocol => \'ftp\',
-                                     server   => \'%%%ftpserver%%%\',
-                                     username => \'%%%ftpusername%%%\',
-                                     password => \'%%%ftppassword%%%\',
-                                     dir      => \'%%%ftpdir%%%\'       );',
+    'code' => '$cust_bill->send_csv( protocol   => \'ftp\',
+                                     server     => \'%%%ftpserver%%%\',
+                                     username   => \'%%%ftpusername%%%\',
+                                     password   => \'%%%ftppassword%%%\',
+                                     dir        => \'%%%ftpdir%%%\',
+                                     \'format\' => \'%%%ftpformat%%%\',
+                                   );',
     'html' =>
-        '<TABLE BORDER=0><TR><TD ALIGN="right">FTP server: </TD>'.
+        '<TABLE BORDER=0>'.
+        '<TR><TD align="right">Format ("default" or "billco"): </TD>'.
+          '<TD>'.
+            '<!--'.
+            '<SELECT NAME="ftpformat">'.
+              '<OPTION VALUE="default">Default'.
+              '<OPTION VALUE="billco">Billco'.
+            '</SELECT>'.
+            '-->'.
+            '<INPUT TYPE="text" NAME="ftpformat" VALUE="%%%ftpformat%%%">'.
+          '</TD></TR>'.
+        '<TR><TD ALIGN="right">FTP server: </TD>'.
           '<TD><INPUT TYPE="text" NAME="ftpserver" VALUE="%%%ftpserver%%%">'.
           '</TD></TR>'.
         '<TR><TD ALIGN="right">FTP username: </TD><TD>'.
@@ -236,6 +249,26 @@ tie my %events, 'Tie::IxHash',
     'weight' => 50,
   },
 
+  'spool_csv' => {
+    'name' => 'Spool CSV invoice data',
+    'code' => '$cust_bill->spool_csv( \'format\' => \'%%%spoolformat%%%\',
+                                    );',
+    'html' =>
+        '<TABLE BORDER=0>'.
+        '<TR><TD align="right">Format ("default" or "billco"): </TD>'.
+          '<TD>'.
+            '<!--'.
+            '<SELECT NAME="spoolformat">'.
+              '<OPTION VALUE="default">Default'.
+              '<OPTION VALUE="billco">Billco'.
+            '</SELECT>'.
+            '-->'.
+            '<INPUT TYPE="text" NAME="spoolformat" VALUE="%%%spoolformat%%%">'.
+          '</TD></TR>'.
+        '</TABLE>',
+    'weight' => 50,
+  },
+
   'bill' => {
     'name' => 'Generate invoices (normally only used with a <i>Late Fee</i> event)',
     'code' => '$cust_main->bill();',
-- 
cgit v1.2.1


From 5862c8ef887a1f8b54aebb8b03aab6cc5dc5860a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 1 Nov 2005 05:14:08 +0000
Subject: add option for spool_csv events to apply only to a specific
 destination type (i.e. postal only)

---
 httemplate/edit/part_bill_event.cgi | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index e60cc87e9..7e27bd400 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -252,6 +252,7 @@ tie my %events, 'Tie::IxHash',
   'spool_csv' => {
     'name' => 'Spool CSV invoice data',
     'code' => '$cust_bill->spool_csv( \'format\' => \'%%%spoolformat%%%\',
+                                      \'dest\'   => \'%%%spooldest%%%\',
                                     );',
     'html' =>
         '<TABLE BORDER=0>'.
@@ -265,6 +266,15 @@ tie my %events, 'Tie::IxHash',
             '-->'.
             '<INPUT TYPE="text" NAME="spoolformat" VALUE="%%%spoolformat%%%">'.
           '</TD></TR>'.
+        '<TR><TD align="right">For destination: </TD>'.
+          '<TD>'.
+            '<SELECT NAME="spooldest">'.
+              '<OPTION VALUE="">(all)'.
+              '<OPTION VALUE="POST">Postal mail'.
+              '<OPTION VALUE="EMAIL">Email'.
+              '<OPTION VALUE="Fax">Fax'.
+            '</SELECT>'.
+          '</TD></TR>'.
         '</TABLE>',
     'weight' => 50,
   },
-- 
cgit v1.2.1


From d6edb7f296db6befc54396c001e64e67a79fe40b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Nov 2005 13:14:47 +0000
Subject: bulk svcpart change

---
 httemplate/edit/bulk-cust_svc.html        | 97 +++++++++++++++++++++++++++++++
 httemplate/edit/process/bulk-cust_svc.cgi |  3 +
 2 files changed, 100 insertions(+)
 create mode 100644 httemplate/edit/bulk-cust_svc.html
 create mode 100644 httemplate/edit/process/bulk-cust_svc.cgi

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/bulk-cust_svc.html b/httemplate/edit/bulk-cust_svc.html
new file mode 100644
index 000000000..332b5b67c
--- /dev/null
+++ b/httemplate/edit/bulk-cust_svc.html
@@ -0,0 +1,97 @@
+<%= header( 'Bulk customer service change',
+            menubar(
+                     'Main Menu' => $p,
+                   ),
+          )
+%>
+
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
+
+<%= include('/elements/progress-init.html',
+              'OneTrueForm',
+              [qw( old_svcpart new_svcpart pkgpart )],
+              'process/bulk-cust_svc.cgi',
+              $p.'browse/part_svc.cgi',
+           )
+%>
+
+<FORM NAME="OneTrueForm">
+
+<%
+  $cgi->param('svcpart') =~ /^(\d+)$/
+    or die "illegal svcpart: ". $cgi->param('svcpart');
+
+  my $old_svcpart = $1;
+  my $src_part_svc = qsearchs('part_svc', { 'svcpart' => $old_svcpart } )
+    or die "unknown svcpart: $old_svcpart";
+%>
+
+<INPUT NAME="old_svcpart" TYPE="hidden" VALUE="<%= $old_svcpart %>">
+Change <!-- customer
+<B><%= $src_part_svc->svcpart %>: <%= $src_part_svc->svc %></B> services
+<BR>
+-->
+
+<SELECT NAME="pkgpart">
+
+<% my $num_cust_svc = $src_part_svc->num_cust_svc; %>
+<% if ( $num_cust_svc > 1 ) { %>
+  <OPTION VALUE="">all <%= $num_cust_svc %> <%= $src_part_svc->svc %> services
+<% } else { %>
+  <OPTION VALUE="">the <%= $num_cust_svc %> <%= $src_part_svc->svc %> service
+<% } %>
+
+<%
+  my $num_unlinked = $src_part_svc->num_cust_svc(0);
+  if ( $num_unlinked ) {
+%>
+  <OPTION VALUE="0">the <%= $num_unlinked %> unlinked <%= $src_part_svc->svc %> services
+
+<% } %>
+
+<% foreach my $schwartz (
+     grep { $_->[1] }
+     map  { [ $_, $src_part_svc->num_cust_svc($_->pkgpart) ] }
+          qsearch('part_pkg', {} )
+   ) {
+     my( $part_pkg, $num_cust_svc ) = @$schwartz;
+%>
+  <OPTION VALUE="<%= $part_pkg->pkgpart %>">the <%= $num_cust_svc %>
+    <%= $src_part_svc->svc %> service<%= $num_cust_svc > 1 ? 's in' : ' in a' %>
+    <%= $part_pkg->pkg %> package<%= $num_cust_svc > 1 ? 's' : '' %>
+<% } %>
+</SELECT>
+<BR>
+
+to new service definition
+<SELECT NAME="new_svcpart">
+<% foreach my $dest_part_svc (
+     grep {    $_->svcpart != $old_svcpart
+            && $_->svcdb   eq $src_part_svc->svcdb
+          }
+          qsearch('part_svc', { 'disabled' => '' } )
+   ) {
+%>
+  <OPTION VALUE="<%= $dest_part_svc->svcpart %>"><%= $dest_part_svc->svcpart %>: <%= $dest_part_svc->svc %>
+
+<% } %>
+</SELECT>
+<BR>
+
+<BR>
+
+<SCRIPT TYPE="text/javascript">
+var confirm_change = '<P ALIGN="center"><B>Bulk customer service change - Are you sure?</B><BR><P ALIGN="CENTER" <INPUT TYPE="button" VALUE="Yes, make changes" onClick="process();">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="BUTTON" VALUE="Cancel" onClick="cClick()">';
+</SCRIPT>
+
+<INPUT TYPE="button" VALUE="Bulk change customer services" onClick="overlib(confirm_change, CAPTION, 'Confirm bulk customer service change', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, 128, TEXTSIZE, 3, BGCOLOR, '#ff0000', CGCOLOR, '#ff0000' );">
+
+</FORM>
+
+</BODY>
+</HTML>
+
+
+
diff --git a/httemplate/edit/process/bulk-cust_svc.cgi b/httemplate/edit/process/bulk-cust_svc.cgi
new file mode 100644
index 000000000..dd9d1dbd2
--- /dev/null
+++ b/httemplate/edit/process/bulk-cust_svc.cgi
@@ -0,0 +1,3 @@
+<%
+  my $server = new FS::UI::Web::JSRPC 'FS::part_svc::process_bulk_cust_svc', $cgi;
+%><%= $server->process %>
-- 
cgit v1.2.1


From e5787d471e4d94f28cfb68db97b31eefbe35a651 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Nov 2005 14:59:53 +0000
Subject: template-ize agent type edit and add comment to package listing

---
 httemplate/edit/agent_type.cgi | 66 +++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 637c710ab..684216335 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 my($agent_type);
@@ -14,50 +13,51 @@ if ( $cgi->param('error') ) {
   $agent_type = new FS::agent_type {};
 }
 my $action = $agent_type->typenum ? 'Edit' : 'Add';
-my $hashref = $agent_type->hashref;
 
-print header("$action Agent Type", menubar(
+%>
+
+<%= header("$action Agent Type", menubar(
   'Main Menu' => "$p",
   'View all agent types' => "${p}browse/agent_type.cgi",
-));
+))
+%>
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+<% } %>
 
-print '<FORM ACTION="', popurl(1), 'process/agent_type.cgi" METHOD=POST>',
-      qq!<INPUT TYPE="hidden" NAME="typenum" VALUE="$hashref->{typenum}">!,
-      "Agent Type #", $hashref->{typenum} ? $hashref->{typenum} : "(NEW)";
+<FORM ACTION="<%= popurl(1) %>process/agent_type.cgi" METHOD=POST>
+<INPUT TYPE="hidden" NAME="typenum" VALUE="<%= $agent_type->typenum %>">
+Agent Type #<%= $agent_type->typenum || "(NEW)" %>
+<BR><BR>
 
-print <<END;
-<BR><BR>Agent Type <INPUT TYPE="text" NAME="atype" SIZE=32 VALUE="$hashref->{atype}">
-<BR><BR>Select which packages agents of this type may sell to customers<BR>
-END
+Agent Type
+<INPUT TYPE="text" NAME="atype" SIZE=32 VALUE="<%= $agent_type->atype %>">
+<BR><BR>
 
-foreach my $part_pkg ( qsearch('part_pkg',{ 'disabled' => '' }) ) {
-  print qq!<BR><INPUT TYPE="checkbox" NAME="pkgpart!,
-        $part_pkg->getfield('pkgpart'), qq!" !,
-       # ( 'CHECKED 'x scalar(
+Select which packages agents of this type may sell to customers<BR>
+
+<% foreach my $part_pkg ( qsearch('part_pkg',{ 'disabled' => '' }) ) { %>
+
+  <BR>
+  <INPUT TYPE="checkbox" NAME="pkgpart<%= $part_pkg->pkgpart %>" <%=
         qsearchs('type_pkgs',{
-          'typenum' => $agent_type->getfield('typenum'),
-          'pkgpart'  => $part_pkg->getfield('pkgpart'),
+          'typenum' => $agent_type->typenum,
+          'pkgpart' => $part_pkg->pkgpart,
         })
           ? 'CHECKED '
-          : '',
-        qq!VALUE="ON"> !,
-    qq!<A HREF="${p}edit/part_pkg.cgi?!, $part_pkg->pkgpart, 
-    '">', $part_pkg->pkgpart. ": ". $part_pkg->getfield('pkg'), '</A>',
-  ;
-}
+          : ''
+  %> VALUE="ON">
 
-print qq!<BR><BR><INPUT TYPE="submit" VALUE="!,
-      $hashref->{typenum} ? "Apply changes" : "Add agent type",
-      qq!">!;
+  <A HREF="<%= $p %>edit/part_pkg.cgi?<%= $part_pkg->pkgpart %>"><%= $part_pkg->pkgpart %>: 
+  <%= $part_pkg->pkg %> (<%= $part_pkg->comment %>)</A>
+
+<% } %>
+
+<BR><BR>
+
+<INPUT TYPE="submit" VALUE="<%= $agent_type->typenum ? "Apply changes" : "Add agent type" %>">
 
-print <<END;
     </FORM>
   </BODY>
 </HTML>
-END
-
-%>
-- 
cgit v1.2.1


From f10cd68f08a6bfbd565a83b40bacc3f55a1265b3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Nov 2005 10:47:12 +0000
Subject: add MCRD payment type for manually processed ccards

---
 httemplate/edit/cust_main/billing.html | 23 ++++++++++++++++++++---
 httemplate/edit/cust_pay.cgi           |  1 +
 2 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index caac3a956..6168fa97e 100644
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -331,6 +331,22 @@ if ( $payby_default eq 'HIDE' ) {
 
       '</TABLE>',
 
+    'MCRD' =>
+
+      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
+
+        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Amount </TD>!.
+          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="paid" VALUE="!. ( $payby eq 'MCRD' ? $cust_main->paid : '' ). qq!"></TD></TR>!.
+
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+        '<TR><TD>&nbsp;</TD></TR>'.
+
+      '</TABLE>',
+
   );
 
 
@@ -341,11 +357,12 @@ if ( $payby_default eq 'HIDE' ) {
     'BILL' => 'Billing',
     'CASH' => 'Cash', # initial payment, then billing',
     'WEST' => 'Western Union', # initial payment, then billing',
+    'MCRD' => 'Manual credit card', # initial payment, then billing',
     'COMP' => 'Complimentary',
   );
-  if ( $cust_main->custnum ) { #don't offer CASH and WEST initial payment types
+  if ( $cust_main->custnum ) { #don't offer CASH/WEST/MCRD initial payment types
                                # when editing customer
-    delete $allopt{$_} for qw(CASH WEST);
+    delete $allopt{$_} for qw(CASH WEST MCRD);
   }
   
   tie my %options, 'Tie::IxHash',
@@ -365,7 +382,7 @@ if ( $payby_default eq 'HIDE' ) {
     #'form_action'    => 'nothingyet',
     #chops bottom of page in IE# 'under_position' => 'absolute',
     'html_between'   => '</TD></TR></TABLE>',
-    'selected_layer' => $payby2option{$payby} || 'CARD',
+    'selected_layer' => $payby2option{$payby || $payby_default || $payby[0] },
     'layer_callback' => sub { my $layer = shift; $payby{$layer}; },
   );
 
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index b2f3f55ff..0370ab726 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -6,6 +6,7 @@ my %payby = (
   'BILL' => 'Check',
   'CASH' => 'Cash',
   'WEST' => 'Western Union',
+  'MCRD' => 'Manual credit card',
 );
 
 my($link, $linknum, $paid, $payby, $payinfo, $quickpay, $_date); 
-- 
cgit v1.2.1


From bbf01f2a628d15c0ca557cf68235f25d6d233ee7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Nov 2005 12:41:43 +0000
Subject: ignore blank lines in payby config

---
 httemplate/edit/cust_main/billing.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 6168fa97e..1f557c84b 100644
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -4,10 +4,10 @@ my( $cust_main ) = @_;
 my $conf = new FS::Conf;
 my $payby_default = $conf->config('payby-default');
 
-my @payby = $conf->config('payby');
+my @payby = grep /\w/, $conf->config('payby');
 #@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP ))
 @payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP ))
-  unless grep /\w/, @payby;
+  unless @payby;
 
 if ( $payby_default eq 'HIDE' ) {
 
-- 
cgit v1.2.1


From a8c51f52a9a13c13b17c00e8bd8bcbafd2bc6424 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Nov 2005 18:29:39 +0000
Subject: add backend-realtime config flag, should be more intuitive for
 guyananet

---
 httemplate/edit/process/cust_main.cgi | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index d77aa2fdd..acc1ca434 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -123,7 +123,20 @@ if ( $new->custnum eq '' ) {
   tie my %hash, 'Tie::RefHash';
   %hash = ( $cust_pkg => [ $svc_acct ] ) if $cust_pkg;
   $error ||= $new->insert( \%hash, \@invoicing_list );
+
+  my $conf = new FS::Conf;
+  if ( $conf->exists('backend-realtime') && ! $error ) {
+
+    my $berror = $new->bill;
+    $new->apply_payments;
+    $new->apply_credits;
+    $berror ||= $new->collect;
+    warn "Warning, error billing during backend-realtime: $berror" if $berror;
+
+  }
+  
 } else { #create old record object
+
   my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
   $error ||= "Old record not found!" unless $old;
   if ( defined dbdef->table('cust_main')->column('paycvv')
@@ -132,6 +145,7 @@ if ( $new->custnum eq '' ) {
     $new->paycvv($old->paycvv);
   }
   $error ||= $new->replace($old, \@invoicing_list);
+  
 }
 
 if ( $error ) {
-- 
cgit v1.2.1


From 1fc8b74ee30a0bc8bc800713bff9ccc9983527e5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 27 Nov 2005 21:59:24 +0000
Subject: per-agent billco spools

---
 httemplate/edit/part_bill_event.cgi | 79 +++++++++++++++++++++++++------------
 1 file changed, 53 insertions(+), 26 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 7e27bd400..64a82493a 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -223,7 +223,7 @@ tie my %events, 'Tie::IxHash',
                                    );',
     'html' =>
         '<TABLE BORDER=0>'.
-        '<TR><TD align="right">Format ("default" or "billco"): </TD>'.
+        '<TR><TD ALIGN="right">Format ("default" or "billco"): </TD>'.
           '<TD>'.
             '<!--'.
             '<SELECT NAME="ftpformat">'.
@@ -251,31 +251,58 @@ tie my %events, 'Tie::IxHash',
 
   'spool_csv' => {
     'name' => 'Spool CSV invoice data',
-    'code' => '$cust_bill->spool_csv( \'format\' => \'%%%spoolformat%%%\',
-                                      \'dest\'   => \'%%%spooldest%%%\',
-                                    );',
-    'html' =>
-        '<TABLE BORDER=0>'.
-        '<TR><TD align="right">Format ("default" or "billco"): </TD>'.
-          '<TD>'.
-            '<!--'.
-            '<SELECT NAME="spoolformat">'.
-              '<OPTION VALUE="default">Default'.
-              '<OPTION VALUE="billco">Billco'.
-            '</SELECT>'.
-            '-->'.
-            '<INPUT TYPE="text" NAME="spoolformat" VALUE="%%%spoolformat%%%">'.
-          '</TD></TR>'.
-        '<TR><TD align="right">For destination: </TD>'.
-          '<TD>'.
-            '<SELECT NAME="spooldest">'.
-              '<OPTION VALUE="">(all)'.
-              '<OPTION VALUE="POST">Postal mail'.
-              '<OPTION VALUE="EMAIL">Email'.
-              '<OPTION VALUE="Fax">Fax'.
-            '</SELECT>'.
-          '</TD></TR>'.
-        '</TABLE>',
+    'code' => '$cust_bill->spool_csv(
+                 \'format\' => \'%%%spoolformat%%%\',
+                 \'dest\'   => \'%%%spooldest%%%\',
+                 \'agent_spools\' => \'%%%spoolagent_spools%%%\',
+               );',
+    'html' => sub {
+       my $plandata = shift;
+
+       my $html =
+       '<TABLE BORDER=0>'.
+       '<TR><TD ALIGN="right">Format: </TD>'.
+         '<TD>'.
+           '<SELECT NAME="spoolformat">';
+
+       foreach my $option (qw( default billco )) {
+         $html .= qq(<OPTION VALUE="$option");
+         $html .= ' SELECTED' if $option eq $plandata->{'spoolformat'};
+         $html .= ">\u$option";
+       }
+
+       $html .= 
+           '</SELECT>'.
+         '</TD></TR>'.
+       '<TR><TD ALIGN="right">For destination: </TD>'.
+         '<TD>'.
+           '<SELECT NAME="spooldest">';
+
+       tie my %dest, 'Tie::IxHash', 
+         ''      => '(all)',
+         'POST'  => 'Postal Mail',
+         'EMAIL' => 'Email',
+         'FAX'   => 'Fax',
+       ;
+
+       foreach my $dest (keys %dest) {
+         $html .= qq(<OPTION VALUE="$dest");
+         $html .= ' SELECTED' if $dest eq $plandata->{'spooldest'};
+         $html .= '>'. $dest{$dest};
+       }
+
+       $html .=
+           '</SELECT>'.
+         '</TD></TR>'.
+       '<TR><TD ALIGN="right">Individual per-agent spools? </TD>'.
+         '<TD><INPUT TYPE="checkbox" NAME="spoolagent_spools" VALUE="1" '.
+           ( $plandata->{'spoolagent_spools'} ? 'CHECKED' : '' ).
+           '>'.
+         '</TD></TR>'.
+       '</TABLE>';
+
+       $html;
+    },
     'weight' => 50,
   },
 
-- 
cgit v1.2.1


From 4e368de88b732462775637b06377d9bdbe2712ed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 1 Dec 2005 19:17:05 +0000
Subject: list disabled packages on agent type edit if they are still
 associated with the type

---
 httemplate/edit/agent_type.cgi | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 684216335..84f4b6599 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -37,7 +37,15 @@ Agent Type
 
 Select which packages agents of this type may sell to customers<BR>
 
-<% foreach my $part_pkg ( qsearch('part_pkg',{ 'disabled' => '' }) ) { %>
+<% foreach my $part_pkg (
+     qsearch({ 'table'     => 'part_pkg',
+               'hashref'   => { 'disabled' => '' },
+               'select'    => 'part_pkg.*',
+               'addl_from' => 'LEFT JOIN type_pkgs USING ( pkgpart )',
+               'extra_sql' => 'OR typenum = '. $agent_type->typenum,
+            })
+   ) {
+%>
 
   <BR>
   <INPUT TYPE="checkbox" NAME="pkgpart<%= $part_pkg->pkgpart %>" <%=
@@ -50,7 +58,8 @@ Select which packages agents of this type may sell to customers<BR>
   %> VALUE="ON">
 
   <A HREF="<%= $p %>edit/part_pkg.cgi?<%= $part_pkg->pkgpart %>"><%= $part_pkg->pkgpart %>: 
-  <%= $part_pkg->pkg %> (<%= $part_pkg->comment %>)</A>
+  <%= $part_pkg->pkg %> - <%= $part_pkg->comment %></A>
+  <%= $part_pkg->disabled =~ /^Y/i ? ' (DISABLED)' : '' %>
 
 <% } %>
 
-- 
cgit v1.2.1


From d5cab3c80bef3d7e2c538e7488af1f3fb0008af9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Dec 2005 17:19:32 +0000
Subject: eek, don't log all this debugging info by default

---
 httemplate/edit/process/cust_main.cgi | 2 --
 1 file changed, 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index acc1ca434..09a42544c 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,7 +1,5 @@
 <%
 
-warn join('', map { "$_ => ". $cgi->param($_). "\n" } $cgi->param );
-
 my $error = '';
 
 #unmunge stuff
-- 
cgit v1.2.1


From 88c42d0423368bf52d593021f704bfa38845ff71 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Dec 2005 16:56:53 +0000
Subject: fix postal mail checkbox misbehaving (isn't sticky on errors -
 reverts back to on)

---
 httemplate/edit/cust_main.cgi          | 5 ++++-
 httemplate/edit/cust_main/billing.html | 7 +++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index e10c85f01..144d5405c 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -234,7 +234,10 @@ Service address
 
 <!-- billing info -->
 
-<%= include('cust_main/billing.html', $cust_main ) %>
+<%= include( 'cust_main/billing.html', $cust_main,
+               'invoicing_list' => \@invoicing_list,
+           )
+%>
 
 <SCRIPT>
 function bottomfixup(what) {
diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 1f557c84b..a9b3c1f75 100644
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -1,6 +1,7 @@
 <%
 
-my( $cust_main ) = @_;
+my( $cust_main, %options ) = @_;
+my @invoicing_list = @{ $options{'invoicing_list'} };
 my $conf = new FS::Conf;
 my $payby_default = $conf->config('payby-default');
 
@@ -49,14 +50,12 @@ if ( $payby_default eq 'HIDE' ) {
 
   <INPUT TYPE="hidden" NAME="tax" VALUE="<%= $cust_main->tax %>">
 
-  <INPUT TYPE="hidden" NAME="invoicing_list" VALUE="<%= join(', ', $cust_main->invoicing_list) %>">
+  <INPUT TYPE="hidden" NAME="invoicing_list" VALUE="<%= join(', ', @invoicing_list) %>">
 
   </FORM>
 
 <% } else {
 
-  my @invoicing_list = $cust_main->invoicing_list;
-
   my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
 %>
-- 
cgit v1.2.1


From 54c73b7ed85f88ef688f68ef8e1b0961dec14f0c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Dec 2005 16:58:40 +0000
Subject: fill in reason if empty when applying a credit to a refund

---
 httemplate/edit/process/cust_credit_bill.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
index 23e2e6ce5..28f892f62 100755
--- a/httemplate/edit/process/cust_credit_bill.cgi
+++ b/httemplate/edit/process/cust_credit_bill.cgi
@@ -14,11 +14,12 @@ my $custnum = $cust_main->custnum;
 my $new;
 if ($cgi->param('invnum') =~ /^Refund$/) {
   $new = new FS::cust_refund ( {
-    'reason'  => $cust_credit->reason,
+    'reason'  => ( $cust_credit->reason || 'refund from credit' ),
     'refund'  => $cgi->param('amount'),
     'payby'   => 'BILL',
     #'_date'   => $cgi->param('_date'),
-    'payinfo' => 'Cash',
+    #'payinfo' => 'Cash',
+    'payinfo' => 'Refund',
     'crednum' => $crednum,
   } );
 } else {
-- 
cgit v1.2.1


From 452dc46f00628a3628f839b1af70e0f9295246e7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 13 Dec 2005 03:13:25 +0000
Subject: fix options in gateway adding

---
 httemplate/edit/process/payment_gateway.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/process/payment_gateway.html b/httemplate/edit/process/payment_gateway.html
index 0fc5b66c6..b9e4d47da 100644
--- a/httemplate/edit/process/payment_gateway.html
+++ b/httemplate/edit/process/payment_gateway.html
@@ -10,11 +10,16 @@ my $new = new FS::payment_gateway ( {
   } fields('payment_gateway')
 } );
 
+my @options = split(/\r?\n/, $cgi->param('gateway_options') );
+pop @options
+  if scalar(@options) % 2 && $options[-1] =~ /^\s*$/;
+my %options = @options;
+
 my $error;
 if ( $gatewaynum ) {
   $error=$new->replace($old);
 } else {
-  $error=$new->insert;
+  $error=$new->insert(\%options);
   $gatewaynum=$new->getfield('gatewaynum');
 }
 
-- 
cgit v1.2.1


From 4b7604d67c78a6507fa52dbd2d476c037a0b723d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 15 Dec 2005 19:36:49 +0000
Subject: fix bug when adding new agent types, noticed by Julius Igugu

---
 httemplate/edit/agent.cgi      | 2 +-
 httemplate/edit/agent_type.cgi | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index f8d0edc1a..cb64ad8cd 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -75,7 +75,7 @@ Agent #<%= $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)" %>
     my @queueids = sort { $a <=> $b } keys %queues;
   %>
     <TR>
-      <TD ALIGN="right">Ticketing</TD>
+      <TD ALIGN="right">Ticketing queue</TD>
       <TD>
         <SELECT NAME="ticketing_queueid">
           <OPTION VALUE=""><%= $default_queue %>
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 84f4b6599..5addbbd4c 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -42,7 +42,10 @@ Select which packages agents of this type may sell to customers<BR>
                'hashref'   => { 'disabled' => '' },
                'select'    => 'part_pkg.*',
                'addl_from' => 'LEFT JOIN type_pkgs USING ( pkgpart )',
-               'extra_sql' => 'OR typenum = '. $agent_type->typenum,
+               'extra_sql' => ( $agent_type->typenum
+                                  ? 'OR typenum = '. $agent_type->typenum
+                                  : ''
+                              ),
             })
    ) {
 %>
-- 
cgit v1.2.1


From e56c43c851f2a549596bf704ffc4031a07779f91 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 16 Dec 2005 01:49:44 +0000
Subject: add TransactionCentral

---
 httemplate/edit/payment_gateway.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/payment_gateway.html b/httemplate/edit/payment_gateway.html
index 837d0c408..33cc236d0 100644
--- a/httemplate/edit/payment_gateway.html
+++ b/httemplate/edit/payment_gateway.html
@@ -64,6 +64,7 @@ Gateway #<%= $payment_gateway->gatewaynum || "(NEW)" %>
          StGeorge
          SurePay
          TCLink
+         TransactionCentral
          VirtualNet
        ) ) {
     %>
-- 
cgit v1.2.1


From 9cc2ba7cbf26eefbd1d01a2f98b47a24a8766428 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 25 Dec 2005 00:36:30 +0000
Subject: don't reenable postal billing for existing customers just cause its
 blank...

---
 httemplate/edit/cust_main/billing.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index a9b3c1f75..96f777baa 100644
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -402,7 +402,10 @@ if ( $payby_default eq 'HIDE' ) {
     <TR>
       <TD WIDTH="608" COLSPAN="2"><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST" <%=
 
-        ( ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
+        ( (    ! @invoicing_list
+            && ! $conf->exists('disablepostalinvoicedefault')
+            && ! $cust_main->custnum
+          )
           || grep { $_ eq 'POST' } @invoicing_list                     )
 
           ? 'CHECKED'
-- 
cgit v1.2.1


From 3213e7c1e281dbdba8baa980028482df3b9c1873 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 25 Dec 2005 00:52:27 +0000
Subject: add invoice event to suspend only when greater than N amount

---
 httemplate/edit/part_bill_event.cgi | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 64a82493a..cc6bb47d2 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -94,6 +94,9 @@ sub select_agentnum {
   '</SELECT>';
 }
 
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char');
+
 #this is pretty kludgy right here.
 tie my %events, 'Tie::IxHash',
 
@@ -110,6 +113,12 @@ tie my %events, 'Tie::IxHash',
     'code'   => '$cust_main->suspend();',
     'weight' => 10,
   },
+  'suspend' => {
+    'name'   => 'Suspend if balance (this invoice and previous) over',
+    'code'   => '$cust_bill->cust_suspend_if_balance_over( %%%balanceover%%% );',
+    'html'   => " $money_char ". '<INPUT TYPE="text" SIZE="7" NAME="balanceover" VALUE="%%%balanceover%%%">',
+    'weight' => 10,
+  },
   'suspend-if-pkgpart' => {
     'name'   => 'Suspend packages',
     'code'   => '$cust_main->suspend_if_pkgpart(%%%if_pkgpart%%%);',
-- 
cgit v1.2.1


From 7003a4377da33f0268eb43f78f7690ef5edb054e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 25 Dec 2005 03:38:36 +0000
Subject: make sure to specify a money_char default

---
 httemplate/edit/part_bill_event.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index cc6bb47d2..32ca47af4 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -95,7 +95,7 @@ sub select_agentnum {
 }
 
 my $conf = new FS::Conf;
-my $money_char = $conf->config('money_char');
+my $money_char = $conf->config('money_char') || '$';
 
 #this is pretty kludgy right here.
 tie my %events, 'Tie::IxHash',
-- 
cgit v1.2.1