per-agent invoice PDF batches, RT#13727

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

diff --git a/httemplate/search/bill_batch.cgi b/httemplate/search/bill_batch.cgi
index 72e5d3a..6d7e18f 100755 (executable)
--- a/httemplate/search/bill_batch.cgi
+++ b/httemplate/search/bill_batch.cgi
@@ -3,10 +3,10 @@
                 'name_singular' => 'batch',
                 'query'         => { 'table'     => 'bill_batch',
                                      'hashref'   => $hashref,
-                                     'extra_sql' => $extra_sql.
-                                        'ORDER BY batchnum DESC',
+                                     #'extra_sql' => $extra_sql.
+                                      'order_by'  => 'ORDER BY batchnum DESC',
                                    },
-                'count_query'   => "$count_query $extra_sql",
+                'count_query'   => $count_query,
                 'header'        => [ 'Batch',
                                      'Item Count',
                                      'Status',
@@ -42,19 +42,30 @@
                                      sub { shift->status eq 'O' ? "b" : '' },
                                    ],
                  'really_disable_download' => 1,
+                 'agent_virt' => 1,
+                 'agent_null_right' => [ 'Process global invoice batches', 'Configuration' ],
+                 'agent_pos' => 1,
+
       )
 
 %>
 <%init>
 
+my $curuser = $FS::CurrentUser::CurrentUser;
+
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('View invoices');
+  unless $curuser->access_right('Process invoice batches')
+      || $curuser->access_right('Process global invoice batches')
+      || $curuser->access_right('Configuration'); #remove in 2.5
 
 my %statusmap = ('O'=>'Open', 'R'=>'Closed');
 my $hashref = {};
-my $count_query = 'SELECT COUNT(*) FROM bill_batch';
+my $count_query = "SELECT COUNT(*) FROM bill_batch WHERE". # $extra_sql AND "
+                    $curuser->agentnums_sql(
+                      'null_right' => ['Process global invoice batches', 'Configuration' ],
+                    );
 
-my $extra_sql = ''; # may add something here later
+#my $extra_sql = ''; # may add something here later
 my $link = [ "${p}view/bill_batch.cgi?batchnum=", 'batchnum' ];
 my $dlink = sub {
   [ "${p}view/bill_batch.cgi?start_download=1;".