X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main.cgi;h=d8edbcd8ea995ad75023249b307c53748db6ed9b;hb=030bef17868168b05a67d9f5866b55da1bb9439c;hp=6fc086a1223585d3081a77dd7960fbbed5865205;hpb=7a168617da5f6702422c098d714a11586d7655e9;p=freeside.git
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 6fc086a12..d8edbcd8e 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -17,6 +17,7 @@ my $conf = new FS::Conf;
my $error = '';
my($custnum, $username, $password, $popnum, $cust_main, $saved_pkgpart);
+my(@invoicing_list);
if ( $cgi->param('error') ) {
$error = $cgi->param('error');
$cust_main = new FS::cust_main ( {
@@ -32,6 +33,7 @@ if ( $cgi->param('error') ) {
$username = $cgi->param('username');
$password = $cgi->param('_password');
$popnum = $cgi->param('popnum');
+ @invoicing_list = split( /\s*,\s*/, $cgi->param('invoicing_list') );
} elsif ( $cgi->keywords ) { #editing
my( $query ) = $cgi->keywords;
$query =~ /^(\d+)$/;
@@ -41,6 +43,7 @@ if ( $cgi->param('error') ) {
$username = '';
$password = '';
$popnum = 0;
+ @invoicing_list = $cust_main->invoicing_list;
} else {
$custnum='';
$cust_main = new FS::cust_main ( {} );
@@ -50,6 +53,7 @@ if ( $cgi->param('error') ) {
$username = '';
$password = '';
$popnum = 0;
+ @invoicing_list = ();
}
$cgi->delete_all();
my $action = $custnum ? 'Edit' : 'Add';
@@ -353,7 +357,7 @@ if ( $payby_default eq 'HIDE' ) {
print qq!';
- foreach my $payby (qw( CARD CHEK LECB BILL COMP )) {
+ foreach my $payby (qw( CARD DCRD CHEK DCHK LECB BILL COMP )) {
foreach my $field (qw( payinfo payname )) {
print qq!';
@@ -383,7 +387,7 @@ if ( $payby_default eq 'HIDE' ) {
print qq!>Tax Exempt
!.
qq!invoicing_list;
+ #my @invoicing_list = $cust_main->invoicing_list;
print qq! CHECKED!
if ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
|| grep { $_ eq 'POST' } @invoicing_list;
@@ -401,8 +405,10 @@ if ( $payby_default eq 'HIDE' ) {
);
my %payby = (
- 'CARD' => qq!Credit card ${r} ${r}Exp !. expselect("CARD"). qq! ${r}Name on card !,
- 'CHEK' => qq!Electronic check ${r}Account number ${r}ABA/Routing code ${r}Bank name !,
+ 'CARD' => qq!Credit card (automatic) ${r} ${r}Exp !. expselect("CARD"). qq! ${r}Name on card !,
+ 'DCRD' => qq!Credit card (on-demand) ${r} ${r}Exp !. expselect("DCRD"). qq! ${r}Name on card !,
+ 'CHEK' => qq!Electronic check (automatic) ${r}Account number ${r}ABA/Routing code ${r}Bank name !,
+ 'DCHK' => qq!Electronic check (on-demand) ${r}Account number ${r}ABA/Routing code ${r}Bank name !,
'LECB' => qq!Phone bill billing ${r}Phone number !,
'BILL' => qq!Billing P.O. Attention !,
'COMP' => qq!Complimentary ${r}Approved by ${r}Exp !. expselect("COMP"),
@@ -411,15 +417,17 @@ if ( $payby_default eq 'HIDE' ) {
my( $account, $aba ) = split('@', $payinfo);
my %paybychecked = (
- 'CARD' => qq!Credit card ${r} ${r}Exp !. expselect("CARD", $cust_main->paydate). qq! ${r}Name on card !,
- 'CHEK' => qq!Electronic check ${r}Account number ${r}ABA/Routing code ${r}Bank name !,
+ 'CARD' => qq!Credit card (automatic) ${r} ${r}Exp !. expselect("CARD", $cust_main->paydate). qq! ${r}Name on card !,
+ 'DCRD' => qq!Credit card (on-demand) ${r} ${r}Exp !. expselect("DCRD", $cust_main->paydate). qq! ${r}Name on card !,
+ 'CHEK' => qq!Electronic check (automatic) ${r}Account number ${r}ABA/Routing code ${r}Bank name !,
+ 'DCHK' => qq!Electronic check (on-demand) ${r}Account number ${r}ABA/Routing code ${r}Bank name !,
'LECB' => qq!Phone bill billing ${r}Phone number !,
'BILL' => qq!Billing P.O. Attention !,
'COMP' => qq!Complimentary ${r}Approved by ${r}Exp !. expselect("COMP", $cust_main->paydate),
);
$cust_main->payby($payby_default) unless $cust_main->payby;
- for (qw(CARD CHEK LECB BILL COMP)) {
+ for (qw(CARD DCRD CHEK DCHK LECB BILL COMP)) {
print qq! | payby eq "$_") {
print qq! CHECKED> $paybychecked{$_} | !;