[freeside-commits] branch master updated. 024d64da1f139ffbcbb52fe071851b9539bebe31

[Ivan Kohler]

The branch, master has been updated
       via  024d64da1f139ffbcbb52fe071851b9539bebe31 (commit)
       via  d75a2141f0f67b07aad07e9d63b0518306597b19 (commit)
      from  856a547c2d699e2ba1d542763df546d6bd7a8cc9 (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 024d64da1f139ffbcbb52fe071851b9539bebe31
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Aug 29 14:42:21 2019 -0700

    quoting fix for asterisk v12+ CDRs stored in Pg, RT#83146

diff --git a/FS/bin/freeside-cdr-asterisk_sql b/FS/bin/freeside-cdr-asterisk_sql
index 7e3c447fa..2c4204548 100755
--- a/FS/bin/freeside-cdr-asterisk_sql
+++ b/FS/bin/freeside-cdr-asterisk_sql
@@ -56,7 +56,12 @@ if ( $engine =~ /^mysql/ ) {
 
 my @cols = ();
 if ( $opt{V} >= 12 ) {
-  push @cols, qw( id start answer end );
+  push @cols, qw( id start answer );
+  if ( $engine =~ /^Pg/ ) {
+    push @cols, "'end'";
+  } else {
+    push @cols, "end";
+  }
 } else {
   push @cols, qw( calldate );
 }
@@ -182,7 +187,7 @@ sub log_and_warn {
 
 
 sub usage {
-  "Usage: \n  freeside-cdr-asterisk_sql\n\t-e mysql|Pg|... [ -H host ]n\t-D database\n\t[ -T table ]\n\t[ -V asterisk_version]\n\t-U user\n\t-P password\n\tfreesideuser\n";
+  "Usage: \n  freeside-cdr-asterisk_sql\n\t-e mysql|Pg|... [ -H host ]\n\t-D database\n\t[ -T table ]\n\t[ -V asterisk_version]\n\t-U user\n\t-P password\n\tfreesideuser\n";
 }
 
 =head1 NAME

commit d75a2141f0f67b07aad07e9d63b0518306597b19
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Aug 13 09:12:54 2019 -0700

    spelling and time

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 9e68ffc67..070b56b4a 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -775,7 +775,7 @@ my $validate_email = sub { $_[0] =~
   {
     'key'         => 'credit-card-surcharge-percentage',
     'section'     => 'credit_cards',
-    'description' => 'Add a credit card surcharge to invoices, as a % of the invoice total.  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%.',
+    'description' => 'Add a credit card surcharge to invoices, as a % of the invoice total.  WARNING: Although permitted to US merchants in general since 2013, specific consumer protection laws may prohibit or restrict this practice in California, Colorado, Connecticut, Florda, Kansas, Maine, Massachusetts, New York, Oklahoma, 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,
   },
@@ -783,7 +783,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.  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%.',
+    'description' => 'Add a credit card surcharge to invoices, as a flat fee.  WARNING: Although permitted to US merchants in general since 2013, specific consumer protection laws may prohibit or restrict this practice in California, Colorado, Connecticut, Florda, Kansas, Maine, Massachusetts, New York, Oklahoma, 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                    | 4 ++--
 FS/bin/freeside-cdr-asterisk_sql | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)