[freeside-commits] branch FREESIDE_3_BRANCH updated. 74a0b887720453ab52ac784ddf1f1d4ecd5abcc1

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  74a0b887720453ab52ac784ddf1f1d4ecd5abcc1 (commit)
      from  e905151de34b9c6ae6ea4bc2719dcd5843f9877a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 74a0b887720453ab52ac784ddf1f1d4ecd5abcc1
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Jul 9 14:57:58 2013 -0700

    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 2a048a1..3a06914 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 b24c9c3..64fd2f9 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];

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/pay_batch.pm            |    2 +-
 FS/FS/pay_batch/eft_canada.pm |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)