Merge branch 'master' of https://github.com/jgoodman/Freeside

[freeside.git] / FS / FS / pay_batch / nacha.pm

diff --git a/FS/FS/pay_batch/nacha.pm b/FS/FS/pay_batch/nacha.pm
index 17c175d..d6786e0 100644 (file)
--- a/FS/FS/pay_batch/nacha.pm
+++ b/FS/FS/pay_batch/nacha.pm
@@ -7,8 +7,8 @@ use Date::Format;
 #use FS::Conf;
 
 $name = 'NACHA';
-
-$DEBUG = 1;
+my $i;
+$DEBUG = 0;
 
 %import_info = (
   #XXX stub finish me
@@ -47,7 +47,7 @@ $DEBUG = 1;
     my $origin = $1;
 
     my $company = $conf->config('company_name', $pay_batch->agentnum);
-    $company = substr($company. (' 'x23), 0, 23);
+    $company = substr(uc($company). (' 'x23), 0, 23);
 
     my $now = time;
 
@@ -79,7 +79,7 @@ $DEBUG = 1;
     '1'.                      #Format code
     $dest_name.               #Immediate Destination Name / 23 char bank name
     $company.                 #Immediate Origin Name / 23 char company name
-    $refcode.                 #Reference Code (internal/optional)
+    $refcode. "\n".           #Reference Code (internal/optional)
 
     ###
     # Batch Header Record
@@ -110,7 +110,7 @@ $DEBUG = 1;
     (' 'x3).                 #Settlement Date / Reserved
     '1'.                     #Originator Status Code
     substr($dest, 0, 8).     #Originating Financial Institution
-    $batchnum                #Batch Number ("number batches sequentially")
+    $batchnum. "\n"          #Batch Number ("number batches sequentially")
 
   },
 
@@ -119,6 +119,10 @@ $DEBUG = 1;
 
     my ($account, $aba) = split('@', $cust_pay_batch->payinfo);
 
+    $conf->config('batchconfig-nacha-destination') =~ /^\s*(\d{9})\s*$/
+      or die 'illegal NACHA Destination';
+    my $dest = $1;
+
     # "Total of all positions 4-11 on each 6 record"
     $entry_hash += substr($aba,0,8); 
 
@@ -130,7 +134,8 @@ $DEBUG = 1;
     my $transaction_code = ( $cust_main->paytype =~ /savings/i ? '37' : '27' );
 
     my $cust_name = substr($cust_main->name. (' 'x22), 0, 22);
-
+    $i++;
+    my $tracenum = $dest. substr(('0'x7). $i, -6);
     #non-PPD transactions?  future
 
     warn "building PPD Record\n" if $DEBUG;
@@ -148,8 +153,9 @@ $DEBUG = 1;
     $cust_name.                       #Individual name (22-char)
     '  '.                             #2 char "company internal use if desired"
     '0'.                              #Addenda Record Indicator
-    (' 'x15)                          #15 digit "bank will assign trace number"
-                                      # (00000?)
+#    (' 'x15).                         #15 digit "bank will assign trace number"
+     $tracenum.
+    "\n"                              # (00000?)
   },
 
   'footer' => sub {
@@ -168,7 +174,7 @@ $DEBUG = 1;
 
     my $batchnum = substr( ('0'x7). $pay_batch->batchnum, -7);
 
-    warn "building Batch and File Control Records\n" if $DEBUG;
+    warn "building Batch & File Control Records\n" if $DEBUG;
 
     ###
     # Batch Control Record
@@ -179,13 +185,13 @@ $DEBUG = 1;
                                   #                    200 mixed debits&credits)
     sprintf('%06d', $batchcount). #Entry / Addenda Count
     $entry_hash.
-    sprintf('%012d', $batchtotal * 100). #Debit total
+    sprintf('%012.0f', $batchtotal * 100). #Debit total
     '000000000000'.               #Credit total
     $origin.                      #Company Identification (Immediate Origin)
     (' 'x19).                     #Message Authentication Code (19 char blank)
     (' 'x6).                      #Federal Reserve Use (6 char blank)
     substr($dest, 0, 8).          #Originating Financial Institution
-    $batchnum.                    #Batch Number ("number batches sequentially")
+    $batchnum. "\n".              #Batch Number ("number batches sequentially")
 
     ###
     # File Control Record
@@ -196,7 +202,7 @@ $DEBUG = 1;
     sprintf('%06d', $batchcount + 4).    #num of physical blocks on the file..?
     sprintf('%08d', $batchcount).        #total # of entry detail and addenda
     $entry_hash.
-    sprintf('%012d', $batchtotal * 100). #Debit total
+    sprintf('%012.0f', $batchtotal * 100). #Debit total
     '000000000000'.                      #Credit total
     ( ' 'x39 )                           #Reserved / blank