add to ACH batch feature from customer view page

3 files changed, 38 insertions, 14 deletions

diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
index da975376b..26c385ebc 100644
--- a/httemplate/misc/download-batch.cgi
+++ b/httemplate/misc/download-batch.cgi
@@ -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;
diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 1008a216b..ac102826a 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -225,6 +225,16 @@ function OLiframeContent(src, width, height, name) {
     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
diff --git a/httemplate/misc/process/payment.cgi b/httemplate/misc/process/payment.cgi
index 8878f5255..9ac5d5d9e 100644
--- a/httemplate/misc/process/payment.cgi
+++ b/httemplate/misc/process/payment.cgi
@@ -89,19 +89,33 @@
 %  die "unknown payby $payby";
 %}
 %
-%my $error = $cust_main->realtime_bop( $FS::payby::payby2bop{$payby}, $amount,
-%  'quiet'    => 1,
-%  'manual'   => 1,
-%  'payinfo'  => $payinfo,
-%  'paydate'  => "$year-$month-01",
-%  'payname'  => $payname,
-%  'paybatch' => $paybatch,
-%  'paycvv'   => $paycvv,
-%  map { $_ => $cgi->param($_) } @{$payby2fields{$payby}}
-%);
-%eidiot($error) if $error;
-%
-%$cust_main->apply_payments;
+%my $error = '';
+%if ($cgi->param('batch')) {
+%  $error = $cust_main->batch_card(
+%                                   'payby'    => $payby,
+%                                   'amount'   => $amount,
+%                                   'payinfo'  => $payinfo,
+%                                   'paydate'  => "$year-$month-01",
+%                                   'payname'  => $payname,
+%                                   map { $_ => $cgi->param($_) } 
+%                                     @{$payby2fields{$payby}}
+%                                 );
+%  eidiot($error) if $error;
+%}else{
+%  $error = $cust_main->realtime_bop( $FS::payby::payby2bop{$payby}, $amount,
+%    'quiet'    => 1,
+%    'manual'   => 1,
+%    'payinfo'  => $payinfo,
+%    'paydate'  => "$year-$month-01",
+%    'payname'  => $payname,
+%    'paybatch' => $paybatch,
+%    'paycvv'   => $paycvv,
+%    map { $_ => $cgi->param($_) } @{$payby2fields{$payby}}
+%  );
+%  eidiot($error) if $error;
+%
+%  $cust_main->apply_payments;
+%}
 %
 %if ( $cgi->param('save') ) {
 %  my $new = new FS::cust_main { $cust_main->hash };