diff options
author | mark <mark> | 2011-01-18 00:32:46 +0000 |
---|---|---|
committer | mark <mark> | 2011-01-18 00:32:46 +0000 |
commit | 8ce6ed212e593c9bfe4834e981b4e987cabe4e8d (patch) | |
tree | e2e9972d2a3c6404122fc6974925048fdda46230 /FS/FS/pay_batch.pm | |
parent | c9a2afc4fc938e6813f336ed9942477cc75b1b7f (diff) |
TD EFT format fixes, RT#10545
Diffstat (limited to 'FS/FS/pay_batch.pm')
-rw-r--r-- | FS/FS/pay_batch.pm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm index 5cd40cd..7db123c 100644 --- 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)); } } + + my $delim = exists($info->{'delimiter'}) ? $info->{'delimiter'} : "\n"; + my $h = $info->{'header'}; if(ref($h) eq 'CODE') { - $batch .= &$h($self, \@cust_pay_batch) . "\n"; + $batch .= &$h($self, \@cust_pay_batch) . $delim; } else { - $batch .= $h . "\n"; + $batch .= $h . $delim; } foreach my $cust_pay_batch (@cust_pay_batch) { @@ -503,16 +506,16 @@ sub export_batch { $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') { - $batch .= &$f($self, $batchcount, $batchtotal) . "\n"; + $batch .= &$f($self, $batchcount, $batchtotal) . $delim; } else { - $batch .= $f . "\n"; + $batch .= $f . $delim; } if ($info->{'autopost'}) { |