Revert "RT# 79902 - fixed so change payment information link will still work when...

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

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index fd05231..5a74451 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1693,6 +1693,15 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
     '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',
   {
     'key'         => 'payment_receipt',
     'section'     => 'notification',


@@ -2046,6 +2055,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'     => 'suspension',
   {
     'key'         => 'unsuspend-always_adjust_next_bill_date',
     'section'     => 'suspension',


@@ -2646,6 +2662,14 @@ and customer address. Include units.',
     'select_enum' => [ qw(CARD DCRD CHEK DCHK) ], #BILL CASH WEST MCRD MCHK PPAL) ],
   },
 
     'select_enum' => [ qw(CARD DCRD CHEK DCHK) ], #BILL CASH WEST MCRD MCHK PPAL) ],
   },
 

+  {
+    'key'         => 'processing-fee',
+    'section'     => 'payments',
+    'description' => 'Fee for back end payment processing.',
+    'type'        => 'text',
+    'per_agent'   => 1,
+  },
+

   {
     'key'         => 'banned_pay-pad',
     'section'     => 'credit_cards',
   {
     'key'         => 'banned_pay-pad',
     'section'     => 'credit_cards',


@@ -5204,6 +5228,13 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
     'type'        => 'checkbox',
   },
 

+  {
+    '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'     => 'packages',
   {
     'key'         => 'disable-cust-pkg_class',
     'section'     => 'packages',