[freeside-commits] branch master updated. cb8a5ae336bba47dfd9cdaccab11f8f1534a7069

[Christopher Burger]

The branch, master has been updated
       via  cb8a5ae336bba47dfd9cdaccab11f8f1534a7069 (commit)
       via  e52bf202f12e3d7cffa1d91b27b19ceb8a4c512b (commit)
      from  b5bce398b1dd80089ec363eb14107645cc5a546f (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 cb8a5ae336bba47dfd9cdaccab11f8f1534a7069
Merge: e52bf202f b5bce398b
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue Nov 20 12:35:49 2018 -0500

    Merge branch 'master' of ssh://git.freeside.biz/home/git/freeside


commit e52bf202f12e3d7cffa1d91b27b19ceb8a4c512b
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue Nov 20 12:35:00 2018 -0500

    RT# 81752 - set RBC pay batch import options to use payment date from file rather than file processing date

diff --git a/FS/FS/pay_batch/RBC.pm b/FS/FS/pay_batch/RBC.pm
index 3d1d98b17..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'};
 

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

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