[freeside-commits]
freeside/httemplate/graph cust_bill_pkg.cgi, NONE,
1.1 cust_bill_pkg-graph.cgi, NONE,
1.1 report_cust_bill_pkg.html, NONE, 1.1 money_time.cgi, 1.13,
1.14 money_time-graph.cgi, 1.9, NONE report_money_time.html,
1.1, 1.2
Ivan,,,
ivan at wavetail.420.am
Sun May 7 13:27:23 PDT 2006
Update of /home/cvs/cvsroot/freeside/httemplate/graph
In directory wavetail:/tmp/cvs-serv30449/httemplate/graph
Modified Files:
money_time.cgi report_money_time.html
Added Files:
cust_bill_pkg.cgi cust_bill_pkg-graph.cgi
report_cust_bill_pkg.html
Removed Files:
money_time-graph.cgi
Log Message:
first pass at sales reports per agent and package class
--- NEW FILE: cust_bill_pkg.cgi ---
<%
#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,
)
%>
--- NEW FILE: report_cust_bill_pkg.html ---
<%= include('/elements/header.html', 'Sales Report' ) %>
<FORM ACTION="cust_bill_pkg.cgi" METHOD="GET">
<TABLE>
<%= 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)',
)
%>
<!--
<TR>
<TD ALIGN="right"><INPUT TYPE="checkbox" NAME="separate_0freq" VALUE="1"></TD>
<TD>Separate one-time vs. recurring sales</TD>
</TR>
-->
</TABLE>
<BR><INPUT TYPE="submit" VALUE="Display">
</FORM>
<%= include('/elements/footer.html') %>
--- NEW FILE: cust_bill_pkg-graph.cgi ---
<%
#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) %>
--- money_time-graph.cgi DELETED ---
Index: report_money_time.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/graph/report_money_time.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- report_money_time.html 2 May 2006 11:59:31 -0000 1.1
+++ report_money_time.html 7 May 2006 20:27:21 -0000 1.2
@@ -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' ) %>
<FORM ACTION="money_time.cgi" METHOD="GET">
@@ -34,38 +14,20 @@
<BR>
-->
-From: <SELECT NAME="smonth">
-<% foreach my $mon ( 1..12 ) { %>
-<OPTION VALUE="<%= $mon %>"<%= $mon == $smonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
-<% } %>
-</SELECT>
-<SELECT NAME="syear">
-<% foreach my $y ( 1999 .. 2010 ) { %>
-<OPTION VALUE="<%= $y %>"<%= $y == $syear ? ' SELECTED' : '' %>><%= $y %>
-<% } %>
-</SELECT>
-<BR>
+<TABLE>
-To: <SELECT NAME="emonth">
-<% foreach my $mon ( 1..12 ) { %>
-<OPTION VALUE="<%= $mon %>"<%= $mon == $emonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
-<% } %>
-</SELECT>
-<SELECT NAME="eyear">
-<% foreach my $y ( 1999 .. 2010 ) { %>
-<OPTION VALUE="<%= $y %>"<%= $y == $eyear ? ' SELECTED' : '' %>><%= $y %>
-<% } %>
-</SELECT>
-<BR>
+<%= include('/elements/tr-select-from_to.html' ) %>
-For agent: <%= include('/elements/select-agent.html' ) %>
-<BR>
+<%= include('/elements/tr-select-agent.html', '', 'label' => 'For agent: ' ) %>
-<INPUT TYPE="checkbox" NAME="12mo" VALUE="1"> Show 12 month totals instead of monthly values.
-<BR>
+<TR>
+ <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="12mo" VALUE="1"></TD>
+ <TD>Show 12 month totals instead of monthly values</TD>
+</TR>
-<INPUT TYPE="submit" VALUE="Display">
+</TABLE>
+
+<BR><INPUT TYPE="submit" VALUE="Display">
</FORM>
<%= include('/elements/footer.html') %>
-
Index: money_time.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/graph/money_time.cgi,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- money_time.cgi 2 May 2006 11:59:31 -0000 1.13
+++ money_time.cgi 7 May 2006 20:27:21 -0000 1.14
@@ -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 @@
}
my $agentname = $agent ? $agent->agent.' ' : '';
-%>
-<%= include('/elements/header.html',
- $agentname. 'Sales, Credits and Receipts Summary'
- )
-%>
-
-<IMG SRC="money_time-graph.cgi?<%= $cgi->query_string %>" WIDTH="976" HEIGHT="384">
-<BR>
-
-<%= table('e8e8e8') %>
-<%
-
my @items = qw( invoiced netsales credits payments receipts );
if ( $cgi->param('12mo') == 1 ) {
@items = map $_.'_12mo', @items;
@@ -44,9 +29,22 @@
'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 @@
);
# 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')),
+ )
%>
-
-<TR><TD></TD>
-<% foreach my $column ( @{$data->{label}} ) {
- #$column =~ s/^(\d+)\//$mon[$1-1]<BR>/e;
- $column =~ s/^(\d+)\//$mon[$1-1]<BR>/;
- %>
- <TH><%= $column %></TH>
-<% } %>
- <TH>Total</TH>
-</TR>
-
-<% foreach my $row (@items) { %>
- <TR><TH><FONT COLOR="#<%= $color{$row} %>"><%= $label{$row} %></FONT></TH>
- <% my $link = exists($link{$row})
- ? qq(<A HREF="$link{$row})
- : '';
- my @speriod = @{$data->{speriod}};
- my @eperiod = @{$data->{eperiod}};
- my $total = 0;
- %>
- <% foreach my $column ( @{$data->{$row}} ) { %>
- <TD ALIGN="right" BGCOLOR="#ffffff">
- <%= $link ? $link. 'begin='. shift(@speriod). ';end='. shift(@eperiod). '">' : '' %><FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $column) %></FONT><%= $link ? '</A>' : '' %>
- </TD>
- <% $total += $column; %>
- <% } %>
- <TD ALIGN="right" BGCOLOR="#f5f6be">
- <%= $link ? $link. 'begin='. @{$data->{speriod}}[0]. ';end='. @{$data->{eperiod}}[-1]. '">' : '' %><FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $total) %></FONT><%= $link ? '</A>' : '' %>
- </TD>
- </TR>
-<% } %>
-</TABLE>
-
-<%= include('/elements/footer.html') %>
More information about the freeside-commits
mailing list