[freeside-commits] freeside/httemplate/graph cust_bill_pkg.cgi, 1.3, 1.4 money_time.cgi, 1.14, 1.15 report_cust_bill_pkg.html, 1.1, 1.2 report_money_time.html, 1.2, 1.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/graph
In directory wavetail:/tmp/cvs-serv18630/httemplate/graph

Modified Files:
	cust_bill_pkg.cgi money_time.cgi report_cust_bill_pkg.html 
	report_money_time.html 
Log Message:
Will things ever be the same again?
It's the final masonize


Index: report_cust_bill_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/graph/report_cust_bill_pkg.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- report_cust_bill_pkg.html	7 May 2006 20:27:21 -0000	1.1
+++ report_cust_bill_pkg.html	23 Aug 2006 22:25:38 -0000	1.2
@@ -1,14 +1,14 @@
-<%= include('/elements/header.html', 'Sales Report' ) %>
+<% 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-from_to.html' ) %>
 
-<%= include('/elements/tr-select-agent.html', 'label' => 'For agent: ' ) %>
+<% include('/elements/tr-select-agent.html', 'label' => 'For agent: ' ) %>
 
-<%= include('/elements/tr-select-pkg_class.html', '',
+<% include('/elements/tr-select-pkg_class.html', '',
               'pre_options' => [ '0' => 'all' ],
               'empty_label' => '(empty class)',
            )
@@ -26,4 +26,4 @@
 <BR><INPUT TYPE="submit" VALUE="Display">
 </FORM>
 
-<%= include('/elements/footer.html') %>
+<% include('/elements/footer.html') %>

Index: cust_bill_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/graph/cust_bill_pkg.cgi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cust_bill_pkg.cgi	19 Jun 2006 08:05:28 -0000	1.3
+++ cust_bill_pkg.cgi	23 Aug 2006 22:25:38 -0000	1.4
@@ -1,103 +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.' ' : '';
-
-#false lazinessish w/search/cust_pkg.cgi
-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)';
-  }
-}
-#eslaf
-
-my $hue = 0;
-#my $hue_increment = 170;
-#my $hue_increment = 145;
-my $hue_increment = 125;
-
-my @items  = ();
-my @params = ();
-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
-                     ->from_hue($hue) #->from_hex($agent->color)
-                     ->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 ) 
-          : ''
-      );
-
-    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;
-
-  }
-
-  $hue += $hue_increment;
-
-}
-
-#use Data::Dumper;
-#warn Dumper(\@items);
-
-%><%= include('elements/monthly.html',
+%
+%
+%
+%#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.' ' : '';
+%
+%#false lazinessish w/search/cust_pkg.cgi
+%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)';
+%  }
+%}
+%#eslaf
+%
+%my $hue = 0;
+%#my $hue_increment = 170;
+%#my $hue_increment = 145;
+%my $hue_increment = 125;
+%
+%my @items  = ();
+%my @params = ();
+%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
+%                     ->from_hue($hue) #->from_hex($agent->color)
+%                     ->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 ) 
+%          : ''
+%      );
+%
+%    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;
+%
+%  }
+%
+%  $hue += $hue_increment;
+%
+%}
+%
+%#use Data::Dumper;
+%#warn Dumper(\@items);
+%
+%
+<% include('elements/monthly.html',
                 'title'        => $title. 'Sales Report (Gross)',
                 'graph_type'   => 'Mountain',
                 'items'        => \@items,

Index: money_time.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/graph/money_time.cgi,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- money_time.cgi	7 May 2006 20:27:21 -0000	1.14
+++ money_time.cgi	23 Aug 2006 22:25:38 -0000	1.15
@@ -1,68 +1,69 @@
-<%
-
-#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',
+%
+%
+%#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,

Index: report_money_time.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/graph/report_money_time.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- report_money_time.html	7 May 2006 20:27:21 -0000	1.2
+++ report_money_time.html	23 Aug 2006 22:25:38 -0000	1.3
@@ -1,4 +1,4 @@
-<%= include('/elements/header.html', 'Sales, Credits and Receipts Summary' ) %>
+<% include('/elements/header.html', 'Sales, Credits and Receipts Summary' ) %>
 
 <FORM ACTION="money_time.cgi" METHOD="GET">
 
@@ -16,9 +16,9 @@
 
 <TABLE>
 
-<%= include('/elements/tr-select-from_to.html' ) %>
+<% include('/elements/tr-select-from_to.html' ) %>
 
-<%= include('/elements/tr-select-agent.html', '', 'label' => 'For agent: ' ) %>
+<% include('/elements/tr-select-agent.html', '', 'label' => 'For agent: ' ) %>
 
 <TR>
   <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="12mo" VALUE="1"></TD>
@@ -30,4 +30,4 @@
 <BR><INPUT TYPE="submit" VALUE="Display">
 </FORM>
 
-<%= include('/elements/footer.html') %>
+<% include('/elements/footer.html') %>