projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 30783 Clean up json code for free_addrs
[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
..
dea89cd
100644
(file)
--- a/
FS/FS/pay_batch/RBC.pm
+++ b/
FS/FS/pay_batch/RBC.pm
@@
-66,7
+66,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;
@@
-127,12
+127,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
@@
-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).