diff options
| author | Mark Wells <mark@freeside.biz> | 2013-07-09 14:57:49 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2013-07-09 14:57:49 -0700 |
| commit | bf2769eca6c8bdcf0332e43cc654f35280624d12 (patch) | |
| tree | 96e82fe145a281852376cff405bd302276823a7d /FS | |
| parent | e4c42d0a335f5a544d68ac7e7a6025694503accd (diff) | |
use per-agent config for all EFT Canada batch options, #23757, from #14859
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/pay_batch.pm | 2 | ||||
| -rw-r--r-- | FS/FS/pay_batch/eft_canada.pm | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm index 2a048a115..3a069149f 100644 --- a/FS/FS/pay_batch.pm +++ b/FS/FS/pay_batch.pm @@ -946,7 +946,7 @@ sub export_batch { my $info = $export_info{$format} or die "Format not found: '$format'\n"; - &{$info->{'init'}}($conf) if exists($info->{'init'}); + &{$info->{'init'}}($conf, $self->agentnum) if exists($info->{'init'}); my $oldAutoCommit = $FS::UID::AutoCommit; local $FS::UID::AutoCommit = 0; diff --git a/FS/FS/pay_batch/eft_canada.pm b/FS/FS/pay_batch/eft_canada.pm index b24c9c3a4..64fd2f971 100644 --- a/FS/FS/pay_batch/eft_canada.pm +++ b/FS/FS/pay_batch/eft_canada.pm @@ -58,7 +58,13 @@ my %holiday = ( init => sub { my $conf = shift; - my @config = $conf->config('batchconfig-eft_canada'); + my $agentnum = shift; + my @config; + if ( $conf->exists('batch-spoolagent') ) { + @config = $conf->config('batchconfig-eft_canada', $agentnum); + } else { + @config = $conf->config('batchconfig-eft_canada'); + } # SFTP login, password, trans code, delay time my $process_delay; ($trans_code, $process_delay) = @config[2,3]; |