X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-paymentech-upload;h=3f8abc047dc9d6838638ac5e6bdd9bb19c1b165b;hb=406b21cab11a2a89f359d40d10d6b37e60eddc1e;hp=b57b01030d64ac090d7ef980d613bf1baf98f7c5;hpb=60f1e25832384fdef3f404fd8f73d63d04af5d14;p=freeside.git

diff --git a/FS/bin/freeside-paymentech-upload b/FS/bin/freeside-paymentech-upload
index b57b01030..3f8abc047 100755
--- a/FS/bin/freeside-paymentech-upload
+++ b/FS/bin/freeside-paymentech-upload
@@ -12,15 +12,15 @@ use FS::pay_batch;
 use FS::cust_pay_batch;
 use FS::Conf;
 
-use vars qw( $opt_a $opt_t $opt_v );
-getopts('avt');
+use vars qw( $opt_a $opt_t $opt_v $opt_p );
+getopts('avtp:');
 
 #$Net::SFTP::Foreign::debug = -1;
 
 sub usage { "
   Usage:
     freeside-paymentech-upload [ -v ] [ -t ] user batchnum
-    freeside-paymentech-upload -a [ -v ] [ -t ] user\n
+    freeside-paymentech-upload -a [ -p payby ] [ -v ] [ -t ] user\n
 " }
 
 my $user = shift or die &usage;
@@ -31,8 +31,11 @@ my $zip_check = `which zip` or die "can't find zip executable\n";
 my @batches; 
 
 if($opt_a) {
-  @batches = qsearch('pay_batch', { status => 'O' } );
-  die "No open batches found.\n" if !@batches;
+  my %criteria = (status => 'O');
+  $criteria{'payby'} = uc($opt_p) if $opt_p;
+  @batches = qsearch('pay_batch', \%criteria);
+  die "No open batches found".($opt_p ? " of type '$opt_p'" : '').".\n" 
+    if !@batches;
 }
 else {
   my $batchnum = shift;
@@ -63,7 +66,7 @@ foreach my $pay_batch (@batches) {
   print OUT $text;
   close OUT;
 
-  system('zip', '-P', '$password', '-q', '-j',
+  system('zip', '-P', $password, '-q', '-j',
            "$tmpdir/$filename.zip", "$tmpdir/$filename.xml");
 
   die "failed to create zip file\n" if (! -f "$tmpdir/$filename.zip" );
@@ -71,7 +74,7 @@ foreach my $pay_batch (@batches) {
 }
 
 my $host = ($opt_t ? 'orbitalbatchvar.paymentech.net'
-                   : 'orbital1.paymentech.net');
+                   : 'orbitalbatch.paymentech.net');
 print STDERR "Connecting to $username\@$host...\n" if $opt_v;
 
 my $sftp = Net::SFTP::Foreign->new( host => $host,
@@ -95,7 +98,7 @@ freeside-paymentech-upload - Transmit a payment batch to Chase Paymentech via SF
 
 =head1 SYNOPSIS
 
-  freeside-paymentech-upload [ -a ] [ -v ] [ -t ] user batchnum
+  freeside-paymentech-upload [ -a [ -p PAYBY ] ] [ -v ] [ -t ] user batchnum
 
 =head1 DESCRIPTION
 
@@ -106,6 +109,8 @@ response file.
 
 -a: Send all open batches, instead of specifying a batchnum.
 
+-p PAYBY: With -a, limit to batches of that payment type, e.g. -p CARD.
+
 -v: Be verbose.
 
 -t: Send the transaction to the test server.