X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=5a744510dfd1e23ae9917d33aaac2079e12cfd1b;hb=afb1c3d32628a6778c56fd3ff356dfaaa6ac0c58;hp=057e4cff6eb68a16962ea0d7cbc0bb1d0db66c80;hpb=29445ff3f69c32ba0f836f3c5bbaf946c154b360;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 057e4cff6..5a744510d 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1693,6 +1693,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',
@@ -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',
@@ -2646,6 +2662,14 @@ and customer address. Include units.',
     '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',