projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
248bdb6
)
fix CDRs showing on typeset (but not printed) invoices w/squelch_cdr, RT#13561
author
ivan
<ivan>
Thu, 14 Jul 2011 17:13:07 +0000
(17:13 +0000)
committer
ivan
<ivan>
Thu, 14 Jul 2011 17:13:07 +0000
(17:13 +0000)
httemplate/view/cust_bill-pdf.cgi
patch
|
blob
|
history
httemplate/view/cust_bill-ps.cgi
patch
|
blob
|
history
diff --git
a/httemplate/view/cust_bill-pdf.cgi
b/httemplate/view/cust_bill-pdf.cgi
index
51e47e0
..
323e502
100755
(executable)
--- 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' );
}
$notice_name = ( $cgi->param('notice_name') || 'Invoice' );
}
+my $conf = new FS::Conf;
+
my %opt = (
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({
);
my $cust_bill = qsearchs({
diff --git
a/httemplate/view/cust_bill-ps.cgi
b/httemplate/view/cust_bill-ps.cgi
index
881491f
..
5d9e034
100755
(executable)
--- 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"
<%init>
die "access denied"
@@
-16,9
+16,12
@@
if ( $query =~ /^((.+)-)?(\d+)(.pdf)?$/ ) {
$notice_name = ( $cgi->param('notice_name') || 'Invoice' );
}
$notice_name = ( $cgi->param('notice_name') || 'Invoice' );
}
+my $conf = new FS::Conf;
+
my %opt = (
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({
);
my $cust_bill = qsearchs({
@@
-30,6
+33,10
@@
my $cust_bill = qsearchs({
});
die "Invoice #$invnum not found!" unless $cust_bill;
});
die "Invoice #$invnum not found!" unless $cust_bill;
+my $ps = $cust_bill->print_ps(\%opt);
+
http_header('Content-Type' => 'application/postscript' );
http_header('Content-Type' => 'application/postscript' );
+http_header('Content-Length' => length($pdf) );
+http_header('Cache-control' => 'max-age=60' );
</%init>
</%init>