From 51984ac3d3da3006809c6866fdecd4ad83610731 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 30 Jul 2001 07:36:04 +0000 Subject: templates!!! --- httemplate/browse/agent.cgi | 138 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100755 httemplate/browse/agent.cgi (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi new file mode 100755 index 000000000..209043744 --- /dev/null +++ b/httemplate/browse/agent.cgi @@ -0,0 +1,138 @@ +<% +# +# $Id: agent.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $ +# +# ivan@sisd.com 97-dec-12 +# +# changes to allow pages to load from a relative location in the web tree. +# bmccane@maxbaud.net 98-mar-25 +# +# changed 'type' to 'atype' because type is reserved word in Pg6.3 +# bmccane@maxbaud.net 98-apr-3 +# +# agent type was linking to wrong cgi ivan@sisd.com 98-jul-18 +# +# lose background, FS::CGI ivan@sisd.com 98-sep-2 +# +# $Log: agent.cgi,v $ +# Revision 1.1 2001-07-30 07:36:03 ivan +# templates!!! +# +# Revision 1.13 1999/04/09 04:22:34 ivan +# also table() +# +# Revision 1.12 1999/04/09 03:52:55 ivan +# explicit & for table/itable/ntable +# +# Revision 1.11 1999/01/20 09:43:16 ivan +# comment out future UI code (but look at it, it's neat!) +# +# Revision 1.10 1999/01/19 05:13:24 ivan +# for mod_perl: no more top-level my() variables; use vars instead +# also the last s/create/new/; +# +# Revision 1.9 1999/01/18 09:41:14 ivan +# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl +# (good idea anyway) +# +# Revision 1.8 1999/01/18 09:22:26 ivan +# changes to track email addresses for email invoicing +# +# Revision 1.7 1998/12/17 05:25:16 ivan +# fix visual and other bugs +# +# Revision 1.6 1998/11/23 05:29:46 ivan +# use CGI::Carp +# +# Revision 1.5 1998/11/23 05:27:31 ivan +# to eliminate warnings +# +# Revision 1.4 1998/11/20 08:50:36 ivan +# s/CGI::Base/CGI.pm, visual fixes +# +# Revision 1.3 1998/11/08 10:11:02 ivan +# CGI.pm +# +# Revision 1.2 1998/11/07 10:24:22 ivan +# don't use depriciated FS::Bill and FS::Invoice, other miscellania +# + +use strict; +use vars qw( $ui $cgi $p $agent ); +use CGI; +use CGI::Carp qw(fatalsToBrowser); +use FS::UID qw(cgisuidsetup swapuid); +use FS::Record qw(qsearch qsearchs); +use FS::CGI qw(header menubar table popurl); +use FS::agent; +use FS::agent_type; + +#Begin silliness +# +#use FS::UI::CGI; +#use FS::UI::agent; +# +#$ui = new FS::UI::agent; +#$ui->browse; +#exit; +#__END__ +#End silliness + +$cgi = new CGI; + +&cgisuidsetup($cgi); + +$p = popurl(2); + +print $cgi->header( '-expires' => 'now' ), header('Agent Listing', menubar( + 'Main Menu' => $p, + 'Agent Types' => $p. 'browse/agent_type.cgi', +# 'Add new agent' => '../edit/agent.cgi' +)), <
+END +print &table(), < + Agent + Type + Freq. (unimp.) + Prog. (unimp.) + +END +# Agent # +# Agent + +foreach $agent ( sort { + $a->getfield('agentnum') <=> $b->getfield('agentnum') +} qsearch('agent',{}) ) { + my($hashref)=$agent->hashref; + my($typenum)=$hashref->{typenum}; + my($agent_type)=qsearchs('agent_type',{'typenum'=>$typenum}); + my($atype)=$agent_type->getfield('atype'); + print < + + $hashref->{agentnum} + + $hashref->{agent} + $atype + $hashref->{freq} + $hashref->{prog} + +END + +} + +print < + Add new agent + Add new agent type + + + + + +END + +%> -- cgit v1.2.1 From 3d671921441ba8422650b54435a1959ad1d4c71d Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 21 Aug 2001 02:31:57 +0000 Subject: remove $Log$ messages. whew. --- httemplate/browse/agent.cgi | 58 +-------------------------------------------- 1 file changed, 1 insertion(+), 57 deletions(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 209043744..23c8f7c5b 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -1,61 +1,5 @@ <% -# -# $Id: agent.cgi,v 1.1 2001-07-30 07:36:03 ivan Exp $ -# -# ivan@sisd.com 97-dec-12 -# -# changes to allow pages to load from a relative location in the web tree. -# bmccane@maxbaud.net 98-mar-25 -# -# changed 'type' to 'atype' because type is reserved word in Pg6.3 -# bmccane@maxbaud.net 98-apr-3 -# -# agent type was linking to wrong cgi ivan@sisd.com 98-jul-18 -# -# lose background, FS::CGI ivan@sisd.com 98-sep-2 -# -# $Log: agent.cgi,v $ -# Revision 1.1 2001-07-30 07:36:03 ivan -# templates!!! -# -# Revision 1.13 1999/04/09 04:22:34 ivan -# also table() -# -# Revision 1.12 1999/04/09 03:52:55 ivan -# explicit & for table/itable/ntable -# -# Revision 1.11 1999/01/20 09:43:16 ivan -# comment out future UI code (but look at it, it's neat!) -# -# Revision 1.10 1999/01/19 05:13:24 ivan -# for mod_perl: no more top-level my() variables; use vars instead -# also the last s/create/new/; -# -# Revision 1.9 1999/01/18 09:41:14 ivan -# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl -# (good idea anyway) -# -# Revision 1.8 1999/01/18 09:22:26 ivan -# changes to track email addresses for email invoicing -# -# Revision 1.7 1998/12/17 05:25:16 ivan -# fix visual and other bugs -# -# Revision 1.6 1998/11/23 05:29:46 ivan -# use CGI::Carp -# -# Revision 1.5 1998/11/23 05:27:31 ivan -# to eliminate warnings -# -# Revision 1.4 1998/11/20 08:50:36 ivan -# s/CGI::Base/CGI.pm, visual fixes -# -# Revision 1.3 1998/11/08 10:11:02 ivan -# CGI.pm -# -# Revision 1.2 1998/11/07 10:24:22 ivan -# don't use depriciated FS::Bill and FS::Invoice, other miscellania -# +# use strict; use vars qw( $ui $cgi $p $agent ); -- cgit v1.2.1 From 6ef34dda51afba96d8dc6c4dd72427c3d4003945 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 21 Aug 2001 09:34:13 +0000 Subject: no more &swapuid --- httemplate/browse/agent.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 23c8f7c5b..138b61365 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -1,11 +1,11 @@ <% -# +# use strict; use vars qw( $ui $cgi $p $agent ); use CGI; use CGI::Carp qw(fatalsToBrowser); -use FS::UID qw(cgisuidsetup swapuid); +use FS::UID qw(cgisuidsetup); use FS::Record qw(qsearch qsearchs); use FS::CGI qw(header menubar table popurl); use FS::agent; -- cgit v1.2.1 From 1e4aa8069f25e1b4101da20bb9e0d3f60357ea52 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 4 Sep 2001 14:44:07 +0000 Subject: new admin documentation, quick one-pkg order --- httemplate/browse/agent.cgi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 138b61365..bb0ee2402 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -1,5 +1,5 @@ <% -# +# use strict; use vars qw( $ui $cgi $p $agent ); @@ -70,8 +70,8 @@ END print < - Add new agent - Add new agent type + Add a new agent + Add a new agent type -- cgit v1.2.1 From 91387f8f489e561deaf1de052d80ef800a4970a3 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 26 Oct 2001 10:24:56 +0000 Subject: cache foo *sigh* --- httemplate/browse/agent.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index bb0ee2402..0f51d00de 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -1,5 +1,5 @@ <% -# +# use strict; use vars qw( $ui $cgi $p $agent ); @@ -28,7 +28,7 @@ $cgi = new CGI; $p = popurl(2); -print $cgi->header( '-expires' => 'now' ), header('Agent Listing', menubar( +print $cgi->header( @FS::CGI::header ), header('Agent Listing', menubar( 'Main Menu' => $p, 'Agent Types' => $p. 'browse/agent_type.cgi', # 'Add new agent' => '../edit/agent.cgi' -- cgit v1.2.1 From c14a267229fc0d6f2d2afdebab3bd34d825df2ef Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 30 Oct 2001 14:54:07 +0000 Subject: get rid of header foo in individual templates --- httemplate/browse/agent.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 0f51d00de..62004490f 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -1,5 +1,5 @@ <% -# +# use strict; use vars qw( $ui $cgi $p $agent ); @@ -28,7 +28,7 @@ $cgi = new CGI; $p = popurl(2); -print $cgi->header( @FS::CGI::header ), header('Agent Listing', menubar( +print header('Agent Listing', menubar( 'Main Menu' => $p, 'Agent Types' => $p. 'browse/agent_type.cgi', # 'Add new agent' => '../edit/agent.cgi' -- cgit v1.2.1 From 1fd6d8cf5d7854860ef4fd10ed89828e0c04ec39 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 30 Jan 2002 14:18:09 +0000 Subject: remove use Module; and $cgi = new CGI; &cgisuidsetup(); from all templates. should work better under Mason. --- httemplate/browse/agent.cgi | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 62004490f..067a06b30 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -1,15 +1,5 @@ + <% -# - -use strict; -use vars qw( $ui $cgi $p $agent ); -use CGI; -use CGI::Carp qw(fatalsToBrowser); -use FS::UID qw(cgisuidsetup); -use FS::Record qw(qsearch qsearchs); -use FS::CGI qw(header menubar table popurl); -use FS::agent; -use FS::agent_type; #Begin silliness # @@ -22,12 +12,6 @@ use FS::agent_type; #__END__ #End silliness -$cgi = new CGI; - -&cgisuidsetup($cgi); - -$p = popurl(2); - print header('Agent Listing', menubar( 'Main Menu' => $p, 'Agent Types' => $p. 'browse/agent_type.cgi', @@ -47,7 +31,7 @@ END # Agent # # Agent -foreach $agent ( sort { +foreach my $agent ( sort { $a->getfield('agentnum') <=> $b->getfield('agentnum') } qsearch('agent',{}) ) { my($hashref)=$agent->hashref; -- cgit v1.2.1 From 22a35047ecdffff80110e06cc08fc84f9ddba9b0 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 10 Feb 2002 13:21:31 +0000 Subject: removed from all files to fix any redirects, whew Mason handler.pl overrides CGI::redirect fixed strict; problems in edit/part_pkg.cgi & edit/process/part_pkg.cgi --- httemplate/browse/agent.cgi | 1 - 1 file changed, 1 deletion(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 067a06b30..8079c722b 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -1,4 +1,3 @@ - <% #Begin silliness -- cgit v1.2.1 From a4c96748eb6eab29a70f3a944c6520283a635c78 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 10 Feb 2002 16:05:22 +0000 Subject: *finally* seems to be working under Mason. sheesh. *finally* seems to be working under Mason. sheesh. *finally* seems to be working under Mason. sheesh. *finally* seems to be working under Mason. sheesh. *finally* seems to be working under Mason. sheesh. *finally* seems to be working under Mason. sheesh. *finally* seems to be working under Mason. sheesh. *finally* seems to be working under Mason. sheesh. --- httemplate/browse/agent.cgi | 1 + 1 file changed, 1 insertion(+) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 8079c722b..ebec068fa 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -1,3 +1,4 @@ + <% #Begin silliness -- cgit v1.2.1 From f38abb144955686f880a528ed6fe4c9c5453517b Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 24 Mar 2002 20:01:31 +0000 Subject: UI improvements for agents --- httemplate/browse/agent.cgi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index ebec068fa..c74ef2b63 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -32,7 +32,8 @@ END # Agent foreach my $agent ( sort { - $a->getfield('agentnum') <=> $b->getfield('agentnum') + #$a->getfield('agentnum') <=> $b->getfield('agentnum') + $a->getfield('agent') cmp $b->getfield('agent') } qsearch('agent',{}) ) { my($hashref)=$agent->hashref; my($typenum)=$hashref->{typenum}; -- cgit v1.2.1 From a63b2729682586d8860290576e9307629424dbe0 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 9 May 2002 12:38:40 +0000 Subject: texas tax! --- httemplate/browse/agent.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index c74ef2b63..246500941 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -24,8 +24,8 @@ print &table(), < Agent Type - Freq. (unimp.) - Prog. (unimp.) + Freq. + Prog. END # Agent # -- cgit v1.2.1 From 6d02e527490b2f0cf080f7b519443caeecd76357 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 4 Jul 2002 10:35:43 +0000 Subject: move "add" links to the top --- httemplate/browse/agent.cgi | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 246500941..cff111ca4 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -1,6 +1,5 @@ <% - #Begin silliness # #use FS::UI::CGI; @@ -11,23 +10,25 @@ #exit; #__END__ #End silliness +%> -print header('Agent Listing', menubar( +<%= header('Agent Listing', menubar( 'Main Menu' => $p, 'Agent Types' => $p. 'browse/agent_type.cgi', # 'Add new agent' => '../edit/agent.cgi' -)), < Agents are resellers of your service. Agents may be limited to a subset of your full offerings (via their type).

-END -print &table(), < - Agent - Type - Freq. - Prog. - -END +Add a new agent

+ +<%= table() %> + + Agent + Type + Freq. + Prog. + +<% # Agent # # Agent @@ -54,12 +55,7 @@ END } print < - Add a new agent - Add a new agent type - - END -- cgit v1.2.1 From a68758a95e760e50ad99a2a2e0885d2aa9cf907a Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 18 Sep 2003 10:46:35 +0000 Subject: include info on number of active/cancelled customers in agent browse --- httemplate/browse/agent.cgi | 75 +++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 26 deletions(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index cff111ca4..adeb78dbd 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -1,15 +1,30 @@ + <% -#Begin silliness -# -#use FS::UI::CGI; -#use FS::UI::agent; -# -#$ui = new FS::UI::agent; -#$ui->browse; -#exit; -#__END__ -#End silliness + + #bad false laziness with search/cust_main.cgi (also needs fixing up for + #old mysql) + my $ncancelled = " + 0 < ( SELECT COUNT(*) FROM cust_pkg + WHERE cust_pkg.custnum = cust_main.custnum + AND ( cust_pkg.cancel IS NULL + OR cust_pkg.cancel = 0 + ) + ) + OR 0 = ( SELECT COUNT(*) FROM cust_pkg + WHERE cust_pkg.custnum = cust_main.custnum + ) + "; + + my $ncancelled_sth = dbh->prepare("SELECT COUNT(*) FROM cust_main + WHERE agentnum = ? + AND $ncancelled ") + or die dbh->errstr; + + my $total_sth = dbh->prepare("SELECT COUNT(*) FROM cust_main + WHERE agentnum = ? ") + or die dbh->errstr; + %> <%= header('Agent Listing', menubar( @@ -25,6 +40,7 @@ full offerings (via their type).

Agent Type + Customers Freq. Prog. @@ -36,28 +52,35 @@ foreach my $agent ( sort { #$a->getfield('agentnum') <=> $b->getfield('agentnum') $a->getfield('agent') cmp $b->getfield('agent') } qsearch('agent',{}) ) { - my($hashref)=$agent->hashref; - my($typenum)=$hashref->{typenum}; - my($agent_type)=qsearchs('agent_type',{'typenum'=>$typenum}); - my($atype)=$agent_type->getfield('atype'); - print <execute($agent->agentnum) or die $ncancelled_sth->errstr; + my $num_ncancelled = $ncancelled_sth->fetchrow_arrayref->[0]; + + $total_sth->execute($agent->agentnum) or die $total_sth->errstr; + my $num_total = $total_sth->fetchrow_arrayref->[0]; + + my $num_cancelled = $num_total - $num_ncancelled; + +%> + - - $hashref->{agentnum} - - $hashref->{agent} - $atype + + <%= $agent->agentnum %> + + <%= $agent->agent %> + <%= $agent->agent_type->atype %> + + <%= $num_ncancelled %> + active +
<%= $num_cancelled %> + cancelled + $hashref->{freq} $hashref->{prog} -END -} +<% } %> -print < -END - -%> -- cgit v1.2.1 From ea1e0de8c51ea562308c20416e1f3fcb719a8847 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 18 Sep 2003 10:52:28 +0000 Subject: oops --- httemplate/browse/agent.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index adeb78dbd..79f6c3dcf 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -75,8 +75,8 @@ foreach my $agent ( sort {
<%= $num_cancelled %> cancelled - $hashref->{freq} - $hashref->{prog} + <%= $agent->freq %> + <%= $agent->prog %> <% } %> -- cgit v1.2.1 From 50ae1571b51626d2dd1cb878b94dff6fec747408 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 24 Sep 2003 01:30:37 +0000 Subject: fix boolean precedence error leading to inaccurate results on the new customer status list --- httemplate/browse/agent.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 79f6c3dcf..0d808cd0d 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -18,7 +18,7 @@ my $ncancelled_sth = dbh->prepare("SELECT COUNT(*) FROM cust_main WHERE agentnum = ? - AND $ncancelled ") + AND ( $ncancelled ) ") or die dbh->errstr; my $total_sth = dbh->prepare("SELECT COUNT(*) FROM cust_main -- cgit v1.2.1 From b59a412755582d30b4f7be2147b6ad32037e6f59 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 29 Sep 2003 05:51:50 +0000 Subject: agents can be disabled (auto-sensing based on schema) --- httemplate/browse/agent.cgi | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 0d808cd0d..ece01724e 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -2,6 +2,14 @@ <% + my %search; + if ( $cgi->param('showdisabled') + || !dbdef->table('agent')->column('disabled') ) { + %search = (); + } else { + %search = ( 'disabled' => '' ); + } + #bad false laziness with search/cust_main.cgi (also needs fixing up for #old mysql) my $ncancelled = " @@ -36,9 +44,18 @@ Agents are resellers of your service. Agents may be limited to a subset of your full offerings (via their type).

Add a new agent

+<% if ( dbdef->table('agent')->column('disabled') ) { %> + <%= $cgi->param('showdisabled') + ? do { $cgi->param('showdisabled', 0); + '( hide disabled agents )'; } + : do { $cgi->param('showdisabled', 1); + '( show disabled agents )'; } + %> +<% } %> + <%= table() %> - Agent + param('showdisabled') ? 2 : 3 %>>Agent Type Customers Freq. @@ -51,7 +68,7 @@ full offerings (via their type).

foreach my $agent ( sort { #$a->getfield('agentnum') <=> $b->getfield('agentnum') $a->getfield('agent') cmp $b->getfield('agent') -} qsearch('agent',{}) ) { +} qsearch('agent', \%search ) ) { $ncancelled_sth->execute($agent->agentnum) or die $ncancelled_sth->errstr; my $num_ncancelled = $ncancelled_sth->fetchrow_arrayref->[0]; @@ -66,6 +83,11 @@ foreach my $agent ( sort { <%= $agent->agentnum %> +<% if ( dbdef->table('agent')->column('disabled') + && !$cgi->param('showdisabled') ) { %> + <%= $agent->disabled ? 'DISABLED' : '' %> +<% } %> + <%= $agent->agent %> <%= $agent->agent_type->atype %> -- cgit v1.2.1 From c3e5b694f98b424f9fe68b76450d1464ba7a0fec Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 29 Sep 2003 10:10:47 +0000 Subject: agent browse now links to active/cancelled customers --- httemplate/browse/agent.cgi | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index ece01724e..44343e15c 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -78,6 +78,9 @@ foreach my $agent ( sort { my $num_cancelled = $num_total - $num_ncancelled; + my $cust_main_link = $p. 'search/cust_main.cgi?agentnum_on=1&'. + 'agentnum='. $agent->agentnum; + %> @@ -93,9 +96,9 @@ foreach my $agent ( sort { <%= $agent->agent_type->atype %> <%= $num_ncancelled %> - active + active
<%= $num_cancelled %> - cancelled + cancelled <%= $agent->freq %> <%= $agent->prog %> -- cgit v1.2.1 From c58132f6a26349d09744ef2b3b235dfb7c3757f6 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 3 Jan 2004 08:42:10 +0000 Subject: fix heading colspan when there is no agent.disabled column --- httemplate/browse/agent.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 44343e15c..2eef5bb91 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -55,7 +55,7 @@ full offerings (via their type).

<%= table() %> - param('showdisabled') ? 2 : 3 %>>Agent + param('showdisabled') || !dbdef->table('agent')->column('disabled') ) ? 2 : 3 %>>Agent Type Customers Freq. -- cgit v1.2.1 From 3913f6d159b5b8110061690b7c97642c27abf7eb Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 10 Jun 2004 12:31:32 +0000 Subject: agent interface --- httemplate/browse/agent.cgi | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 2eef5bb91..af3288720 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -95,10 +95,30 @@ foreach my $agent ( sort { <%= $agent->agent %> <%= $agent->agent_type->atype %> - <%= $num_ncancelled %> - active -
<%= $num_cancelled %> - cancelled + + + <%= my $num_prospect = $agent->num_prospect_cust_main %> + + <% if ( $num_prospect ) { %> + <% } %>prospects<% if ($num_prospect ) { %><% } %> + +
+ <%= 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 ) { %><% } %> <%= $agent->freq %> <%= $agent->prog %> -- cgit v1.2.1 From 7209026857ada1ec716c728ae966f0fc986b180e Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 10 Jun 2004 12:58:40 +0000 Subject: now available as methods --- httemplate/browse/agent.cgi | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'httemplate/browse/agent.cgi') diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index af3288720..f38934297 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -10,29 +10,6 @@ %search = ( 'disabled' => '' ); } - #bad false laziness with search/cust_main.cgi (also needs fixing up for - #old mysql) - my $ncancelled = " - 0 < ( SELECT COUNT(*) FROM cust_pkg - WHERE cust_pkg.custnum = cust_main.custnum - AND ( cust_pkg.cancel IS NULL - OR cust_pkg.cancel = 0 - ) - ) - OR 0 = ( SELECT COUNT(*) FROM cust_pkg - WHERE cust_pkg.custnum = cust_main.custnum - ) - "; - - my $ncancelled_sth = dbh->prepare("SELECT COUNT(*) FROM cust_main - WHERE agentnum = ? - AND ( $ncancelled ) ") - or die dbh->errstr; - - my $total_sth = dbh->prepare("SELECT COUNT(*) FROM cust_main - WHERE agentnum = ? ") - or die dbh->errstr; - %> <%= header('Agent Listing', menubar( @@ -70,14 +47,6 @@ foreach my $agent ( sort { $a->getfield('agent') cmp $b->getfield('agent') } qsearch('agent', \%search ) ) { - $ncancelled_sth->execute($agent->agentnum) or die $ncancelled_sth->errstr; - my $num_ncancelled = $ncancelled_sth->fetchrow_arrayref->[0]; - - $total_sth->execute($agent->agentnum) or die $total_sth->errstr; - my $num_total = $total_sth->fetchrow_arrayref->[0]; - - my $num_cancelled = $num_total - $num_ncancelled; - my $cust_main_link = $p. 'search/cust_main.cgi?agentnum_on=1&'. 'agentnum='. $agent->agentnum; -- cgit v1.2.1