X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fgraph%2Fmoney_time.cgi;h=829b1e66fbd8f9516fdc741b0517b15a069b4c94;hb=221ab7ff23a7d18668f589a4382780b00b351f12;hp=1c7d54266c04d59e6ea6726b2374ab404438b235;hpb=673b9a458d9138523026963df6fa3b4683e09bae;p=freeside.git
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index 1c7d54266..829b1e66f 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -1,125 +1,81 @@
-
-<%
-
-#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;
-
+%
+%
+%#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, $agent ) = ('', '');
+%if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+% $agentnum = $1;
+% $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
+% die "agentnum $agentnum not found!" unless $agent;
+%}
+%my $agentname = $agent ? $agent->agent.' ' : '';
+%
+%my @items = qw( invoiced netsales credits payments receipts );
+%if ( $cgi->param('12mo') == 1 ) {
+% @items = map $_.'_12mo', @items;
+%}
+%
+%my %label = (
+% 'invoiced' => 'Gross Sales',
+% 'netsales' => 'Net Sales',
+% 'credits' => 'Credits',
+% '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
+% 'credits' => 'cc0000', #red
+% 'payments' => '99cc99', #light green
+% 'receipts' => '00cc00', #green
+%);
+%$color{$_.'_12mo'} = $color{$_}
+% foreach keys %color;
+%
+%my %link = (
+% 'invoiced' => "${p}search/cust_bill.html?agentnum=$agentnum;",
+% 'credits' => "${p}search/cust_credit.html?agentnum=$agentnum;",
+% 'payments' => "${p}search/cust_pay.cgi?magic=_date;agentnum=$agentnum;",
+%);
+%# XXX link 12mo?
+%
+%
+<% 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')),
+ )
%>
-
-
-
- Sales, Credits and Receipts Summary
-
-
-
-
-
-<%= table('e8e8e8') %>
-<%
-
-my @items = qw( invoiced netsales credits payments receipts );
-my %label = (
- 'invoiced' => 'Gross Sales',
- 'netsales' => 'Net Sales',
- 'credits' => 'Credits',
- 'payments' => 'Gross Receipts',
- 'receipts' => 'Net Receipts',
-);
-my %color = (
- 'invoiced' => '9999ff', #light blue
- 'netsales' => '0000cc', #blue
- 'credits' => 'cc0000', #red
- 'payments' => '99cc99', #light green
- 'receipts' => '00cc00', #green
-);
-my %link = (
- 'invoiced' => "${p}search/cust_bill.html?",
- 'credits' => "${p}search/cust_credit.html?",
- 'payments' => "${p}search/cust_pay.cgi?magic=_date;",
-);
-
-my $report = new FS::Report::Table::Monthly (
- 'items' => \@items,
- 'start_month' => $smonth,
- 'start_year' => $syear,
- 'end_month' => $emonth,
- 'end_year' => $eyear,
-);
-my $data = $report->data;
-
-my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
-
-%>
-
- |
-<% foreach my $column ( @{$data->{label}} ) {
- #$column =~ s/^(\d+)\//$mon[$1-1]
/e;
- $column =~ s/^(\d+)\//$mon[$1-1]
/;
- %>
- <%= $column %> |
-<% } %>
-
|---|
-
-<% foreach my $row (@items) { %>
- | <%= $label{$row} %> |
- <% my $link = exists($link{$row})
- ? qq(
- <%= $link ? $link. 'begin='. shift(@speriod). ';end='. shift(@eperiod). '">' : '' %>$<%= sprintf("%.2f", $column) %><%= $link ? '' : '' %>
-
- <% } %>
-
|---|
-<% } %>
-
-
-
-
-
-