diff options
Diffstat (limited to 'httemplate/search/cust_bill_pkg_discount.html')
| -rw-r--r-- | httemplate/search/cust_bill_pkg_discount.html | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/httemplate/search/cust_bill_pkg_discount.html b/httemplate/search/cust_bill_pkg_discount.html index f4fbd561b..eb39dea8f 100644 --- a/httemplate/search/cust_bill_pkg_discount.html +++ b/httemplate/search/cust_bill_pkg_discount.html @@ -38,7 +38,7 @@ Parameters: if ( $_[0]->pkgdiscountnum ) { # Standard discount, not a waived setup fee my $discount = qsearchs('discount',{ - pkgdiscountnum => $_[0]->pkgdiscountnum + discountnum => $_[0]->discountnum }); return $discount->description; } else { @@ -228,7 +228,11 @@ if ( $cgi->param('usernum') =~ /^(\d+)$/ ) { } # Filter: Include waived setup fees -if ( !$cgi->param('include_waived_setup') ) { +if ( $cgi->param('include_waived_setup') ) { + # Filter a hidden fee attached to a package with a waived setup fee from + # causing the waived-fee for that package to be double-counted + push @where, 'cust_bill_pkg.pkgpart_override IS NULL'; +} else { push @where, "cust_bill_pkg_discount.pkgdiscountnum IS NOT NULL"; } |