[freeside-commits] freeside/httemplate/view cust_bill-pdf.cgi, 1.12, 1.13 cust_bill-ps.cgi, 1.9, 1.10

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view
In directory wavetail.420.am:/tmp/cvs-serv17043

Modified Files:
	cust_bill-pdf.cgi cust_bill-ps.cgi 
Log Message:
consolate cust_bill-(ps|pdf).cgi into elements/cust_bill-typeset

Index: cust_bill-ps.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_bill-ps.cgi,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -d -r1.9 -r1.10
--- cust_bill-ps.cgi	15 Aug 2011 20:51:15 -0000	1.9
+++ cust_bill-ps.cgi	15 Aug 2011 20:59:06 -0000	1.10
@@ -1,43 +1 @@
-<% $ps %>
-<%init>
-
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('View invoices');
-
-my( $invnum, $template, $notice_name );
-my($query) = $cgi->keywords;
-if ( $query =~ /^((.+)-)?(\d+)(.pdf)?$/ ) { #probably not necessary anymore?
-  $template = $2;
-  $invnum = $3;
-  $notice_name = 'Invoice';
-} else {
-  $invnum = $cgi->param('invnum');
-  $template = $cgi->param('template');
-  $notice_name = ( $cgi->param('notice_name') || 'Invoice' );
-}
-
-my $conf = new FS::Conf;
-
-my %opt = (
-  'unsquelch_cdr' => $conf->exists('voip-cdr_email'),
-  'template'      => $template,
-  'notice_name'   => $notice_name,
-);
-
-my $cust_bill = qsearchs({
-  'select'    => 'cust_bill.*',
-  'table'     => 'cust_bill',
-  'addl_from' => 'LEFT JOIN cust_main USING ( custnum )',
-  'hashref'   => { 'invnum' => $invnum },
-  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
-});
-die "Invoice #$invnum not found!" unless $cust_bill;
-
-my $ps = $cust_bill->print_ps(\%opt);
-
-http_header('Content-Type' => 'application/postscript' );
-http_header('Content-Disposition' => "filename=$invnum.ps" );
-http_header('Content-Length' => length($ps) );
-http_header('Cache-control' => 'max-age=60' );
-
-</%init>
+<& elements/cust_bill-typeset 'ps' &>\

Index: cust_bill-pdf.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_bill-pdf.cgi,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -d -r1.12 -r1.13
--- cust_bill-pdf.cgi	15 Aug 2011 20:51:15 -0000	1.12
+++ cust_bill-pdf.cgi	15 Aug 2011 20:59:06 -0000	1.13
@@ -1,44 +1 @@
-<% $pdf %>
-<%init>
-
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('View invoices');
-
-my( $invnum, $template, $notice_name );
-my($query) = $cgi->keywords;
-if ( $query =~ /^((.+)-)?(\d+)(.pdf)?$/ ) { #probably not necessary anymore?
-  $template = $2;
-  $invnum = $3;
-  $notice_name = 'Invoice';
-} else {
-  $invnum = $cgi->param('invnum');
-  $invnum =~ s/\.pdf//i; #probably not necessary anymore
-  $template = $cgi->param('template');
-  $notice_name = ( $cgi->param('notice_name') || 'Invoice' );
-}
-
-my $conf = new FS::Conf;
-
-my %opt = (
-  'unsquelch_cdr' => $conf->exists('voip-cdr_email'),
-  'template'      => $template,
-  'notice_name'   => $notice_name,
-);
-
-my $cust_bill = qsearchs({
-  'select'    => 'cust_bill.*',
-  'table'     => 'cust_bill',
-  'addl_from' => 'LEFT JOIN cust_main USING ( custnum )',
-  'hashref'   => { 'invnum' => $invnum },
-  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
-});
-die "Invoice #$invnum not found!" unless $cust_bill;
-
-my $pdf = $cust_bill->print_pdf(\%opt);
-
-http_header('Content-Type' => 'application/pdf' );
-http_header('Content-Disposition' => "filename=$invnum.pdf" );
-http_header('Content-Length' => length($pdf) );
-http_header('Cache-control' => 'max-age=60' );
-
-</%init>
+<& elements/cust_bill-typeset, 'pdf' &>\