diff options
| author | Mitch Jackson <mitch@freeside.biz> | 2018-04-15 22:48:58 -0500 |
|---|---|---|
| committer | Mitch Jackson <mitch@freeside.biz> | 2018-04-15 22:48:58 -0500 |
| commit | c5386b4378bcad35867beabec1c344c0a596aecb (patch) | |
| tree | bfa677eb992906b5ae2e638b477497915d6b129e /httemplate/graph | |
| parent | adfc623691f9de2feacdb62b5b596112509e2ce9 (diff) | |
RT# 79353 Update discount graph - include waived setup fees
Diffstat (limited to 'httemplate/graph')
| -rw-r--r-- | httemplate/graph/cust_bill_pkg_discount.html | 11 | ||||
| -rw-r--r-- | httemplate/graph/report_cust_bill_pkg_discount.html | 6 |
2 files changed, 15 insertions, 2 deletions
diff --git a/httemplate/graph/cust_bill_pkg_discount.html b/httemplate/graph/cust_bill_pkg_discount.html index 5074aa35c..22327e05b 100644 --- a/httemplate/graph/cust_bill_pkg_discount.html +++ b/httemplate/graph/cust_bill_pkg_discount.html @@ -20,7 +20,10 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Financial reports'); +my $include_waived_setup = $cgi->param('include_waived_setup') || 0; + my $link = "${p}search/cust_bill_pkg_discount.html?"; +$link .= "include_waived_setup=Y&" if $include_waived_setup; my $bottom_link = $link; #XXX or virtual @@ -35,7 +38,8 @@ my $title = $sel_agent ? $sel_agent->agent.' ' : ''; $title .= 'Discount Overview'; -my $hue = 0; +#my $hue = 0; # Start with illegible yellow-on-white +my $hue = 255; # Start with red-on-white #my $hue_increment = 170; #my $hue_increment = 145; my $hue_increment = 125; @@ -56,7 +60,10 @@ foreach my $agent ( $sel_agent || qsearch('agent', { 'disabled' => '' } ) ) { #foreach my $pkg_class ( @pkg_class ) { - push @items, 'cust_bill_pkg_discount'; + push @items, + $include_waived_setup + ? 'cust_bill_pkg_discount_or_waived' + : 'cust_bill_pkg_discount'; push @labels, ( $sel_agent ? '' : $agent->agent.' ' ); diff --git a/httemplate/graph/report_cust_bill_pkg_discount.html b/httemplate/graph/report_cust_bill_pkg_discount.html index 36ad78252..094c652c7 100644 --- a/httemplate/graph/report_cust_bill_pkg_discount.html +++ b/httemplate/graph/report_cust_bill_pkg_discount.html @@ -19,6 +19,12 @@ 'disable_empty' => 0, &> + <& /elements/tr-checkbox.html, + label => 'Include waived setup fees:', + field => 'include_waived_setup', + value => 'Y', + &> + % # anything about line items, discounts or packages really % # otaker? % # package class? |