RT# 82087 - added logging for decode json error

[freeside.git] / FS / FS / Conf.pm

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d2351c0..597e2c9 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -894,6 +894,14 @@ my $validate_email = sub { $_[0] =~
     'per_agent'   => 1,
   },
 
+  {
+    'key'         => 'credit-card-surcharge-text',
+    'section'     => 'billing',
+    'description' => 'Text for the credit card surcharge invoice line.  If not set, it will default to Credit Card Surcharge.',
+    'type'        => 'text',
+    'per_agent'   => 1,
+  },
+
   {
     'key'         => 'discount-show-always',
     'section'     => 'billing',
@@ -1830,6 +1838,15 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'allow_payment_receipt_noemail',
+    'section'     => 'notification',
+    'description' => 'Add option on customer edit/view page to disable emailing of payment receipts.  If this option is set to NO it will override customer specific option, so when set to NO system will not check for payment_receipt_noemail option at customer level.',
+    'type'        => 'checkbox',
+    'per_agent'   => 1,
+    'agent_bool'  => 1,
+  },
+
   {
     'key'         => 'payment_receipt',
     'section'     => 'notification',
@@ -1958,7 +1975,7 @@ and customer address. Include units.',
   {
     'key'         => 'passwordmin',
     'section'     => 'password',
-    'description' => 'Minimum password length (default 6)',
+    'description' => 'Minimum password length (default 8)',
     'type'        => 'text',
   },
 
@@ -2196,6 +2213,13 @@ and customer address. Include units.',
     ],
   },
 
+  {
+    'key'         => 'unsuspend_reason_type',
+    'section'     => 'suspension',
+    'description' => 'If set, limits automatic unsuspension to packages which were suspended for this reason type.',
+    reason_type_options('S'),
+  },
+
   {
     'key'         => 'unsuspend-always_adjust_next_bill_date',
     'section'     => 'billing',
@@ -2821,6 +2845,14 @@ and customer address. Include units.',
     'select_enum' => [ qw(CARD DCRD CHEK DCHK LECB BILL CASH WEST MCRD MCHK PPAL COMP) ],
   },
 
+  {
+    'key'         => 'processing-fee',
+    'section'     => 'billing',
+    'description' => 'Fee for back end payment processing.',
+    'type'        => 'text',
+    'per_agent'   => 1,
+  },
+
   {
     'key'         => 'payby-default',
     'section'     => 'UI',
@@ -3336,6 +3368,13 @@ and customer address. Include units.',
     'select_enum' => [ 'enabled', 'disabled' ],
   },
 
+  {
+    'key'         => 'global_unique-svc_hardware',
+    'section'     => '',
+    'description' => 'Turn on duplicate checking for svc_hardware services.  Unique fields are IP address, hardware address, and serial number (per device type).',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'svc_external-skip_manual',
     'section'     => 'UI',
@@ -5503,6 +5542,13 @@ and customer address. Include units.',
     'multiple'    => 1,
   },
 
+  {
+    'key'         => 'cdr-max_duration',
+    'section'     => 'telephony',
+    'description' => 'If set, defines a global maximum billsec/duration for (prefix-based) call rating, in seconds.  Used with questionable/dirty CDR data that may contain bad records with long billsecs/durations.',
+    'type'        => 'text',
+  },
+
   {
     'key'         => 'disable-cust-pkg_class',
     'section'     => 'UI',