X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Fdownload-batch.cgi;h=c4bc37e93df7e1cf61c6aaefbd7fca435b4b0b9e;hp=5ee12f174c6bd822a548be02ace22b71d5bc03b1;hb=560af69840e7e3fcebf65d5d56ca4efc0851efec;hpb=95b6fff06bd55cfc97647b056cb321b1b57c2d78

diff --git a/httemplate/misc/download-batch.cgi b/httemplate/misc/download-batch.cgi
index 5ee12f174..c4bc37e93 100644
--- a/httemplate/misc/download-batch.cgi
+++ b/httemplate/misc/download-batch.cgi
@@ -1,15 +1,37 @@
-<%
+<% $exporttext %><%init>
 
-http_header('Content-Type' => 'text/comma-separated-values');
+#http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes
+http_header('Content-Type' => 'text/plain' ); # not necessarily correct...
 
-for my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
-                              qsearch('cust_pay_batch', {} )
-) {
+my $batchnum;
+if ( $cgi->param('batchnum') =~ /^(\d+)$/ ) {
+  $batchnum = $1;
+} else {
+  die "No batch number (bad URL) \n";
+}
 
-$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";
+my %opt;
+if ( $cgi->param('gatewaynum') =~ /^(\d+)$/ ) {
+  my $gateway = FS::payment_gateway->by_key($1);
+  die "gatewaynum $1 not found" unless $gateway;
+  $opt{'gateway'} = $gateway;
+}
+elsif ( $cgi->param('format') =~ /^([\w\- ]+)$/ ) {
+  $opt{'format'} = $1;
+}
 
-%>,,,,<%= $cust_pay_batch->cardnum %>,<%= $exp %>,<%= $cust_pay_batch->amount %>,<%= $cust_pay_batch->paybatchnum %>
-<% } %>
+my $pay_batch = qsearchs('pay_batch', { batchnum => $batchnum } );
+die "Batch not found: '$batchnum'" if !$pay_batch;
+
+my $exporttext = $pay_batch->export_batch(%opt);
+unless ($exporttext) {
+  http_header('Content-Type' => 'text/html' );
+  $exporttext = <<EOF;
+<SCRIPT>
+alert('Batch was empty, and has been resolved');
+window.top.location.href = '${p}search/pay_batch.cgi?magic=_date;open=1;intransit=1;resolved=1';
+</SCRIPT>
+EOF
+}
+
+</%init>