projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
miss you, mark
[freeside.git]
/
httemplate
/
elements
/
tr-amount_fee.html
diff --git
a/httemplate/elements/tr-amount_fee.html
b/httemplate/elements/tr-amount_fee.html
index
a1a9e34
..
9c13f59
100644
(file)
--- a/
httemplate/elements/tr-amount_fee.html
+++ b/
httemplate/elements/tr-amount_fee.html
@@
-1,4
+1,4
@@
- <TR>
+ <TR
ID="payment_amount_row" <% $opt{'row_style'} %>
>
<TH ALIGN="right"><% mt('Payment amount') |h %></TH>
<TD COLSPAN=7>
<TABLE><TR><TD BGCOLOR="#ffffff">
<TH ALIGN="right"><% mt('Payment amount') |h %></TH>
<TD COLSPAN=7>
<TABLE><TR><TD BGCOLOR="#ffffff">
@@
-15,7
+15,7
@@
onKeyPress = "amount_changed(this)"
% }
>
onKeyPress = "amount_changed(this)"
% }
>
- </TD><TD BGCOLOR="
#cccccc
">
+ </TD><TD BGCOLOR="
<% length($fee) ? '#cccccc' : '#ffffff' %>
">
% if ( $fee ) {
<INPUT TYPE="hidden" NAME="fee_pkgpart" VALUE="<% $fee_pkg->pkgpart %>">
<INPUT TYPE="hidden" NAME="fee" VALUE="<% $fee_display eq 'add' ? $fee : '' %>">
% if ( $fee ) {
<INPUT TYPE="hidden" NAME="fee_pkgpart" VALUE="<% $fee_pkg->pkgpart %>">
<INPUT TYPE="hidden" NAME="fee" VALUE="<% $fee_display eq 'add' ? $fee : '' %>">
@@
-90,7
+90,9
@@
if ( $amount > 0 ) {
$amount += $fee
if $fee && $fee_display eq 'subtract';
$amount += $fee
if $fee && $fee_display eq 'subtract';
- &{ $opt{post_fee_callback} }( \$amount ) if $opt{post_fee_callback};
+ #&{ $opt{post_fee_callback} }( \$amount ) if $opt{post_fee_callback};
+ $amount += $amount * $opt{'surcharge_percentage'}/100
+ if $opt{'surcharge_percentage'} > 0;
$amount = sprintf("%.2f", $amount);
}
$amount = sprintf("%.2f", $amount);
}