projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 82988 - Fixed so only formats that can handle electronic refunds can download...
[freeside.git]
/
FS
/
FS
/
pay_batch
/
RBC.pm
diff --git
a/FS/FS/pay_batch/RBC.pm
b/FS/FS/pay_batch/RBC.pm
index
c4388d1
..
1da511a
100644
(file)
--- 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 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';
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' =>
'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
'fields' => [ qw(
recordtype
clientnum
@@
-39,6
+40,9
@@
$name = 'RBC';
subtype
paybatchnum
custname
subtype
paybatchnum
custname
+ paydate_month
+ paydate_day
+ paydate_year
bank
payinfo
paid
bank
payinfo
paid
@@
-54,7
+58,8
@@
$name = 'RBC';
my $hash = shift;
$hash->{'paid'} = sprintf("%.2f", $hash->{'paid'} / 100 );
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'};
$hash->{'payinfo'} =~ s/^(\S+).*/$1/; # these often have trailing spaces
$hash->{'payinfo'} = $hash->{'payinfo'} . '@' . $hash->{'bank'};
@@
-149,7
+154,8
@@
$name = 'RBC';
my $pay_batch = shift;
my $mode = $testmode ? 'TEST' : 'PROD';
my $filenum = $testmode ? 'TEST' : sprintf("%04u", $pay_batch->batchnum);
my $pay_batch = shift;
my $mode = $testmode ? 'TEST' : 'PROD';
my $filenum = $testmode ? 'TEST' : sprintf("%04u", $pay_batch->batchnum);
- '$$AAPASTD0152['.$mode.'[NL$$'."\n".
+ my $qualifier = $pay_batch->type eq 'CREDIT' ? 'D' : 'A';
+ '$$AAP'.$qualifier.'STD0152['.$mode.'[NL$$'."\n".
'000001'.
'A'.
'HDR'.
'000001'.
'A'.
'HDR'.
@@
-216,13
+222,15
@@
$name = 'RBC';
},
footer => sub {
my ($pay_batch, $batchcount, $batchtotal) = @_;
},
footer => sub {
my ($pay_batch, $batchcount, $batchtotal) = @_;
+
+ my $batch_info = '0' x 20 . sprintf("%06u", $batchcount) . sprintf("%014.0f", $batchtotal*100);
+ $batch_info = sprintf("%06u", $batchcount) . sprintf("%014.0f", $batchtotal*100) . '0' x 20 if ($pay_batch->type eq 'CREDIT');
+
sprintf("%06u", $i + 1).
'Z'.
'TRL'.
sprintf("%10s", $client_num).
sprintf("%06u", $i + 1).
'Z'.
'TRL'.
sprintf("%10s", $client_num).
- '0' x 20 .
- sprintf("%06u", $batchcount).
- sprintf("%014.0f", $batchtotal*100).
+ $batch_info.
'00' .
'000000' . # total number of customer information records
' ' x 84
'00' .
'000000' . # total number of customer information records
' ' x 84