[freeside-commits] freeside/FS/FS pay_batch.pm,1.26.2.3,1.26.2.4

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv23905

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	pay_batch.pm 
Log Message:
TD EFT format fixes, RT#10545

Index: pay_batch.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/pay_batch.pm,v
retrieving revision 1.26.2.3
retrieving revision 1.26.2.4
diff -u -w -d -r1.26.2.3 -r1.26.2.4
--- pay_batch.pm	24 Dec 2010 00:41:25 -0000	1.26.2.3
+++ pay_batch.pm	18 Jan 2011 00:32:57 -0000	1.26.2.4
@@ -471,12 +471,15 @@
       $_->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 @@
 
     $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'}) {