X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fbill_batch.cgi;h=55ee4be1c5750fb7138f3083232c6e8d00bbabc0;hb=0e115ecd7e70269ac58ce705adec4b1c801d14de;hp=3fca6ebbe5dd54a52bea07ca27d5bc30a96eaffc;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git

diff --git a/httemplate/view/bill_batch.cgi b/httemplate/view/bill_batch.cgi
index 3fca6ebbe..55ee4be1c 100644
--- a/httemplate/view/bill_batch.cgi
+++ b/httemplate/view/bill_batch.cgi
@@ -1,33 +1,8 @@
-% if($magic eq 'print') {
-<% include('/elements/header.html', "Download Batch") %>
-<FORM NAME="OneTrueForm">
-<INPUT TYPE="hidden" NAME="batchnum" VALUE="<% $batchnum %>">
-% $cgi->delete('magic');
-<% include('/elements/progress-init.html',
-              'OneTrueForm',
-              [ 'batchnum' ],
-              $p.'misc/process/bill_batch-print.html',
-              {'url' => $cgi->self_url . ';magic=download'},
-              '',
-) %></FORM>
-<SCRIPT TYPE="text/javascript">process();</SCRIPT>
-<% include('/elements/footer.html') %>
-% }
-% 
-% elsif($magic eq 'download') {
-%   $m->clear_buffer;
-%   $r->content_type('application/pdf');
-%   $r->headers_out->add('Content-Disposition' => 'attachment;filename="invoice_batch_'.$batchnum.'.pdf"');
-<% $batch->pdf %>
-%   $batch->pdf('');
-%   my $error = $batch->replace;
-%   warn "error deleting cached PDF: '$error'\n" if $error;
-% }
-% else {
 <% include('/search/elements/search.html', 
               'title'     => $close ?
                               "Batch $batchnum closed." :
                               "Invoice Batch $batchnum",
+              'menubar'   => ['All batches' => $p.'search/bill_batch.cgi'],
               'name'      => 'invoices',
               'query'     => { 'table'   => 'cust_bill_batch',
                                'select'  => join(', ',
@@ -38,9 +13,8 @@
                                'hashref' => { },
                                'addl_from' => 
                                  'LEFT JOIN cust_bill USING ( invnum ) '.
-                                 'LEFT JOIN cust_main USING ( custnum )',
-                               'extra_sql' => '',
-                                 " WHERE batchnum = $batchnum",
+                                 FS::UI::Web::join_cust_main('cust_bill'),
+                               'extra_sql' => " WHERE batchnum = $batchnum",
                              },
               'count_query' => "SELECT COUNT(*) FROM cust_bill_batch WHERE batchnum = $batchnum",
               'html_init' => $html_init,
@@ -61,7 +35,6 @@
                              ],
               'really_disable_download' => 1,
 ) %>
-% }
 <%init>
 
 die "access denied"
@@ -74,23 +47,23 @@ my $batchnum = $cgi->param('batchnum');
 $batch = FS::bill_batch->by_key($batchnum);
 die "Batch '$batchnum' not found!\n" if !$batch;
 
-my $magic = $cgi->param('magic');
-my $html_init = '';
-
 my $close = $cgi->param('close');
 $batch->close if $close;
 
-if(!$magic) {
-  $cgi->param('magic' => 'print');
-  $cgi->delete('close');
-  $html_init  = '<A HREF="'.$cgi->self_url.'">Download this batch</A><BR>';
-  if($batch->status eq 'O') {
-    $cgi->param('close' => 1);
-    $cgi->delete('magic');
-    $html_init .= '<A HREF="'.$cgi->self_url.'">Close this batch</A><BR>';
-  }
-  $html_init .= '<BR>';
+my $html_init = qq!<FORM NAME="OneTrueForm">
+  <INPUT TYPE="hidden" NAME="batchnum" VALUE="$batchnum">! .
+  include('/elements/progress-init.html',
+    'OneTrueForm',
+    [ 'batchnum' ],
+    $p.'misc/process/bill_batch-print.html',
+    { url => $p.'misc/download-bill_batch.html?'.$batchnum }
+  ) .
+  '<A HREF="#" onclick="process();">Download this batch</A></FORM><BR>';
+if ( $batch->status eq 'O' ) {
+  $cgi->param('close' => 1);
+  $html_init .= '<A HREF="'.$cgi->self_url.'">Close this batch</A><BR>';
 }
+$html_init .= '<BR>';
 
 my $link = [ "$p/view/cust_bill.cgi?", 'invnum' ];
 my $clink = [ "$p/view/cust_main.cgi?", 'custnum' ];