From: mark <mark>
Date: Mon, 31 Jan 2011 20:28:39 +0000 (+0000)
Subject: fixed format option for TD EFT, RT#10545
X-Git-Tag: freeside_2_1_2~89
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=e0fb1463f48285cbab8fc464cbec16a6f880c4d8

fixed format option for TD EFT, RT#10545
---

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 991906563..c13915baf 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2974,7 +2974,7 @@ 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'
+                       'paymentech', 'ach-spiritone', 'RBC', 'td_eft1464'
                      ]
   },
 
diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi
index cb101d4db..6d628d39d 100755
--- a/httemplate/search/cust_pay_batch.cgi
+++ b/httemplate/search/cust_pay_batch.cgi
@@ -179,7 +179,15 @@ if ( $pay_batch ) {
                          ).
                   '<BR></TR>'
                   ;
-    if ( $fixed ) {
+    if ( $fixed and $fixed eq 'td_eft1464' ) {
+      # special case, this one has two upload formats
+      $html_init .= qq!<TR>Format !.
+                    qq!<SELECT NAME="format">!.
+                    qq!<OPTION VALUE="td_eftack264">TD EFT Acknowledgement</OPTION>!.
+                    qq!<OPTION VALUE="td_eftret80">TD EFT Returned Items</OPTION>!.
+                    qq!</SELECT><BR></TR>!;
+    }
+    elsif ( $fixed ) {
       $html_init .= qq!<INPUT TYPE="hidden" NAME="format" VALUE="$fixed">!;
     } else {
       # should pull this from %import_info