[freeside-commits] freeside/httemplate/search cust_pay_batch.cgi,
1.1, 1.2 pay_batch.cgi, 1.1, 1.2
Ivan,,,
ivan at wavetail.420.am
Sun Oct 8 01:17:08 PDT 2006
- Previous message: [freeside-commits] freeside/httemplate/elements menu.html, 1.11,
1.12
- Next message: [freeside-commits] freeside/FS/FS Conf.pm, 1.161,
1.162 AccessRight.pm, 1.10, 1.11 payby.pm, 1.8,
1.9 pay_batch.pm, 1.3, 1.4 Schema.pm, 1.31, 1.32 cust_bill.pm,
1.155, 1.156 Setup.pm, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv332/httemplate/search
Modified Files:
cust_pay_batch.cgi pay_batch.cgi
Log Message:
add menu items for credit card batching, debug last-minute changes to payby.pm, add ACL for re-processing batches, separate CARD and CHEK batches, fixed defaults for batch formats
Index: cust_pay_batch.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pay_batch.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cust_pay_batch.cgi 26 Aug 2006 23:15:14 -0000 1.1
+++ cust_pay_batch.cgi 8 Oct 2006 08:17:06 -0000 1.2
@@ -1,18 +1,17 @@
-%
-%
-%my ($count_query, $sql_query, $batchnum);
+%my( $count_query, $sql_query );
%my $hashref = {};
%my @search = ();
%my $orderby = 'paybatchnum';
%
+%my( $pay_batch, $batchnum ) = ( '', '');
%if ( $cgi->param('batchnum') && $cgi->param('batchnum') =~ /^(\d+)$/ ) {
% push @search, "batchnum = $1";
-% my $pay_batch = qsearchs('pay_batch', { 'batchnum' => $1 } );
+% $pay_batch = qsearchs('pay_batch', { 'batchnum' => $1 } );
% die "Batch $1 not found!" unless $pay_batch;
% $batchnum = $pay_batch->batchnum;
%}
%
-%if ( $cgi->param('payby') ) {
+%if ( $cgi->param('payby') ) {
% $cgi->param('payby') =~ /^(CARD|CHEK)$/
% or die "illegal payby " . $cgi->param('payby');
%
@@ -24,7 +23,7 @@
%}
%
%my ($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-%unless ($batchnum){
+%unless ($pay_batch){
% push @search, "pay_batch.upload >= $beginning" if ($beginning);
% push @search, "pay_batch.upload <= $ending" if ($ending < 4294967295);#2^32-1
% $orderby = "pay_batch.download,paybatchnum";
@@ -46,30 +45,55 @@
% 'LEFT JOIN pay_batch USING ( batchnum ) ' .
% "$search ORDER BY $orderby";
%
-%my $html_init = <<EOF;
-%<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="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>
+%my $html_init = '';
+%if ( $pay_batch ) {
+% my $conf = new FS::Conf;
+% my $fixed = $conf->config('batch-fixed_format-'. $pay_batch->payby);
+% if (
+% $pay_batch->status eq 'O'
+% || ( $pay_batch->status eq 'I'
+% && $FS::CurrentUser::CurrentUser->access_right('Reprocess batches')
+% )
+% ) {
+% $html_init .= qq!<FORM ACTION="$p/misc/download-batch.cgi" METHOD="POST">!;
+% if ( $fixed ) {
+% $html_init .= qq!<INPUT TYPE="hidden" NAME="format" VALUE="$fixed">!;
+% } else {
+% $html_init .= qq!Download batch in format <SELECT NAME="format">!.
+% qq!<OPTION VALUE="">Default batch mode</OPTION>!.
+% qq!<OPTION VALUE="csv-td_canada_trust-merchant_pc_batch">CSV file for TD Canada Trust Merchant PC Batch</OPTION>!.
+% qq!<OPTION VALUE="PAP">80 byte file for TD Canada Trust PAP Batch</OPTION>!.
+% qq!<OPTION VALUE="BoM">Bank of Montreal ECA batch</OPTION>!.
+% qq!</SELECT>!;
+% }
+% $html_init .= qq!<INPUT TYPE="hidden" NAME="batchnum" VALUE="$batchnum"><INPUT TYPE="submit" VALUE="Download"></FORM><BR>!;
+% }
%
-%<FORM ACTION="$p/misc/upload-batch.cgi" METHOD="POST" ENCTYPE="multipart/form-data">
-%Upload results<BR>
-%Filename <INPUT TYPE="file" NAME="batch_results"><BR>
-%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="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>
-%EOF
+% if (
+% $pay_batch->status eq 'I'
+% || ( $pay_batch->status eq 'R'
+% && $FS::CurrentUser::CurrentUser->access_right('Reprocess batches')
+% )
+% ) {
+% $html_init .= qq!<FORM ACTION="$p/misc/upload-batch.cgi" METHOD="POST" ENCTYPE="multipart/form-data">!.
+% qq!Upload results<BR>!.
+% qq!Filename <INPUT TYPE="file" NAME="batch_results"><BR>!;
+% if ( $fixed ) {
+% $html_init .= qq!<INPUT TYPE="hidden" NAME="format" VALUE="$fixed">!;
+% } else {
+% $html_init .= qq!Format <SELECT NAME="format">!.
+% qq!<OPTION VALUE="">Default batch mode</OPTION>!.
+% qq!<OPTION VALUE="csv-td_canada_trust-merchant_pc_batch">CSV results from TD Canada Trust Merchant PC Batch</OPTION>!.
+% qq!<OPTION VALUE="PAP">264 byte results for TD Canada Trust PAP Batch</OPTION>!.
+% qq!<OPTION VALUE="BoM">Bank of Montreal ECA results</OPTION>!.
+% qq!</SELECT><BR>!;
+% }
+% $html_init .= '<INPUT TYPE="submit" VALUE="Upload"></FORM><BR>';
+% }
%
-%if ($batchnum) {
+%}
+%
+%if ($pay_batch) {
% my $sth = dbh->prepare($count_query) or die dbh->errstr. "doing $count_query";
% $sth->execute or die "Error executing \"$count_query\": ". $sth->errstr;
% my $cards = $sth->fetchrow_arrayref->[0];
@@ -90,7 +114,7 @@
'menubar' => ['Main Menu' => $p,],
'query' => $sql_query,
'count_query' => $count_query,
- 'html_init' => $batchnum ? $html_init : '',
+ 'html_init' => $pay_batch ? $html_init : '',
'header' => [ '#',
'Inv #',
'Customer',
@@ -124,7 +148,7 @@
sub {
shift->[7] =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
my( $mon, $year ) = ( $2, $1 );
- $mon = "0$mon" if $mon < 10;
+ $mon = "0$mon" if length($mon) == 1;
"$mon/$year";
},
sub {
Index: pay_batch.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/pay_batch.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pay_batch.cgi 26 Aug 2006 23:15:14 -0000 1.1
+++ pay_batch.cgi 8 Oct 2006 08:17:06 -0000 1.2
@@ -37,55 +37,89 @@
%
%my $extra_sql = scalar(@where) ? 'WHERE ' . join(' AND ', @where) : '';
%
+%my $link = [ "${p}search/cust_pay_batch.cgi?batchnum=", 'batchnum' ];
%
<% include( 'elements/search.html',
- 'title' => 'Credit Card Batches',
- 'menubar' => [ 'Main Menu' => $p, ],
- 'name' => 'batches',
- 'query' => { 'table' => 'pay_batch',
- 'hashref' => $hashref,
- 'extra_sql' => "$extra_sql ORDER BY batchnum DESC",
- },
- 'count_query' => "$count_query $extra_sql",
- 'header' => [ 'Batch',
- 'First Download',
- 'Last Upload',
- 'Item Count',
- 'Amount',
- 'Status',
- ],
- 'align' => 'lllrrl',
- 'fields' => [ 'batchnum',
- sub {
- my $_date = shift->download;
- $_date ? time2str("%a %b %e %T %Y", $_date) : ''
- },
- sub {
- my $_date = shift->upload;
- $_date ? time2str("%a %b %e %T %Y", $_date) : ''
- },
- sub {
- my $st = "SELECT COUNT(*) from cust_pay_batch WHERE batchnum=" . shift->batchnum;
- my $sth = dbh->prepare($st)
- or die dbh->errstr. "doing $st";
- $sth->execute
- or die "Error executing \"$st\": ". $sth->errstr;
- $sth->fetchrow_arrayref->[0];
- },
- sub {
- my $st = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=" . shift->batchnum;
- my $sth = dbh->prepare($st)
- or die dbh->errstr. "doing $st";
- $sth->execute
- or die "Error executing \"$st\": ". $sth->errstr;
- $sth->fetchrow_arrayref->[0];
- },
- sub {
- $statusmap{shift->status};
- },
- ],
- 'links' => [ [ "${p}search/cust_pay_batch.cgi?batchnum=", 'batchnum',],
- ],
+ 'title' => 'Payment Batches',
+ 'name_singular' => 'batch',
+ 'query' => { 'table' => 'pay_batch',
+ 'hashref' => $hashref,
+ 'extra_sql' => "$extra_sql ORDER BY batchnum DESC",
+ },
+ 'count_query' => "$count_query $extra_sql",
+ 'header' => [ 'Batch',
+ 'Type',
+ 'First Download',
+ 'Last Upload',
+ 'Item Count',
+ 'Amount',
+ 'Status',
+ ],
+ 'align' => 'rcllrrc',
+ 'fields' => [ 'batchnum',
+ sub {
+ FS::payby->shortname(shift->payby);
+ },
+ sub {
+ my $self = shift;
+ my $_date = $self->download;
+ if ( $_date ) {
+ time2str("%a %b %e %T %Y", $_date);
+ } elsif ( $self->status eq 'O' ) {
+ 'Download batch';
+ } else {
+ '';
+ }
+ },
+ sub {
+ my $self = shift;
+ my $_date = $self->upload;
+ if ( $_date ) {
+ time2str("%a %b %e %T %Y", $_date);
+ } elsif ( $self->status eq 'I' ) {
+ 'Upload results';
+ } else {
+ '';
+ }
+ },
+ sub {
+ my $st = "SELECT COUNT(*) from cust_pay_batch WHERE batchnum=" . shift->batchnum;
+ my $sth = dbh->prepare($st)
+ or die dbh->errstr. "doing $st";
+ $sth->execute
+ or die "Error executing \"$st\": ". $sth->errstr;
+ $sth->fetchrow_arrayref->[0];
+ },
+ sub {
+ my $st = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=" . shift->batchnum;
+ my $sth = dbh->prepare($st)
+ or die dbh->errstr. "doing $st";
+ $sth->execute
+ or die "Error executing \"$st\": ". $sth->errstr;
+ $sth->fetchrow_arrayref->[0];
+ },
+ sub {
+ $statusmap{shift->status};
+ },
+ ],
+ 'links' => [
+ $link,
+ '',
+ sub { shift->status eq 'O' ? $link : '' },
+ sub { shift->status eq 'I' ? $link : '' },
+ ],
+ 'size' => [
+ '',
+ '',
+ sub { shift->status eq 'O' ? "+1" : '' },
+ sub { shift->status eq 'I' ? "+1" : '' },
+ ],
+ 'style' => [
+ '',
+ '',
+ sub { shift->status eq 'O' ? "b" : '' },
+ sub { shift->status eq 'I' ? "b" : '' },
+ ],
)
%>
- Previous message: [freeside-commits] freeside/httemplate/elements menu.html, 1.11,
1.12
- Next message: [freeside-commits] freeside/FS/FS Conf.pm, 1.161,
1.162 AccessRight.pm, 1.10, 1.11 payby.pm, 1.8,
1.9 pay_batch.pm, 1.3, 1.4 Schema.pm, 1.31, 1.32 cust_bill.pm,
1.155, 1.156 Setup.pm, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the freeside-commits
mailing list