projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 80138 - Added config option to display/edit customer option to send or not send...
[freeside.git]
/
httemplate
/
view
/
elements
/
cust_bill-typeset
diff --git
a/httemplate/view/elements/cust_bill-typeset
b/httemplate/view/elements/cust_bill-typeset
index
00f503f
..
ab5d298
100644
(file)
--- a/
httemplate/view/elements/cust_bill-typeset
+++ b/
httemplate/view/elements/cust_bill-typeset
@@
-6,7
+6,7
@@
die "access denied"
my $type = shift;
my $type = shift;
-my( $invnum, $
template, $notice_name
);
+my( $invnum, $
mode, $template, $notice_name, $no_coupon
);
my($query) = $cgi->keywords;
if ( $query =~ /^((.+)-)?(\d+)(.pdf)?$/ ) { #probably not necessary anymore?
$template = $2;
my($query) = $cgi->keywords;
if ( $query =~ /^((.+)-)?(\d+)(.pdf)?$/ ) { #probably not necessary anymore?
$template = $2;
@@
-16,7
+16,9
@@
if ( $query =~ /^((.+)-)?(\d+)(.pdf)?$/ ) { #probably not necessary anymore?
$invnum = $cgi->param('invnum');
$invnum =~ s/\.pdf//i; #probably not necessary anymore
$template = $cgi->param('template');
$invnum = $cgi->param('invnum');
$invnum =~ s/\.pdf//i; #probably not necessary anymore
$template = $cgi->param('template');
- $notice_name = ( $cgi->param('notice_name') || 'Invoice' );
+ $notice_name = $cgi->param('notice_name');
+ $mode = $cgi->param('mode');
+ $no_coupon = $cgi->param('no_coupon');
}
my $conf = new FS::Conf;
}
my $conf = new FS::Conf;
@@
-25,6
+27,7
@@
my %opt = (
'unsquelch_cdr' => $conf->exists('voip-cdr_email'),
'template' => $template,
'notice_name' => $notice_name,
'unsquelch_cdr' => $conf->exists('voip-cdr_email'),
'template' => $template,
'notice_name' => $notice_name,
+ 'no_coupon' => $no_coupon,
);
my $cust_bill = qsearchs({
);
my $cust_bill = qsearchs({
@@
-36,6
+39,8
@@
my $cust_bill = qsearchs({
});
die "Invoice #$invnum not found!" unless $cust_bill;
});
die "Invoice #$invnum not found!" unless $cust_bill;
+$cust_bill->set(mode => $mode);
+
my $method = "print_$type";
my $content = $cust_bill->$method(\%opt);
my $method = "print_$type";
my $content = $cust_bill->$method(\%opt);