projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c9a2afc
)
TD EFT format fixes, RT#10545
author
mark
<mark>
Tue, 18 Jan 2011 00:32:46 +0000
(
00:32
+0000)
committer
mark
<mark>
Tue, 18 Jan 2011 00:32:46 +0000
(
00:32
+0000)
FS/FS/pay_batch.pm
patch
|
blob
|
history
FS/FS/pay_batch/td_eft1464.pm
patch
|
blob
|
history
diff --git
a/FS/FS/pay_batch.pm
b/FS/FS/pay_batch.pm
index
5cd40cd
..
7db123c
100644
(file)
--- a/
FS/FS/pay_batch.pm
+++ b/
FS/FS/pay_batch.pm
@@
-471,12
+471,15
@@
sub export_batch {
$_->setfield('expmmyy', sprintf('%02u%02u', $mon+1, $year % 100));
}
}
$_->setfield('expmmyy', sprintf('%02u%02u', $mon+1, $year % 100));
}
}
+
+ my $delim = exists($info->{'delimiter'}) ? $info->{'delimiter'} : "\n";
+
my $h = $info->{'header'};
if(ref($h) eq 'CODE') {
my $h = $info->{'header'};
if(ref($h) eq 'CODE') {
- $batch .= &$h($self, \@cust_pay_batch) .
"\n"
;
+ $batch .= &$h($self, \@cust_pay_batch) .
$delim
;
}
else {
}
else {
- $batch .= $h .
"\n"
;
+ $batch .= $h .
$delim
;
}
foreach my $cust_pay_batch (@cust_pay_batch) {
}
foreach my $cust_pay_batch (@cust_pay_batch) {
@@
-503,16
+506,16
@@
sub export_batch {
$batchcount++;
$batchtotal += $cust_pay_batch->amount;
$batchcount++;
$batchtotal += $cust_pay_batch->amount;
- $batch .= &{$info->{'row'}}($cust_pay_batch, $self, $batchcount, $batchtotal) .
"\n"
;
+ $batch .= &{$info->{'row'}}($cust_pay_batch, $self, $batchcount, $batchtotal) .
$delim
;
}
my $f = $info->{'footer'};
if(ref($f) eq 'CODE') {
}
my $f = $info->{'footer'};
if(ref($f) eq 'CODE') {
- $batch .= &$f($self, $batchcount, $batchtotal) .
"\n"
;
+ $batch .= &$f($self, $batchcount, $batchtotal) .
$delim
;
}
else {
}
else {
- $batch .= $f .
"\n"
;
+ $batch .= $f .
$delim
;
}
if ($info->{'autopost'}) {
}
if ($info->{'autopost'}) {
diff --git
a/FS/FS/pay_batch/td_eft1464.pm
b/FS/FS/pay_batch/td_eft1464.pm
index
7f58ab5
..
851f625
100644
(file)
--- a/
FS/FS/pay_batch/td_eft1464.pm
+++ b/
FS/FS/pay_batch/td_eft1464.pm
@@
-53,6
+53,7
@@
$name = 'td_eft1464';
# just to suppress warning; importing this format is a fatal error
%export_info = (
# just to suppress warning; importing this format is a fatal error
%export_info = (
+ delimiter => '',
init => sub {
$conf = shift;
@opt{
init => sub {
$conf = shift;
@opt{
@@
-95,7
+96,6
@@
$name = 'td_eft1464';
$now,
$opt{'datacenter'},
' ' x 1429, #filler
$now,
$opt{'datacenter'},
' ' x 1429, #filler
- "\r"
);
},
row => sub {
);
},
row => sub {
@@
-133,7
+133,7
@@
$name = 'td_eft1464';
' ' x 2,
'0' x 11,
);
' ' x 2,
'0' x 11,
);
- return sprintf('%-1464s',$control . $payment)
. "\r"
;
+ return sprintf('%-1464s',$control . $payment) ;
},
footer => sub {
my ($pay_batch, $batchcount, $batchtotal) = @_;
},
footer => sub {
my ($pay_batch, $batchcount, $batchtotal) = @_;
@@
-147,7
+147,6
@@
$name = 'td_eft1464';
'0' x 14, # total of credit txns
'0' x 8, # total of credit txns
' ' x 1396,
'0' x 14, # total of credit txns
'0' x 8, # total of credit txns
' ' x 1396,
- "\r"
)
},
);
)
},
);