- |
+ >
<% mt('Exp.') |h %> |
@@ -102,8 +69,7 @@
|
@@ -124,43 +90,62 @@
|
<& /elements/location.html,
- 'object' => $cust_main, #XXX errors???
+ 'object' => $cust_main->bill_location,
'no_asterisks' => 1,
'address1_label' => emt('Card billing address'),
&>
% } elsif ( $payby eq 'CHEK' ) {
%
-% my( $payinfo1, $payinfo2, $payname, $ss, $paytype, $paystate,
+% my( $account, $aba, $branch, $payname, $ss, $paytype, $paystate,
% $stateid, $stateid_state )
-% = ( '', '', '', '', '', '', '', '' );
+% = ( '', '', '', '', '', '', '', '', '' );
% if ( $cust_main->payby =~ /^(CHEK|DCHK)$/ ) {
-% $cust_main->paymask =~ /^([\dx]+)\@([\dx]+)$/i
+% $cust_main->paymask =~ /^([\dx]+)\@([\d\.x]*)$/i
% or die "unparsable payinfo ". $cust_main->payinfo;
-% ($payinfo1, $payinfo2) = ($1, $2);
+% ($account, $aba) = ($1, $2);
+% ($branch,$aba) = split('\.',$aba)
+% if $conf->config('echeck-country') eq 'CA';
% $payname = $cust_main->payname;
% $ss = $cust_main->ss;
% $paytype = $cust_main->getfield('paytype');
% $paystate = $cust_main->getfield('paystate');
% $stateid = $cust_main->getfield('stateid');
% $stateid_state = $cust_main->getfield('stateid_state');
+% } elsif ($disable_payauto_default) {
+% $auto = 0;
% }
+%
+% #false laziness w/{edit,view}/cust_main/billing.html
+% 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;
<% mt('Account number') |h %> |
- |
+ > |
<% mt('Type') |h %> |
|
- <% mt('ABA/Routing number') |h %> |
+ <% mt($routing_label) |h %> |
-
+ >
(<% mt('help') |h %>)
|
+% if ( $conf->config('echeck-country') eq 'CA' ) {
+
+ <% mt('Branch number') |h %> |
+
+ >
+ |
+
+% }
<% mt('Bank name') |h %> |
|
@@ -222,15 +207,17 @@
- <% mt('Remember this informatio') |h %>
+ <% mt('Remember this information') |h %>
|
+% my $disallow_no_auto_apply = 0;
% if ( $conf->exists("batch-enable")
% || grep $payby eq $_, $conf->config('batch-enable_payby')
% ) {
%
% if ( grep $payby eq $_, $conf->config('realtime-disable_payby') ) {
+% $disallow_no_auto_apply = 1;
@@ -238,7 +225,7 @@
-
+
<% mt('Add to current batch') |h %>
|
@@ -248,11 +235,52 @@
- payby ne 'DCRD' ) || ( $payby eq 'CHEK' && $cust_main->payby eq 'CHEK' ) ) ? ' CHECKED' : '' %> NAME="auto" VALUE="1" onClick="if (this.checked) { document.OneTrueForm.save.checked=true; }">
+ NAME="auto" VALUE="1" onClick="if (this.checked) { document.OneTrueForm.save.checked=true; }">
<% mt("Charge future payments to this [_1] automatically",$type{$payby}) |h %>
|
+% unless ($disallow_no_auto_apply) {
+% # false laziness with edit/cust_pay.cgi
+
+
+
+ <% mt('Auto-apply to invoices') |h %>
+
+ |
+
+
+% # this can go away if no_auto_apply handling gets added to batch payment processing
+
+
+% }
+
+% if ($auto && $disable_payauto_default) {
+
+% }
+