[freeside-commits] branch master updated. dd26195f5d9683ca3ede7cca224ed8fded2ec163

[Christopher Burger]

The branch, master has been updated
       via  dd26195f5d9683ca3ede7cca224ed8fded2ec163 (commit)
       via  86448cce000b5c1db8e33b7884b6acd6ea7906c6 (commit)
      from  8f47a838311c8bdc7823bdb9bbf0859e59d4a8c6 (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 dd26195f5d9683ca3ede7cca224ed8fded2ec163
Merge: 86448cce0 8f47a8383
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Wed May 16 09:50:47 2018 -0400

    Merge branch 'master' of ssh://git.freeside.biz/home/git/freeside


commit 86448cce000b5c1db8e33b7884b6acd6ea7906c6
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Wed May 16 09:15:39 2018 -0400

    RT# 34134 - fixed initial display of surcharge amount

diff --git a/httemplate/elements/tr-amount_fee.html b/httemplate/elements/tr-amount_fee.html
index 3ad2cdf06..1c78d7ec1 100644
--- a/httemplate/elements/tr-amount_fee.html
+++ b/httemplate/elements/tr-amount_fee.html
@@ -32,7 +32,7 @@
            <INPUT TYPE="hidden" NAME="surcharge_percentage" ID="surcharge_percentage" VALUE="<% $surcharge_percentage %>">
            <INPUT TYPE="hidden" NAME="surcharge_flatfee" ID="surcharge_flatfee" VALUE="<% $surcharge_flatfee %>">
       </TD><TD ID="ajax_surcharge_cell" BGCOLOR="#dddddd" STYLE="border:1px solid blue">
-           <FONT SIZE="+1">A credit card surcharge of <% $money_char. sprintf('%.2f', ($amount * $surcharge_percentage) + $surcharge_flatfee) %> is included in this payment</FONT>
+           <FONT SIZE="+1">A credit card surcharge of <% $money_char. sprintf('%.2f', $surcharge) %> is included in this payment</FONT>
 %        }
       </TD></TR></TABLE>
     </TD>

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

Summary of changes: