X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fbill_batch.cgi;h=cbd7f270a3800c33bd40b45ee5864e5574363375;hb=3d62ec9362d0b22c17a17da6197f8b2fc219a54e;hp=e5abc8955c4f99843ccf42af30253d7908ef6e45;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git
diff --git a/httemplate/search/bill_batch.cgi b/httemplate/search/bill_batch.cgi
index e5abc8955..cbd7f270a 100755
--- a/httemplate/search/bill_batch.cgi
+++ b/httemplate/search/bill_batch.cgi
@@ -1,12 +1,27 @@
+% my $batchnum = $cgi->param('download');
+% if ( $batchnum =~ /^\d+$/ ) {
+% $cgi->delete('download');
+
+Starting download...
+
+
+<& /elements/footer.html &>
+% }
+% else {
<% include( 'elements/search.html',
'title' => 'Invoice Batches',
'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',
@@ -25,41 +40,63 @@
sub {
$statusmap{shift->status};
},
- sub { shift->status eq 'O' ?
- 'Download and close' : 'Download'
- },
+ \&download_link,
],
'links' => [
$link,
$link,
$link,
- $dlink,
- ],
- 'style' => [
- '',
- '',
'',
- 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?magic=print;".
- (shift->status eq 'O' ? 'close=1;' : '').
- 'batchnum=',
- 'batchnum']
-};
+
+my $download_id = int(rand(1000000));
+
+sub download_link {
+ my $batch = shift;
+ my $batchnum = $batch->batchnum;
+ my $close = ($batch->status eq 'O' ? ';close=1' : '');
+ my $html = qq!';
+ return $html;
+}
+