X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-eftca-upload;h=321b969d3383607edfe949b69f64fa9c47d0ba34;hp=45a358b234b340ea53bcd84d46a83cf64800d9a4;hb=1f1190b8fb6d06852dbd16c6a288f9acd9cc83dd;hpb=80e675c7305768010f8b08ef2ebdfb936432e84d

diff --git a/FS/bin/freeside-eftca-upload b/FS/bin/freeside-eftca-upload
index 45a358b23..321b969d3 100755
--- a/FS/bin/freeside-eftca-upload
+++ b/FS/bin/freeside-eftca-upload
@@ -9,6 +9,7 @@ use FS::UID qw(adminsuidsetup dbh);
 use FS::Record qw(qsearch qsearchs);
 use FS::pay_batch;
 use FS::Conf;
+use FS::Log;
 
 use vars qw( $opt_a $opt_v );
 getopts('av');
@@ -24,17 +25,42 @@ sub HELP_MESSAGE { "
 my $user = shift or die &HELP_MESSAGE;
 adminsuidsetup $user;
 
+my $log = FS::Log->new('freeside-eftca-upload');
+log_info( "EFT Canada upload started\n" );
+
 my @batches; 
 
 if($opt_a) {
-  @batches = qsearch('pay_batch', { 'status' => 'O', 'payby' => 'CHEK' })
-    or die "No open batches found.\n";
+  local $@;
+
+  my %criteria= ( 'status' => 'O', 'payby' => 'CHEK' );
+  $criteria{'type'} = 'DEBIT' unless FS::pay_batch->can_handle_electronic_refunds('eft_canada');
+
+  eval {
+    @batches = qsearch('pay_batch', \%criteria)
+  };
+  log_error_and_die ("Fatal database error: $@")
+    if $@;
+
+  log_info_and_die( "Finished: No open batches found.\n" )
+    unless @batches;
 }
 else {
   my $batchnum = shift;
   die &HELP_MESSAGE if !$batchnum;
-  @batches = qsearchs('pay_batch', { batchnum => $batchnum } );
-  die "Can't find payment batch '$batchnum'\n" if !@batches;
+
+  local $@;
+  eval { @batches = qsearchs('pay_batch', { batchnum => $batchnum } ); };
+  log_error_and_die("Fatal database error: $@")
+    if $@;
+
+  log_error_and_die( "Can't find payment batch '$batchnum'\n" ) if !@batches;
+
+  if ($batches[0]->type eq "CREDIT") {
+    warn "running credit\n";
+    log_error_and_die( "Batch number $batchnum is a credit (batch refund) batch, and this format can not handle batch refunds.\n" )
+      unless FS::pay_batch->can_handle_electronic_refunds('eft_canada');
+  }
 }
 
 my $conf = new FS::Conf;
@@ -45,45 +71,77 @@ foreach my $pay_batch (@batches) {
 
   my $batchnum = $pay_batch->batchnum;
   my $filename = time2str('%Y%m%d', time) . '-' . sprintf('%06d.csv',$batchnum);
-  print STDERR "Exporting batch $batchnum to $filename...\n" if $opt_v;
-  my $text = $pay_batch->export_batch('eft_canada');
+  log_info( "Exporting batch $batchnum to $filename...\n" );
+  my $text = $pay_batch->export_batch(format => 'eft_canada');
+  unless ($text) {
+    log_info( "Batch is empty, resolving..." );
+    next;
+  }
   open OUT, ">$tmpdir/$filename";
   print OUT $text;
   close OUT;
 
   my @batchconf = $conf->config('batchconfig-eft_canada', $pay_batch->agentnum);
-  my $user = $batchconf[0] or die "no EFT Canada batch username configured\n";
-  my $pass = $batchconf[1] or die "no EFT Canada batch password configured\n";
+  my $user = $batchconf[0]
+    or log_error_and_die( "no EFT Canada batch username configured\n" );
+  my $pass = $batchconf[1]
+    or log_error_and_die( "no EFT Canada batch password configured\n" );
 
   my $host = 'ftp.eftcanada.com';
-  print STDERR "Connecting to $user\@$host...\n" if $opt_v;
+  log_info( "Connecting to $user\@$host...\n" );
 
   my $sftp = Net::SFTP::Foreign->new( host     => $host,
                                       user     => $user,
                                       password => $pass,
                                       timeout  => 30,
                                     );
-  die "failed to connect to '$user\@$host'\n(".$sftp->error.")\n" 
+  log_error_and_die("failed to connect to '$user\@$host'\n(".$sftp->error.")\n")
       if $sftp->error;
 
   $sftp->put("$tmpdir/$filename", "$filename")
-    or die "failed to upload file (".$sftp->error.")\n";
+    or log_error_and_die( "failed to upload file (".$sftp->error.")\n" );
 
   undef $sftp; #$sftp->disconnect;
 
   # Auto-approve and close the batch.  Some false laziness with manual_approve.
   my $batchnum = $pay_batch->batchnum;
   my $error;
-  foreach my $cpb ( qsearch('cust_pay_batch', { 'batchnum' => $batchnum } ) ) {
-    $cpb->setfield('paid', $cpb->amount);
-    $error = $cpb->approve($batchnum);
-    last if $error;
-  }
+
+  local $@;
+  eval {
+    foreach my $cpb ( qsearch('cust_pay_batch', { 'batchnum' => $batchnum } )) {
+      $cpb->setfield('paid', $cpb->amount);
+      $error = $cpb->approve($batchnum);
+      last if $error;
+    }
+  };
+  log_error_and_die("Fatal database error: $@")
+    if $@;
+
   $error ||= $pay_batch->set_status('R');
-  die "error closing batch $batchnum: $error\n\n" if $error;
+  log_error_and_die( "error closing batch $batchnum: $error\n\n" )
+    if $error;
 }
 
-print STDERR "Finished!\n" if $opt_v;
+log_info( "Finished!\n" );
+
+sub log_info {
+  my $log_message = shift;
+  $log->info( $log_message );
+  print STDERR $log_message if $opt_v;
+}
+
+sub log_info_and_die {
+  my $log_message = shift;
+  $log->info( $log_message );
+  die $log_message;
+}
+
+sub log_error_and_die {
+  my $log_message = shift;
+  $log->error( $log_message );
+  die $log_message;
+}
 
 =head1 NAME
 
@@ -91,7 +149,7 @@ freeside-eftca-upload - Transmit a payment batch to EFT Canada via SFTP.
 
 =head1 SYNOPSIS
 
-  freeside-paymentech-upload [ -a ] [ -v ] user batchnum
+  freeside-eftca-upload [ -a ] [ -v ] user batchnum
 
 =head1 DESCRIPTION