X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Fpayment.cgi;h=4a867d28d2ead8fdef69d1747fee198bf3bf1662;hp=472763b2d046532313a5b94b1ba9d2ec57c6dc92;hb=c5e31619e5a3071506cff19578e9e377753a96f4;hpb=8800e519dc0e4b8eee4ab2cddc74d52c205bc536 diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi index 472763b2d..4a867d28d 100644 --- a/httemplate/misc/payment.cgi +++ b/httemplate/misc/payment.cgi @@ -1,23 +1,20 @@ -<% include( '/elements/header.html', "Process $type{$payby} payment" ) %> -<% include( '/elements/small_custview.html', $cust_main, '', '', popurl(2) . "view/cust_main.cgi" ) %> +<& /elements/header.html, mt("Process [_1] payment",$type{$payby}) &> +<& /elements/small_custview.html, $cust_main, '', '', popurl(2) . "view/cust_main.cgi" &>
-<% include('/elements/init_overlib.html') %> - -% #include( '/elements/table.html', '#cccccc' ) - -% my $amount = $balance > 0 ? sprintf("%.2f", $balance) : ''; +<& /elements/init_overlib.html &> <% ntable('#cccccc') %> - Payment amount + <% mt('Payment amount') |h %>
<% $money_char %> % if ( $fee ) { - - + + + <% $fee_op %> <% $money_char . $fee %> <% $fee_pkg->pkg |h %> = - <% length($amount) ? $money_char. sprintf('%.2f', $amount + $fee ) : '' %> TOTAL + <% length($amount) ? $money_char. sprintf('%.2f', ($fee_display eq 'add') ? $amount + $fee : $amount - $fee ) : '' %> <% $fee_display eq 'add' ? 'TOTAL' : 'AVAILABLE' %> % }
@@ -55,13 +52,13 @@ var total = ''; if ( what.value.length ) { - total = parseFloat(what.value) + <% $fee %>; + total = parseFloat(what.value) <% $fee_op %> <% $fee %>; /* total = Math.round(total*100)/100; */ total = '<% $money_char %>' + total.toFixed(2); } var total_cell = document.getElementById('ajax_total_cell'); - total_cell.innerHTML = '' + total + ' TOTAL'; + total_cell.innerHTML = '' + total + ' <% $fee_display eq 'add' ? 'TOTAL' : 'AVAILABLE' %>'; } @@ -69,6 +66,10 @@ % } +<& /elements/tr-select-discount_term.html, + 'custnum' => $custnum, + 'amount_id' => 'amount', +&> % if ( $payby eq 'CARD' ) { % @@ -82,13 +83,13 @@ % } - Card number + <% mt('Card number') |h %> - + - + - + - <% include( '/elements/location.html', + <& /elements/location.html, 'object' => $cust_main, #XXX errors??? '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->exists('cust_main-require-bank-branch'); % $payname = $cust_main->payname; % $ss = $cust_main->ss; % $paytype = $cust_main->getfield('paytype'); @@ -150,34 +152,41 @@ - - - + + + - + +% if ( $conf->exists('cust_main-require-bank-branch') ) { + + + + +% } - + % if ( $conf->exists('show_bankstate') ) { - - + % } else { @@ -187,8 +196,8 @@ % if ( $conf->exists('show_ss') ) { @@ -199,19 +208,18 @@ % if ( $conf->exists('show_stateid') ) { - - + % } else { @@ -225,7 +233,7 @@ @@ -242,7 +250,7 @@ @@ -252,17 +260,17 @@
Exp.<% mt('Exp.') |h %>
CVV2<% mt('CVV2') |h %> - (help) + (<% mt('help') |h %>)
Exact name on card<% mt('Exact name on card') |h %>
Account numberType<% mt('Account number') |h %><% mt('Type') |h %>
ABA/Routing number<% mt('ABA/Routing number') |h %> - - (help) + + (<% mt('help') |h %>)
<% mt('Branch number') |h %> + +
Bank name<% mt('Bank name') |h %>
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', - ) - %> + &>
- Account holder
- Social security or tax ID # + <% mt('Account holder') |h %>
+ <% mt('Social security or tax ID #') |h %>
- 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_', - ) - %> + &>
- Remember this information + <% mt('Remember this information') |h %>
- Add to current batch + <% mt('Add to current batch') |h %>
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 + <% mt("Charge future payments to this [_1] automatically",$type{$payby}) |h %>

- +
-<% include('/elements/footer.html') %> +<& /elements/footer.html &> <%init> die "access denied" @@ -300,7 +308,20 @@ my @states = sort { $a cmp $b } keys %states; my $fee = ''; my $fee_pkg = ''; -if ( $conf->config('manual_process-pkgpart') ) { +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') } ); @@ -308,6 +329,19 @@ if ( $conf->config('manual_process-pkgpart') ) { # (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); } my $payunique = "webui-payment-". time. "-$$-". rand() * 2**32;