X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pay_batch.cgi;h=73ead9196ab78cb3a5b627c67b4df5342bda09b6;hb=d8299144d2175f1695adafe29e9549bd9b158e2f;hp=7376e9dcbccfa88fb76b996542121995b1966c06;hpb=624b2d44625f69d71175c3348cae635d580c890b;p=freeside.git

diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi
index 7376e9dcb..73ead9196 100755
--- a/httemplate/search/cust_pay_batch.cgi
+++ b/httemplate/search/cust_pay_batch.cgi
@@ -4,6 +4,7 @@
 	      'query'       => $sql_query,
 	      'count_query' => $count_query,
               'html_init'   => $pay_batch ? $html_init : '',
+              'disable_download' => 1,
 	      'header'      => [ '#',
 	                         'Inv #',
 	                         'Customer',
@@ -66,7 +67,6 @@ die "access denied"
            && (    $conf->exists('batch-enable')
                 || $conf->config('batch-enable_payby')
               )
-           #&& $FS::CurrentUser::CurrentUser->access_right('View customer batched payments')
          );
 
 my( $count_query, $sql_query );
@@ -126,75 +126,7 @@ $sql_query = "SELECT paybatchnum,invnum,custnum,cpb.last,cpb.first," .
 
 my $html_init = '';
 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!<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="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!</SELECT>!;
-    }
-    $html_init .= qq!<INPUT TYPE="hidden" NAME="batchnum" VALUE="$batchnum"><INPUT TYPE="submit" VALUE="Download"></FORM><BR>!;
-  }
-
-  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="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!</SELECT><BR>!;
-    }
-    $html_init .= qq!<INPUT TYPE="hidden" NAME="batchnum" VALUE="$batchnum">!;
-    $html_init .= '<INPUT TYPE="submit" VALUE="Upload"></FORM><BR>';
-  }
-
+  $html_init = include('elements/cust_pay_batch_top.html', 
+                    'pay_batch' => $pay_batch);
 }
-
-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>";
-}
-
 </%init>