[freeside-commits] freeside/httemplate/graph report_cust_bill_pkg.html, 1.9.2.1, 1.9.2.2 cust_bill_pkg.cgi, 1.10.2.2, 1.10.2.3

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/httemplate/graph
In directory wavetail.420.am:/tmp/cvs-serv7776/httemplate/graph

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	report_cust_bill_pkg.html cust_bill_pkg.cgi 
Log Message:
RT#8504: option to aggregate agents on sales report

Index: report_cust_bill_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/graph/report_cust_bill_pkg.html,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -w -d -r1.9.2.1 -r1.9.2.2
--- report_cust_bill_pkg.html	3 Dec 2009 19:06:52 -0000	1.9.2.1
+++ report_cust_bill_pkg.html	21 May 2010 19:09:18 -0000	1.9.2.2
@@ -9,11 +9,14 @@
 <% include('/elements/tr-select-agent.html',
              'label'         => 'For agent: ',
              'disable_empty' => 0,
+             'pre_options'   => [ 'all' => 'all (aggregate)' ],
+             'empty_label'   => 'all (breakdown)',
           )
 %>
 
 <% include('/elements/tr-select-pkg_class.html',
-              'pre_options' => [ '0' => 'all' ],
+              'pre_options' => [ 'all'  => 'all (aggregate)',
+                                 '0' => 'all (breakdown)' ],
               'empty_label' => '(empty class)',
            )
 %>

Index: cust_bill_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/graph/cust_bill_pkg.cgi,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -w -d -r1.10.2.2 -r1.10.2.3
--- cust_bill_pkg.cgi	3 Dec 2009 19:22:59 -0000	1.10.2.2
+++ cust_bill_pkg.cgi	21 May 2010 19:09:18 -0000	1.10.2.3
@@ -1,4 +1,5 @@
 <% include('elements/monthly.html',
+   #Dumper(
                 'title'        => $title,
                 'graph_type'   => 'Mountain',
                 'items'        => \@items,
@@ -26,8 +27,12 @@
 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+)$/ ) {
+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 } );
@@ -45,18 +50,21 @@
 # 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 = ();
-if ( $cgi->param('classnum') =~ /^(\d*)$/ ) {
+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.' ';
+    $title .= ' '.$pkg_class[0]->classname.' ';
     $bottom_link .= "classnum=$classnum;";
 
   } elsif ( $classnum eq '' ) { #the empty class
@@ -85,7 +93,7 @@
 my @colors = ();
 my @links  = ();
 
-foreach my $agent ( $sel_agent || qsearch('agent', { 'disabled' => '' } ) ) {
+foreach my $agent ( $all_agent || $sel_agent || qsearch('agent', { 'disabled' => '' } ) ) {
 
   my $col_scheme = Color::Scheme->new
                      ->from_hue($hue) #->from_hex($agent->color)
@@ -104,7 +112,7 @@
       push @items, 'cust_bill_pkg';
 
       push @labels,
-        ( $sel_agent ? '' : $agent->agent.' ' ).
+        ( $all_agent || $sel_agent ? '' : $agent->agent.' ' ).
         ( $classnum eq '0'
             ? ( ref($pkg_class) ? $pkg_class->classname : $pkg_class ) 
             : ''
@@ -112,15 +120,16 @@
         " $component";
 
       my $row_classnum = ref($pkg_class) ? $pkg_class->classnum : 0;
-      my $row_agentnum = $agent->agentnum;
-      push @params, [ 'classnum'             => $row_classnum,
-                      'agentnum'             => $row_agentnum,
+      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;agentnum=$row_agentnum;classnum=$row_classnum;".
+      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]
@@ -137,6 +146,5 @@
 }
 
 #use Data::Dumper;
-#warn Dumper(\@items);
 
 </%init>