diff options
| author | ivan <ivan> | 2012-01-14 07:05:18 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2012-01-14 07:05:18 +0000 |
| commit | 074464a707b2c8b83cc50cd0bb067660ef4d0f9f (patch) | |
| tree | 0ad8867e31ae73ea793a29ca4589b6ba0fbb86dd /httemplate/edit | |
| parent | a6446097691aa2e1b393cd1f099f304316a82689 (diff) | |
improve echeck validation for canada, deprecate echeck-nonus and cust_main-require-bank-branch config in favor of echeck-country, RT#15982
Diffstat (limited to 'httemplate/edit')
| -rw-r--r-- | httemplate/edit/cust_main/billing.html | 18 | ||||
| -rwxr-xr-x | httemplate/edit/process/cust_main.cgi | 2 |
2 files changed, 14 insertions, 6 deletions
diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html index fd078c5da..78fac6c22 100644 --- a/httemplate/edit/cust_main/billing.html +++ b/httemplate/edit/cust_main/billing.html @@ -127,7 +127,7 @@ % my( $account, $aba ) = split('@', $payinfo); % my $branch = ''; % ($branch,$aba) = split('\.',$aba) -% if $conf->exists('cust_main-require-bank-branch'); +% if $conf->config('echeck-country') eq 'CA'; % % my $disabled = 'DISABLED style="background-color: #dddddd"'; % my $text_disabled = 'style="color: #999999"'; @@ -161,6 +161,14 @@ % my $card_billday_select_disabled = $payby eq 'CARD' ? '' : 'DISABLED'; % my $chek_billday_select_disabled = $payby eq 'CHEK' ? '' : 'DISABLED'; % +% #false laziness w/view/cust_main/billing.html and misc/payment.cgi +% my $routing_label = $conf->config('echeck-country') eq 'US' +% ? 'ABA/Routing number' +% : 'Routing number'; +% my $routing_size = $conf->config('echeck-country') eq 'CA' ? 4 : 10; +% my $routing_maxlength = $conf->config('echeck-country') eq 'CA' ? 3 : 9; +% +% % my %payby = ( % % 'CARD' => @@ -235,17 +243,17 @@ % join('', map { qq!<OPTION VALUE="$_" !.($paytype eq $_ ? 'SELECTED' : '').">$_</OPTION>" } @FS::cust_main::paytypes). % qq!</SELECT></TD></TR>!. % -% qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('ABA/Routing number').qq! </TD>!. -% qq!<TD COLSPAN="3" WIDTH="408"><INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="CHEK_payinfo2" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $aba : '' ). qq!" SIZE=10 MAXLENGTH=9> !. +% qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt($routing_label).qq! </TD>!. +% qq!<TD COLSPAN="3" WIDTH="408"><INPUT TYPE="text" SIZE=$routing_size MAXLENGTH=$routing_maxlength NAME="CHEK_payinfo2" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $aba : '' ). qq!"> !. % 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;">!.emt('help').qq!</A>)!. % qq!</TD></TR>!. % % qq!<INPUT TYPE="hidden" NAME="CHEK_exp_month" VALUE="12">!. % qq!<INPUT TYPE="hidden" NAME="CHEK_exp_year" VALUE="2037">!. % -% ( $conf->exists('cust_main-require-bank-branch') ? +% ( $conf->config('echeck-country') eq 'CA' ? % qq!<TR><TD ALIGN="right">$r !.emt('Branch number').qq!</TD><TD COLSPAN="3"> -% <INPUT TYPE="text" name="CHEK_payinfo3" VALUE=$branch></TD></TR>! : '' ). +% <INPUT TYPE="text" name="CHEK_payinfo3" VALUE="$branch" SIZE=6 MAXLENGTH=5></TD></TR>! : '' ). % % qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Bank name').qq! </TD>!. % qq!<TD COLSPAN="3" WIDTH="408"><INPUT TYPE="text" NAME="CHEK_payname" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $cust_main->payname : '' ). qq!"></TD></TR>!. diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi index df6cec9df..f75e2a6ae 100755 --- a/httemplate/edit/process/cust_main.cgi +++ b/httemplate/edit/process/cust_main.cgi @@ -44,7 +44,7 @@ if ( $payby ) { if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) { my $payinfo = $cgi->param('payinfo1'). '@'; $payinfo .= $cgi->param('payinfo3').'.' - if $conf->exists('cust_main-require-bank-branch'); + if $conf->config('echeck-country') eq 'CA'; $payinfo .= $cgi->param('payinfo2'); $cgi->param('payinfo',$payinfo); } |