X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FCron%2Fpay_batch.pm;h=9791749ee8462919cc19e920a73c6f032693f09f;hp=c7cedafb9d151c8a18413dfc55618716d1a3d62b;hb=24fc23950ce4844b81744f68ba8edc201eff495d;hpb=85e677b86fc37c54e6de2b06340351a28f5a5916 diff --git a/FS/FS/Cron/pay_batch.pm b/FS/FS/Cron/pay_batch.pm index c7cedafb9..9791749ee 100644 --- a/FS/FS/Cron/pay_batch.pm +++ b/FS/FS/Cron/pay_batch.pm @@ -11,7 +11,7 @@ use FS::queue; use FS::agent; @ISA = qw( Exporter ); -@EXPORT_OK = qw ( batch_submit batch_receive ); +@EXPORT_OK = qw ( pay_batch_submit pay_batch_receive ); $DEBUG = 0; $me = '[FS::Cron::pay_batch]'; @@ -22,7 +22,7 @@ $me = '[FS::Cron::pay_batch]'; # -r: Multi-process mode dry run option # -a: Only process customers with the specified agentnum -sub batch_submit { +sub pay_batch_submit { my %opt = @_; local $DEBUG = ($opt{l} || 1) if $opt{v}; # if anything goes wrong, don't try to roll back previously submitted batches @@ -58,7 +58,7 @@ sub batch_submit { # warn the error and continue. rolling back the transaction once # we've started sending batches is bad. warn "error submitting batch ".$pay_batch->batchnum." to gateway '". - $gateway->label."\n$@\n"; + $gateway->label."': $@\n"; } } @@ -71,7 +71,7 @@ sub batch_submit { 1; } -sub batch_receive { +sub pay_batch_receive { my %opt = @_; local $DEBUG = ($opt{l} || 1) if $opt{v}; local $FS::UID::AutoCommit = 0; @@ -103,7 +103,7 @@ sub batch_receive { if ( $gateway->batch_processor->can('default_transport') ) { warn "Importing results from '".$gateway->label."'\n" if $DEBUG; $error = eval { - FS::pay_batch->import_from_gateway( $gateway, debug => $DEBUG ) + FS::pay_batch->import_from_gateway( gateway =>$gateway, debug => $DEBUG ) } || $@; if ( $error ) { # this we can roll back