X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpay_batch%2FRBC.pm;h=22521e0e104ee95ce0f9d44e20e4824e639ec4ef;hb=d0a105a296bae50a191424abed78a1ba4f251248;hp=1577a7f85956de3871aadd5afcf25304104ae999;hpb=780141c7e972a8b55212515049bf3d51ef590466;p=freeside.git

diff --git a/FS/FS/pay_batch/RBC.pm b/FS/FS/pay_batch/RBC.pm
index 1577a7f85..22521e0e1 100644
--- a/FS/FS/pay_batch/RBC.pm
+++ b/FS/FS/pay_batch/RBC.pm
@@ -3,6 +3,7 @@ package FS::pay_batch::RBC;
 use strict;
 use vars qw(@ISA %import_info %export_info $name);
 use Date::Format 'time2str';
+use Date::Parse;
 use FS::Conf;
 use Encode 'encode';
 use feature 'state';
@@ -31,7 +32,7 @@ $name = 'RBC';
   'filetype'    => 'fixed',
   #this only really applies to Debit Detail, but we otherwise only need first char
   'formatre'    => 
-  '^(.).{3}(.{10}).{5}(.{4}).{3}(.).{11}(.{19}).{6}(.{30}).{17}(.{9})(.{18}).{6}(.{14}).{23}(.).{9}\r?$',
+  '^(.).{3}(.{10}).{5}(.{4}).{3}(.).{11}(.{19}).{6}(.{30})(.{2})(.{2})(.{4}).{9}(.{9})(.{18}).{6}(.{14}).{23}(.).{9}\r?$',
   'fields' => [ qw(
     recordtype
     clientnum
@@ -39,6 +40,9 @@ $name = 'RBC';
     subtype
     paybatchnum
     custname
+    paydate_month
+    paydate_day
+    paydate_year
     bank
     payinfo
     paid
@@ -54,7 +58,8 @@ $name = 'RBC';
 
     my $hash = shift;
     $hash->{'paid'} = sprintf("%.2f", $hash->{'paid'} / 100 );
-    $hash->{'_date'} = time;
+    my $paydate = $hash->{'paydate_year'} . $hash->{'paydate_month'} . $hash->{'paydate_day'};
+    $hash->{'_date'} = str2time($paydate, 'local');
     $hash->{'payinfo'} =~ s/^(\S+).*/$1/; # these often have trailing spaces
     $hash->{'payinfo'} = $hash->{'payinfo'} . '@' . $hash->{'bank'};
 
@@ -175,9 +180,7 @@ $name = 'RBC';
     }
 
     ## set custname to business name if business checking or savings account is used otherwise leave as first and last name.
-    my $custname = $cust_pay_batch->cust_main->first . ' ' . $cust_pay_batch->cust_main->last;
-    $custname = $cust_pay_batch->cust_main->company
-      if (($cust_pay_batch->{Hash}->{paytype} eq "Business checking" || $cust_pay_batch->{Hash}->{paytype} eq "Business savings") && $cust_pay_batch->cust_main->company);
+    my $custname = $cust_pay_batch->cust_main->batch_payment_payname($cust_pay_batch);
 
     $i++;
 
@@ -230,5 +233,10 @@ $name = 'RBC';
   },
 );
 
+## this format can handle credit transactions
+sub can_handle_credits {
+  1;
+}
+
 1;