'pay_batch' => { #batches of payments to an external processor
'columns' => [
'batchnum', 'serial', '', '', '', '',
- 'status', 'char', 'NULL', 1, '', '',
+ 'status', 'char', 'NULL', 1, '', '',
+ 'download', @date_type, 'NULL', '',
+ 'upload', @date_type, 'NULL', '',
],
'primary_key' => 'batchnum',
'unique' => [],
'zip', 'varchar', 'NULL', 10, '', '',
'country', 'char', '', 2, '', '',
# 'trancode', 'int', '', '', '', ''
+ 'payby', 'char', '', 4, '', '', # CARD/BILL/COMP, should be
'payinfo', 'varchar', '', 512, '', '',
#'exp', @date_type, '', ''
- 'exp', 'varchar', '', 11, '', '',
+ 'exp', 'varchar', 'NULL', 11, '', '',
'payname', 'varchar', 'NULL', $char_d, '', '',
'amount', @money_type, '', '',
+ 'status', 'varchar', 'NULL', $char_d, '', '',
],
'primary_key' => 'paybatchnum',
'unique' => [],
'weight' => 50,
'plan' => 'send',
},
+ { 'payby' => 'DCLN',
+ 'event' => 'Suspend',
+ 'seconds' => 0,
+ 'eventcode' => '$cust_bill->suspend();',
+ 'weight' => 40,
+ 'plan' => 'suspend',
+ },
],
#you must create a service definition. An example of a service definition
my $self = shift;
my $cust_main = $self->cust_main;
+ my $amount = sprintf("%.2f", $cust_main->balance - $cust_main->in_transit_payments);
+ return '' unless $amount > 0;
+
my $oldAutoCommit = $FS::UID::AutoCommit;
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
}
}
+ my $old_cust_pay_batch = qsearchs('cust_pay_batch', {
+ 'batchnum' => $pay_batch->getfield('batchnum'),
+ 'custnum' => $cust_main->getfield('custnum'),
+ } );
+
my $cust_pay_batch = new FS::cust_pay_batch ( {
'batchnum' => $pay_batch->getfield('batchnum'),
- 'invnum' => $self->getfield('invnum'),
+ 'invnum' => $self->getfield('invnum'), # is there a better value?
'custnum' => $cust_main->getfield('custnum'),
'last' => $cust_main->getfield('last'),
'first' => $cust_main->getfield('first'),
'state' => $cust_main->getfield('state'),
'zip' => $cust_main->getfield('zip'),
'country' => $cust_main->getfield('country'),
+ 'payby' => $cust_main->payby,
'payinfo' => $cust_main->payinfo,
'exp' => $cust_main->getfield('paydate'),
'payname' => $cust_main->getfield('payname'),
- 'amount' => $self->owed,
+ 'amount' => $amount, # consolidating
} );
- my $error = $cust_pay_batch->insert;
+
+ $cust_pay_batch->paybatchnum($old_cust_pay_batch->paybatchnum)
+ if $old_cust_pay_batch;
+
+ my $error;
+ if ($old_cust_pay_batch) {
+ $error = $cust_pay_batch->replace($old_cust_pay_batch)
+ } else {
+ $error = $cust_pay_batch->insert;
+ }
+
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
die $error;
freq - "1d" for the traditional, daily events (the default), or "1m" for the
new monthly events
+payby - allows for one time override of normal customer billing method
+
=cut
sub collect {
}
qsearch( {
'table' => 'part_bill_event',
- 'hashref' => { 'payby' => $self->payby,
+ 'hashref' => { 'payby' => (exists($options{'payby'})
+ ? $options{'payby'}
+ : $self->payby
+ ),
'disabled' => '', },
'extra_sql' => $extra_sql,
} )
);
}
+=item in_transit_payments
+
+Returns the total of requests for payments for this customer pending in
+batches in transit to the bank. See L<FS::pay_batch> and L<FS::cust_pay_batch>
+
+=cut
+
+sub in_transit_payments {
+ my $self = shift;
+ my $in_transit_payments = 0;
+ foreach my $pay_batch ( qsearch('pay_batch', {
+ 'status' => 'I',
+ } ) ) {
+ foreach my $cust_pay_batch ( qsearch('cust_pay_batch', {
+ 'batchnum' => $pay_batch->batchnum,
+ 'custnum' => $self->custnum,
+ } ) ) {
+ $in_transit_payments += $cust_pay_batch->amount;
+ }
+ }
+ sprintf( "%.2f", $in_transit_payments );
+}
+
=item paydate_monthyear
Returns a two-element list consisting of the month and year of this customer's
package FS::cust_pay_batch;
use strict;
-use vars qw( @ISA );
-use FS::Record qw(dbh qsearchs);
+use vars qw( @ISA $DEBUG );
+use FS::Record qw(dbh qsearch qsearchs);
use Business::CreditCard;
@ISA = qw( FS::Record );
+# 1 is mostly method/subroutine entry and options
+# 2 traces progress of some operations
+# 3 is even more information including possibly sensitive data
+$DEBUG = 0;
+
=head1 NAME
FS::cust_pay_batch - Object methods for batch cards
=item paybatchnum - primary key (automatically assigned)
+=item batchnum - indentifies group in batch
+
+=item payby - CARD/CHEK/LECB/BILL/COMP
+
=item payinfo
=item exp - card expiration
=item country
+=item status
+
=back
=head1 METHODS
=item replace OLD_RECORD
-#inactive
-#
-#Replaces the OLD_RECORD with this one in the database. If there is an error,
-#returns the error, otherwise returns false.
-
-=cut
-
-sub replace {
- return "Can't (yet?) replace batched transactions!";
-}
+Replaces the OLD_RECORD with this one in the database. If there is an error,
+returns the error, otherwise returns false.
=item check
my $error =
$self->ut_numbern('paybatchnum')
|| $self->ut_numbern('trancode') #depriciated
- || $self->ut_number('payinfo')
|| $self->ut_money('amount')
|| $self->ut_number('invnum')
|| $self->ut_number('custnum')
$self->first =~ /^([\w \,\.\-\']+)$/ or return "Illegal first name";
$self->first($1);
+ $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP|PREP|CASH|WEST|MCRD)$/
+ or return "Illegal payby";
+ $self->payby($1);
+
# FIXME
# there is no point in false laziness here
# we will effectively set "check_payinfo to 0"
#return "Unknown card type" if cardtype($cardnum) eq "Unknown";
if ( $self->exp eq '' ) {
- return "Expiration date required"; #unless
+ return "Expiration date required"
+ unless $self->payby =~ /^(CHEK|DCHK|LECB|WEST)$/;
$self->exp('');
} else {
if ( $self->exp =~ /^(\d{4})[\/\-](\d{1,2})[\/\-](\d{1,2})$/ ) {
my $format = $param->{'format'};
my $paybatch = $param->{'paybatch'};
+ my $filetype; # CSV, Fixed80, Fixed264
my @fields;
+ my $formatre; # for Fixed.+
+ my @values;
+ my $begin_condition;
my $end_condition;
my $end_hook;
my $hook;
if ( $format eq 'csv-td_canada_trust-merchant_pc_batch' ) {
+ $filetype = "CSV";
+
@fields = (
'paybatchnum', # Reference#: Invoice number of the transaction
'paid', # Amount: Amount of the transaction. Dollars and cents
};
+ }elsif ( $format eq 'PAP' ) {
+
+ $filetype = "Fixed264";
+
+ @fields = (
+ 'recordtype', # We are interested in the 'D' or debit records
+ 'batchnum', # Record#: batch number we used when sending the file
+ 'datacenter', # Where in the bowels of the bank the data was processed
+ 'paid', # Amount: Amount of the transaction. Dollars and cents
+ # with no decimal entered.
+ '_date', # Transaction Date: Date the Transaction was processed
+ 'bank', # Routing information
+ 'payinfo', # Account number for the transaction
+ 'paybatchnum', # Reference#: Invoice number of the transaction
+ );
+
+ $formatre = '^(.).{19}(.{4})(.{3})(.{10})(.{6})(.{9})(.{12}).{110}(.{19}).{71}$';
+
+ $end_condition = sub {
+ my $hash = shift;
+ $hash->{'recordtype'} eq 'W';
+ };
+
+ $end_hook = sub {
+ my( $hash, $total) = @_;
+ $total = sprintf("%.2f", $total);
+ my $batch_total = $hash->{'datacenter'}.$hash->{'paid'}.
+ substr($hash->{'_date'},0,1); # YUCK!
+ $batch_total = sprintf("%.2f", $batch_total / 100 );
+ return "Our total $total does not match bank total $batch_total!"
+ if $total != $batch_total;
+ '';
+ };
+
+ $hook = sub {
+ my $hash = shift;
+ $hash->{'paid'} = sprintf("%.2f", $hash->{'paid'} / 100 );
+ my $tmpdate = timelocal( 0,0,1,1,0,substr($hash->{'_date'}, 0, 3)+2000);
+ $tmpdate += 86400*(substr($hash->{'_date'}, 3, 3)-1) ;
+ $hash->{'_date'} = $tmpdate;
+ $hash->{'payinfo'} = $hash->{'payinfo'} . '@' . $hash->{'bank'};
+ };
+
+ $approved_condition = sub {
+ 1;
+ };
+
+ $declined_condition = sub {
+ 0;
+ };
+
+
} else {
return "Unknown format $format";
}
return "batch $paybatch is not in transit";
};
- my %batchhash = $pay_batch->hash;
- $batchhash{'status'} = 'R'; # Resolved
- my $newbatch = new FS::pay_batch ( \%batchhash );
- my $error = $newbatch->replace($paybatch);
+ my $newbatch = new FS::pay_batch { $pay_batch->hash };
+ $newbatch->status('R'); # Resolved
+ $newbatch->upload(time);
+ my $error = $newbatch->replace($pay_batch);
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return $error
next if $line =~ /^\s*$/; #skip blank lines
- $csv->parse($line) or do {
+ if ($filetype eq "CSV") {
+ $csv->parse($line) or do {
+ $dbh->rollback if $oldAutoCommit;
+ return "can't parse: ". $csv->error_input();
+ };
+ @values = $csv->fields();
+ }elsif ($filetype eq "Fixed80" || $filetype eq "Fixed264"){
+ @values = $line =~ /$formatre/;
+ unless (@values) {
+ $dbh->rollback if $oldAutoCommit;
+ return "can't parse: ". $line;
+ };
+ }else{
$dbh->rollback if $oldAutoCommit;
- return "can't parse: ". $csv->error_input();
- };
+ return "Unknown file type $filetype";
+ }
- my @values = $csv->fields();
my %hash;
foreach my $field ( @fields ) {
my $value = shift @values;
}
my $cust_pay_batch =
- qsearchs('cust_pay_batch', { 'paybatchnum' => $hash{'paybatchnum'} } );
+ qsearchs('cust_pay_batch', { 'paybatchnum' => $hash{'paybatchnum'}+0 } );
unless ( $cust_pay_batch ) {
$dbh->rollback if $oldAutoCommit;
return "unknown paybatchnum $hash{'paybatchnum'}\n";
}
my $custnum = $cust_pay_batch->custnum,
+ my $payby = $cust_pay_batch->payby,
- my $error = $cust_pay_batch->delete;
- if ( $error ) {
- $dbh->rollback if $oldAutoCommit;
- return "error removing paybatchnum $hash{'paybatchnum'}: $error\n";
- }
+ my $new_cust_pay_batch = new FS::cust_pay_batch { $cust_pay_batch->hash };
&{$hook}(\%hash);
if ( &{$approved_condition}(\%hash) ) {
+ $new_cust_pay_batch->status('Approved');
+
my $cust_pay = new FS::cust_pay ( {
'custnum' => $custnum,
- 'payby' => 'CARD',
+ 'payby' => $payby,
'paybatch' => $paybatch,
map { $_ => $hash{$_} } (qw( paid _date payinfo )),
} );
} elsif ( &{$declined_condition}(\%hash) ) {
+ $new_cust_pay_batch->status('Declined');
+
#this should be configurable... if anybody else ever uses batches
- $cust_pay_batch->cust_main->suspend;
+ # $cust_pay_batch->cust_main->suspend;
+
+ foreach my $part_bill_event (
+ sort { $a->seconds <=> $b->seconds
+ || $a->weight <=> $b->weight
+ || $a->eventpart <=> $b->eventpart }
+ grep { ! qsearch( 'cust_bill_event', {
+ 'invnum' => $cust_pay_batch->invnum,
+ 'eventpart' => $_->eventpart,
+ 'status' => 'done',
+ } )
+ }
+ qsearch( {
+ 'table' => 'part_bill_event',
+ 'hashref' => { 'payby' => 'DCLN',
+ 'disabled' => '', },
+ } )
+ ) {
+
+ # don't run subsequent events if balance<=0
+ last if $cust_pay_batch->cust_main->balance <= 0;
+
+ warn " calling invoice event (". $part_bill_event->eventcode. ")\n"
+ if $DEBUG > 1;
+ my $cust_main = $cust_pay_batch->cust_main; #for callback
+
+ my $error;
+ {
+ local $SIG{__DIE__}; # don't want Mason __DIE__ handler active
+ $error = eval $part_bill_event->eventcode;
+ }
+
+ my $status = '';
+ my $statustext = '';
+ if ( $@ ) {
+ $status = 'failed';
+ $statustext = $@;
+ } elsif ( $error ) {
+ $status = 'done';
+ $statustext = $error;
+ } else {
+ $status = 'done'
+ }
+
+ #add cust_bill_event
+ my $cust_bill_event = new FS::cust_bill_event {
+ 'invnum' => $cust_pay_batch->invnum,
+ 'eventpart' => $part_bill_event->eventpart,
+ '_date' => time,
+ 'status' => $status,
+ 'statustext' => $statustext,
+ };
+ $error = $cust_bill_event->insert;
+ if ( $error ) {
+ # gah, even with transactions.
+ $dbh->commit if $oldAutoCommit; #well.
+ my $e = 'WARNING: Event run but database not updated - '.
+ 'error inserting cust_bill_event, invnum #'. $cust_pay_batch->invnum.
+ ', eventpart '. $part_bill_event->eventpart.
+ ": $error";
+ warn $e;
+ return $e;
+ }
+
+ }
}
+ my $error = $new_cust_pay_batch->replace($cust_pay_batch);
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "error updating status of paybatchnum $hash{'paybatchnum'}: $error\n";
+ }
+
}
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
}
my $error = $self->ut_numbern('eventpart')
- || $self->ut_enum('payby', [qw( CARD DCRD CHEK DCHK LECB BILL COMP )] )
+ || $self->ut_enum('payby', [qw( CARD DCLN DCRD CHEK DCHK LECB BILL COMP )] )
|| $self->ut_text('event')
|| $self->ut_anything('eventcode')
|| $self->ut_number('seconds')
=item batchnum - primary key
-=item status -
+=item status -
+
+=item download -
+
+=item upload -
=back
=head1 BUGS
-The author forgot to customize this manpage.
+status is somewhat redundant now that download and upload exist
=head1 SEE ALSO
shortname => 'Complimentary',
longname => 'Complimentary',
},
+ 'DCLN' => { # This is only an event.
+ tinyname => 'declined',
+ shortname => 'Declined payment',
+ longname => 'Declined payment',
+ },
;
sub payby {
ALTER TABLE cust_pay_batch ADD COLUMN payinfo varchar(512);
UPDATE cust_pay_batch SET payinfo = cardnum;
ALTER TABLE cust_pay_batch DROP COLUMN cardnum;
+ALTER TABLE cust_pay_batch ALTER COLUMN exp DROP NOT NULL;
ALTER TABLE h_cust_pay_batch ADD COLUMN payinfo varchar(512);
UPDATE h_cust_pay_batch SET payinfo = cardnum;
ALTER TABLE h_cust_pay_batch DROP COLUMN cardnum;
+ALTER TABLE h_cust_pay_batch ALTER COLUMN exp DROP NOT NULL;
make install-perl-modules
run "freeside-upgrade username" to uprade your database schema
<!-- mason kludge -->
-<%= include("/elements/header.html","Pending credit card batch", menubar( 'Main Menu' => $p,)) %>
+<%= include("/elements/header.html","Credit card batch details", menubar( 'Main Menu' => $p,)) %>
+
+<%
+
+die "No batch specified (bad URL)!" unless $cgi->keywords;
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+my $batchnum = $1;
+my $pay_batch = qsearchs('pay_batch',{'batchnum'=>$batchnum});
+die "Batch not found!" unless $pay_batch;
+
+%>
<FORM ACTION="<%=$p%>misc/download-batch.cgi" METHOD="POST">
Download batch in format <SELECT NAME="format">
<OPTION VALUE="">Default batch mode</OPTION>
<OPTION VALUE="csv-td_canada_trust-merchant_pc_batch">CSV file for TD Canada Trust Merchant PC Batch</OPTION>
-<OPTION VALUE="BoM">Bank of Montreal ECA results</OPTION>
-</SELECT><INPUT TYPE="submit" VALUE="Download"></FORM>
+<OPTION VALUE="PAP">80 byte file for TD Canada Trust PAP Batch</OPTION>
+<OPTION VALUE="BoM">Bank of Montreal ECA batch</OPTION>
+</SELECT><INPUT TYPE="hidden" NAME="batchnum" VALUE="<%= $batchnum %>"><INPUT TYPE="submit" VALUE="Download"></FORM>
<BR><BR>
<FORM ACTION="<%=$p%>misc/upload-batch.cgi" METHOD="POST" ENCTYPE="multipart/form-data">
Format <SELECT NAME="format">
<OPTION VALUE="">Default batch mode</OPTION>
<OPTION VALUE="csv-td_canada_trust-merchant_pc_batch">CSV results from TD Canada Trust Merchant PC Batch</OPTION>
-<OPTION VALUE="BoM">Bank of Montreal ECA batch</OPTION>
+<OPTION VALUE="PAP">264 byte results for TD Canada Trust PAP Batch</OPTION>
+<OPTION VALUE="BoM">Bank of Montreal ECA results</OPTION>
</SELECT><BR>
<INPUT TYPE="submit" VALUE="Upload"></FORM>
<BR>
<%
- my $statement = "SELECT SUM(amount) from cust_pay_batch";
+ my $statement = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=".
+ $batchnum;
my $sth = dbh->prepare($statement) or die dbh->errstr. "doing $statement";
$sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
my $total = $sth->fetchrow_arrayref->[0];
- my $c_statement = "SELECT COUNT(*) from cust_pay_batch";
+ my $c_statement = "SELECT COUNT(*) from cust_pay_batch WHERE batchnum=".
+ $batchnum;
my $c_sth = dbh->prepare($c_statement)
or die dbh->errstr. "doing $c_statement";
$c_sth->execute or die "Error executing \"$c_statement\": ". $c_sth->errstr;
my $cards = $c_sth->fetchrow_arrayref->[0];
%>
<%= $cards %> credit card payments batched<BR>
-$<%= sprintf("%.2f", $total) %> total in pending batch<BR>
+$<%= sprintf("%.2f", $total) %> total in batch<BR>
<BR>
<%= &table() %>
<TH>Card</TH>
<TH>Exp</TH>
<TH>Amount</TH>
+ <TH>Status</TH>
</TR>
<%
foreach my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
- qsearch('cust_pay_batch', {} )
+ qsearch('cust_pay_batch', {'batchnum'=>$batchnum} )
) {
my $cardnum = $cust_pay_batch->payinfo;
#$cardnum =~ s/.{4}$/xxxx/;
<TD><%= $cardnum %></TD>
<TD><%= $exp %></TD>
<TD align="right">$<%= $cust_pay_batch->amount %></TD>
+ <TD><%= $cust_pay_batch->status %></TD>
</TR>
<% } %>
--- /dev/null
+<!-- mason kludge -->
+<%= include("/elements/header.html","Credit card batches", menubar( 'Main Menu' => $p,)) %>
+
+<BR><BR>
+
+<%
+ my %statusmap = ('I'=>'In Transit', 'O'=>'Open', 'R'=>'Resolved');
+%>
+
+<BR>
+<%= &table() %>
+ <TR>
+ <TH>Batch</TH>
+ <TH>First Download</TH>
+ <TH>Last Upload</TH>
+ <TH>Item Count</TH>
+ <TH>Amount</TH>
+ <TH>Status</TH>
+ </TR>
+
+<%
+foreach my $pay_batch ( sort { $b->batchnum <=> $a->batchnum }
+ qsearch('pay_batch', {} )
+) {
+
+ my $statement = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=" .
+ $pay_batch->batchnum;
+ my $sth = dbh->prepare($statement) or die dbh->errstr. "doing $statement";
+ $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
+ my $total = $sth->fetchrow_arrayref->[0];
+
+ my $c_statement = "SELECT COUNT(*) from cust_pay_batch WHERE batchnum=" .
+ $pay_batch->batchnum;
+ my $c_sth = dbh->prepare($c_statement)
+ or die dbh->errstr. "doing $c_statement";
+ $c_sth->execute or die "Error executing \"$c_statement\": ". $c_sth->errstr;
+ my $cards = $c_sth->fetchrow_arrayref->[0];
+
+%>
+
+ <TR>
+ <TD><A HREF="cust_pay_batch.cgi?<%= $pay_batch->batchnum %>"><%= $pay_batch->batchnum %></TD>
+ <TD><%= $pay_batch->download ? time2str("%a %b %e %T %Y", $pay_batch->download) : '' %></TD>
+ <TD><%= $pay_batch->upload ? time2str("%a %b %e %T %Y", $pay_batch->upload) : '' %></TD>
+ <TD><%= $cards %></TD>
+ <TD align="right"><%= $total %></TD>
+ <TD><%= $statusmap{$pay_batch->status} %></TD>
+ </TR>
+
+<% } %>
+
+ </TABLE>
+ </BODY>
+</HTML>
<ul>
<li>batchnum
<li>status
+ <li>download
+ <li>upload
</ul>
<li><a name="cust_pay_batch" href="man/FS/cust_pay_batch.html">cust_pay_batch</a> - Pending batch members
<ul>
<li>paybatchnum
<li>batchnum
+ <li>payby - CARD, CHEK, LECB, BILL, or COMP
<li>payinfo - account number
<li>exp - card expiration
<li>amount
<li>state
<li>zip
<li>country
+ <li>status
</ul>
<li><a name="cust_pkg" href="man/FS/cust_pkg.html">cust_pkg</a> - Customer billing items
<ul>
#http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes
http_header('Content-Type' => 'text/plain' );
+my $batchnum;
+if ( $cgi->param('batchnum') =~ /^(\d+)$/ ) {
+ $batchnum = $1;
+} else {
+ die "No batch number (bad URL) \n";
+}
+
my $format;
if ( $cgi->param('format') =~ /^([\w\- ]+)$/ ) {
$format = $1;
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
-my $pay_batch = qsearchs('pay_batch', {'status'=>'O'} );
+my $pay_batch = qsearchs('pay_batch', {'batchnum'=>$batchnum, 'status'=>'O'} );
die "No pending batch. \n" unless $pay_batch;
my %batchhash = $pay_batch->hash;
$batchhash{'status'} = 'I';
+$batchhash{'download'} = time unless $batchhash{'download'};
my $new = new FS::pay_batch \%batchhash;
my $error = $new->replace($pay_batch);
die "error updating batch status: $error\n" if $error;
my $batchtotal=0;
my $batchcount=0;
-my (@date)=localtime();
-my $jdate = sprintf("%03d", $date[5] % 100).sprintf("%03d", $date[7]);
+my (@date)=localtime($new->download);
+my $jdate = sprintf("%03d", $date[5] % 100).sprintf("%03d", $date[7] + 1);
+my $cdate = sprintf("%02d", $date[3]).sprintf("%02d", $date[4] + 1).
+ sprintf("%02d", $date[5] % 100);
if ($format eq "BoM") {
sprintf( "XD%03u%06u%-15s%-30s%09u%-12s \n",$typecode,$jdate,$shortname,$longname,$mybank,$myacct )
%><%
+}elsif ($format eq "PAP"){
+
+ my($origid,$datacenter,$typecode,$shortname,$longname,$mybank,$myacct) =
+ $conf->config("batchconfig-$format");
+ %><%= sprintf( "H%10sD%3s%06u%-15s%09u%-12s%04u%19s\n",$origid,$typecode,$cdate,$shortname,$mybank,$myacct,$pay_batch->batchnum,"")
+
+ %><%
+
}elsif ($format eq "csv-td_canada_trust-merchant_pc_batch"){
# 1;
}else{
if ($format eq "BoM") {
my( $account, $aba ) = split( '@', $cust_pay_batch->payinfo );
- %><%= sprintf( "D%010u%09u%-12s%-29s%-19s\n",$cust_pay_batch->amount*100,$aba,$account,$cust_pay_batch->payname,$cust_pay_batch->invnum %><%
+ %><%= sprintf( "D%010.0f%09u%-12s%-29s%-19s\n",$cust_pay_batch->amount*100,$aba,$account,$cust_pay_batch->payname,$cust_pay_batch->paybatchnum) %><%
+
+ } elsif ($format eq "PAP"){
+
+ my( $account, $aba ) = split( '@', $cust_pay_batch->payinfo );
+ %><%= sprintf( "D%-23s%06u%-19s%09u%-12s%010.0f\n",$cust_pay_batch->payname,$cdate,$cust_pay_batch->paybatchnum,$aba,$account,$cust_pay_batch->amount*100) %><%
} elsif ($format eq "csv-td_canada_trust-merchant_pc_batch") {
if ($format eq "BoM") {
- %><%= sprintf( "YD%08u%014u%56s\n",$batchcount,$batchtotal*100,"" ).
+ %><%= sprintf( "YD%08u%014.0f%56s\n",$batchcount,$batchtotal*100,"" ).
sprintf( "Z%014u%05u%014u%05u%41s\n",$batchtotal*100,$batchcount,"0","0","" ) %><%
+} elsif ($format eq "PAP"){
+
+ %><%= sprintf( "T%08u%014.0f%57s\n",$batchcount,$batchtotal*100,"" ) %><%
+
} elsif ($format eq "csv-td_canada_trust-merchant_pc_batch"){
#1;
} else {
projects / freeside.git / commitdiff