From a0732f52fdcc2bca7c399d1249ccceb191de51cd Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 25 Jul 2006 08:33:46 +0000 Subject: [PATCH] this should finish adding the "inactive" status, i think? --- FS/FS/agent.pm | 11 ++++ httemplate/browse/agent.cgi | 114 +++++++++++++++++++++++++++--------- httemplate/elements/table-grid.html | 6 ++ httemplate/search/cust_main.cgi | 111 ++++++++++++++++++++++------------- httemplate/search/cust_pkg.cgi | 13 +++- 5 files changed, 185 insertions(+), 70 deletions(-) diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm index 4158341e4..e40ef09db 100644 --- a/FS/FS/agent.pm +++ b/FS/FS/agent.pm @@ -322,6 +322,17 @@ sub num_pkg_sql { $sth->fetchrow_arrayref->[0]; } +=item num_inactive_cust_pkg + +Returns the number of inactive customer packages (one-time packages otherwise +unsuspended/uncancelled) for this agent. + +=cut + +sub num_inactive_cust_pkg { + shift->num_pkg_sql(FS::cust_pkg->inactive_sql); +} + =item num_susp_cust_pkg Returns the number of suspended customer packages for this agent. diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 17cc8bd40..f5157d9b7 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -29,21 +29,27 @@ full offerings (via their type).

