X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pay_batch.cgi;h=4a2248726d3a960634cd0a930b6b530089a3c2c2;hb=38dd3ed3eeda0a467e1b4d8cedd741fc62aedc9c;hp=df635ee8de95366ce53866741d5cd85c6556cf18;hpb=5188e8406a1fa2bee63ea81090ffefe3d4bf1b89;p=freeside.git

diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi
index df635ee8d..4a2248726 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
@@ -193,13 +201,22 @@ if ( $pay_batch ) {
                     qq!<OPTION VALUE="ach-spiritone">Spiritone ACH batch</OPTION>!.
                     qq!<OPTION VALUE="paymentech">Chase Paymentech XML</OPTION>!.
                     qq!<OPTION VALUE="RBC">Royal Bank of Canada PDS</OPTION>!.
-                    qq!<OPTION VALUE="td_eft1464">TD Commercial Banking EFT 1464 byte</OPTION>!.
+                    qq!<OPTION VALUE="td_eftack264">TD EFT Acknowledgement</OPTION>!.
+                    qq!<OPTION VALUE="td_eftret80">TD EFT Returned Items</OPTION>!.
                     qq!</SELECT><BR></TR>!;
     }
     $html_init .= qq!<INPUT TYPE="hidden" NAME="batchnum" VALUE="$batchnum">!;
     $html_init .= '<TR> <INPUT TYPE="submit" VALUE="Upload"></FORM><BR> </TR>';
+    if ( $conf->exists('batch-manual_approval') 
+          and $conf->config('batch-fixed_format-CHEK') eq 'td_eft1464'
+          and $pay_batch->status eq 'I'
+          and $pay_batch->payby eq 'CHEK' ) {
+      $html_init .= qq!<TR><INPUT TYPE="button" VALUE="Manually approve" onclick="
+if ( confirm('Approve all remaining payments in this batch?') )
+  window.location.href='${p}misc/process/pay_batch-approve.cgi?batchnum=$batchnum';"></TR>!
+    }
   }
-  $html_init .= '</TABLE>'
+  $html_init .= '</TABLE>';
 }
 
 if ($pay_batch) {