2 files changed, 8 insertions, 79 deletions
diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
index 98ea2f5a2..c7f0afe76 100755
--- a/httemplate/browse/cust_pay_batch.cgi
+++ b/httemplate/browse/cust_pay_batch.cgi
@@ -1,24 +1,12 @@
 <!-- mason kludge -->
-<%= 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;
-
-%>
+<%= include("/elements/header.html","Pending credit card batch", menubar( 'Main Menu' => $p,)) %>
 
 <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>
+<OPTION VALUE="BoM">Bank of Montreal ECA results</OPTION>
+</SELECT><INPUT TYPE="submit" VALUE="Download"></FORM>
 <BR><BR>
 
 <FORM ACTION="<%=$p%>misc/upload-batch.cgi" METHOD="POST" ENCTYPE="multipart/form-data">
@@ -27,28 +15,25 @@ 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>
+<OPTION VALUE="BoM">Bank of Montreal ECA batch</OPTION>
 </SELECT><BR>
 <INPUT TYPE="submit" VALUE="Upload"></FORM>
 <BR>
 
 <%
-  my $statement = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=".
-                     $batchnum;
+  my $statement = "SELECT SUM(amount) from cust_pay_batch";
   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=".
-                       $batchnum;
+  my $c_statement = "SELECT COUNT(*) from cust_pay_batch";
   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 batch<BR>
+$<%= sprintf("%.2f", $total) %> total in pending batch<BR>
 
 <BR>
 <%= &table() %>
@@ -60,12 +45,11 @@ $<%= sprintf("%.2f", $total) %> total in batch<BR>
         <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', {'batchnum'=>$batchnum} )
+                             qsearch('cust_pay_batch', {} )
 ) {
   my $cardnum = $cust_pay_batch->payinfo;
   #$cardnum =~ s/.{4}$/xxxx/;
@@ -87,7 +71,6 @@ foreach my $cust_pay_batch ( sort { $a->paybatchnum <=> $b->paybatchnum }
         <TD><%= $cardnum %></TD>
         <TD><%= $exp %></TD>
         <TD align="right">$<%= $cust_pay_batch->amount %></TD>
-        <TD><%= $cust_pay_batch->status %></TD>
       </TR>
 
 <% } %>
diff --git a/httemplate/browse/pay_batch.cgi b/httemplate/browse/pay_batch.cgi
deleted file mode 100755
index 66c86d676..000000000
--- a/httemplate/browse/pay_batch.cgi
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- 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>