[freeside-commits] freeside/httemplate/graph cust_bill_pkg_detail.cgi, NONE, 1.1 report_cust_bill_pkg_detail.html, NONE, 1.1 cust_bill_pkg.cgi, 1.9, 1.10 report_cust_bill_pkg.html, 1.8, 1.9
Jeff Finucane,420,,
jeff at wavetail.420.am
Sun Aug 23 22:09:27 PDT 2009
Update of /home/cvs/cvsroot/freeside/httemplate/graph
In directory wavetail.420.am:/tmp/cvs-serv32112/httemplate/graph
Modified Files:
cust_bill_pkg.cgi report_cust_bill_pkg.html
Added Files:
cust_bill_pkg_detail.cgi report_cust_bill_pkg_detail.html
Log Message:
add rated call sales report and option to sales report to count usage separately from recurring #5588
Index: report_cust_bill_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/graph/report_cust_bill_pkg.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- report_cust_bill_pkg.html 19 Aug 2009 06:15:14 -0000 1.8
+++ report_cust_bill_pkg.html 24 Aug 2009 05:09:25 -0000 1.9
@@ -30,6 +30,12 @@
<TD>Separate sub-packages from parents</TD>
</TR>
+<TR>
+ <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="use_usage" VALUE="1"></TD>
+ <TD>Separate rated usage from recurring fees</TD>
+</TR>
+
+
</TABLE>
<BR><INPUT TYPE="submit" VALUE="Display">
Index: cust_bill_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/graph/cust_bill_pkg.cgi,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cust_bill_pkg.cgi 19 Aug 2009 06:15:14 -0000 1.9
+++ cust_bill_pkg.cgi 24 Aug 2009 05:09:25 -0000 1.10
@@ -71,6 +71,9 @@
my $use_override = 0;
$use_override = 1 if ( $cgi->param('use_override') );
+my $use_usage = 0;
+$use_usage = 1 if ( $cgi->param('use_usage') );
+
my $hue = 0;
#my $hue_increment = 170;
#my $hue_increment = 145;
@@ -92,35 +95,40 @@
my @onetime_colors = ();
### fixup the color handling for package classes...
+ ### and usage
my $n = 0;
foreach my $pkg_class ( @pkg_class ) {
+ foreach my $component ( $use_usage ? ('recurring', 'usage') : ('') ) {
- push @items, 'cust_bill_pkg';
+ push @items, 'cust_bill_pkg';
- push @labels,
- ( $sel_agent ? '' : $agent->agent.' ' ).
- ( $classnum eq '0'
- ? ( ref($pkg_class) ? $pkg_class->classname : $pkg_class )
- : ''
- );
+ push @labels,
+ ( $sel_agent ? '' : $agent->agent.' ' ).
+ ( $classnum eq '0'
+ ? ( ref($pkg_class) ? $pkg_class->classname : $pkg_class )
+ : ''
+ ).
+ " $component";
- my $row_classnum = ref($pkg_class) ? $pkg_class->classnum : 0;
- my $row_agentnum = $agent->agentnum;
- push @params, [ 'classnum' => $row_classnum,
- 'agentnum' => $row_agentnum,
- 'use_override' => $use_override,
- ];
+ my $row_classnum = ref($pkg_class) ? $pkg_class->classnum : 0;
+ my $row_agentnum = $agent->agentnum;
+ push @params, [ 'classnum' => $row_classnum,
+ 'agentnum' => $row_agentnum,
+ 'use_override' => $use_override,
+ 'use_usage' => $component,
+ ];
- push @links, "$link;agentnum=$row_agentnum;classnum=$row_classnum;".
- "use_override=$use_override;";
+ push @links, "$link;agentnum=$row_agentnum;classnum=$row_classnum;".
+ "use_override=$use_override;use_usage=$component;";
- @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;
+ @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;
--- NEW FILE: report_cust_bill_pkg_detail.html ---
<% include('/elements/header.html', 'Usage Sales Report' ) %>
<FORM ACTION="cust_bill_pkg_detail.cgi" METHOD="GET">
<TABLE>
<% include('/elements/tr-select-from_to.html' ) %>
<% include('/elements/tr-select-agent.html',
'label' => 'For agent: ',
'disable_empty' => 0,
)
%>
<% include('/elements/tr-select-pkg_class.html',
'pre_options' => [ '0' => 'all' ],
'empty_label' => '(empty class)',
)
%>
<TR>
<TD ALIGN="right"><INPUT TYPE="checkbox" NAME="use_override" VALUE="1"></TD>
<TD>Separate sub-packages from parents</TD>
</TR>
<% include('/elements/tr-select-table.html',
'label' => 'Usage class: ',
'element_name' => 'usageclass',
'table' => 'usage_class',
'name_col' => 'classname',
'hashref' => { 'disabled' => '' },
'pre_options' => [ '0' => 'all' ],
'empty_label' => '(empty class)',
)
%>
</TABLE>
<BR><INPUT TYPE="submit" VALUE="Display">
</FORM>
<% include('/elements/footer.html') %>
<%init>
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
</%init>
--- NEW FILE: cust_bill_pkg_detail.cgi ---
<% include('elements/monthly.html',
'title' => $title. 'Rated Call Sales Report (Gross)',
'graph_type' => 'Mountain',
'items' => \@items,
'params' => \@params,
'labels' => \@labels,
'graph_labels' => \@labels,
'colors' => \@colors,
'remove_empty' => 1,
'bottom_total' => 1,
'agentnum' => $agentnum,
)
%>
<%init>
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
#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/FS::cust_pkg::search_sql (previously search/cust_pkg.cgi)
my $classnum = '';
if ( $cgi->param('classnum') =~ /^(\d*)$/ ) {
$classnum = $1;
if ( $classnum ) { #a specific class
my $pkg_class = ( qsearchs('pkg_class', { 'classnum' => $classnum } ) );
die "classnum $classnum not found!" unless $pkg_class;
$title .= $pkg_class->classname.' ';
} elsif ( $classnum eq '' ) { #the empty class
$title .= 'Empty class ';
# FS::Report::Table::Monthly.pm has the converse view
$classnum = 0;
} elsif ( $classnum eq '0' ) { #all classes
# FS::Report::Table::Monthly.pm has the converse view
$classnum = '';
}
}
#eslaf
my $use_override = 0;
$use_override = 1 if ( $cgi->param('use_override') );
my $usageclass = 0;
my @usage_class = ();
if ( $cgi->param('usageclass') =~ /^(\d*)$/ ) {
$usageclass = $1;
if ( $usageclass ) { #a specific class
@usage_class = ( qsearchs('usage_class', { 'classnum' => $usageclass } ) );
die "usage class $usageclass not found!" unless $usage_class[0];
$title .= $usage_class[0]->classname.' ';
} elsif ( $usageclass eq '' ) { #the empty class -- legacy
$title .= 'Empty usage class ';
@usage_class = ( '(empty usage class)' );
} elsif ( $usageclass eq '0' ) { #all classes
@usage_class = qsearch('usage_class', {} ); # { 'disabled' => '' } );
push @usage_class, '(empty usage 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 = ();
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 usage classes...
my $n = 0;
foreach my $usage_class ( @usage_class ) {
push @items, 'cust_bill_pkg_detail';
push @labels,
( $sel_agent ? '' : $agent->agent.' ' ).
( $usageclass eq '0'
? ( ref($usage_class) ? $usage_class->classname : $usage_class )
: ''
);
my $row_classnum = ref($usage_class) ? $usage_class->classnum : 0;
my $row_agentnum = $agent->agentnum;
push @params, [ 'usageclass' => $row_classnum,
'agentnum' => $row_agentnum,
'use_override' => $use_override,
'classnum' => $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);
</%init>
More information about the freeside-commits
mailing list