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

21 files changed, 847 insertions, 222 deletions

diff --git a/Changes.1.5.8 b/Changes.1.5.8
index e69cf92..77b0b6f 100644
--- a/Changes.1.5.8
+++ b/Changes.1.5.8
@@ -5,3 +5,5 @@
 - add active/suspended/cancelled customer packages to agent browse
 - add export to everyone.net outsource mail service
 - add native Radiator export
+- added agent/taxclass gateway overrides
+- re-did billing section of customer edit and added switch/solo support
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 45c2eb0..4b67f53 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -27,7 +27,7 @@ use vars qw( @cust_main_editable_fields );
     county state zip country daytime night fax
   ship_first ship_last ship_company ship_address1 ship_address2 ship_city
     ship_state ship_zip ship_country ship_daytime ship_night ship_fax
-  payby payinfo payname
+  payby payinfo payname paystart_month paystart_year payissue payip
 );
 
 use subs qw(_provision);
@@ -226,6 +226,8 @@ sub payment_info {
       'MasterCard' => 'MasterCard',
       'Discover' => 'Discover card',
       'American Express' => 'American Express card',
+      'Switch' => 'Switch',
+      'Solo' => 'Solo',
     },
 
   };
@@ -341,7 +343,8 @@ sub process_payment {
     'payname'  => $payname,
     'paybatch' => $paybatch,
     'paycvv'   => $paycvv,
-    map { $_ => $p->{$_} } qw( address1 address2 city state zip )
+    map { $_ => $p->{$_} } qw( paystart_month paystart_year payissue payip
+                               address1 address2 city state zip )
   );
   return { 'error' => $error } if $error;
 
