From 6af1b1bfa25e5ececef5e0dcd38b55917121cee2 Mon Sep 17 00:00:00 2001 From: jeff Date: Sat, 26 Aug 2006 23:15:14 +0000 Subject: batch refactor continued --- httemplate/search/cust_pay_batch.cgi | 145 +++++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100755 httemplate/search/cust_pay_batch.cgi (limited to 'httemplate/search/cust_pay_batch.cgi') diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi new file mode 100755 index 000000000..1b0bf6abf --- /dev/null +++ b/httemplate/search/cust_pay_batch.cgi @@ -0,0 +1,145 @@ +% +% +%my ($count_query, $sql_query, $batchnum); +%my $hashref = {}; +%my @search = (); +%my $orderby = 'paybatchnum'; +% +%if ( $cgi->param('batchnum') && $cgi->param('batchnum') =~ /^(\d+)$/ ) { +% push @search, "batchnum = $1"; +% my $pay_batch = qsearchs('pay_batch', { 'batchnum' => $1 } ); +% die "Batch $1 not found!" unless $pay_batch; +% $batchnum = $pay_batch->batchnum; +%} +% +%if ( $cgi->param('payby') ) { +% $cgi->param('payby') =~ /^(CARD|CHEK)$/ +% or die "illegal payby " . $cgi->param('payby'); +% +% push @search, "cust_pay_batch.payby = '$1'"; +%} +% +%if ( not $cgi->param('dcln') ) { +% push @search, "cpb.status IS DISTINCT FROM 'Approved'"; +%} +% +%my ($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); +%unless ($batchnum){ +% 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"; +%} +% +%push @search, $FS::CurrentUser::CurrentUser->agentnums_sql; +%my $search = ' WHERE ' . join(' AND ', @search); +% +%$count_query = 'SELECT COUNT(*) FROM cust_pay_batch AS cpb ' . +% 'LEFT JOIN cust_main USING ( custnum ) ' . +% 'LEFT JOIN pay_batch USING ( batchnum )' . +% $search; +% +%#grr +%$sql_query = "SELECT paybatchnum,invnum,custnum,cpb.last,cpb.first," . +% "cpb.payname,cpb.payinfo,cpb.exp,amount,cpb.status " . +% "FROM cust_pay_batch AS cpb " . +% 'LEFT JOIN cust_main USING ( custnum ) ' . +% 'LEFT JOIN pay_batch USING ( batchnum ) ' . +% "$search ORDER BY $orderby"; +% +%my $html_init = < +%Download batch in format +%

+% +%
+%Upload results
+%Filename
+%Format
+%
+%
+%EOF +% +%if ($batchnum) { +% 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]; +% +% my $st = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=". $batchnum; +% $sth = dbh->prepare($st) or die dbh->errstr. "doing $st"; +% $sth->execute or die "Error executing \"$st\": ". $sth->errstr; +% my $total = $sth->fetchrow_arrayref->[0]; +% +% $html_init .= "$cards credit card payments batched
\$" . +% sprintf("%.2f", $total) ." total in batch
"; +%} +% +% +<% include('elements/search.html', + 'title' => 'Batch payment details', + 'name' => 'batch details', + 'menubar' => ['Main Menu' => $p,], + 'query' => $sql_query, + 'count_query' => $count_query, + 'html_init' => $batchnum ? $html_init : '', + 'header' => [ '#', + 'Inv #', + 'Customer', + 'Customer', + 'Card Name', + 'Card', + 'Exp', + 'Amount', + 'Status', + ], + 'fields' => [ sub { + shift->[0]; + }, + sub { + shift->[1]; + }, + sub { + shift->[2]; + }, + sub { + my $cpb = shift; + $cpb->[3] . ', ' . $cpb->[4]; + }, + sub { + shift->[5]; + }, + sub { + my $cardnum = shift->[6]; + 'x'x(length($cardnum)-4). substr($cardnum,(length($cardnum)-4)); + }, + sub { + shift->[7] =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/; + my( $mon, $year ) = ( $2, $1 ); + $mon = "0$mon" if $mon < 10; + "$mon/$year"; + }, + sub { + shift->[8]; + }, + sub { + shift->[9]; + }, + ], + 'align' => 'lllllllrl', + 'links' => [ ['', sub{'#';}], + ["${p}view/cust_bill.cgi?", sub{shift->[1];},], + ["${p}view/cust_main.cgi?", sub{shift->[2];},], + ["${p}view/cust_main.cgi?", sub{shift->[2];},], + ], + ) +%> + -- cgit v1.2.1 From 22c70177969f30e2e419b32cb5d475c143f10b12 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 8 Oct 2006 08:17:06 +0000 Subject: 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 --- httemplate/search/cust_pay_batch.cgi | 88 +++++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 32 deletions(-) (limited to 'httemplate/search/cust_pay_batch.cgi') diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi index 1b0bf6abf..d12e3c44f 100755 --- a/httemplate/search/cust_pay_batch.cgi +++ b/httemplate/search/cust_pay_batch.cgi @@ -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 = < -%Download batch in format -%

-% -%
-%Upload results
-%Filename
-%Format
-%
-%
-%EOF -% -%if ($batchnum) { +%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!
!; +% if ( $fixed ) { +% $html_init .= qq!!; +% } else { +% $html_init .= qq!Download batch in format !; +% } +% $html_init .= qq!

!; +% } +% +% if ( +% $pay_batch->status eq 'I' +% || ( $pay_batch->status eq 'R' +% && $FS::CurrentUser::CurrentUser->access_right('Reprocess batches') +% ) +% ) { +% $html_init .= qq!
!. +% qq!Upload results
!. +% qq!Filename
!; +% if ( $fixed ) { +% $html_init .= qq!!; +% } else { +% $html_init .= qq!Format
!; +% } +% $html_init .= '

'; +% } +% +%} +% +%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 { -- cgit v1.2.1 From 2c8748ac26281934a1b75671c6a5d0125145660a Mon Sep 17 00:00:00 2001 From: jeff Date: Fri, 1 Dec 2006 06:31:55 +0000 Subject: chase canada E-xactBatch --- httemplate/search/cust_pay_batch.cgi | 2 ++ 1 file changed, 2 insertions(+) (limited to 'httemplate/search/cust_pay_batch.cgi') diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi index d12e3c44f..b2354b24e 100755 --- a/httemplate/search/cust_pay_batch.cgi +++ b/httemplate/search/cust_pay_batch.cgi @@ -62,6 +62,7 @@ % $html_init .= qq!Download batch in format !; @@ -84,6 +85,7 @@ % $html_init .= qq!Format
!; -- cgit v1.2.1 From e8e43b0e59cf50e7a3c0789f589046459bc658c1 Mon Sep 17 00:00:00 2001 From: jeff Date: Wed, 10 Jan 2007 00:42:23 +0000 Subject: ignore filenames and rely on selected batch number --- httemplate/search/cust_pay_batch.cgi | 1 + 1 file changed, 1 insertion(+) (limited to 'httemplate/search/cust_pay_batch.cgi') diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi index b2354b24e..9b0aaeca9 100755 --- a/httemplate/search/cust_pay_batch.cgi +++ b/httemplate/search/cust_pay_batch.cgi @@ -90,6 +90,7 @@ % qq!!. % qq!
!; % } +% $html_init .= qq!!; % $html_init .= '
'; % } % -- cgit v1.2.1 From 590603ecaea3184f64530755a76626be8205da49 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 3 Feb 2007 11:36:30 +0000 Subject: add customer status column to customer & most other reports. also put the C in ACL in the search/ and graph/ directories. --- httemplate/search/cust_pay_batch.cgi | 231 ++++++++++++++++++----------------- 1 file changed, 118 insertions(+), 113 deletions(-) (limited to 'httemplate/search/cust_pay_batch.cgi') diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi index 9b0aaeca9..fec3dfdeb 100755 --- a/httemplate/search/cust_pay_batch.cgi +++ b/httemplate/search/cust_pay_batch.cgi @@ -1,116 +1,3 @@ -%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"; -% $pay_batch = qsearchs('pay_batch', { 'batchnum' => $1 } ); -% die "Batch $1 not found!" unless $pay_batch; -% $batchnum = $pay_batch->batchnum; -%} -% -%if ( $cgi->param('payby') ) { -% $cgi->param('payby') =~ /^(CARD|CHEK)$/ -% or die "illegal payby " . $cgi->param('payby'); -% -% push @search, "cust_pay_batch.payby = '$1'"; -%} -% -%if ( not $cgi->param('dcln') ) { -% push @search, "cpb.status IS DISTINCT FROM 'Approved'"; -%} -% -%my ($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); -%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"; -%} -% -%push @search, $FS::CurrentUser::CurrentUser->agentnums_sql; -%my $search = ' WHERE ' . join(' AND ', @search); -% -%$count_query = 'SELECT COUNT(*) FROM cust_pay_batch AS cpb ' . -% 'LEFT JOIN cust_main USING ( custnum ) ' . -% 'LEFT JOIN pay_batch USING ( batchnum )' . -% $search; -% -%#grr -%$sql_query = "SELECT paybatchnum,invnum,custnum,cpb.last,cpb.first," . -% "cpb.payname,cpb.payinfo,cpb.exp,amount,cpb.status " . -% "FROM cust_pay_batch AS cpb " . -% 'LEFT JOIN cust_main USING ( custnum ) ' . -% 'LEFT JOIN pay_batch USING ( batchnum ) ' . -% "$search ORDER BY $orderby"; -% -%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!
!; -% if ( $fixed ) { -% $html_init .= qq!!; -% } else { -% $html_init .= qq!Download batch in format !; -% } -% $html_init .= qq!

!; -% } -% -% if ( -% $pay_batch->status eq 'I' -% || ( $pay_batch->status eq 'R' -% && $FS::CurrentUser::CurrentUser->access_right('Reprocess batches') -% ) -% ) { -% $html_init .= qq!
!. -% qq!Upload results
!. -% qq!Filename
!; -% if ( $fixed ) { -% $html_init .= qq!!; -% } else { -% $html_init .= qq!Format
!; -% } -% $html_init .= qq!!; -% $html_init .= '

'; -% } -% -%} -% -%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]; -% -% my $st = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=". $batchnum; -% $sth = dbh->prepare($st) or die dbh->errstr. "doing $st"; -% $sth->execute or die "Error executing \"$st\": ". $sth->errstr; -% my $total = $sth->fetchrow_arrayref->[0]; -% -% $html_init .= "$cards credit card payments batched
\$" . -% sprintf("%.2f", $total) ." total in batch
"; -%} -% -% <% include('elements/search.html', 'title' => 'Batch payment details', 'name' => 'batch details', @@ -169,4 +56,122 @@ ], ) %> +<%init> +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Financial reports') + || $FS::CurrentUser::CurrentUser->access_right('Process batches'); + +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"; + $pay_batch = qsearchs('pay_batch', { 'batchnum' => $1 } ); + die "Batch $1 not found!" unless $pay_batch; + $batchnum = $pay_batch->batchnum; +} + +if ( $cgi->param('payby') ) { + $cgi->param('payby') =~ /^(CARD|CHEK)$/ + or die "illegal payby " . $cgi->param('payby'); + + push @search, "cust_pay_batch.payby = '$1'"; +} + +if ( not $cgi->param('dcln') ) { + push @search, "cpb.status IS DISTINCT FROM 'Approved'"; +} + +my ($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); +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"; +} + +push @search, $FS::CurrentUser::CurrentUser->agentnums_sql; +my $search = ' WHERE ' . join(' AND ', @search); + +$count_query = 'SELECT COUNT(*) FROM cust_pay_batch AS cpb ' . + 'LEFT JOIN cust_main USING ( custnum ) ' . + 'LEFT JOIN pay_batch USING ( batchnum )' . + $search; + +#grr +$sql_query = "SELECT paybatchnum,invnum,custnum,cpb.last,cpb.first," . + "cpb.payname,cpb.payinfo,cpb.exp,amount,cpb.status " . + "FROM cust_pay_batch AS cpb " . + 'LEFT JOIN cust_main USING ( custnum ) ' . + 'LEFT JOIN pay_batch USING ( batchnum ) ' . + "$search ORDER BY $orderby"; + +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!
!; + if ( $fixed ) { + $html_init .= qq!!; + } else { + $html_init .= qq!Download batch in format !; + } + $html_init .= qq!

