X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fgraph%2Fcust_bill_pkg.cgi;h=ccd41b8a99778b5c71a2db4bbed96a1840a52d02;hb=63a268637b2d51a8766412617724b9436439deb6;hp=b655f1f01bb693209ad46f836e6826bdc3e2a5c1;hpb=52feaa06fcb7a06e253adcb18d87854498ad218e;p=freeside.git

diff --git a/httemplate/graph/cust_bill_pkg.cgi b/httemplate/graph/cust_bill_pkg.cgi
index b655f1f01..ccd41b8a9 100644
--- 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
@@ -89,33 +95,41 @@ foreach my $agent ( $sel_agent || qsearch('agent', { 'disabled' => '' } ) ) {
   my @onetime_colors = ();
 
   ### fixup the color handling for package classes...
+  ### and usage
   my $n = 0;
 
   foreach my $pkg_class ( @pkg_class ) {
-
-    push @items, 'cust_bill_pkg';
-
-    push @labels,
-      ( $sel_agent ? '' : $agent->agent.' ' ).
-      ( $classnum eq '0'
-          ? ( ref($pkg_class) ? $pkg_class->classname : $pkg_class ) 
-          : ''
-      );
-
-    my $row_classnum = ref($pkg_class) ? $pkg_class->classnum : 0;
-    my $row_agentnum = $agent->agentnum;
-    push @params, [ 'classnum' => $row_classnum,
-                    'agentnum' => $row_agentnum,
-                  ];
-
-    push @links, "$link;agentnum=$row_agentnum;classnum=$row_classnum;";
-
-    @recur_colors = ($col_scheme->colors)[0,4,8,1,5,9]
-      unless @recur_colors;
-    @onetime_colors = ($col_scheme->colors)[2,6,10,3,7,11]
-      unless @onetime_colors;
-    push @colors, shift @recur_colors;
-
+    foreach my $component ( $use_usage ? ('recurring', 'usage') : ('') ) {
+
+      push @items, 'cust_bill_pkg';
+
+      push @labels,
+        ( $sel_agent ? '' : $agent->agent.' ' ).
+        ( $classnum eq '0'
+            ? ( ref($pkg_class) ? $pkg_class->classname : $pkg_class ) 
+            : ''
+        ).
+        " $component";
+
+      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,
+                      'average_per_cust_pkg' => $average_per_cust_pkg,
+                    ];
+
+      push @links, "$link;agentnum=$row_agentnum;classnum=$row_classnum;".
+                   "use_override=$use_override;use_usage=$component;";
+
+      @recur_colors = ($col_scheme->colors)[0,4,8,1,5,9]
+        unless @recur_colors;
+      @onetime_colors = ($col_scheme->colors)[2,6,10,3,7,11]
+        unless @onetime_colors;
+      push @colors, shift @recur_colors;
+
+    }
   }
 
   $hue += $hue_increment;