projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
torrus, add router UI, RT10574
[freeside.git]
/
httemplate
/
misc
/
payment.cgi
diff --git
a/httemplate/misc/payment.cgi
b/httemplate/misc/payment.cgi
index
8d7baa5
..
aec68af
100644
(file)
--- a/
httemplate/misc/payment.cgi
+++ b/
httemplate/misc/payment.cgi
@@
-67,6
+67,11
@@
% }
% }
+<% include('/elements/tr-select-discount_term.html',
+ 'custnum' => $custnum,
+ 'cgi' => $cgi
+ )
+%>
% if ( $payby eq 'CARD' ) {
%
% if ( $payby eq 'CARD' ) {
%
@@
-300,8
+305,12
@@
my $fee = '';
my $fee_pkg = '';
my $fee_display = '';
my $fee_op = '';
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')
if ( $conf->config('manual_process-pkgpart')
- and ! $conf->exists('manual_process-skip_first') || $
cust_main->cust_pay
+ and ! $conf->exists('manual_process-skip_first') || $
num_payments
)
{
)
{
@@
-323,6
+332,10
@@
if ( $balance > 0 ) {
$amount = $balance;
$amount += $fee
if $fee && $fee_display eq 'subtract';
$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);
}
$amount = sprintf("%.2f", $amount);
}