X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpay_batch%2Feft_canada.pm;h=b7a9e198eefda057e3ee6e451d9bc3833a3efb67;hb=463e2e6d248db7c3787cfbe1074abdb84ce2010e;hp=310c400b1b93070e908b8f56cac77887e09181a4;hpb=a618055d3a8cfc55a449847b433dcdc85df92bcd;p=freeside.git

diff --git a/FS/FS/pay_batch/eft_canada.pm b/FS/FS/pay_batch/eft_canada.pm
index 310c400b1..b7a9e198e 100644
--- a/FS/FS/pay_batch/eft_canada.pm
+++ b/FS/FS/pay_batch/eft_canada.pm
@@ -15,7 +15,7 @@ $name = 'eft_canada';
 
 %import_info = ( filetype  => 'NONE' ); # see FS/bin/freeside-eftca-download
 
-my ($trans_code, $process_date);
+my ($business_trans_code, $personal_trans_code, $trans_code, $process_date);
 
 #ref http://gocanada.about.com/od/canadatravelplanner/a/canada_holidays.htm
 my %holiday_yearly = (
@@ -66,7 +66,8 @@ my %holiday = (
       @config = $conf->config('batchconfig-eft_canada');
     }
     # SFTP login, password, trans code, delay time
-    ($trans_code) = $config[2];
+    ($business_trans_code) = $config[2];
+    ($personal_trans_code) = $config[3];
 
     $process_date = time2str('%D', process_date($conf, $agentnum));
   },
@@ -81,11 +82,15 @@ my %holiday = (
     # company + empty or first + last
     my $company = sprintf('%.64s', $cust_pay_batch->cust_main->company);
     if ( $company ) {
-      push @fields, $company, ''
+      push @fields, 'Business';
+      push @fields, $company, '';
+      $trans_code = $business_trans_code;
     }
     else {
+      push @fields, 'Personal';
       push @fields, map { sprintf('%.64s', $_) } 
         $cust_pay_batch->first, $cust_pay_batch->last;
+        $trans_code = $personal_trans_code;
     }
     my ($account, $aba) = split('@', $cust_pay_batch->payinfo);
     my($bankno, $branch);
@@ -144,7 +149,7 @@ sub process_date {
     @config = $conf->config('batchconfig-eft_canada');
   }
 
-  my $process_delay = $config[3] || 1;
+  my $process_delay = $config[4] || 1;
 
   if ( (localtime(time))[2] >= 10 and $process_delay == 1 ) {
     # If downloading the batch after 10:00 local time, it likely won't make