X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fgraph%2Fmoney_time.cgi;h=f085c226436030ff24c9cd28d6498fd097774285;hp=73f9d23a23b626cadd19dafa5f6099ce84b99245;hb=e65c6a26ca778166aec2b2d1dd3012ab84fa611a;hpb=29644d5921c99520965b884b25800ed084891e94

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'
-           )
-%>
-
-<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 @@ 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')),
+             )
 %>
-
-<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') %>