projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.freeside.biz/home/git/freeside
[freeside.git]
/
httemplate
/
graph
/
cust_bill_pkg_discount.html
diff --git
a/httemplate/graph/cust_bill_pkg_discount.html
b/httemplate/graph/cust_bill_pkg_discount.html
index
0d66799
..
22327e0
100644
(file)
--- 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');
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?";
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
my $bottom_link = $link;
#XXX or virtual
@@
-35,7
+38,8
@@
my $title = $sel_agent ? $sel_agent->agent.' ' : '';
$title .= 'Discount Overview';
$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;
#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 ) {
#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.' ' );
push @labels,
( $sel_agent ? '' : $agent->agent.' ' );
@@
-74,7
+81,7
@@
foreach my $agent ( $sel_agent || qsearch('agent', { 'disabled' => '' } ) ) {
#'average_per_cust_pkg' => $average_per_cust_pkg,
];
#'average_per_cust_pkg' => $average_per_cust_pkg,
];
- push @links,
"$link?agentnum=$row_agentnum"; #;classnum=$row_class
num;";
+ push @links,
$link . "agentnum=$row_agent
num;";
@_colors = ($col_scheme->colors)[0,4,8,1,5,9,2,6,10,3,7,11];
push @colors, shift @_colors;
@_colors = ($col_scheme->colors)[0,4,8,1,5,9,2,6,10,3,7,11];
push @colors, shift @_colors;