From 626dbc1a49b6b1dfba94584670a0a0b11ac52148 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 16 Oct 2008 05:29:00 +0000
Subject: add batch-enable_payby and realtime_disable_payby for better control
 over hybrid realtime/batch installs; deprecate never-used
 paymentforcedtobatch, RT#4052

---
 httemplate/misc/payment.cgi | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

(limited to 'httemplate/misc')

diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 7546a858a..9aaa45904 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -185,23 +185,37 @@
     <INPUT TYPE="checkbox" CHECKED NAME="save" VALUE="1">
     Remember this information
   </TD>
-</TR><TR>
-% if ($conf->exists("batch-enable")) {
-  <TD COLSPAN=2>
-    <INPUT TYPE="checkbox" <% ( $conf->exists("paymentforcedtobatch") && $payby eq 'CHEK' ) ? 'CHECKED DISABLED' : '' %> NAME="batch" VALUE="1">
-    Add to current batch
-% if ($conf->exists("paymentforcedtobatch") && $payby eq 'CHEK' ) {
-    <INPUT TYPE="hidden" NAME="batch" VALUE="1">
-% }
-  </TD>
-</TR><TR>
+</TR>
+
+% if ( $conf->exists("batch-enable")
+%      || grep $payby eq $_, $conf->config('batch-enable_payby')
+%    ) {
+%
+%     if ( grep $payby eq $_, $conf->config('realtime-disable_payby') ) {
+
+          <INPUT TYPE="hidden" NAME="batch" VALUE="1">
+
+%     } else {
+
+          <TR>
+            <TD COLSPAN=2>
+              <INPUT TYPE="checkbox" NAME="batch" VALUE="1">
+              Add to current batch
+            </TD>
+          </TR>
+
+%     }
 % }
+
+<TR>
   <TD COLSPAN=2>
     <INPUT TYPE="checkbox"<% ( ( $payby eq 'CARD' && $cust_main->payby ne 'DCRD' ) || ( $payby eq 'CHEK' && $cust_main->payby eq 'CHEK' ) ) ? ' CHECKED' : '' %> NAME="auto" VALUE="1" onClick="if (this.checked) { document.OneTrueForm.save.checked=true; }">
     Charge future payments to this <% $type{$payby} %> automatically
   </TD>
 </TR>
+
 </TABLE>
+
 <BR>
 <INPUT TYPE="submit" NAME="process" VALUE="Process payment">
 </FORM>
-- 
cgit v1.2.1