projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eliminate dups, RT#85671
[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
644c73c
..
691e2a2
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'};
@@
-66,7
+71,7
@@
$name = 'RBC';
},
'approved' => sub {
my $hash = shift;
},
'approved' => sub {
my $hash = shift;
- $hash->{'status'} eq ' '
+ ($hash->{'status'} eq ' ') || ($hash->{'status'} eq 'W');
},
'declined' => sub {
my $hash = shift;
},
'declined' => sub {
my $hash = shift;
@@
-89,22
+94,17
@@
$name = 'RBC';
},
'begin_condition' => sub {
my $hash = shift;
},
'begin_condition' => sub {
my $hash = shift;
- # De
bit De
tail Record
- if ($hash->{recordtype} eq '1') {
+ # Detail Record
+ if ($hash->{recordtype} eq '1'
|| $hash->{recordtype} eq '2'
) {
$declined = {};
$totaloffset = 0;
return 1;
$declined = {};
$totaloffset = 0;
return 1;
- # Credit Detail Record, will immediately trigger end condition & error
- } elsif ($hash->{recordtype} eq '2') {
- return 1;
} else {
return 0;
}
},
'end_hook' => sub {
my( $hash, $total, $line ) = @_;
} else {
return 0;
}
},
'end_hook' => sub {
my( $hash, $total, $line ) = @_;
- return "Can't process Credit Detail Record, aborting import"
- if ($hash->{'recordtype'} eq '2');
$total += $totaloffset;
$total = sprintf("%.2f", $total);
# We assume here that this is an 'All Records' or 'Input Records' report.
$total += $totaloffset;
$total = sprintf("%.2f", $total);
# We assume here that this is an 'All Records' or 'Input Records' report.
@@
-115,8
+115,7
@@
$name = 'RBC';
},
'end_condition' => sub {
my $hash = shift;
},
'end_condition' => sub {
my $hash = shift;
- return ($hash->{recordtype} eq '4') # Client Trailer Record
- || ($hash->{recordtype} eq '2'); # Credit Detail Record, will throw error in end_hook
+ return ($hash->{recordtype} eq '4'); # Client Trailer Record
},
'skip_condition' => sub {
my $hash = shift;
},
'skip_condition' => sub {
my $hash = shift;
@@
-127,12
+126,6
@@
$name = 'RBC';
if $hash->{'status'} eq ' '; #false laziness with 'approved' above
return 1;
}
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
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
@@
-155,7
+148,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'.
@@
-180,9
+174,17
@@
$name = 'RBC';
die "invalid branch/routing number '$aba'\n";
}
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++;
$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).
sprintf("%06u", $i).
-
'D'
.
+
$debitorcredit
.
sprintf("%3s",$trans_code).
sprintf("%10s",$client_num).
' '.
sprintf("%3s",$trans_code).
sprintf("%10s",$client_num).
' '.
@@
-195,8
+197,7
@@
$name = 'RBC';
sprintf("%010.0f",$cust_pay_batch->amount*100).
' '.
time2str("%Y%j", time + 86400).
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).
'E'. # English
' '.
sprintf("%-15s", $shortname).
@@
-213,13
+214,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
@@
-227,5
+230,10
@@
$name = 'RBC';
},
);
},
);
+## this format can handle credit transactions
+sub can_handle_credits {
+ 1;
+}
+
1;
1;