@@ -350,7 +353,8 @@ sub process_payment {
   if ( $p->{'save'} ) {
     my $new = new FS::cust_main { $cust_main->hash };
     $new->set( $_ => $p->{$_} )
-      foreach qw( payname address1 address2 city state zip payinfo );
+      foreach qw( payname paystart_month paystart_year payissue payip
+                  address1 address2 city state zip payinfo );
     $new->set( 'paydate' => $p->{'year'}. '-'. $p->{'month'}. '-01' );
     $new->set( 'payby' => $p->{'auto'} ? 'CARD' : 'DCRD' );
     my $error = $new->replace($cust_main);
diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index ede7ba9..ed71651 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -197,7 +197,12 @@ sub new_customer {
       ship_city ship_county ship_state ship_zip ship_country
       ship_daytime ship_night ship_fax
 
-      payby payinfo paycvv paydate payname referral_custnum comments
+      payby
+      payinfo paycvv paydate payname
+      paystart_month paystart_year payissue
+      payip
+
+      referral_custnum comments
     )
 
   } );
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 8622b87..0169039 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -17,7 +17,7 @@ BEGIN {
 use Date::Format;
 #use Date::Manip;
 use String::Approx qw(amatch);
-use Business::CreditCard;
+use Business::CreditCard 0.28;
 use FS::UID qw( getotaker dbh );
 use FS::Record qw( qsearchs qsearch dbdef );
 use FS::Misc qw( send_email );
@@ -2195,13 +2195,33 @@ sub realtime_bop {
     $paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
     $content{expiration} = "$2/$1";
 
-    if ( defined $self->dbdef_table->column('paycvv') ) {
-      my $paycvv = exists($options{'paycvv'})
-                     ? $options{'paycvv'}
-                     : $self->paycvv;
-      $content{cvv2} = $self->paycvv
-        if length($paycvv);
-    }
+    my $paycvv = exists($options{'paycvv'})
+                   ? $options{'paycvv'}
+                   : $self->paycvv;
+    $content{cvv2} = $self->paycvv
+      if length($paycvv);
+
+    my $paystart_month = exists($options{'paystart_month'})
+                           ? $options{'paystart_month'}
+                           : $self->paystart_month;
+
+    my $paystart_year  = exists($options{'paystart_year'})
+                           ? $options{'paystart_year'}
+                           : $self->paystart_year;
+
+    $content{card_start} = "$paystart_month/$paystart_year"
+      if $paystart_month && $paystart_year;
+
+    my $payissue       = exists($options{'payissue'})
+                           ? $options{'payissue'}
+                           : $self->payissue;
+    $content{issue_number} = $payissue if $payissue;
+
+    my $payip          = exists($options{'payip'})
+                           ? $options{'payip'}
+                           : $self->payip;
+    $content{customer_ip} = $payip
+      if length($payip);
 
     $content{recurring_billing} = 'YES'
       if qsearch('cust_pay', { 'custnum' => $self->custnum,
diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index e44f919..17f3460 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -251,7 +251,7 @@ END
   foreach my $state ( sort keys %{ $cust_main_county{$selected_country} } ) {
     my $text = $state || '(n/a)';
     my $selected = $state eq $selected_state ? 'SELECTED' : '';
-    $state_html .= "\n<OPTION $selected VALUE=$state>$text</OPTION>"
+    $state_html .= qq(\n<OPTION $selected VALUE="$state">$text</OPTION>);
   }
   $state_html .= '</SELECT>';
 
@@ -265,7 +265,7 @@ END
       keys %cust_main_county
   ) {
     my $selected = $country eq $selected_country ? ' SELECTED' : '';
-    $country_html .= "\n<OPTION$selected>$country</OPTION>"
+    $country_html .= qq(\n<OPTION$selected VALUE="$country">$country</OPTION>");
   }
   $country_html .= '</SELECT>';
 
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 1e6c4ec..ad90933 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -163,6 +163,10 @@ FS::SelfService - Freeside self-service API
                         'payby'            => $payby,
                         'payinfo'          => $payinfo,
                         'paycvv'           => $paycvv,
+                        'paystart_month'   => $paystart_month
+                        'paystart_year'    => $paystart_year,
+                        'payissue'         => $payissue,
+                        'payip'            => $payip
                         'paydate'          => $paydate,
                         'payname'          => $payname,
                         'invoicing_list'   => $invoicing_list,
diff --git a/htetc/global.asa b/htetc/global.asa
index 1979261..1a81c4b 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -27,7 +27,7 @@ use Spreadsheet::WriteExcel;
 use Business::CreditCard;
 use String::Approx qw(amatch);
 use Chart::LinesPoints;
-use HTML::Widgets::SelectLayers 0.03;
+use HTML::Widgets::SelectLayers 0.05;
 use FS;
 use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
 use FS::Record qw(qsearch qsearchs fields dbdef);
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 397e426..ba59e89 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -110,7 +110,7 @@ sub handler
       use Business::CreditCard;
       use String::Approx qw(amatch);
       use Chart::LinesPoints;
-      use HTML::Widgets::SelectLayers 0.03;
+      use HTML::Widgets::SelectLayers 0.05;
       use FS;
       use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
       use FS::Record qw(qsearch qsearchs fields dbdef);
diff --git a/httemplate/docs/ach.html b/httemplate/docs/ach.html
index b79df78..b8a17c8 100644
--- a/httemplate/docs/ach.html
+++ b/httemplate/docs/ach.html
@@ -4,9 +4,7 @@
       Electronic check (ACH) information
     </TITLE>
   </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
+  <BODY BGCOLOR="#ffffff">
     <IMG BORDER=0 SRC="../images/ach.png">
-    <BR>
-    <CENTER><A HREF="javascript:close()">(close window)</A></CENTER>
   </BODY>
 </HTML>
diff --git a/httemplate/docs/cvv2.html b/httemplate/docs/cvv2.html
index fe8a17f..7670985 100644
--- a/httemplate/docs/cvv2.html
+++ b/httemplate/docs/cvv2.html
@@ -20,6 +20,5 @@
         <IMG BORDER=0 ALT="American Express" SRC="../images/cvv2_amex.png">
       </TD>
   </TABLE>
-    <CENTER><A HREF="javascript:close()">(close window)</A></CENTER>
   </BODY>
 </HTML>
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 61468f3..2911fc1 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 0000000..65cca0a
--- /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 7b88ccb..d3b7b16 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 d2773a6..85dbb97 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') );
diff --git a/httemplate/elements/overlibmws_draggable.js b/httemplate/elements/overlibmws_draggable.js
new file mode 100644
index 0000000..14e4a60
--- /dev/null
+++ b/httemplate/elements/overlibmws_draggable.js
@@ -0,0 +1,78 @@
+/*

+ overlibmws_draggable.js plug-in module - Copyright Foteos Macrides 2002=2005

+   For support of the DRAGGABLE feature.

+   Initial: August 24, 2002 - Last Revised: January 12, 2005

+ See the Change History and Command Reference for overlibmws via:

+

+	http://www.macridesweb.com/oltest/

+

+ Published under an open source license: http://www.macridesweb.com/oltest/license.html

+*/

+

+OLloaded=0;

+OLregCmds('draggable');

+

+// DEFAULT CONFIGURATION

+if(OLud('draggable'))var ol_draggable=0;

+// END CONFIGURATION

+

+var o3_draggable=0,o3_dragging=0,OLmMv,OLcX,OLcY,OLcbX,OLcbY;

+function OLloadDraggable(){OLload('draggable');}

+function OLparseDraggable(pf,i,ar){

+var k=i;

+if(k<ar.length){if(Math.abs(ar[k])==DRAGGABLE){OLtoggle(ar[k],pf+'draggable');return k;}}

+return -1;

+}

+

+function OLcheckDrag(){

+if(o3_draggable){if(o3_sticky&&(o3_frame==self))initDrag();else o3_draggable=0;}

+}

+function initDrag(){

+OLmMv=OLdw.onmousemove;o3_dragging=0;

+if(OLns4){document.captureEvents(Event.MOUSEDOWN|Event.CLICK);

+document.onmousedown=OLgrabEl;;document.onclick=function(e){return routeEvent(e);}}

+else{over.onmousedown=OLgrabEl;OLsetDrgCur(1);}

+}

+function OLsetDrgCur(d){if(!OLns4)over.style.cursor=(d?'move':'auto');}

+

+function OLgrabEl(e){

+var e=(e||event);

+var cKy=(OLns4?e.modifiers&Event.ALT_MASK:(!OLop7?e.altKey:e.ctrlKey));o3_dragging=1;

+if(cKy){OLsetDrgCur(0);document.onmouseup=function(){OLsetDrgCur(1);o3_dragging=0;}

+return(OLns4?routeEvent(e):true);}

+OLx=(e.pageX||e.clientX+OLfd().scrollLeft);OLy=(e.pageY||e.clientY+OLfd().scrollTop);

+if(OLie4)over.onselectstart=function(){return false;}

+if(OLns4){OLcX=OLx;OLcY=OLy;document.captureEvents(Event.MOUSEUP)}else{

+OLcX=OLx-(OLns4?over.left:parseInt(over.style.left));

+OLcY=OLy-(OLns4?over.top:parseInt(over.style.top));

+if((OLshadowPI)&&bkdrop&&o3_shadow){OLcbX=OLx-(parseInt(bkdrop.style.left));

+OLcbY=OLy-(parseInt(bkdrop.style.top));}}OLdw.onmousemove=OLmoveEl;

+document.onmouseup=function(){

+if(OLie4)over.onselectstart=null;o3_dragging=0;OLdw.onmousemove=OLmMv;}

+return(OLns4?routeEvent(e):false);

+}

+

+function OLmoveEl(e){

+var e=(e||event);

+OLx=(e.pageX||e.clientX+OLfd().scrollLeft);OLy=(e.pageY||e.clientY+OLfd().scrollTop);

+if(o3_dragging){if(OLns4){over.moveBy(OLx-OLcX,OLy-OLcY);

+if(OLshadowPI&&bkdrop&&o3_shadow)bkdrop.moveBy(OLx-OLcX,OLy-OLcY);}

+else{OLrepositionTo(over,OLx-OLcX,OLy-OLcY);

+if((OLiframePI)&&OLie55&&OLifsP1)OLrepositionTo(OLifsP1,OLx-OLcX,OLy-OLcY);

+if((OLshadowPI)&&bkdrop&&o3_shadow){OLrepositionTo(bkdrop,OLx-OLcbX,OLy-OLcbY);

+if((OLiframePI)&&OLie55&&OLifsSh)OLrepositionTo(OLifsSh,OLx-OLcbX,OLy-OLcbY);}}

+if(OLhidePI)OLhideUtil(0,1,1,0,0,0);}if(OLns4){OLcX=OLx;OLcY=OLy;}

+return false;

+}

+

+function OLclearDrag(){

+if(OLns4){document.releaseEvents(Event.MOUSEDOWN|Event.MOUSEUP|Event.CLICK);

+document.onmousedown=document.onclick=null;}else{over.onmousedown=null;OLsetDrgCur(0);}

+document.onmouseup=null;o3_dragging=0;

+}

+

+OLregRunTimeFunc(OLloadDraggable);

+OLregCmdLineFunc(OLparseDraggable);

+

+OLdraggablePI=1;

+OLloaded=1;

diff --git a/httemplate/elements/overlibmws_iframe.js b/httemplate/elements/overlibmws_iframe.js
new file mode 100644
index 0000000..e3032f2
--- /dev/null
+++ b/httemplate/elements/overlibmws_iframe.js
@@ -0,0 +1,93 @@
+/*

+ overlibmws_iframe.js plug-in module - Copyright Foteos Macrides 2003-2005

+   Masks system controls to prevent obscuring of popops for IE v5.5 or higher.

+   Initial: October 19, 2003 - Last Revised: May 15, 2005

+ See the Change History and Command Reference for overlibmws via:

+

+	http://www.macridesweb.com/oltest/

+

+ Published under an open source license: http://www.macridesweb.com/oltest/license.html

+*/

+

+OLloaded=0;

+

+var OLifsP1=null,OLifsSh=null,OLifsP2=null;

+

+// IFRAME SHIM SUPPORT FUNCTIONS

+function OLinitIfs(){

+if(!OLie55)return;

+if((OLovertwoPI)&&over2&&over==over2){

+var o=o3_frame.document.all['overIframeOvertwo'];

+if(!o||OLifsP2!=o){OLifsP2=null;OLgetIfsP2Ref();}return;}

+o=o3_frame.document.all['overIframe'];

+if(!o||OLifsP1!=o){OLifsP1=null;OLgetIfsRef();}

+if((OLshadowPI)&&o3_shadow){o=o3_frame.document.all['overIframeShadow'];

+if(!o||OLifsSh!=o){OLifsSh=null;OLgetIfsShRef();}}

+}

+

+function OLsetIfsRef(o,i,z){

+o.id=i;o.src='javascript:false;';o.scrolling='no';var os=o.style;

+os.position='absolute';os.top=0;os.left=0;os.width=1;os.height=1;os.visibility='hidden';

+os.zIndex=over.style.zIndex-z;os.filter='Alpha(style=0,opacity=0)';

+}

+

+function OLgetIfsRef(){

+if(OLifsP1||!OLie55)return;

+OLifsP1=o3_frame.document.createElement('iframe');

+OLsetIfsRef(OLifsP1,'overIframe',2);

+o3_frame.document.body.appendChild(OLifsP1);

+}

+

+function OLgetIfsShRef(){

+if(OLifsSh||!OLie55)return;

+OLifsSh=o3_frame.document.createElement('iframe');

+OLsetIfsRef(OLifsSh,'overIframeShadow',3);

+o3_frame.document.body.appendChild(OLifsSh);

+}

+

+function OLgetIfsP2Ref(){

+if(OLifsP2||!OLie55)return;

+OLifsP2=o3_frame.document.createElement('iframe');

+OLsetIfsRef(OLifsP2,'overIframeOvertwo',1);

+o3_frame.document.body.appendChild(OLifsP2);

+}

+

+function OLsetDispIfs(o,w,h){

+var os=o.style;

+os.width=w+'px';os.height=h+'px';os.clip='rect(0px '+w+'px '+h+'px 0px)';

+o.filters.alpha.enabled=true;

+}

+

+function OLdispIfs(){

+if(!OLie55)return;

+var wd=over.offsetWidth,ht=over.offsetHeight;

+if(OLfilterPI&&o3_filter&&o3_filtershadow){wd+=5;ht+=5;}

+if((OLovertwoPI)&&over2&&over==over2){

+if(!OLifsP2)return;

+OLsetDispIfs(OLifsP2,wd,ht);return;}

+if(!OLifsP1)return;

+OLsetDispIfs(OLifsP1,wd,ht);

+if((!OLshadowPI)||!o3_shadow||!OLifsSh)return;

+OLsetDispIfs(OLifsSh,wd,ht);

+}

+

+function OLshowIfs(){

+if(OLifsP1){OLifsP1.style.visibility="visible";

+if((OLshadowPI)&&o3_shadow&&OLifsSh)OLifsSh.style.visibility="visible";}

+}

+

+function OLhideIfs(o){

+if(!OLie55||o!=over)return;

+if(OLifsP1)OLifsP1.style.visibility="hidden";

+if((OLshadowPI)&&o3_shadow&&OLifsSh)OLifsSh.style.visibility="hidden";

+}

+

+function OLrepositionIfs(X,Y){

+if(OLie55){if((OLovertwoPI)&&over2&&over==over2){

+if(OLifsP2)OLrepositionTo(OLifsP2,X,Y);}

+else{if(OLifsP1){OLrepositionTo(OLifsP1,X,Y);if((OLshadowPI)&&o3_shadow&&OLifsSh)

+OLrepositionTo(OLifsSh,X+o3_shadowx,Y+o3_shadowy);}}}

+}

+

+OLiframePI=1;

+OLloaded=1;

diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html
index a8268c1..472a172 100644
--- a/httemplate/elements/progress-init.html
+++ b/httemplate/elements/progress-init.html
@@ -13,6 +13,7 @@
 
 <SCRIPT TYPE="text/javascript" SRC="../elements/jsrsClient.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript">
 function OLiframeContent(src, width, height, name) {
   return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
diff --git a/httemplate/elements/select-month_year.html b/httemplate/elements/select-month_year.html
new file mode 100644
index 0000000..a0ea74dd
--- /dev/null
+++ b/httemplate/elements/select-month_year.html
@@ -0,0 +1,50 @@
+<%
+
+  my %opt = @_;
+
+  my $prefix = $opt{'prefix'} || '';
+  my $disabled = $opt{'disabled'} || '';
+  my $empty = $opt{'empty_option'} || '';
+  my $date = $opt{'selected_date'} || '';
+  $date = '' if $date eq '-';
+  #$date ||= '01-2000' unless $empty;
+  my $start_year = $opt{'start_year'};
+  my $end_year = $opt{'end_year'} || '2037';
+
+  my( $mon, $year ) = (0, 0);
+  if ( $date ) {
+    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";
+    }
+  }
+
+  unless ( $start_year ) {
+    my @t = localtime;
+    $start_year = $t[5] + 1900;
+  }
+  $start_year = $year if $start_year > $year && $year > 0;
+
+%>
+
+<SELECT NAME="<%= $prefix %>_month" SIZE="1" <%= $disabled%>>
+
+<%= $empty ? '<OPTION VALUE="">' : '' %>
+
+<% for ( 1 .. 12 ) { %>
+   <OPTION<%= $_ == $mon ? ' SELECTED' : '' %> VALUE="<%= $_ %>"><%= $_ %>
+<% } %>
+
+</SELECT>/<SELECT NAME="<%= $prefix %>_year" SIZE="1" <%= $disabled%>>
+
+<%= $empty ? '<OPTION VALUE="">' : '' %>
+
+<% for ( $start_year .. $end_year ) { %>
+   <OPTION<%= $_ == $year ? ' SELECTED' : '' %> VALUE="<%= $_ %>"><%= $_ %>
+<% } %>
+
+</SELECT>
+
diff --git a/httemplate/images/cvv2.png b/httemplate/images/cvv2.png
index 4610dcb..48c58d5 100644
--- a/httemplate/images/cvv2.png
+++ b/httemplate/images/cvv2.png
diff --git a/httemplate/images/cvv2_amex.png b/httemplate/images/cvv2_amex.png
index 21c36a0..82d1f47 100644
--- a/httemplate/images/cvv2_amex.png
+++ b/httemplate/images/cvv2_amex.png
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 561fff9..30397fd 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -6,28 +6,7 @@
 Billing information
 (<A HREF="<%= $p %>misc/bill.cgi?<%= $cust_main->custnum %>">Bill now</A>)
 <%= ntable("#cccccc") %><TR><TD><%= ntable("#cccccc",2) %>
-<TR>
-  <TD ALIGN="right">Tax&nbsp;exempt</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->tax ? 'yes' : 'no' %></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Postal&nbsp;invoices</TD>
-  <TD BGCOLOR="#ffffff">
-    <%= ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no' %>
-  </TD>
-</TR>
-<TR>
-  <TD ALIGN="right">FAX&nbsp;invoices</TD>
-  <TD BGCOLOR="#ffffff">
-    <%= ( grep { $_ eq 'FAX' } @invoicing_list ) ? 'yes' : 'no' %>
-  </TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Email&nbsp;invoices</TD>
-  <TD BGCOLOR="#ffffff">
-    <%= join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || 'no' %>
-  </TD>
-</TR>
+
 <TR>
   <TD ALIGN="right">Billing&nbsp;type</TD>
   <TD BGCOLOR="#ffffff">
@@ -41,10 +20,37 @@ Billing information
   <TD ALIGN="right">Card number</TD>
   <TD BGCOLOR="#ffffff"><%= $cust_main->payinfo_masked %></TD>
 </TR>
+
+<%
+#false laziness w/elements/select-month_year.html & edit/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 {
+  warn "unrecognized expiration date format: $date";
+  ( $mon, $year ) = ( '', '' );
+}
+%>
 <TR>
   <TD ALIGN="right">Expiration</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->paydate %></TD>
-</TR>
+  <TD BGCOLOR="#ffffff"><%= "$mon/$year" %></TD>
+</TR>
+
+<% if ( $cust_main->paystart_month ) { %>
+  <TR>
+    <TD ALIGN="right">Start date</TD>
+    <TD BGCOLOR="#ffffff"><%= $cust_main->paystart_month. '/'. $cust_main->paystart_year %>
+  </TR>
+<% } elsif ( $cust_main->payissue ) { %>
+  <TR>
+    <TD ALIGN="right">Issue #</TD>
+    <TD BGCOLOR="#ffffff"><%= $cust_main->payissue %>
+  </TR>
+<% } %>
+
 <TR>
   <TD ALIGN="right">Name on card</TD>
   <TD BGCOLOR="#ffffff"><%= $cust_main->payname %></TD>
@@ -97,10 +103,6 @@ Billing information
   <% } %>
 
 <TR>
-  <TD ALIGN="right">Expiration</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->paydate %></TD>
-</TR>
-<TR>
   <TD ALIGN="right">Attention</TD>
   <TD BGCOLOR="#ffffff"><%= $cust_main->payname %></TD>
 </TR>
@@ -114,12 +116,49 @@ Billing information
   <TD ALIGN="right">Authorized&nbsp;by</TD>
   <TD BGCOLOR="#ffffff"><%= $cust_main->payinfo %></TD>
 </TR>
+
+<%
+#false laziness w/above etc.
+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 {
+  warn "unrecognized expiration date format: $date";
+  ( $mon, $year ) = ( '', '' );
+}
+%>
 <TR>
   <TD ALIGN="right">Expiration</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->paydate %></TD>
+  <TD BGCOLOR="#ffffff"><%= "$mon/$year" %></TD>
 </TR>
 
 <% } %>
 
+<TR>
+  <TD ALIGN="right">Tax&nbsp;exempt</TD>
+  <TD BGCOLOR="#ffffff"><%= $cust_main->tax ? 'yes' : 'no' %></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Postal&nbsp;invoices</TD>
+  <TD BGCOLOR="#ffffff">
+    <%= ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no' %>
+  </TD>
+</TR>
+<TR>
+  <TD ALIGN="right">FAX&nbsp;invoices</TD>
+  <TD BGCOLOR="#ffffff">
+    <%= ( grep { $_ eq 'FAX' } @invoicing_list ) ? 'yes' : 'no' %>
+  </TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Email&nbsp;invoices</TD>
+  <TD BGCOLOR="#ffffff">
+    <%= join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || 'no' %>
+  </TD>
+</TR>
+
 </TABLE></TD></TR></TABLE>