[freeside-commits] branch master updated. 2009d9cee8038aeff5b4313113fc23f546455cf5

[Christopher Burger]

The branch, master has been updated
       via  2009d9cee8038aeff5b4313113fc23f546455cf5 (commit)
      from  37e92c220a54636ebc7900cd59ec6ce56790ede8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2009d9cee8038aeff5b4313113fc23f546455cf5
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue Jun 25 10:55:00 2019 -0400

    RT# 82137 - added processing fee template substitution.

diff --git a/httemplate/edit/msg_template/email.html b/httemplate/edit/msg_template/email.html
index 53f538b11..a400bc804 100644
--- a/httemplate/edit/msg_template/email.html
+++ b/httemplate/edit/msg_template/email.html
@@ -297,6 +297,7 @@ my %substitutions = (
   'cust_pay'  => [
     '$paynum'         => 'Payment#',
     '$paid'           => 'Amount',
+    '$processing_fee' => 'Processing fee',
     '$payby'          => 'Payment method',
     '$date'           => 'Payment date',
     '$payinfo'        => 'Card/account# (masked)',
@@ -372,6 +373,7 @@ Substitutions: '
 Enclose substitutions and other Perl expressions in braces:
 <BR>{ $name } = ExampleCo (Smith, John)
 <BR>{ time2str("%D", time) } = '.time2str("%D", time).'
+<BR>{ "processing fee of $processing_fee" if $processing_fee; } = Will display text if there is a processing fee
 </P>';
 $sidebar .= include('/elements/template_image-dialog.html',
               'callback' => 'insertHtml'
diff --git a/httemplate/elements/tr-amount_fee.html b/httemplate/elements/tr-amount_fee.html
index 42636cfe4..40f55e7a3 100644
--- a/httemplate/elements/tr-amount_fee.html
+++ b/httemplate/elements/tr-amount_fee.html
@@ -5,7 +5,7 @@
         <% $money_char %><INPUT NAME     = "amount"
                                 ID       = "amount"
                                 TYPE     = "text"
-                                VALUE    = ""
+                                VALUE    = "0.00"
                                 SIZE     = 8
                                 STYLE    = "text-align:right;"
 %                               if ( $fee || $surcharge_percentage || $surcharge_flatfee || $processing_fee) {

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/msg_template/email.html | 2 ++
 httemplate/elements/tr-amount_fee.html  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)