X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpay_batch%2Fnacha.pm;h=befba09a2c403921438a8962bef6c501981195a7;hb=8f1f857ffd2f01a543bdef6b8486ad8c90bd302a;hp=c069082c7945e62a4c85a0867efec31499fcca74;hpb=63973c641c4be00765fa27e55c57cc5b9aa4da19;p=freeside.git

diff --git a/FS/FS/pay_batch/nacha.pm b/FS/FS/pay_batch/nacha.pm
index c069082c7..befba09a2 100644
--- a/FS/FS/pay_batch/nacha.pm
+++ b/FS/FS/pay_batch/nacha.pm
@@ -7,7 +7,7 @@ use Date::Format;
 #use FS::Conf;
 
 $name = 'NACHA';
-
+my $i;
 $DEBUG = 0;
 
 %import_info = (
@@ -47,7 +47,12 @@ $DEBUG = 0;
     my $origin = $1;
 
     my $company = $conf->config('company_name', $pay_batch->agentnum);
-    $company = substr(uc($company). (' 'x23), 0, 23);
+
+    my $origin_name =  $conf->config('batchconfig-nacha-origin_name')
+                    || $company;
+    $origin_name = substr(uc($origin_name). (' 'x23), 0, 23);
+
+    $company = substr(uc($company). (' 'x16), 0, 16);
 
     my $now = time;
 
@@ -78,8 +83,8 @@ $DEBUG = 0;
     '10'.                     #Blocking Factor
     '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)
+    $origin_name.             #Immediate Origin Name / 23 char company name
+    $refcode. "\n".           #Reference Code (internal/optional)
 
     ###
     # Batch Header Record
@@ -88,7 +93,7 @@ $DEBUG = 0;
     '5'.                     #Record Type Code
     '225'.                   #Service Class Code (220 credits only,
                              #                    200 mixed debits & credits)
-    substr($company, 0, 16). #on cust. statements
+    $company.                #on cust. statements
     (' 'x20 ).               #20 char "company internal use if desired"
     $origin.                 #Company Identification (Immediate Origin)
     'PPD'. #others?
@@ -110,7 +115,7 @@ $DEBUG = 0;
     (' '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 +124,10 @@ $DEBUG = 0;
 
     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 +139,8 @@ $DEBUG = 0;
     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;
@@ -143,13 +153,14 @@ $DEBUG = 0;
     $transaction_code.                #Transaction Code
     $aba.                             #Receiving DFI Identification, check digit
     substr($account.(' 'x17), 0, 17). #DFI Account number (Left justify)
-    sprintf('%010d', $cust_pay_batch->amount * 100). #Amount
+    sprintf('%010.0f', $cust_pay_batch->amount * 100). #Amount
     $cust_identifier.                 #Individual Identification Number, 15 char
     $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,6 +179,15 @@ $DEBUG = 0;
 
     my $batchnum = substr( ('0'x7). $pay_batch->batchnum, -7);
 
+    my $lines = $batchcount + 4;
+    my $blocks = int($lines/10);
+    my $fill = '';
+
+    if ( my $remainder = $lines % 10 ) {
+      $blocks++;
+      $fill = ("\n".('9'x94))x( 10 - $remainder );
+    }
+
     warn "building Batch & File Control Records\n" if $DEBUG;
 
     ###
@@ -179,13 +199,13 @@ $DEBUG = 0;
                                   #                    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
@@ -193,12 +213,18 @@ $DEBUG = 0;
 
     '9'.                                 #Record Type Code
     '000001'.                            #Batch Counter (# of batch header recs)
-    sprintf('%06d', $batchcount + 4).    #num of physical blocks on the file..?
+    sprintf('%06d', $blocks).            #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
+    ( ' 'x39 ).                          #Reserved / blank
+
+    ###
+    # Pad with 9999 records to blocks of 10
+    ###
+
+    $fill
 
   },