From e65c6a26ca778166aec2b2d1dd3012ab84fa611a Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 7 May 2006 20:27:21 +0000 Subject: first pass at sales reports per agent and package class --- httemplate/graph/cust_bill_pkg-graph.cgi | 84 +++++++++++++++ httemplate/graph/cust_bill_pkg.cgi | 104 +++++++++++++++++++ httemplate/graph/elements/monthly.html | 157 +++++++++++++++++++++++++++++ httemplate/graph/money_time-graph.cgi | 84 --------------- httemplate/graph/money_time.cgi | 97 ++++++------------ httemplate/graph/report_cust_bill_pkg.html | 29 ++++++ httemplate/graph/report_money_time.html | 58 ++--------- 7 files changed, 416 insertions(+), 197 deletions(-) create mode 100755 httemplate/graph/cust_bill_pkg-graph.cgi create mode 100644 httemplate/graph/cust_bill_pkg.cgi create mode 100644 httemplate/graph/elements/monthly.html delete mode 100755 httemplate/graph/money_time-graph.cgi create mode 100644 httemplate/graph/report_cust_bill_pkg.html (limited to 'httemplate/graph') diff --git a/httemplate/graph/cust_bill_pkg-graph.cgi b/httemplate/graph/cust_bill_pkg-graph.cgi new file mode 100755 index 000000000..637a3bf94 --- /dev/null +++ b/httemplate/graph/cust_bill_pkg-graph.cgi @@ -0,0 +1,84 @@ +<% + +#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); +my ($curmon,$curyear) = (localtime(time))[4,5]; + +#find first month +my $syear = $cgi->param('syear') || 1899+$curyear; +my $smonth = $cgi->param('smonth') || $curmon+1; + +#find last month +my $eyear = $cgi->param('eyear') || 1900+$curyear; +my $emonth = $cgi->param('emonth') || $curmon+1; +#if ( $emonth++>12 ) { $emonth-=12; $eyear++; } + +# XXX or virtual +my $agentnum = ''; +if ( $cgi->param('agentnum') =~ /^(\d*)$/ ) { + $agentnum = $1; +} + +#my @labels; +#my %data; + +my @items = qw( invoiced netsales credits payments receipts ); +if ( $cgi->param('12mo') == 1 ) { + @items = map $_.'_12mo', @items; +} + +my %label = ( + 'invoiced' => 'Gross Sales (invoiced)', + 'netsales' => 'Net Sales (invoiced - applied credits)', + 'credits' => 'Credits', + 'payments' => 'Gross Receipts (payments)', + 'receipts' => 'Net Receipts/Cashflow (payments - refunds)', +); +$label{$_.'_12mo'} = $label{$_}. " (previous 12 months)" + foreach keys %label; + +my %color = ( + 'invoiced' => [ 153, 153, 255 ], #light blue + 'netsales' => [ 0, 0, 204 ], #blue + 'credits' => [ 204, 0, 0 ], #red + 'payments' => [ 153, 204, 153 ], #light green + 'receipts' => [ 0, 204, 0 ], #green +); +$color{$_.'_12mo'} = $color{$_} + foreach keys %color; + +my $report = new FS::Report::Table::Monthly ( + 'items' => \@items, + 'start_month' => $smonth, + 'start_year' => $syear, + 'end_month' => $emonth, + 'end_year' => $eyear, + 'agentnum' => $agentnum, +); +my %data = %{$report->data}; + +#my $chart = Chart::LinesPoints->new(1024,480); +#my $chart = Chart::LinesPoints->new(768,480); +my $chart = Chart::LinesPoints->new(976,384); + +my $d = 0; +$chart->set( + #'min_val' => 0, + 'legend' => 'bottom', + 'colors' => { ( map { 'dataset'.$d++ => $color{$_} } @items ), + #'grey_background' => [ 211, 211, 211 ], + 'grey_background' => 'white', + 'background' => [ 0xe8, 0xe8, 0xe8 ], #grey + }, + #'grey_background' => 'false', + 'legend_labels' => [ map { $label{$_} } @items ], + 'brush_size' => 4, + #'pt_size' => 12, +); + +my @data = map { $data{$_} } ( 'label', @items ); + +http_header('Content-Type' => 'image/png' ); + +$chart->_set_colors(); + +%><%= $chart->scalar_png(\@data) %> diff --git a/httemplate/graph/cust_bill_pkg.cgi b/httemplate/graph/cust_bill_pkg.cgi new file mode 100644 index 000000000..0dbd222ce --- /dev/null +++ b/httemplate/graph/cust_bill_pkg.cgi @@ -0,0 +1,104 @@ +<% + + +#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.' ' : ''; + +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)'; + } +} + +my $hue = 0; +my $hue_increment = 145; + +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) + ->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 ) + : '' + ); + + # push some params + push @params, + [ 'classnum' => ( ref($pkg_class) ? $pkg_class->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', + 'graph_type' => 'Mountain', + 'items' => \@items, + 'params' => \@params, + 'labels' => \@labels, + 'graph_labels' => \@labels, + 'colors' => \@colors, + #'links' => \%link, + 'start_month' => $smonth, + 'start_year' => $syear, + 'end_month' => $emonth, + 'end_year' => $eyear, + 'agentnum' => $agentnum, + ) +%> diff --git a/httemplate/graph/elements/monthly.html b/httemplate/graph/elements/monthly.html new file mode 100644 index 000000000..c45113fa3 --- /dev/null +++ b/httemplate/graph/elements/monthly.html @@ -0,0 +1,157 @@ +<% + + # options example... + # + # 'title' => 'Page title', + # 'items' => \@items, + # 'params' => \@params, # opt, + # 'labels' => \@labels, # or \%labels (keys are items) + # 'graph_labels' => \%graph_labels, + # 'colors' => \%colors, + # 'links => \%link, #opt + # 'start_month' => $smonth, + # 'start_year' => $syear, + # 'end_month' => $emonth, + # 'end_year' => $eyear, + # 'agentnum' => $agentnum, #opt + # 'nototal' => 1, #opt, + # 'graph_type' => 'LinesPoints', #opt + + my(%opt) = @_; + my @items = @{ $opt{'items'} }; + + #foreach my $other (qw( labels graph_labels colors links )) { + foreach my $other (qw( labels graph_labels colors )) { + if ( ref($opt{$other}) eq 'HASH' ) { + $opt{$other} = [ map $opt{$other}{$_}, @items ]; + } + } + + my $report = new FS::Report::Table::Monthly ( + #'items' => $opt{'items'}, + 'items' => \@items, + 'params' => $opt{'params'}, + 'start_month' => $opt{'start_month'}, + 'start_year' => $opt{'start_year'}, + 'end_month' => $opt{'end_month'}, + 'end_year' => $opt{'end_year'}, + 'agentnum' => $opt{'agentnum'}, + ); + my $data = $report->data; + + if ( $cgi->param('_type') =~ /^(png)$/ ) { + + #my $chart = Chart::LinesPoints->new(1024,480); + #my $chart = Chart::LinesPoints->new(768,480); + + my $graph_type = 'LinesPoints'; + if ( $opt{'graph_type'} =~ /^(LinesPoints|Mountain)$/ ) { + $graph_type = $1; + } + my $class = "Chart::$graph_type"; + + my $chart = $class->new(976,384); + + my $d = 0; + $chart->set( + #'min_val' => 0, + 'legend' => 'bottom', + 'colors' => { ( + map { my $color = $_; + 'dataset'.$d++ => + [ map hex($_), unpack 'a2a2a2', $color ] + } + @{ $opt{'colors'} } + ), + #'grey_background' => [ 211, 211, 211 ], + 'grey_background' => 'white', + 'background' => [ 0xe8, 0xe8, 0xe8 ], #grey + }, + #'grey_background' => 'false', + 'legend_labels' => $opt{'graph_labels'}, + 'brush_size' => 4, + #'pt_size' => 12, + ); + + #my @data = map { $data->{$_} } ( 'label', @items ); + my @data = @{ $data->{data} }; + unshift @data, $data->{'label'}; + + http_header('Content-Type' => 'image/png' ); + + $chart->_set_colors(); + + %><%= $chart->scalar_png(\@data) %><% + + } else { + + my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); + +%><%= include('/elements/header.html', $opt{'title'} ) %> + +<% $cgi->param('_type', 'png'); %> + +
+ +<%= table('e8e8e8') %> + + + + + + <% foreach my $column ( @{$data->{label}} ) { + #$column =~ s/^(\d+)\//$mon[$1-1]
/e; + $column =~ s/^(\d+)\//$mon[$1-1]
/; + %> + <%= $column %> + <% } %> + + <% unless ( $opt{'nototal'} ) { %> + Total + <% } %> + + + +<% foreach my $row (@items) { + + my $color = shift( @{ $opt{'colors'} } ); +%> + + + + <%= shift( @{ $opt{'labels'} } ) %> + + <% my $link = exists($opt{'links'}{$row}) + ? qq( + <%= $link ? $link. 'begin='. shift(@speriod). ';end='. shift(@eperiod). '">' : '' %>$<%= sprintf("%.2f", $column) %><%= $link ? '' : '' %> + + <% $total += $column; %> + + <% } %> + + <% unless ( $opt{'nototal'} ) { %> + + + <%= $link ? $link. 'begin='. @{$data->{speriod}}[0]. ';end='. @{$data->{eperiod}}[-1]. '">' : '' %>$<%= sprintf("%.2f", $total) %><%= $link ? '' : '' %> + + + <% } %> + + + +<% } %> + + + +<%= include('/elements/footer.html') %> + +<% } %> diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi deleted file mode 100755 index 637a3bf94..000000000 --- a/httemplate/graph/money_time-graph.cgi +++ /dev/null @@ -1,84 +0,0 @@ -<% - -#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); -my ($curmon,$curyear) = (localtime(time))[4,5]; - -#find first month -my $syear = $cgi->param('syear') || 1899+$curyear; -my $smonth = $cgi->param('smonth') || $curmon+1; - -#find last month -my $eyear = $cgi->param('eyear') || 1900+$curyear; -my $emonth = $cgi->param('emonth') || $curmon+1; -#if ( $emonth++>12 ) { $emonth-=12; $eyear++; } - -# XXX or virtual -my $agentnum = ''; -if ( $cgi->param('agentnum') =~ /^(\d*)$/ ) { - $agentnum = $1; -} - -#my @labels; -#my %data; - -my @items = qw( invoiced netsales credits payments receipts ); -if ( $cgi->param('12mo') == 1 ) { - @items = map $_.'_12mo', @items; -} - -my %label = ( - 'invoiced' => 'Gross Sales (invoiced)', - 'netsales' => 'Net Sales (invoiced - applied credits)', - 'credits' => 'Credits', - 'payments' => 'Gross Receipts (payments)', - 'receipts' => 'Net Receipts/Cashflow (payments - refunds)', -); -$label{$_.'_12mo'} = $label{$_}. " (previous 12 months)" - foreach keys %label; - -my %color = ( - 'invoiced' => [ 153, 153, 255 ], #light blue - 'netsales' => [ 0, 0, 204 ], #blue - 'credits' => [ 204, 0, 0 ], #red - 'payments' => [ 153, 204, 153 ], #light green - 'receipts' => [ 0, 204, 0 ], #green -); -$color{$_.'_12mo'} = $color{$_} - foreach keys %color; - -my $report = new FS::Report::Table::Monthly ( - 'items' => \@items, - 'start_month' => $smonth, - 'start_year' => $syear, - 'end_month' => $emonth, - 'end_year' => $eyear, - 'agentnum' => $agentnum, -); -my %data = %{$report->data}; - -#my $chart = Chart::LinesPoints->new(1024,480); -#my $chart = Chart::LinesPoints->new(768,480); -my $chart = Chart::LinesPoints->new(976,384); - -my $d = 0; -$chart->set( - #'min_val' => 0, - 'legend' => 'bottom', - 'colors' => { ( map { 'dataset'.$d++ => $color{$_} } @items ), - #'grey_background' => [ 211, 211, 211 ], - 'grey_background' => 'white', - 'background' => [ 0xe8, 0xe8, 0xe8 ], #grey - }, - #'grey_background' => 'false', - 'legend_labels' => [ map { $label{$_} } @items ], - 'brush_size' => 4, - #'pt_size' => 12, -); - -my @data = map { $data{$_} } ( 'label', @items ); - -http_header('Content-Type' => 'image/png' ); - -$chart->_set_colors(); - -%><%= $chart->scalar_png(\@data) %> diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi index 73f9d23a2..f085c2264 100644 --- a/httemplate/graph/money_time.cgi +++ b/httemplate/graph/money_time.cgi @@ -1,15 +1,12 @@ <% -# #my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); -# my ($curmon,$curyear) = (localtime(time))[4,5]; - #find first month -my $syear = $cgi->param('syear'); # || 1899+$curyear; -my $smonth = $cgi->param('smonth'); # || $curmon+1; +my $syear = $cgi->param('start_year'); # || 1899+$curyear; +my $smonth = $cgi->param('start_month'); # || $curmon+1; #find last month -my $eyear = $cgi->param('eyear'); # || 1900+$curyear; -my $emonth = $cgi->param('emonth'); # || $curmon+1; +my $eyear = $cgi->param('end_year'); # || 1900+$curyear; +my $emonth = $cgi->param('end_month'); # || $curmon+1; #XXX or virtual my( $agentnum, $agent ) = ('', ''); @@ -20,18 +17,6 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { } my $agentname = $agent ? $agent->agent.' ' : ''; -%> -<%= include('/elements/header.html', - $agentname. 'Sales, Credits and Receipts Summary' - ) -%> - - -
- -<%= table('e8e8e8') %> -<% - my @items = qw( invoiced netsales credits payments receipts ); if ( $cgi->param('12mo') == 1 ) { @items = map $_.'_12mo', @items; @@ -44,9 +29,22 @@ my %label = ( 'payments' => 'Gross Receipts', 'receipts' => 'Net Receipts', ); + +my %graph_suffix = ( + 'invoiced' => ' (invoiced)', + 'netsales' => ' (invoiced - applied credits)', + 'credits' => '', + 'payments' => ' (payments)', + 'receipts' => '/Cashflow (payments - refunds)', +); +my %graph_label = map { $_ => $label{$_}.$graph_suffix{$_} } keys %label; + $label{$_.'_12mo'} = $label{$_}. " (previous 12 months)" foreach keys %label; +$graph_label{$_.'_12mo'} = $graph_label{$_}. " (previous 12 months)" + foreach keys %graph_label; + my %color = ( 'invoiced' => '9999ff', #light blue 'netsales' => '0000cc', #blue @@ -64,50 +62,19 @@ my %link = ( ); # XXX link 12mo? -my $report = new FS::Report::Table::Monthly ( - 'items' => \@items, - 'start_month' => $smonth, - 'start_year' => $syear, - 'end_month' => $emonth, - 'end_year' => $eyear, - 'agentnum' => $agentnum, -); -my $data = $report->data; - -my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); - +%><%= include('elements/monthly.html', + 'title' => $agentname. + 'Sales, Credits and Receipts Summary', + 'items' => \@items, + 'labels' => \%label, + 'graph_labels' => \%graph_label, + 'colors' => \%color, + 'links' => \%link, + 'start_month' => $smonth, + 'start_year' => $syear, + 'end_month' => $emonth, + 'end_year' => $eyear, + 'agentnum' => $agentnum, + 'nototal' => scalar($cgi->param('12mo')), + ) %> - - -<% foreach my $column ( @{$data->{label}} ) { - #$column =~ s/^(\d+)\//$mon[$1-1]
/e; - $column =~ s/^(\d+)\//$mon[$1-1]
/; - %> - <%= $column %> -<% } %> - Total - - -<% foreach my $row (@items) { %> - <%= $label{$row} %> - <% my $link = exists($link{$row}) - ? qq( - <%= $link ? $link. 'begin='. shift(@speriod). ';end='. shift(@eperiod). '">' : '' %>$<%= sprintf("%.2f", $column) %><%= $link ? '' : '' %> - - <% $total += $column; %> - <% } %> - - <%= $link ? $link. 'begin='. @{$data->{speriod}}[0]. ';end='. @{$data->{eperiod}}[-1]. '">' : '' %>$<%= sprintf("%.2f", $total) %><%= $link ? '' : '' %> - - -<% } %> - - -<%= include('/elements/footer.html') %> diff --git a/httemplate/graph/report_cust_bill_pkg.html b/httemplate/graph/report_cust_bill_pkg.html new file mode 100644 index 000000000..4f29b761f --- /dev/null +++ b/httemplate/graph/report_cust_bill_pkg.html @@ -0,0 +1,29 @@ +<%= include('/elements/header.html', 'Sales Report' ) %> + +
+ + + +<%= include('/elements/tr-select-from_to.html' ) %> + +<%= include('/elements/tr-select-agent.html', 'label' => 'For agent: ' ) %> + +<%= include('/elements/tr-select-pkg_class.html', '', + 'pre_options' => [ '0' => 'all' ], + 'empty_label' => '(empty class)', + ) +%> + + + +
+ +
+
+ +<%= include('/elements/footer.html') %> diff --git a/httemplate/graph/report_money_time.html b/httemplate/graph/report_money_time.html index 6c7e42716..564749686 100644 --- a/httemplate/graph/report_money_time.html +++ b/httemplate/graph/report_money_time.html @@ -1,23 +1,3 @@ -<% - -#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); -my ($curmon,$curyear) = (localtime(time))[4,5]; - -#find first month -my $syear = 1899+$curyear; -my $smonth = $curmon+1; - -#want 12 month by default, not 13 -$smonth++; -if ( $smonth > 12 ) { $smonth-=12; $syear++ } - -#find last month -my $eyear = 1900+$curyear; -my $emonth = $curmon+1; - -my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); - -%> <%= include('/elements/header.html', 'Sales, Credits and Receipts Summary' ) %>
@@ -34,38 +14,20 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
--> -From: - -
+ -To: - -
+<%= include('/elements/tr-select-from_to.html' ) %> -For agent: <%= include('/elements/select-agent.html' ) %> -
+<%= include('/elements/tr-select-agent.html', '', 'label' => 'For agent: ' ) %> - Show 12 month totals instead of monthly values. -
+ + + + + +
Show 12 month totals instead of monthly values
- +
<%= include('/elements/footer.html') %> - -- cgit v1.2.1