X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpay_batch%2FRBC.pm;h=3d1d98b17c4b09000b30a9360dfdef674eaed281;hp=53f81085216dc389bd8fe0232198d81f5759cde5;hb=e44835f640559a6eb5bc831e08732d5ab8947dd4;hpb=6650941e7d21dbe82d7fa0944ae9217edb8adf28

diff --git a/FS/FS/pay_batch/RBC.pm b/FS/FS/pay_batch/RBC.pm
index 53f810852..3d1d98b17 100644
--- a/FS/FS/pay_batch/RBC.pm
+++ b/FS/FS/pay_batch/RBC.pm
@@ -5,6 +5,7 @@ use vars qw(@ISA %import_info %export_info $name);
 use Date::Format 'time2str';
 use FS::Conf;
 use Encode 'encode';
+use feature 'state';
 
 my $conf;
 my ($client_num, $shortname, $longname, $trans_code, $testmode, $i, $declined, $totaloffset);
@@ -30,9 +31,10 @@ $name = 'RBC';
   'filetype'    => 'fixed',
   #this only really applies to Debit Detail, but we otherwise only need first char
   'formatre'    => 
-  '^(.).{18}(.{4}).{3}(.).{11}(.{19}).{6}(.{30}).{17}(.{9})(.{18}).{6}(.{14}).{23}(.).{9}\r?$',
+  '^(.).{3}(.{10}).{5}(.{4}).{3}(.).{11}(.{19}).{6}(.{30}).{17}(.{9})(.{18}).{6}(.{14}).{23}(.).{9}\r?$',
   'fields' => [ qw(
     recordtype
+    clientnum
     batchnum
     subtype
     paybatchnum
@@ -43,15 +45,28 @@ $name = 'RBC';
     status
     ) ],
   'hook' => sub {
-      my $hash = shift;
-      $hash->{'paid'} = sprintf("%.2f", $hash->{'paid'} / 100 );
-      $hash->{'_date'} = time;
-      $hash->{'payinfo'} =~ s/^(\S+).*/$1/; # these often have trailing spaces
-      $hash->{'payinfo'} = $hash->{'payinfo'} . '@' . $hash->{'bank'};
+    # pull client_num from config and check it against what's in the batch
+    state $clientnum ||= do {
+      my $conf = FS::Conf->new;
+      my @config = $conf->config("batchconfig-RBC");
+      $config[0];
+    };
+
+    my $hash = shift;
+    $hash->{'paid'} = sprintf("%.2f", $hash->{'paid'} / 100 );
+    $hash->{'_date'} = time;
+    $hash->{'payinfo'} =~ s/^(\S+).*/$1/; # these often have trailing spaces
+    $hash->{'payinfo'} = $hash->{'payinfo'} . '@' . $hash->{'bank'};
+
+    if ( $clientnum and $hash->{clientnum} ne $clientnum ) {
+      die "RBC client number in batch (".$hash->{clientnum}.") does not ".
+        "match configuration.\n";
+    }
+    '';
   },
   'approved'    => sub { 
       my $hash = shift;
-      $hash->{'status'} eq ' '
+      ($hash->{'status'} eq ' ') || ($hash->{'status'} eq 'W');
   },
   'declined'    => sub {
       my $hash = shift;
@@ -112,12 +127,6 @@ $name = 'RBC';
           if $hash->{'status'} eq ' '; #false laziness with 'approved' above
         return 1;
       }
-      #skipping W for now (maybe it should be declined?)
-      if ($hash->{'status'} eq 'W') {
-        #file counts this as part of total, but we skip
-        $totaloffset += sprintf("%.2f", $hash->{'paid'} / 100 );
-        return 1;
-      }
       return 
         ($hash->{'recordtype'} eq '3') || #Account Trailer Record, concludes returned items
         ($hash->{'subtype'} ne '0'); #error messages, etc, too late to apply to previous entry
@@ -165,9 +174,17 @@ $name = 'RBC';
       die "invalid branch/routing number '$aba'\n";
     }
 
+    ## 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->batch_payment_payname($cust_pay_batch);
+
     $i++;
+
+    ## set to D for debit by default, then override to what cust_pay_batch has as payments may not have paycode.
+    my $debitorcredit = 'D';
+    $debitorcredit = $cust_pay_batch->paycode unless !$cust_pay_batch->paycode;
+
     sprintf("%06u", $i).
-    'D'.
+    $debitorcredit.
     sprintf("%3s",$trans_code).
     sprintf("%10s",$client_num).
     ' '.
@@ -180,8 +197,7 @@ $name = 'RBC';
     sprintf("%010.0f",$cust_pay_batch->amount*100).
     '      '.
     time2str("%Y%j", time + 86400).
-    sprintf("%-30.30s", encode('utf8', $cust_pay_batch->cust_main->first . ' ' .
-                     $cust_pay_batch->cust_main->last)).
+    sprintf("%-30.30s", encode('utf8', $custname)).
     'E'. # English
     ' '.
     sprintf("%-15s", $shortname).
@@ -212,5 +228,10 @@ $name = 'RBC';
   },
 );
 
+## this format can handle credit transactions
+sub can_handle_credits {
+  1;
+}
+
 1;