X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fgraph%2Fcust_bill_pkg.cgi;h=1fad5e1cda0a4a6ed264af4e60d76b276cd8386c;hb=7b125e587a4d1ee0aca692e23ea7897f671855ae;hp=ea5ae0b2bd6ec5c6a3cf256abd3bfea30ca6b29a;hpb=3ce7691203a7737406bf2d4442f7fd84b81f847e;p=freeside.git

diff --git a/httemplate/graph/cust_bill_pkg.cgi b/httemplate/graph/cust_bill_pkg.cgi
index ea5ae0b2b..1fad5e1cd 100644
--- a/httemplate/graph/cust_bill_pkg.cgi
+++ b/httemplate/graph/cust_bill_pkg.cgi
@@ -1,105 +1,6 @@
-%
-%
-%
-%#find first month
-%my $syear = $cgi->param('start_year'); # || 1899+$curyear;
-%my $smonth = $cgi->param('start_month'); # || $curmon+1;
-%
-%#find last month
-%my $eyear = $cgi->param('end_year'); # || 1900+$curyear;
-%my $emonth = $cgi->param('end_month'); # || $curmon+1;
-%
-%#XXX or virtual
-%my( $agentnum, $sel_agent ) = ('', '');
-%if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-%  $agentnum = $1;
-%  $sel_agent = qsearchs('agent', { 'agentnum' => $agentnum } );
-%  die "agentnum $agentnum not found!" unless $sel_agent;
-%}
-%my $title = $sel_agent ? $sel_agent->agent.' ' : '';
-%
-%#false lazinessish w/search/cust_pkg.cgi
-%my $classnum = 0;
-%my @pkg_class = ();
-%if ( $cgi->param('classnum') =~ /^(\d*)$/ ) {
-%  $classnum = $1;
-%  if ( $classnum ) {
-%    @pkg_class = ( qsearchs('pkg_class', { 'classnum' => $classnum } ) );
-%    die "classnum $classnum not found!" unless $pkg_class[0];
-%    $title .= $pkg_class[0]->classname.' ';
-%  } elsif ( $classnum eq '' ) {
-%    $title .= 'Empty class ';
-%    @pkg_class = ( '(empty class)' );
-%  } elsif ( $classnum eq '0' ) {
-%    @pkg_class = qsearch('pkg_class', {} ); # { 'disabled' => '' } );
-%    push @pkg_class, '(empty class)';
-%  }
-%}
-%#eslaf
-%
-%my $hue = 0;
-%#my $hue_increment = 170;
-%#my $hue_increment = 145;
-%my $hue_increment = 125;
-%
-%my @items  = ();
-%my @params = ();
-%my @labels = ();
-%my @colors = ();
-%my @links  = ();
-%
-%my $link = "${p}search/cust_bill_pkg.cgi?nottax=1;include_comp_cust=1";
-%
-%foreach my $agent ( $sel_agent || qsearch('agent', { 'disabled' => '' } ) ) {
-%
-%  my $col_scheme = Color::Scheme->new
-%                     ->from_hue($hue) #->from_hex($agent->color)
-%                     ->scheme('analogic')
-%                   ;
-%  my @recur_colors = ();
-%  my @onetime_colors = ();
-%
-%  ### fixup the color handling for package classes...
-%  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;
-%
-%  }
-%
-%  $hue += $hue_increment;
-%
-%}
-%
-%#use Data::Dumper;
-%#warn Dumper(\@items);
-%
-%
 <% include('elements/monthly.html',
-                'title'        => $title. 'Sales Report (Gross)',
+   #Dumper(
+                'title'        => $title,
                 'graph_type'   => 'Mountain',
                 'items'        => \@items,
                 'params'       => \@params,
@@ -109,11 +10,142 @@
                 'links'        => \@links,
                 'remove_empty' => 1,
                 'bottom_total' => 1,
-                'bottom_link'  => "$link;",
-                'start_month'  => $smonth,
-                'start_year'   => $syear,
-                'end_month'    => $emonth,
-                'end_year'     => $eyear,
+                'bottom_link'  => $bottom_link,
                 'agentnum'     => $agentnum,
              )
 %>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
+
+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, $all_agent ) = ('', '', '');
+if ( $cgi->param('agentnum') eq 'all' ) {
+  $agentnum = 0;
+  $all_agent = 'ALL';
+}
+elsif ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+  $agentnum = $1;
+  $bottom_link .= "agentnum=$agentnum;";
+  $sel_agent = qsearchs('agent', { 'agentnum' => $agentnum } );
+  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
+# not specified: empty class
+# N: classnum
+#classnum (link)
+# not specified: all classes
+# 0: empty class
+# N: classnum
+
+#false lazinessish w/FS::cust_pkg::search_sql (previously search/cust_pkg.cgi)
+my $classnum = 0;
+my @pkg_class = ();
+my $all_class = '';
+if ( $cgi->param('classnum') eq 'all' ) {
+  $all_class = 'ALL';
+  @pkg_class = ('');
+}
+elsif ( $cgi->param('classnum') =~ /^(\d*)$/ ) {
+  $classnum = $1;
+  if ( $classnum ) { #a specific class
+
+    @pkg_class = ( qsearchs('pkg_class', { 'classnum' => $classnum } ) );
+    die "classnum $classnum not found!" unless $pkg_class[0];
+    $title .= ' '.$pkg_class[0]->classname.' ';
+    $bottom_link .= "classnum=$classnum;";
+
+  } elsif ( $classnum eq '' ) { #the empty class
+
+    $title .= 'Empty class ';
+    @pkg_class = ( '(empty class)' );
+    $bottom_link .= "classnum=0;";
+
+  } elsif ( $classnum eq '0' ) { #all classes
+
+    @pkg_class = qsearch('pkg_class', {} ); # { 'disabled' => '' } );
+    push @pkg_class, '(empty class)';
+
+  }
+}
+#eslaf
+
+my $hue = 0;
+#my $hue_increment = 170;
+#my $hue_increment = 145;
+my $hue_increment = 125;
+
+my @items  = ();
+my @params = ();
+my @labels = ();
+my @colors = ();
+my @links  = ();
+
+foreach my $agent ( $all_agent || $sel_agent || qsearch('agent', { 'disabled' => '' } ) ) {
+
+  my $col_scheme = Color::Scheme->new
+                     ->from_hue($hue) #->from_hex($agent->color)
+                     ->scheme('analogic')
+                   ;
+  my @recur_colors = ();
+  my @onetime_colors = ();
+
+  ### fixup the color handling for package classes...
+  ### and usage
+  my $n = 0;
+
+  foreach my $pkg_class ( @pkg_class ) {
+    foreach my $component ( $use_usage ? ('recurring', 'usage') : ('') ) {
+
+      push @items, 'cust_bill_pkg';
+
+      push @labels,
+        ( $all_agent || $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 = $all_agent || $agent->agentnum;
+      push @params, [ ($all_class ? () : ('classnum' => $row_classnum) ),
+                      ($all_agent ? () : ('agentnum' => $row_agentnum) ),
+                      'use_override'         => $use_override,
+                      'use_usage'            => $component,
+                      'average_per_cust_pkg' => $average_per_cust_pkg,
+                    ];
+
+      push @links, "$link;".($all_agent ? '' : "agentnum=$row_agentnum;").
+                   ($all_class ? '' : "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;
+
+}
+
+#use Data::Dumper;
+
+</%init>