[freeside-commits] branch FREESIDE_4_BRANCH updated. b487b3c39e258cd3b8978bfa8e052ecc8af5c57d

[Ivan Kohler]

The branch, FREESIDE_4_BRANCH has been updated
       via  b487b3c39e258cd3b8978bfa8e052ecc8af5c57d (commit)
      from  f3f123567e61f41a4004fc0d4cc73fba0dd52e52 (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 b487b3c39e258cd3b8978bfa8e052ecc8af5c57d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu May 31 15:40:07 2018 -0700

    add warning to flat fee description too, RT#79737

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 10ae2450e..5c55d2e68 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -806,7 +806,7 @@ my $validate_email = sub { $_[0] =~
   {
     'key'         => 'credit-card-surcharge-flatfee',
     'section'     => 'credit_cards',
-    'description' => 'Add a credit card surcharge to invoices, as a flat fee.',
+    'description' => 'Add a credit card surcharge to invoices, as a flat fee.  WARNING: Although recently permitted to US merchants in general, specific consumer protection laws may prohibit or restrict this practice in California, Colorado, Connecticut, Florda, Kansas, Maine, Massachusetts, New York, Oklahome, and Texas.  Surcharging is also generally prohibited in most countries outside the US, AU and UK.  When allowed, typically not permitted to be above 4%.',
     'type'        => 'text',
     'per_agent'   => 1,
   },

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

Summary of changes:
 FS/FS/Conf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)