!; + } + + if ( + $pay_batch->status eq 'I' + || ( $pay_batch->status eq 'R' + && $FS::CurrentUser::CurrentUser->access_right('Reprocess batches') + ) + ) { + $html_init .= qq!
!. + qq!Upload results
!. + qq!Filename
!; + if ( $fixed ) { + $html_init .= qq!!; + } else { + $html_init .= qq!Format
!; + } + $html_init .= qq!!; + $html_init .= '

'; + } + +} + +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]; + + my $st = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=". $batchnum; + $sth = dbh->prepare($st) or die dbh->errstr. "doing $st"; + $sth->execute or die "Error executing \"$st\": ". $sth->errstr; + my $total = $sth->fetchrow_arrayref->[0]; + + $html_init .= "$cards credit card payments batched
\$" . + sprintf("%.2f", $total) ." total in batch
"; +} + + -- cgit v1.2.1 From 5d9a5e54a74950b0e62264abcd53e77607f04b48 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 4 Feb 2007 01:47:51 +0000 Subject: add link to some batched payment info to customer view --- httemplate/search/cust_pay_batch.cgi | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'httemplate/search/cust_pay_batch.cgi') diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi index fec3dfdeb..e378ffae7 100755 --- a/httemplate/search/cust_pay_batch.cgi +++ b/httemplate/search/cust_pay_batch.cgi @@ -58,9 +58,15 @@ %> <%init> +my $conf = new FS::Conf; + die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Financial reports') - || $FS::CurrentUser::CurrentUser->access_right('Process batches'); + || $FS::CurrentUser::CurrentUser->access_right('Process batches') + || ( $cgi->param('custnum') + && $conf->exists('batch-enable') + #&& $FS::CurrentUser::CurrentUser->access_right('View customer batched payments') + ); my( $count_query, $sql_query ); my $hashref = {}; @@ -75,6 +81,14 @@ if ( $cgi->param('batchnum') && $cgi->param('batchnum') =~ /^(\d+)$/ ) { $batchnum = $pay_batch->batchnum; } +if ( $cgi->param('custnum') && $cgi->param('custnum') =~ /^(\d+)$/ ) { + push @search, "custnum = $1"; +} + +if ( $cgi->param('status') && $cgi->param('status') =~ /^(\w)$/ ) { + push @search, "pay_batch.status = '$1'"; +} + if ( $cgi->param('payby') ) { $cgi->param('payby') =~ /^(CARD|CHEK)$/ or die "illegal payby " . $cgi->param('payby'); @@ -111,7 +125,6 @@ $sql_query = "SELECT paybatchnum,invnum,custnum,cpb.last,cpb.first," . 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' -- cgit v1.2.1