[freeside-commits] freeside/httemplate/search cust_pay_batch.cgi, 1.18, 1.19 pay_batch.cgi, 1.6, 1.7
Mark Wells
mark at wavetail.420.am
Tue Feb 15 15:52:34 PST 2011
Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv11671/httemplate/search
Modified Files:
cust_pay_batch.cgi pay_batch.cgi
Log Message:
batch payment revocation, RT#10545
Index: cust_pay_batch.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pay_batch.cgi,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -d -r1.18 -r1.19
--- cust_pay_batch.cgi 12 Feb 2011 02:36:57 -0000 1.18
+++ cust_pay_batch.cgi 15 Feb 2011 23:52:31 -0000 1.19
@@ -3,7 +3,10 @@
'name' => 'batch details',
'query' => $sql_query,
'count_query' => $count_query,
- 'html_init' => $pay_batch ? $html_init : '',
+ 'html_init' => $pay_batch ?
+ include('elements/cust_pay_batch_top.html',
+ 'pay_batch' => $pay_batch
+ ) : '',
'header' => [ '#',
'Inv #',
'Customer',
@@ -66,7 +69,6 @@
&& ( $conf->exists('batch-enable')
|| $conf->config('batch-enable_payby')
)
- #&& $FS::CurrentUser::CurrentUser->access_right('View customer batched payments')
);
my( $count_query, $sql_query );
@@ -124,113 +126,9 @@
'LEFT JOIN pay_batch USING ( batchnum ) ' .
"$search ORDER BY $orderby";
-my $html_init = '<TABLE>';
-if ( $pay_batch ) {
- 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')
- )
- || ( $pay_batch->status eq 'R'
- && $FS::CurrentUser::CurrentUser->access_right('Redownload resolved batches')
- )
- ) {
- $html_init .= qq!<TR><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 !.
- qq!<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="csv-chase_canada-E-xactBatch">CSV file for Chase Canada E-xactBatch</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!<OPTION VALUE="ach-spiritone">Spiritone ACH batch</OPTION>!.
- qq!<OPTION VALUE="paymentech">Chase Paymentech XML</OPTION>!.
- qq!<OPTION VALUE="RBC">Royal Bank of Canada PDS</OPTION>!.
- qq!<OPTION VALUE="td_eft1464">TD Commercial Banking EFT 1464 byte</OPTION>!.
-
- qq!</SELECT>!;
- }
- $html_init .= qq!<INPUT TYPE="hidden" NAME="batchnum" VALUE="$batchnum"><INPUT TYPE="submit" VALUE="Download"></FORM><BR><BR></TR>!;
- }
-
- if (
- $pay_batch->status eq 'I'
- || ( $pay_batch->status eq 'R'
- && $FS::CurrentUser::CurrentUser->access_right('Reprocess batches')
- )
- ) {
- $html_init .= '<TR>'.
- include('/elements/form-file_upload.html',
- 'name' => 'FileUpload',
- 'action' => "$p/misc/upload-batch.cgi",
- 'num_files' => 1,
- 'fields' => [ 'batchnum', 'format' ],
- 'message' => 'Batch results uploaded.',
- ) .
- 'Upload results<BR></TR><TR>'.
- include('/elements/file-upload.html',
- 'field' => 'file',
- 'label' => 'Filename',
- 'no_table'=> 1
- ).
- '<BR></TR>'
- ;
- if ( $fixed and $fixed eq 'td_eft1464' ) {
- # special case, this one has two upload formats
- $html_init .= qq!<TR>Format !.
- qq!<SELECT NAME="format">!.
- qq!<OPTION VALUE="td_eftack264">TD EFT Acknowledgement</OPTION>!.
- qq!<OPTION VALUE="td_eftret80">TD EFT Returned Items</OPTION>!.
- qq!</SELECT><BR></TR>!;
- }
- elsif ( $fixed ) {
- $html_init .= qq!<INPUT TYPE="hidden" NAME="format" VALUE="$fixed">!;
- } else {
- # should pull this from %import_info
- $html_init .= qq!<TR>Format !.
- qq!<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="csv-chase_canada-E-xactBatch">CSV file for Chase Canada E-xactBatch</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!<OPTION VALUE="ach-spiritone">Spiritone ACH batch</OPTION>!.
- qq!<OPTION VALUE="paymentech">Chase Paymentech XML</OPTION>!.
- qq!<OPTION VALUE="RBC">Royal Bank of Canada PDS</OPTION>!.
- qq!<OPTION VALUE="td_eftack264">TD EFT Acknowledgement</OPTION>!.
- qq!<OPTION VALUE="td_eftret80">TD EFT Returned Items</OPTION>!.
- qq!</SELECT><BR></TR>!;
- }
- $html_init .= qq!<INPUT TYPE="hidden" NAME="batchnum" VALUE="$batchnum">!;
- $html_init .= '<TR> <INPUT TYPE="submit" VALUE="Upload"></FORM><BR> </TR>';
- if ( $conf->exists('batch-manual_approval')
- and $conf->config('batch-fixed_format-CHEK') eq 'td_eft1464'
- and $pay_batch->status eq 'I'
- and $pay_batch->payby eq 'CHEK' ) {
- $html_init .= qq!<TR><INPUT TYPE="button" VALUE="Manually approve" onclick="
-if ( confirm('Approve all remaining payments in this batch?') )
- window.location.href='${p}misc/process/pay_batch-approve.cgi?batchnum=$batchnum';"></TR>!
- }
- }
- $html_init .= '</TABLE>';
-}
-
+my $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<BR>\$" .
- sprintf("%.2f", $total) ." total in batch<BR>";
+ $html_init = include('elements/cust_pay_batch_top.html',
+ 'pay_batch' => $pay_batch);
}
-
</%init>
Index: pay_batch.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/pay_batch.cgi,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -d -r1.6 -r1.7
--- pay_batch.cgi 11 Nov 2010 01:44:43 -0000 1.6
+++ pay_batch.cgi 15 Feb 2011 23:52:31 -0000 1.7
@@ -80,6 +80,7 @@
sub { shift->status eq 'O' ? "b" : '' },
sub { shift->status eq 'I' ? "b" : '' },
],
+ 'html_init' => $html_init,
)
%>
@@ -128,4 +129,9 @@
my $link = [ "${p}search/cust_pay_batch.cgi?dcln=1;batchnum=", 'batchnum' ];
+my $resolved = $cgi->param('resolved') || 0;
+$cgi->param('resolved' => !$resolved);
+my $html_init = '<A HREF="' . $cgi->self_url . '"><I>'.
+ ($resolved ? 'Hide' : 'Show') . ' resolved batches</I></A><BR>';
+
</%init>
More information about the freeside-commits
mailing list