X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fdownload-batch.cgi;h=23deba712e76c6ad276be4b3b2a73fdc38b67af2;hb=3d2e1d9b5d1883f768f5a90e0dfaae7cc9a41367;hp=2c6481493590404716445096884ad84a825a233a;hpb=6c375156081be5d2023001ed8eaac9b6db568e95;p=freeside.git

diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
index 2c6481493..23deba712 100644
--- a/httemplate/misc/download-batch.cgi
+++ b/httemplate/misc/download-batch.cgi
@@ -1,9 +1,7 @@
-<%
-
-my $conf=new FS::Conf;
+<% $pay_batch->export_batch($format) %><%init>
 
 #http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes
-http_header('Content-Type' => 'text/plain' );
+http_header('Content-Type' => 'text/plain' ); # not necessarily correct...
 
 my $batchnum;
 if ( $cgi->param('batchnum') =~ /^(\d+)$/ ) {
@@ -15,103 +13,9 @@ if ( $cgi->param('batchnum') =~ /^(\d+)$/ ) {
 my $format;
 if ( $cgi->param('format') =~ /^([\w\- ]+)$/ ) {
   $format = $1;
-} else {
-  $format = $conf->config('batch-default_format');
 }
 
-my $oldAutoCommit = $FS::UID::AutoCommit;
-local $FS::UID::AutoCommit = 0;
-my $dbh = dbh;
-
-my $pay_batch = qsearchs('pay_batch', {'batchnum'=>$batchnum, 'status'=>'O'} );
-die "No pending batch. \n" unless $pay_batch;
-
-my %batchhash = $pay_batch->hash;
-$batchhash{'status'} = 'I';
-$batchhash{'download'} = time unless $batchhash{'download'};
-my $new = new FS::pay_batch \%batchhash;
-my $error = $new->replace($pay_batch);
-die "error updating batch status: $error\n" if $error;
-
-my $batchtotal=0;
-my $batchcount=0;
-
-my (@date)=localtime($new->download);
-my $jdate = sprintf("%03d", $date[5] % 100).sprintf("%03d", $date[7] + 1);
-my $cdate = sprintf("%02d", $date[3]).sprintf("%02d", $date[4] + 1).
-            sprintf("%02d", $date[5] % 100);
-
-if ($format eq "BoM") {
-
-  my($origid,$datacenter,$typecode,$shortname,$longname,$mybank,$myacct) =
-    $conf->config("batchconfig-$format");
-  %><%= sprintf( "A%10s%04u%06u%05u%54s\n",$origid,$pay_batch->batchnum,$jdate,$datacenter,"").
-        sprintf( "XD%03u%06u%-15s%-30s%09u%-12s   \n",$typecode,$jdate,$shortname,$longname,$mybank,$myacct )
-  %><%
-
-}elsif ($format eq "PAP"){
-
-  my($origid,$datacenter,$typecode,$shortname,$longname,$mybank,$myacct) =
-    $conf->config("batchconfig-$format");
-  %><%= sprintf( "H%10sD%3s%06u%-15s%09u%-12s%04u%19s\n",$origid,$typecode,$cdate,$shortname,$mybank,$myacct,$pay_batch->batchnum,"")
-
-  %><%
-
-}elsif ($format eq "csv-td_canada_trust-merchant_pc_batch"){
-#  1;
-}else{
-  die "Unknown format for batch in batchconfig. \n";
-}
-
-
-for my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
-                           qsearch('cust_pay_batch',
-			      {'batchnum'=>$pay_batch->batchnum} )
-) {
-
-  $cust_pay_batch->exp =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-  my( $mon, $y ) = ( $2, $1 );
-  $mon = "0$mon" if $mon < 10;
-  my $exp = "$mon$y";
-  $batchcount++;
-  $batchtotal += $cust_pay_batch->amount;
-  
-  if ($format eq "BoM") {
-
-    my( $account, $aba ) = split( '@', $cust_pay_batch->payinfo );
-    %><%= sprintf( "D%010.0f%09u%-12s%-29s%-19s\n",$cust_pay_batch->amount*100,$aba,$account,$cust_pay_batch->payname,$cust_pay_batch->paybatchnum) %><%
-
-  } elsif ($format eq "PAP"){
-
-    my( $account, $aba ) = split( '@', $cust_pay_batch->payinfo );
-    %><%= sprintf( "D%-23s%06u%-19s%09u%-12s%010.0f\n",$cust_pay_batch->payname,$cdate,$cust_pay_batch->paybatchnum,$aba,$account,$cust_pay_batch->amount*100) %><%
-
-  } elsif ($format eq "csv-td_canada_trust-merchant_pc_batch") {
-
-    %>,,,,<%= $cust_pay_batch->payinfo %>,<%= $exp %>,<%= $cust_pay_batch->amount %>,<%= $cust_pay_batch->paybatchnum %><%
-
-  } else {
-    die "I'm already dead, but you did not know that.\n";
-  }
-
-}
-
-if ($format eq "BoM") {
-
-  %><%= sprintf( "YD%08u%014.0f%56s\n",$batchcount,$batchtotal*100,"" ).
-        sprintf( "Z%014u%05u%014u%05u%41s\n",$batchtotal*100,$batchcount,"0","0","" ) %><%
-
-} elsif ($format eq "PAP"){
-
-  %><%= sprintf( "T%08u%014.0f%57s\n",$batchcount,$batchtotal*100,"" ) %><%
-
-} elsif ($format eq "csv-td_canada_trust-merchant_pc_batch"){
-  #1;
-} else {
-  die "I'm already dead (again), but you did not know that.\n";
-}
-
-$dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-%>
+my $pay_batch = qsearchs('pay_batch', { batchnum => $batchnum } );
+die "Batch not found: '$batchnum'" if !$pay_batch;
 
+</%init>