%> <% } %> -<%= table() %> +<%= include('/elements/table-grid.html') %> + +<% my $bgcolor1 = '#eeeeee'; + my $bgcolor2 = '#ffffff'; + my $bgcolor = ''; +%> + - param('showdisabled') || !dbdef->table('agent')->column('disabled') ) ? 2 : 3 %>>Agent - Type - Customers - Customer
packages - Reports - Registration codes - Prepaid cards + param('showdisabled') || !dbdef->table('agent')->column('disabled') ) ? 2 : 3 %>>Agent + Type + Customers + Customer
packages + Reports + Registration codes + Prepaid cards <% if ( $conf->config('ticket_system') ) { %> - Ticketing + Ticketing <% } %> - Payment Gateway Overrides - Freq. - Prog. + Payment Gateway Overrides + Freq. + Prog. <% # Agent # @@ -58,107 +64,157 @@ foreach my $agent ( sort { 'agentnum='. $agent->agentnum; my $cust_pkg_link = $p. 'search/cust_pkg.cgi?agentnum='. $agent->agentnum; + + if ( $bgcolor eq $bgcolor1 ) { + $bgcolor = $bgcolor2; + } else { + $bgcolor = $bgcolor1; + } %> - + <%= $agent->agentnum %> <% if ( dbdef->table('agent')->column('disabled') && !$cgi->param('showdisabled') ) { %> - <%= $agent->disabled ? 'DISABLED' : '' %> + <%= $agent->disabled ? 'DISABLED' : '' %> <% } %> - + <%= $agent->agent %> - <%= $agent->agent_type->atype %> + <%= $agent->agent_type->atype %> + + + - - + + } else { %> + + + +<% } - print ""; } my($n1)=''; diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi index e8b3f490d..614e9b509 100755 --- a/httemplate/search/cust_pkg.cgi +++ b/httemplate/search/cust_pkg.cgi @@ -24,6 +24,12 @@ if ( $cgi->param('magic') eq 'active' push @where, FS::cust_pkg->active_sql(); +} elsif ( $cgi->param('magic') eq 'inactive' + || $cgi->param('status') eq 'inactive' ) { + + push @where, FS::cust_pkg->inactive_sql(); + + } elsif ( $cgi->param('magic') eq 'suspended' || $cgi->param('status') eq 'suspended' ) { @@ -47,7 +53,10 @@ if ( $cgi->param('magic') eq 'active' #false lazinessish w/graph/cust_bill_pkg.cgi my $classnum = 0; my @pkg_class = (); -if ( $cgi->param('classnum') =~ /^(\d*)$/ ) { +if ( exists($cgi->Vars->{'classnum'}) + && $cgi->param('classnum') =~ /^(\d*)$/ + ) +{ $classnum = $1; if ( $classnum ) { #a specific class push @where, "classnum = $classnum"; @@ -90,7 +99,7 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) { } else { if ( $cgi->param('magic') && - $cgi->param('magic') =~ /^(active|suspended|cancell?ed)$/ + $cgi->param('magic') =~ /^(active|inactive|suspended|cancell?ed)$/ ) { $orderby = 'ORDER BY pkgnum'; -- 2.11.0
- + + + + + + + + + + + + + +
- <%= my $num_prospect = $agent->num_prospect_cust_main %>  + + <%= my $num_prospect = $agent->num_prospect_cust_main %>  + <% if ( $num_prospect ) { %> <% } %>prospects<% if ($num_prospect ) { %><% } %>
+ + <%= my $num_inactive = $agent->num_inactive_cust_main %>  + + + <% if ( $num_inactive ) { %> + <% } %>inactive<% if ( $num_inactive ) { %><% } %> +
<%= my $num_active = $agent->num_active_cust_main %>  <% if ( $num_active ) { %> <% } %>active<% if ( $num_active ) { %><% } %>
<%= my $num_susp = $agent->num_susp_cust_main %>  <% if ( $num_susp ) { %> <% } %>suspended<% if ( $num_susp ) { %><% } %>
<%= my $num_cancel = $agent->num_cancel_cust_main %>  <% if ( $num_cancel ) { %> <% } %>cancelled<% if ( $num_cancel ) { %><% } %>
- + - - - - - + diff --git a/httemplate/elements/table-grid.html b/httemplate/elements/table-grid.html index 17eafdf1a..fd1cb9113 100644 --- a/httemplate/elements/table-grid.html +++ b/httemplate/elements/table-grid.html @@ -5,9 +5,15 @@ %>
+ + + + + + + + + + + + +
+ + <%= my $num_inactive_pkg = $agent->num_inactive_cust_pkg %>  + + + <% if ( $num_inactive_pkg ) { %> + <% } %>inactive<% if ( $num_inactive_pkg ) { %><% } %> +
<%= my $num_active_pkg = $agent->num_active_cust_pkg %>  <% if ( $num_active_pkg ) { %> <% } %>active<% if ( $num_active_pkg ) { %><% } %>
<%= my $num_susp_pkg = $agent->num_susp_cust_pkg %>  + <% if ( $num_susp_pkg ) { %> <% } %>suspended<% if ( $num_susp_pkg ) { %><% } %>
<%= my $num_cancel_pkg = $agent->num_cancel_cust_pkg %>  <% if ( $num_cancel_pkg ) { %> <% } %>cancelled<% if ( $num_cancel_pkg ) { %><% } %>
+ Payments
Credits
A/R Aging @@ -166,14 +222,14 @@ foreach my $agent ( sort { 		+ <%= my $num_reg_code = $agent->num_reg_code %> <% if ( $num_reg_code ) { %> <% } %>Unused<% if ( $num_reg_code ) { %><% } %>
Generate codes 		+ <%= my $num_prepay_credit = $agent->num_prepay_credit %> <% if ( $num_prepay_credit ) { %> <% } %>Unused<% if ( $num_prepay_credit ) { %><% } %> @@ -182,7 +238,7 @@ foreach my $agent ( sort { <% if ( $conf->config('ticket_system') ) { %> - + <% if ( $agent->ticketing_queueid ) { %> Queue: <%= $agent->ticketing_queueid %>: <%= $agent->ticketing_queue %>
<% } %> @@ -190,7 +246,7 @@ foreach my $agent ( sort { <% } %> - 		+ <% foreach my $override ( # sort { } want taxclass-full stuff first? and default cards (empty cardtype) @@ -214,8 +270,10 @@ foreach my $agent ( sort {
<%= $agent->freq %><%= $agent->prog %>
CELLPADDING=<%= $opt{cellpadding} %> BORDER=1 BORDERCOLOR="#000000" STYLE="border: solid 1px black; empty-cells: show"> diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi index 7d5941a16..c72ab44df 100755 --- a/httemplate/search/cust_main.cgi +++ b/httemplate/search/cust_main.cgi @@ -109,6 +109,7 @@ if ( $cgi->param('browse') push @qual, FS::cust_main->cancel_sql if $cgi->param('cancelled'); push @qual, FS::cust_main->prospect_sql if $cgi->param('prospect'); push @qual, FS::cust_main->active_sql if $cgi->param('active'); + push @qual, FS::cust_main->inactive_sql if $cgi->param('inactive'); push @qual, FS::cust_main->susp_sql if $cgi->param('suspended'); #EWWWWWW @@ -415,48 +416,78 @@ END foreach my $addl_col ( @addl_cols ) { %> - '. - " ". - ""; - - } - print ''. - '
ALIGN=right> - - <% if ( $addl_col eq 'tickets' ) { - if ( @custom_priorities ) { - print &itable('', 0); - foreach my $priority ( @custom_priorities, '' ) { - - my $num = - FS::TicketSystem->num_customer_tickets($custnum,$priority); - my $ahref = ''; - $ahref= '' - if $num; - - print '
$ahref$num$ahref". - ( $priority || '(none)' ). - "
'; - } - - my $ahref = ''; - $ahref = '' - if $cust_main->get($addl_col); - - print $ahref. $cust_main->get($addl_col). ''; - print "". - "${ahref}Total". - "
" - if @custom_priorities; + <% if ( $addl_col eq 'tickets' ) { %> - } else { - print $cust_main->get($addl_col); + <% if ( @custom_priorities ) { %> + + 		ALIGN=right> + + + + <% foreach my $priority ( @custom_priorities, '' ) { %> + + <% + my $num = + FS::TicketSystem->num_customer_tickets($custnum,$priority); + my $ahref = ''; + $ahref= '' + if $num; + %> + + + + + + + <% } %> + + + + +
+ <%= $ahref.$num %> + + <%= $ahref %><%= $priority || '(none)' %> +
+ + + <% } else { %> + + ALIGN=right> + + <% } %> + + <% + my $ahref = ''; + $ahref = '' + if $cust_main->get($addl_col); + %> + + <%= $ahref %><%= $cust_main->get($addl_col) %> + + <% if ( @custom_priorities ) { %> + + + + <%= ${ahref} %>Total +
+ + <% } %> + + 		ALIGN=right> + <%= $cust_main->get($addl_col) %> +