value issues and many bits remain

[freeside.git] / httemplate / misc / download-batch.cgi

diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
index 37b31c1..6172b13 100644 (file)
--- a/httemplate/misc/download-batch.cgi
+++ b/httemplate/misc/download-batch.cgi
@@ -6,17 +6,17 @@ my $conf=new FS::Conf;
 http_header('Content-Type' => 'text/plain' );
 
 my $format;
-if ( $cgi->param('format') =~ /^([\w ]+)$/ ) {
+if ( $cgi->param('format') =~ /^([\w\- ]+)$/ ) {
   $format = $1;
 } else {
-  $format = $conf->config('batch_default_format');
+  $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', {'status'=>''} );
+my $pay_batch = qsearchs('pay_batch', {'status'=>'O'} );
 die "No pending batch. \n" unless $pay_batch;
 
 my %batchhash = $pay_batch->hash;
@@ -33,12 +33,13 @@ my $jdate = sprintf("%03d", $date[5] % 100).sprintf("%03d", $date[7]);
 
 if ($format eq "BoM") {
 
-  my($reformat,$origid,$datacenter,$typecode,$shortname,$longname,$mybank,$myacct) = $conf->config("batchconfig-$format");
+  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 "CSV file for TD Canada Trust Merchant PC Batch"){
+}elsif ($format eq "csv-td_canada_trust-merchant_pc_batch"){
 #  1;
 }else{
   die "Unknown format for batch in batchconfig. \n";
@@ -62,7 +63,7 @@ for my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
     my( $account, $aba ) = split( '@', $cust_pay_batch->payinfo );
     %><%= sprintf( "D%010u%09u%-12s%-29s%-19s\n",$cust_pay_batch->amount*100,$aba,$account,$cust_pay_batch->payname,$cust_pay_batch->invnum %><%
 
-  } elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch") {
+  } elsif ($format eq "csv-td_canada_trust-merchant_pc_batch") {
 
     %>,,,,<%= $cust_pay_batch->payinfo %>,<%= $exp %>,<%= $cust_pay_batch->amount %>,<%= $cust_pay_batch->paybatchnum %><%
 
@@ -77,7 +78,7 @@ if ($format eq "BoM") {
   %><%= sprintf( "YD%08u%014u%56s\n",$batchcount,$batchtotal*100,"" ).
         sprintf( "Z%014u%05u%014u%05u%41s\n",$batchtotal*100,$batchcount,"0","0","" ) %><%
 
-} elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
+} 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";