From 4cdb4d97098422b1e55f59b144ea9950b1a99ffd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 14 Jul 2011 17:13:07 +0000
Subject: [PATCH] fix CDRs showing on typeset (but not printed) invoices
 w/squelch_cdr, RT#13561

---
 httemplate/view/cust_bill-pdf.cgi |  7 +++++--
 httemplate/view/cust_bill-ps.cgi  | 13 ++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/httemplate/view/cust_bill-pdf.cgi b/httemplate/view/cust_bill-pdf.cgi
index 51e47e00d..323e502b4 100755
--- a/httemplate/view/cust_bill-pdf.cgi
+++ b/httemplate/view/cust_bill-pdf.cgi
@@ -17,9 +17,12 @@ if ( $query =~ /^((.+)-)?(\d+)(.pdf)?$/ ) {
   $notice_name = ( $cgi->param('notice_name') || 'Invoice' );
 }
 
+my $conf = new FS::Conf;
+
 my %opt = (
-  'template'    => $template,
-  'notice_name' => $notice_name,
+  'unsquelch_cdr' => $conf->exists('voip-cdr_email'),
+  'template'      => $template,
+  'notice_name'   => $notice_name,
 );
 
 my $cust_bill = qsearchs({
diff --git a/httemplate/view/cust_bill-ps.cgi b/httemplate/view/cust_bill-ps.cgi
index 881491f69..5d9e034bb 100755
--- a/httemplate/view/cust_bill-ps.cgi
+++ b/httemplate/view/cust_bill-ps.cgi
@@ -1,4 +1,4 @@
-<% $cust_bill->print_ps(\%opt) %>
+<% $ps %>
 <%init>
 
 die "access denied"
@@ -16,9 +16,12 @@ if ( $query =~ /^((.+)-)?(\d+)(.pdf)?$/ ) {
   $notice_name = ( $cgi->param('notice_name') || 'Invoice' );
 }
 
+my $conf = new FS::Conf;
+
 my %opt = (
-  'template'    => $template,
-  'notice_name' => $notice_name,
+  'unsquelch_cdr' => $conf->exists('voip-cdr_email'),
+  'template'      => $template,
+  'notice_name'   => $notice_name,
 );
 
 my $cust_bill = qsearchs({
@@ -30,6 +33,10 @@ my $cust_bill = qsearchs({
 });
 die "Invoice #$invnum not found!" unless $cust_bill;
 
+my $ps = $cust_bill->print_ps(\%opt);
+
 http_header('Content-Type' => 'application/postscript' );
+http_header('Content-Length' => length($pdf) );
+http_header('Cache-control' => 'max-age=60' );
 
 </%init>
-- 
2.11.0