[freeside-commits] freeside/httemplate/misc download-batch.cgi, 1.20.2.1, 1.20.2.2 payment.cgi, 1.12.2.1, 1.12.2.2

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/misc
In directory wavetail:/tmp/cvs-serv15281/httemplate/misc

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	download-batch.cgi payment.cgi 
Log Message:
add to ACH batch feature from customer view page (backport)

Index: payment.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/payment.cgi,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- payment.cgi	6 Apr 2007 23:58:52 -0000	1.12.2.1
+++ payment.cgi	23 Apr 2007 03:42:40 -0000	1.12.2.2
@@ -225,6 +225,16 @@
     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>
+% }
   <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

Index: download-batch.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/download-batch.cgi,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -d -r1.20.2.1 -r1.20.2.2
--- download-batch.cgi	21 Mar 2007 04:12:58 -0000	1.20.2.1
+++ download-batch.cgi	23 Apr 2007 03:42:40 -0000	1.20.2.2
@@ -99,7 +99,7 @@
 %
 %  my( $account, $aba ) = split( '@', $cust_pay_batch->payinfo );
 %  my $payname=$cust_pay_batch->payname; $payname =~ tr/",/  /; #payinfo too?
-%  my $batchline = qq!"$payname","!.$cust_pay_batch->paybatchnum.
+%  my $batchline = qq!"$payname","!.$cust_pay_batch->custnum.   #dodgy, works for autoapply
 %                  qq!","$aba","$account","27","!.$cust_pay_batch->amount.
 %                  qq!","27","0.00"!;
 %  push @batchlines, $batchline;