X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main.cgi;h=6fc086a1223585d3081a77dd7960fbbed5865205;hp=2941acdf32fbda66964ca19ab00d990cabeb485a;hb=7a168617da5f6702422c098d714a11586d7655e9;hpb=3dddb60bd783aaf5fa1fda90a351f1e877b7e19b

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 2941acdf3..6fc086a12 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,47 +1,33 @@
+<!-- mason kludge -->
 <%
-#<!-- $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 
-             $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;
+  #use FS::part_pkg;
 
-  #for false laziness below
-  use FS::svc_acct_pop;
+  #for false laziness below (now more properly lazy)
+  #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
 
+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 ( {
     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,43 +37,44 @@ if ( $cgi->param('error') ) {
   $query =~ /^(\d+)$/;
   $custnum=$1;
   $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
-  $pkgpart = 0;
+  $saved_pkgpart = 0;
   $username = '';
   $password = '';
   $popnum = 0;
 } else {
   $custnum='';
   $cust_main = new FS::cust_main ( {} );
-  $cust_main->setfield('otaker',&getotaker);
-  $pkgpart = 0;
+  $cust_main->otaker( &getotaker );
+  $cust_main->referral_custnum( $cgi->param('referral_custnum') );
+  $saved_pkgpart = 0;
   $username = '';
   $password = '';
   $popnum = 0;
 }
-$action = $custnum ? 'Edit' : 'Add';
+$cgi->delete_all();
+my $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');
+my $p1 = popurl(1);
+print header("Customer $action", '');
+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">!,
-      qq!Customer # !, ( $custnum ? $custnum : " (NEW)" ),
+      qq!Customer # !, ( $custnum ? "<B>$custnum</B>" : " (NEW)" ),
       
 ;
 
 # agent
 
-$r = qq!<font color="#ff0000">*</font>!;
+my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
-@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
+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">!;
 } else {
@@ -98,23 +85,26 @@ 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>";
 }
 
 #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 {
   my(@referrals) = qsearch('part_referral',{});
-  if ( scalar(@referrals) == 1 ) {
+  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}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 {
@@ -127,10 +117,28 @@ 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 '<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="">';
+}
 
 # 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,
@@ -142,51 +150,62 @@ if ( $custnum && ! $conf->exists('editreferrals') ) {
 );
 
 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;
 <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>
-<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
 
-$cust_main->country( $conf->config('countrydefault') || 'US' )
-  unless $cust_main->country;
+#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 ( 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)=(
+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,
   $cust_main->night,
   $cust_main->fax,
 );
 
+my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
+my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
+
 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><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>
 END
 
-print "</TABLE>$r required fields<BR>";
+print "</TABLE>${r}required fields<BR>";
 
 # service address
 
@@ -203,18 +222,23 @@ 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>
 END
 
   print '<BR>Service address ',
-        '(<INPUT TYPE="checkbox" NAME="same" onClick="samechanged(this)"';
-  unless ( $cust_main->ship_last ) {
+        '(<INPUT TYPE="checkbox" NAME="same" VALUE="Y" onClick="samechanged(this)"';
+  unless ( $cust_main->ship_last && $cgi->param('same') ne 'Y' ) {
     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($_) );
     }
@@ -232,7 +256,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;
@@ -245,24 +269,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
 
-  $cust_main->ship_country( $conf->config('countrydefault') || 'US' )
-    unless $cust_main->ship_country;
+  #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';
-  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_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,
@@ -271,12 +296,13 @@ END
   );
 
   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><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>";
+  print "</TABLE>${r}required fields<BR>";
 
 }
 
@@ -313,47 +339,98 @@ 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"!;
-@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,
-);
+my $payby_default = $conf->config('payby-default');
+
+if ( $payby_default eq 'HIDE' ) {
+
+  $cust_main->payby('BILL') unless $cust_main->payby;
 
-%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"),
+  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 CHEK LECB 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 );
+    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">!.
+          qq!<INPUT TYPE="hidden" NAME="${payby}_year"  VALUE="$y">!;
+
+  }
+
+} 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="">!,
+    '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"),
 );
-%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),
+
+  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">!,
+    '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),
 );
-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 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>!;
+    } 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"),
@@ -369,7 +446,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 {
@@ -384,10 +461,12 @@ unless ( $custnum ) {
   #eslaf
 
   my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
-    qsearch( 'part_pkg', {} );
+    qsearch( 'part_pkg', { 'disabled' => '' } );
 
   if ( @part_pkg ) {
 
+#    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">!;
 
@@ -397,41 +476,36 @@ 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>";
 
     #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;
 <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
-    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">Access number</TD><TD WIDTH="100%">'
+          .
+          &FS::svc_acct_pop::popselector($popnum).
+          '</TD></TR></TABLE>'
+          ;
   }
 }
 
-$otaker = $cust_main->otaker;
+my $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>",
 ;