projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FS RT #30363 - Hide Account usage template output in an HTML comment when $hide_usage...
[freeside.git]
/
FS
/
bin
/
freeside-paymentech-upload
diff --git
a/FS/bin/freeside-paymentech-upload
b/FS/bin/freeside-paymentech-upload
index
6de29dd
..
609019e
100755
(executable)
--- a/
FS/bin/freeside-paymentech-upload
+++ b/
FS/bin/freeside-paymentech-upload
@@
-2,37
+2,40
@@
use strict;
use Getopt::Std;
use strict;
use Getopt::Std;
+use Date::Format qw(time2str);
+use File::Temp qw(tempdir); #0.19 for ->newdir() interface, not in 5.10.0
use Net::SFTP::Foreign;
use Net::SFTP::Foreign;
+use Expect;
use FS::UID qw(adminsuidsetup datasrc);
use FS::Record qw(qsearch qsearchs);
use FS::pay_batch;
use FS::cust_pay_batch;
use FS::Conf;
use FS::UID qw(adminsuidsetup datasrc);
use FS::Record qw(qsearch qsearchs);
use FS::pay_batch;
use FS::cust_pay_batch;
use FS::Conf;
-use Date::Format 'time2str';
-use File::Temp;
-
-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;
#$Net::SFTP::Foreign::debug = -1;
-sub usage {
'
+sub usage {
"
Usage:
Usage:
- paymentech-upload [ -v ] [ -t ] user batchnum
- paymentech-upload -a [ -v ] [ -t ] user
-
-'
-}
+ freeside-paymentech-upload [ -v ] [ -t ] user batchnum
+ freeside-paymentech-upload -a [ -p payby ] [ -v ] [ -t ] user\n
+" }
my $user = shift or die &usage;
adminsuidsetup $user;
my $user = shift or die &usage;
adminsuidsetup $user;
+my $zip_check = `which zip` or die "can't find zip executable\n";
+
my @batches;
if($opt_a) {
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;
}
else {
my $batchnum = shift;
@@
-47,7
+50,8
@@
my @batchconf = $conf->config('batchconfig-paymentech');
my $username = $batchconf[3] or die "no Paymentech batch username configured\n";
my $password = $batchconf[4] or die "no Paymentech batch password configured\n";
my $username = $batchconf[3] or die "no Paymentech batch username configured\n";
my $password = $batchconf[4] or die "no Paymentech batch password configured\n";
-my $tmpdir = File::Temp->newdir();
+#my $tmpdir = File::Temp->newdir();
+my $tmpdir = tempdir( CLEANUP => 1 ); #DIR=>somewhere?
my @filenames;
my @filenames;
@@
-55,21
+59,22
@@
foreach my $pay_batch (@batches) {
my $batchnum = $pay_batch->batchnum;
my $filename = sprintf('%06d',$batchnum) . '-' .time2str('%Y%m%d%H%M%S', time);
print STDERR "Exporting batch $batchnum to $filename...\n" if $opt_v;
my $batchnum = $pay_batch->batchnum;
my $filename = sprintf('%06d',$batchnum) . '-' .time2str('%Y%m%d%H%M%S', time);
print STDERR "Exporting batch $batchnum to $filename...\n" if $opt_v;
- my $text = $pay_batch->export_batch('paymentech');
+ my $text = $pay_batch->export_batch(
format =>
'paymentech');
$text =~ s!<fileID>FILEID</fileID>!<fileID>$filename</fileID>!
or die "couldn't find FILEID tag\n";
open OUT, ">$tmpdir/$filename.xml";
print OUT $text;
close OUT;
$text =~ s!<fileID>FILEID</fileID>!<fileID>$filename</fileID>!
or die "couldn't find FILEID tag\n";
open OUT, ">$tmpdir/$filename.xml";
print OUT $text;
close OUT;
- system("zip -P $password -q -j $tmpdir/$filename.zip $tmpdir/$filename.xml");
+ system('zip', '-P', $password, '-q', '-j',
+ "$tmpdir/$filename.zip", "$tmpdir/$filename.xml");
die "failed to create zip file\n" if (! -f "$tmpdir/$filename.zip" );
push @filenames, $filename;
}
die "failed to create zip file\n" if (! -f "$tmpdir/$filename.zip" );
push @filenames, $filename;
}
-my $host = ($opt_t ? 'orbitalbatchvar.paymentech.net'
:
-
'orbitalbatch.paymentech.net');
+my $host = ($opt_t ? 'orbitalbatchvar.paymentech.net'
+
:
'orbitalbatch.paymentech.net');
print STDERR "Connecting to $username\@$host...\n" if $opt_v;
my $sftp = Net::SFTP::Foreign->new( host => $host,
print STDERR "Connecting to $username\@$host...\n" if $opt_v;
my $sftp = Net::SFTP::Foreign->new( host => $host,
@@
-89,13
+94,11
@@
print STDERR "Finished!\n" if $opt_v;
=head1 NAME
=head1 NAME
-paymentech-upload
-
-paymentech-upload - Transmit a payment batch to Chase Paymentech via SFTP.
+freeside-paymentech-upload - Transmit a payment batch to Chase Paymentech via SFTP.
=head1 SYNOPSIS
=head1 SYNOPSIS
-
paymentech-upload [ -a
] [ -v ] [ -t ] user batchnum
+
freeside-paymentech-upload [ -a [ -p PAYBY ]
] [ -v ] [ -t ] user batchnum
=head1 DESCRIPTION
=head1 DESCRIPTION
@@
-106,6
+109,8
@@
response file.
-a: Send all open batches, instead of specifying a batchnum.
-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.
-v: Be verbose.
-t: Send the transaction to the test server.