X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-rbc-upload;h=8f67a6e4ff3d533fc7660ef5a5158b6db4f069b0;hb=90e334773bc11bba47ab857530ff602009f4c4ce;hp=52501028cb4a1ebd4165afdb07c1786bf735f21e;hpb=9aee669886202be7035e6c6049fc71bc99dd3013;p=freeside.git

diff --git a/FS/bin/freeside-rbc-upload b/FS/bin/freeside-rbc-upload
index 52501028c..8f67a6e4f 100755
--- a/FS/bin/freeside-rbc-upload
+++ b/FS/bin/freeside-rbc-upload
@@ -33,6 +33,7 @@ my @batches;
 if($opt_a) {
   my %criteria = (status => 'O');
   $criteria{'payby'} = uc($opt_p) if $opt_p;
+  $criteria{'type'} = 'DEBIT' unless FS::pay_batch->can_handle_electronic_refunds('RBC');
   @batches = qsearch('pay_batch', \%criteria);
   die "No open batches found".($opt_p ? " of type '$opt_p'" : '').".\n" 
     if !@batches;
@@ -70,6 +71,10 @@ foreach my $pay_batch (@batches) {
   debug "Exporting batch $batchnum to $filename\n";
 
   my $text = $pay_batch->export_batch(format => 'RBC');
+  unless ($text) {
+    print STDERR "Batch is empty, resolving..." if $opt_v;
+    next;
+  }
   write_file("$tmpdir/$filename", $text);
 
   debug "Uploading $filename...";