- Card number |
+ <% mt('Card number') |h %> |
- |
- Exp. |
+ >
+ <% mt('Exp.') |h %> |
|
- CVV2 |
+ <% mt('CVV2') |h %> |
- (help)
+ (<% mt('help') |h %>)
|
- Exact name on card |
+ <% mt('Exact name on card') |h %> |
|
- <% include( '/elements/location.html',
- 'object' => $cust_main, #XXX errors???
+ <& /elements/location.html,
+ 'object' => $cust_main->bill_location,
'no_asterisks' => 1,
- 'address1_label' => 'Card billing address',
- )
- %>
+ '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;
- Account number |
- |
- Type |
+ <% mt('Account number') |h %> |
+ > |
+ <% mt('Type') |h %> |
|
- ABA/Routing number |
+ <% mt($routing_label) |h %> |
-
- (help)
+ >
+ (<% mt('help') |h %>)
|
+% if ( $conf->config('echeck-country') eq 'CA' ) {
+
+ <% mt('Branch number') |h %> |
+
+ >
+ |
+
+% }
- Bank name |
+ <% mt('Bank name') |h %> |
|
% if ( $conf->exists('show_bankstate') ) {
- Bank state |
- <% include('/elements/select-state.html',
+ | <% mt('Bank state') |h %> |
+ <& /elements/select-state.html,
'disable_empty' => 0,
- 'empty_label' => '(choose)',
+ 'empty_label' => emt('(choose)'),
'state' => $paystate,
'country' => $cust_main->country,
'prefix' => 'pay',
- )
- %>
+ &>
|
% } else {
@@ -190,8 +167,8 @@
% if ( $conf->exists('show_ss') ) {
- Account holder
- Social security or tax ID #
+ <% mt('Account holder') |h %>
+ <% mt('Social security or tax ID #') |h %>
|
|
@@ -202,19 +179,18 @@
% if ( $conf->exists('show_stateid') ) {
- Account holder
- Driver’s license or state ID #
+ <% mt('Account holder') |h %>
+ <% mt("Driver's license or state ID #") |h %>
|
|
- State |
- <% include('/elements/select-state.html',
+ | <% mt('State') |h %> |
+ <& /elements/select-state.html,
'disable_empty' => 0,
- 'empty_label' => '(choose)',
+ 'empty_label' => emt('(choose)'),
'state' => $stateid_state,
'country' => $cust_main->country,
'prefix' => 'stateid_',
- )
- %>
+ &>
|
% } else {
@@ -228,15 +204,17 @@
- Remember this information
+ <% 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;
@@ -244,8 +222,8 @@
-
- Add to current batch
+
+ <% mt('Add to current batch') |h %>
|
@@ -254,18 +232,59 @@
- 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; }">
- Charge future payments to this <% $type{$payby} %> automatically
+ 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) {
+
+% }
+
-
+
-<% include('/elements/footer.html') %>
+<& /elements/footer.html &>
<%init>
die "access denied"
@@ -286,13 +305,19 @@ my $custnum = $1;
my $cust_main = qsearchs( 'cust_main', { 'custnum'=>$custnum } );
die "unknown custnum $custnum" unless $cust_main;
+my $location = $cust_main->bill_location;
+# no proper error handling on this anyway, but when we have it,
+# remember to repopulate fields in $location
+
my $balance = $cust_main->balance;
my $payinfo = '';
my $conf = new FS::Conf;
-my $money_char = $conf->config('money_char') || '$';
+my $auto = ( ( $payby eq 'CARD' && $cust_main->payby ne 'DCRD' ) || ( $payby eq 'CHEK' && $cust_main->payby eq 'CHEK' ) ) ? 1 : 0;
+my $disable_payauto_default = $conf->exists('disable_payauto_default');
+my $possibly_uncheck_auto = ' ONCHANGE="possibly_uncheck_auto()"';
#false laziness w/selfservice make_payment.html shortcut for one-country
my %states = map { $_->state => 1 }
@@ -301,42 +326,13 @@ my %states = map { $_->state => 1 }
} );
my @states = sort { $a cmp $b } keys %states;
-my $fee = '';
-my $fee_pkg = '';
-my $fee_display = '';
-my $fee_op = '';
-my $num_payments = scalar($cust_main->cust_pay);
-#handle old cust_main.pm (remove...)
-$num_payments = scalar( @{ [ $cust_main->cust_pay ] } )
- unless defined $num_payments;
-if ( $conf->config('manual_process-pkgpart')
- and ! $conf->exists('manual_process-skip_first') || $num_payments
- )
-{
-
- $fee_display = $conf->config('manual_process-display') || 'add';
- $fee_op = $fee_display eq 'add' ? '+' : '-';
-
- $fee_pkg =
- qsearchs('part_pkg', { pkgpart=>$conf->config('manual_process-pkgpart') } );
-
- #well ->unit_setup or ->calc_setup both call for a $cust_pkg
- # (though ->unit_setup doesn't use it...)
- $fee = $fee_pkg->option('setup_fee')
- if $fee_pkg; #in case.. better than dying with a perl traceback
-
-}
-
my $amount = '';
if ( $balance > 0 ) {
- $amount = $balance;
- $amount += $fee
- if $fee && $fee_display eq 'subtract';
-
- my $cc_surcharge_pct = $conf->config('credit-card-surcharge-percentage');
- $amount += $amount * $cc_surcharge_pct/100 if $cc_surcharge_pct > 0;
-
- $amount = sprintf("%.2f", $amount);
+ # when configured to do so, amount will only auto-fill with balance
+ # if balance represents a single invoice
+ $amount = $balance
+ unless $conf->exists('manual_process-single_invoice_amount')
+ && ($cust_main->open_cust_bill != 1);
}
my $payunique = "webui-payment-". time. "-$$-". rand() * 2**32;
|