X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=b3fdfdcf435a24900f50af50d1c9a90ec163727f;hb=3d62ec9362d0b22c17a17da6197f8b2fc219a54e;hp=9953ea54b0e909d5ffa6a4542a3b28ed2dc6dbd4;hpb=982ded2d929bdcdfa72efa810273f3bc753bf036;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 9953ea54b..b3fdfdcf4 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2862,7 +2862,7 @@ and customer address. Include units.',
   {
     'key'         => 'overlimit_groups',
     'section'     => '',
-    'description' => 'RADIUS group (or comma-separated groups) to assign to svc_acct which has exceeded its bandwidth or time limit.',
+    'description' => 'RADIUS group(s) to assign to svc_acct which has exceeded its bandwidth or time limit.',
     'type'        => 'select-sub',
     'per_agent'   => 1,
     'multiple'    => 1,
@@ -2959,6 +2959,13 @@ 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.',
@@ -3122,7 +3129,8 @@ and customer address. Include units.',
     'description' => 'Fixed (unchangeable) format for electronic check batches.',
     'type'        => 'select',
     'select_enum' => [ 'csv-td_canada_trust-merchant_pc_batch', 'BoM', 'PAP',
-                       'paymentech', 'ach-spiritone', 'RBC', 'td_eft1464'
+                       'paymentech', 'ach-spiritone', 'RBC', 'td_eft1464',
+                       'eft_canada'
                      ]
   },
 
@@ -3183,6 +3191,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'batchconfig-eft_canada',
+    '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',
+  },
+
+  {
     'key'         => 'payment_history-years',
     'section'     => 'UI',
     'description' => 'Number of years of payment history to show by default.  Currently defaults to 2.',