[freeside-commits] branch FREESIDE_3_BRANCH updated. 690b42d0311236b1c07acb5bdbae32276e20e3b9

[Ivan Kohler]

The branch, FREESIDE_3_BRANCH has been updated
       via  690b42d0311236b1c07acb5bdbae32276e20e3b9 (commit)
      from  1aef4abc1ce1a8469b7b707904993647a57ab296 (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 690b42d0311236b1c07acb5bdbae32276e20e3b9
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu May 31 15:43:00 2018 -0700

    add warning to flat fee description too, RT#79737

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 97a258ca0..c21d69244 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -889,7 +889,7 @@ my $validate_email = sub { $_[0] =~
   {
     'key'         => 'credit-card-surcharge-flatfee',
     'section'     => 'billing',
-    '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(-)