[freeside-commits] branch FREESIDE_4_BRANCH updated. 6db5c31175c207fd6fdae97b1d7ecb719d6c94aa

Christopher Burger burgerc at freeside.biz
Tue Jun 25 09:26:48 PDT 2019


The branch, FREESIDE_4_BRANCH has been updated
       via  6db5c31175c207fd6fdae97b1d7ecb719d6c94aa (commit)
       via  482141ff3752cb2d32c7002078735489dec30e06 (commit)
      from  eedd5a49c5584189e7dbc1038afa74af688b15ca (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 6db5c31175c207fd6fdae97b1d7ecb719d6c94aa
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) {

commit 482141ff3752cb2d32c7002078735489dec30e06
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue Jun 25 08:27:29 2019 -0400

    RT# 82137 - default payment amount now has processing fee in total if processing fee exists.

diff --git a/httemplate/elements/tr-amount_fee.html b/httemplate/elements/tr-amount_fee.html
index 42132e09a..42636cfe4 100644
--- a/httemplate/elements/tr-amount_fee.html
+++ b/httemplate/elements/tr-amount_fee.html
@@ -140,6 +140,8 @@ if ( $amount ) {
 
   $amount += $surcharge;
 
+  $amount += $processing_fee; ## needed if processing fee is checked on default.
+
   $amount = sprintf("%.2f", $amount);
 }
 

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

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




More information about the freeside-commits mailing list