RT# 82137 - added processing fee template substitution.

Conflicts:
	httemplate/edit/msg_template/email.html
	httemplate/elements/tr-amount_fee.html

1 files changed, 3 insertions, 3 deletions

diff --git a/httemplate/elements/tr-amount_fee.html b/httemplate/elements/tr-amount_fee.html
index 7797f6c2b..e90d36459 100644
--- a/httemplate/elements/tr-amount_fee.html
+++ b/httemplate/elements/tr-amount_fee.html
@@ -123,7 +123,9 @@ if ( $opt{'process-pkgpart'}
 
 }
 
-my $amount = $opt{'amount'};
+$processing_fee = $opt{'processing_fee'} if $opt{'processing_fee'} > 0;
+
+my $amount = $opt{'amount'} ? $opt{'amount'} : "0.00";
 if ( $amount > 0 ) {
   $amount += $fee
     if $fee && $fee_display eq 'subtract';
@@ -135,8 +137,6 @@ if ( $amount > 0 ) {
   $amount += $opt{'surcharge_flatfee'}
     if $opt{'surcharge_flatfee'} > 0;
 
-  $processing_fee = $opt{'processing_fee'} if $opt{'processing_fee'} > 0;
-
   $amount += $processing_fee; ## needed if processing fee is checked on default.
 
   $amount = sprintf("%.2f", $amount);