From 2b49cbe76b94c6c1561aa2bf37beba7d47591190 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Aug 2005 13:22:27 +0000
Subject: [PATCH] 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

---
 Changes.1.5.8                                |   2 +
 FS/FS/ClientAPI/MyAccount.pm                 |  10 +-
 FS/FS/ClientAPI/Signup.pm                    |   7 +-
 FS/FS/cust_main.pm                           |  36 ++-
 FS/FS/cust_main_county.pm                    |   4 +-
 fs_selfservice/FS-SelfService/SelfService.pm |   4 +
 htetc/global.asa                             |   2 +-
 htetc/handler.pl                             |   2 +-
 httemplate/docs/ach.html                     |   4 +-
 httemplate/docs/cvv2.html                    |   1 -
 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 +-
 httemplate/elements/overlibmws_draggable.js  |  78 ++++++
 httemplate/elements/overlibmws_iframe.js     |  93 +++++++
 httemplate/elements/progress-init.html       |   1 +
 httemplate/elements/select-month_year.html   |  50 ++++
 httemplate/images/cvv2.png                   | Bin 3854 -> 7791 bytes
 httemplate/images/cvv2_amex.png              | Bin 4573 -> 9539 bytes
 httemplate/view/cust_main/billing.html       |  97 ++++---
 21 files changed, 847 insertions(+), 222 deletions(-)
 create mode 100644 httemplate/edit/cust_main/billing.html
 create mode 100644 httemplate/elements/overlibmws_draggable.js
 create mode 100644 httemplate/elements/overlibmws_iframe.js
 create mode 100644 httemplate/elements/select-month_year.html

diff --git a/Changes.1.5.8 b/Changes.1.5.8
index e69cf92d1..77b0b6fb0 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 45c2eb0de..4b67f53af 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 ede7ba9a0..ed71651fa 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 8622b87e7..0169039b9 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 e44f919f2..17f346071 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 1e6c4ec0c..ad909332c 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 1979261ed..1a81c4b1c 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 397e4267a..ba59e89d3 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 b79df78fe..b8a17c87d 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 fe8a17f6f..767098537 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 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') );
diff --git a/httemplate/elements/overlibmws_draggable.js b/httemplate/elements/overlibmws_draggable.js
new file mode 100644
index 000000000..14e4a6062
--- /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 000000000..e3032f2ee
--- /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 a8268c12c..472a1725f 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 000000000..a0ea74ddd
--- /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 4610dcbe62aa30a493a84265090f59ade25d83f8..48c58d561da29a7b1f9d7d84ff65b07c088063af 100644
GIT binary patch
literal 7791
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

literal 3854
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
Q>;M1&07*qoM6N<$f(|>W{Qv*}

diff --git a/httemplate/images/cvv2_amex.png b/httemplate/images/cvv2_amex.png
index 21c36a0ab5eb9f9fe56bb994007ac2d5284d55c5..82d1f4715f9506385fa56be6cc33aaa4a6187fa6 100644
GIT binary patch
literal 9539
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
W>NhvF&%kyk6eW4J*OgF{(EkCo`9#71

literal 4573
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
Hu0mjf_HDMR

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 561fff992..30397fd3e 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>
 
-- 
2.11.0