[freeside-commits] freeside/FS/FS Conf.pm,1.180.2.36,1.180.2.37

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv2076/FS/FS

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	Conf.pm 
Log Message:
add batch-enable_payby and realtime_disable_payby for better control over hybrid realtime/batch installs; deprecate never-used paymentforcedtobatch, RT#4052

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.180.2.36
retrieving revision 1.180.2.37
diff -u -d -r1.180.2.36 -r1.180.2.37
--- Conf.pm	13 Oct 2008 22:00:53 -0000	1.180.2.36
+++ Conf.pm	16 Oct 2008 05:35:36 -0000	1.180.2.37
@@ -1556,8 +1556,8 @@
 
   {
     'key'         => 'paymentforcedtobatch',
-    'section'     => 'UI',
-    'description' => 'Causes per customer payment entry to be forced to a batch processor rather than performed realtime.',
+    'section'     => 'deprecated',
+    'description' => 'See batch-enable_payby and realtime-disable_payby.  Used to (for CHEK): Cause per customer payment entry to be forced to a batch processor rather than performed realtime.',
     'type'        => 'checkbox',
   },
 
@@ -2037,12 +2037,29 @@
 
   {
     'key'         => 'batch-enable',
-    'section'     => 'billing',
+    'section'     => 'deprecated', #make sure batch-enable_payby is set for
+                                   #everyone before removing
     'description' => 'Enable credit card and/or ACH batching - leave disabled for real-time installations.',
     'type'        => 'checkbox',
   },
 
   {
+    'key'         => 'batch-enable_payby',
+    'section'     => 'billing',
+    'description' => 'Enable batch processing for the specified payment types.',
+    'type'        => 'selectmultiple',
+    'select_enum' => [qw( CARD CHEK )],
+  },
+
+  {
+    'key'         => 'realtime-disable_payby',
+    'section'     => 'billing',
+    'description' => 'Disable realtime processing for the specified payment types.',
+    'type'        => 'selectmultiple',
+    'select_enum' => [qw( CARD CHEK )],
+  },
+
+  {
     'key'         => 'batch-default_format',
     'section'     => 'billing',
     'description' => 'Default format for batches.',
@@ -2360,13 +2377,6 @@
   },
 
   {
-    'key'         => 'disable_acl_changes',
-    'section'     => '',
-    'description' => 'Disable all ACL changes, for demos.',
-    'type'        => 'checkbox',
-  },
-
-  {
     'key'         => 'cust_main-edit_agent_custid',
     'section'     => 'UI',
     'description' => 'Enable editing of the agent_custid field.',