X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=113bac08307ef552d1f56ae17e13080415dac948;hp=7dcbf044c6b7e39c63cd3de7ad0058edaab1485e;hb=f63936fb0404dc44fc8d3aa45c4edd4fa6670821;hpb=9c866ccad0f187f29d21f12b93f15f2787aa9843

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 7dcbf044c..113bac083 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2465,6 +2465,16 @@ and customer address. Include units.',
     'type'        => 'select-part_svc',
     'multiple'    => 1,
   },
+
+  {
+    'key'         => 'selfservice-password_reset_verification',
+    'section'     => 'self-service',
+    'description' => 'If enabled, specifies the type of verification required for self-service password resets.',
+    'type'        => 'select',
+    'select_hash' => [ '' => 'Password reset disabled',
+                       'paymask,amount,zip' => 'Verify with credit card (or bank account) last 4 digits, payment amount and zip code',
+                     ],
+  },
   
   {
     'key'         => 'selfservice-recent-did-age',
@@ -3014,13 +3024,6 @@ and customer address. Include units.',
   },
 
   {
-    'key'         => 'echeck-no_routing',
-    'section'     => 'billing',
-    'description' => 'Disable the routing number entirely for Electronic Check payment info.',
-    'type'        => 'checkbox',
-  },
-
-  {
     'key'         => 'voip-cust_accountcode_cdr',
     'section'     => 'telephony',
     'description' => 'Enable the per-customer option for CDR breakdown by accountcode.',
@@ -3250,6 +3253,14 @@ and customer address. Include units.',
     'section'     => 'billing',
     'description' => 'Configuration for EFT Canada batching, four lines: 1. SFTP username, 2. SFTP password, 3. Transaction code, 4. Number of days to delay process date.',
     'type'        => 'textarea',
+    'per_agent'   => 1,
+  },
+
+  {
+    'key'         => 'batch-spoolagent',
+    'section'     => 'billing',
+    'description' => 'Store payment batches per-agent.',
+    'type'        => 'checkbox',
   },
 
   {
@@ -3331,6 +3342,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'cust_main-edit_calling_list_exempt',
+    'section'     => 'UI',
+    'description' => 'Display the "calling_list_exempt" checkbox on customer edit.',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'support-key',
     'section'     => '',
     'description' => 'A support key enables access to commercial services delivered over the network, such as the payroll module, access to the internal ticket system, priority support and optional backups.',
@@ -4410,8 +4428,8 @@ and customer address. Include units.',
   {
     'key'         => 'cust_main-custom_link',
     'section'     => 'UI',
-    'description' => 'URL to use as source for the "Custom" tab in the View Customer page.  The custnum will be appended.',
-    'type'        => 'text',
+    'description' => 'URL to use as source for the "Custom" tab in the View Customer page.  The customer number will be appended, or you can insert "$custnum" to have it inserted elsewhere.  "$agentnum" will be replaced with the agent number.',
+    'type'        => 'textarea',
   },
 
   {
@@ -4488,6 +4506,13 @@ and customer address. Include units.',
     'description' => 'Enable DID activity summary on invoices, showing # DIDs activated/deactivated/ported-in/ported-out and total minutes usage, covering period since last invoice.',
     'type'        => 'checkbox',
   },
+
+  {
+    'key'         => 'svc_acct-usage_seconds',
+    'section'     => 'invoicing',
+    'description' => 'Enable calculation of RADIUS usage time for invoices.  You must modify your template to display this information.',
+    'type'        => 'checkbox',
+  },
   
   {
     'key'         => 'opensips_gwlist',
@@ -4563,7 +4588,7 @@ and customer address. Include units.',
   {
     'key'         => 'payment-history-report',
     'section'     => 'UI',
-    'description' => 'Show a link to the payment history report in the Reports menu. DO NOT ENABLE THIS.',
+    'description' => 'Show a link to the raw database payment history report in the Reports menu.  DO NOT ENABLE THIS for modern installations.',
     'type'        => 'checkbox',
   },