diff options
Diffstat (limited to 'httemplate/graph')
| -rw-r--r-- | httemplate/graph/cust_bill_pkg.cgi | 96 | ||||
| -rw-r--r-- | httemplate/graph/cust_bill_pkg_detail.cgi | 137 | ||||
| -rw-r--r-- | httemplate/graph/report_cust_bill_pkg.html | 11 | ||||
| -rw-r--r-- | httemplate/graph/report_cust_bill_pkg_detail.html | 48 |
4 files changed, 260 insertions, 32 deletions
diff --git a/httemplate/graph/cust_bill_pkg.cgi b/httemplate/graph/cust_bill_pkg.cgi index d7cae80..832660f 100644 --- a/httemplate/graph/cust_bill_pkg.cgi +++ b/httemplate/graph/cust_bill_pkg.cgi @@ -9,7 +9,7 @@ 'links' => \@links, 'remove_empty' => 1, 'bottom_total' => 1, - 'bottom_link' => "$link;", + 'bottom_link' => $bottom_link, 'agentnum' => $agentnum, ) %> @@ -18,34 +18,62 @@ 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;"; + #XXX or virtual my( $agentnum, $sel_agent ) = ('', ''); if ( $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.' ' : ''; -#false lazinessish w/search/cust_pkg.cgi +#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 = (); if ( $cgi->param('classnum') =~ /^(\d*)$/ ) { $classnum = $1; - if ( $classnum ) { + + 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.' '; - } elsif ( $classnum eq '' ) { + $bottom_link .= "classnum=$classnum;"; + + } elsif ( $classnum eq '' ) { #the empty class + $title .= 'Empty class '; @pkg_class = ( '(empty class)' ); - } elsif ( $classnum eq '0' ) { + $bottom_link .= "classnum=0;"; + + } elsif ( $classnum eq '0' ) { #all classes + @pkg_class = qsearch('pkg_class', {} ); # { 'disabled' => '' } ); push @pkg_class, '(empty class)'; + } } #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; @@ -57,8 +85,6 @@ 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 @@ -69,34 +95,40 @@ 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, + ]; + + 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; diff --git a/httemplate/graph/cust_bill_pkg_detail.cgi b/httemplate/graph/cust_bill_pkg_detail.cgi new file mode 100644 index 0000000..642a9ec --- /dev/null +++ b/httemplate/graph/cust_bill_pkg_detail.cgi @@ -0,0 +1,137 @@ +<% include('elements/monthly.html', + 'title' => $title. 'Rated Call Sales Report (Gross)', + 'graph_type' => 'Mountain', + 'items' => \@items, + 'params' => \@params, + 'labels' => \@labels, + 'graph_labels' => \@labels, + 'colors' => \@colors, + 'remove_empty' => 1, + 'bottom_total' => 1, + 'agentnum' => $agentnum, + ) +%> +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Financial reports'); + +#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/FS::cust_pkg::search_sql (previously search/cust_pkg.cgi) +my $classnum = ''; +if ( $cgi->param('classnum') =~ /^(\d*)$/ ) { + $classnum = $1; + + if ( $classnum ) { #a specific class + + my $pkg_class = ( qsearchs('pkg_class', { 'classnum' => $classnum } ) ); + die "classnum $classnum not found!" unless $pkg_class; + $title .= $pkg_class->classname.' '; + + } elsif ( $classnum eq '' ) { #the empty class + + $title .= 'Empty class '; + # FS::Report::Table::Monthly.pm has the converse view + $classnum = 0; + + } elsif ( $classnum eq '0' ) { #all classes + + # FS::Report::Table::Monthly.pm has the converse view + $classnum = ''; + } +} +#eslaf + +my $use_override = 0; +$use_override = 1 if ( $cgi->param('use_override') ); + +my $usageclass = 0; +my @usage_class = (); +if ( $cgi->param('usageclass') =~ /^(\d*)$/ ) { + $usageclass = $1; + + if ( $usageclass ) { #a specific class + + @usage_class = ( qsearchs('usage_class', { 'classnum' => $usageclass } ) ); + die "usage class $usageclass not found!" unless $usage_class[0]; + $title .= $usage_class[0]->classname.' '; + + } elsif ( $usageclass eq '' ) { #the empty class -- legacy + + $title .= 'Empty usage class '; + @usage_class = ( '(empty usage class)' ); + + } elsif ( $usageclass eq '0' ) { #all classes + + @usage_class = qsearch('usage_class', {} ); # { 'disabled' => '' } ); + push @usage_class, '(empty usage 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 = (); + +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 usage classes... + my $n = 0; + + foreach my $usage_class ( @usage_class ) { + + push @items, 'cust_bill_pkg_detail'; + + push @labels, + ( $sel_agent ? '' : $agent->agent.' ' ). + ( $usageclass eq '0' + ? ( ref($usage_class) ? $usage_class->classname : $usage_class ) + : '' + ); + + my $row_classnum = ref($usage_class) ? $usage_class->classnum : 0; + my $row_agentnum = $agent->agentnum; + push @params, [ 'usageclass' => $row_classnum, + 'agentnum' => $row_agentnum, + 'use_override' => $use_override, + 'classnum' => $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); + +</%init> diff --git a/httemplate/graph/report_cust_bill_pkg.html b/httemplate/graph/report_cust_bill_pkg.html index 5193bf4..51655a9 100644 --- a/httemplate/graph/report_cust_bill_pkg.html +++ b/httemplate/graph/report_cust_bill_pkg.html @@ -25,6 +25,17 @@ </TR> --> +<TR> + <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="use_override" VALUE="1"></TD> + <TD>Separate sub-packages from parents</TD> +</TR> + +<TR> + <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="use_usage" VALUE="1"></TD> + <TD>Separate rated usage from recurring fees</TD> +</TR> + + </TABLE> <BR><INPUT TYPE="submit" VALUE="Display"> diff --git a/httemplate/graph/report_cust_bill_pkg_detail.html b/httemplate/graph/report_cust_bill_pkg_detail.html new file mode 100644 index 0000000..3b85d52 --- /dev/null +++ b/httemplate/graph/report_cust_bill_pkg_detail.html @@ -0,0 +1,48 @@ +<% include('/elements/header.html', 'Usage Sales Report' ) %> + +<FORM ACTION="cust_bill_pkg_detail.cgi" METHOD="GET"> + +<TABLE> + +<% include('/elements/tr-select-from_to.html' ) %> + +<% include('/elements/tr-select-agent.html', + 'label' => 'For agent: ', + 'disable_empty' => 0, + ) +%> + +<% include('/elements/tr-select-pkg_class.html', + 'pre_options' => [ '0' => 'all' ], + 'empty_label' => '(empty class)', + ) +%> + +<TR> + <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="use_override" VALUE="1"></TD> + <TD>Separate sub-packages from parents</TD> +</TR> + +<% include('/elements/tr-select-table.html', + 'label' => 'Usage class: ', + 'element_name' => 'usageclass', + 'table' => 'usage_class', + 'name_col' => 'classname', + 'hashref' => { 'disabled' => '' }, + 'pre_options' => [ '0' => 'all' ], + 'empty_label' => '(empty class)', + ) +%> + +</TABLE> + +<BR><INPUT TYPE="submit" VALUE="Display"> +</FORM> + +<% include('/elements/footer.html') %> +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Financial reports'); + +</%init> |