From: Mark Wells <mark@freeside.biz>
Date: Tue, 9 Jul 2013 21:57:58 +0000 (-0700)
Subject: use per-agent config for all EFT Canada batch options, #23757, from #14859
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=74a0b887720453ab52ac784ddf1f1d4ecd5abcc1;p=freeside.git

use per-agent config for all EFT Canada batch options, #23757, from #14859
---

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];