This commit was generated by cvs2svn to compensate for changes in r9232,

[freeside.git] / httemplate / graph / cust_bill_pkg.cgi

diff --git a/httemplate/graph/cust_bill_pkg.cgi b/httemplate/graph/cust_bill_pkg.cgi
index 832660f..ccd41b8 100644 (file)
--- a/httemplate/graph/cust_bill_pkg.cgi
+++ b/httemplate/graph/cust_bill_pkg.cgi
@@ -1,5 +1,5 @@
 <% include('elements/monthly.html',
-                'title'        => $title. 'Sales Report (Gross)',
+                'title'        => $title,
                 'graph_type'   => 'Mountain',
                 'items'        => \@items,
                 'params'       => \@params,
@@ -21,6 +21,10 @@ die "access denied"
 my $link = "${p}search/cust_bill_pkg.cgi?nottax=1;include_comp_cust=1";
 my $bottom_link = "$link;";
 
+my $use_override         = $cgi->param('use_override')         ? 1 : 0;
+my $use_usage            = $cgi->param('use_usage')            ? 1 : 0;
+my $average_per_cust_pkg = $cgi->param('average_per_cust_pkg') ? 1 : 0;
+
 #XXX or virtual
 my( $agentnum, $sel_agent ) = ('', '');
 if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
@@ -30,6 +34,8 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
   die "agentnum $agentnum not found!" unless $sel_agent;
 }
 my $title = $sel_agent ? $sel_agent->agent.' ' : '';
+$title .= 'Sales Report (Gross)';
+$title .= ', average per customer package'  if $average_per_cust_pkg;
 
 #classnum (here)
 # 0: all classes
@@ -68,12 +74,6 @@ if ( $cgi->param('classnum') =~ /^(\d*)$/ ) {
 }
 #eslaf
 
-my $use_override = 0;
-$use_override = 1 if ( $cgi->param('use_override') );
-
-my $use_usage = 0;
-$use_usage = 1 if ( $cgi->param('use_usage') );
-
 my $hue = 0;
 #my $hue_increment = 170;
 #my $hue_increment = 145;
@@ -113,10 +113,11 @@ foreach my $agent ( $sel_agent || qsearch('agent', { 'disabled' => '' } ) ) {
 
       my $row_classnum = ref($pkg_class) ? $pkg_class->classnum : 0;
       my $row_agentnum = $agent->agentnum;
-      push @params, [ 'classnum'     => $row_classnum,
-                      'agentnum'     => $row_agentnum,
-                      'use_override' => $use_override,
-                      'use_usage'    => $component,
+      push @params, [ 'classnum'             => $row_classnum,
+                      'agentnum'             => $row_agentnum,
+                      'use_override'         => $use_override,
+                      'use_usage'            => $component,
+                      'average_per_cust_pkg' => $average_per_cust_pkg,
                     ];
 
       push @links, "$link;agentnum=$row_agentnum;classnum=$row_classnum;".