[freeside-commits] branch master updated. 1fc0d74aab287141c02c74978b0e95b44ff8e319

[Jonathan Prykop]

The branch, master has been updated
       via  1fc0d74aab287141c02c74978b0e95b44ff8e319 (commit)
      from  d2df919ea5209bf075bec446be9cacf970dd0f37 (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 1fc0d74aab287141c02c74978b0e95b44ff8e319
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Thu Feb 26 14:16:47 2015 -0600

    RT#33582: RBC return batch processing failure

diff --git a/FS/FS/pay_batch/RBC.pm b/FS/FS/pay_batch/RBC.pm
index 4b11fdb..a9b670d 100644
--- a/FS/FS/pay_batch/RBC.pm
+++ b/FS/FS/pay_batch/RBC.pm
@@ -14,7 +14,7 @@ $name = 'RBC';
 %import_info = (
   'filetype'    => 'fixed',
   'formatre'    => 
-  '^(.).{18}(.{4}).{3}(.).{11}(.{19}).{6}(.{30}).{17}(.{9})(.{18}).{6}(.{14}).{23}(.).{9}\r?$',
+  '^([0134]).{18}(.{4}).{3}(.).{11}(.{19}).{6}(.{30}).{17}(.{9})(.{18}).{6}(.{14}).{23}(.).{9}\r?$',
   'fields' => [ qw(
     recordtype
     batchnum
@@ -61,7 +61,8 @@ $name = 'RBC';
   },
   'skip_condition' => sub {
       my $hash = shift;
-      $hash->{'subtype'} ne '0';
+      $hash->{'recordtype'} eq '3' ||
+        $hash->{'subtype'} ne '0';
   },
 );
 

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

Summary of changes:
 FS/FS/pay_batch/RBC.pm |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)