This commit was manufactured by cvs2svn to create tag 'freeside_2_1_0'.

[freeside.git] / httemplate / search / cust_pay_batch.cgi

diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi
index fec3dfd..7376e9d 100755 (executable)
--- a/httemplate/search/cust_pay_batch.cgi
+++ b/httemplate/search/cust_pay_batch.cgi
@@ -1,7 +1,6 @@
 <% include('elements/search.html',
               'title'       => 'Batch payment details',
               'name'        => 'batch details',
-             'menubar'     => ['Main Menu'  => $p,],
              'query'       => $sql_query,
              'count_query' => $count_query,
               'html_init'   => $pay_batch ? $html_init : '',
@@ -58,9 +57,17 @@
 %>
 <%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')
+                || $conf->config('batch-enable_payby')
+              )
+           #&& $FS::CurrentUser::CurrentUser->access_right('View customer batched payments')
+         );
 
 my( $count_query, $sql_query );
 my $hashref = {};
@@ -75,6 +82,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,13 +126,15 @@ $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' 
        || ( $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 ) {
@@ -129,6 +146,9 @@ if ( $pay_batch ) {
                     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>!;
@@ -152,6 +172,9 @@ if ( $pay_batch ) {
                     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">!;