fix one-time card charging not pulling in exp date?

[freeside.git] / httemplate / browse / agent.cgi

diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 44343e1..f389342 100755 (executable)
--- 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(
@@ -55,7 +32,7 @@ full offerings (via their type).<BR><BR>
 
 <%= table() %>
 <TR>
-  <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Agent</TH>
+  <TH COLSPAN=<%= ( $cgi->param('showdisabled') || !dbdef->table('agent')->column('disabled') ) ? 2 : 3 %>>Agent</TH>
   <TH>Type</TH>
   <TH>Customers</TH>
   <TH><FONT SIZE=-1>Freq.</FONT></TH>
@@ -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;
 
@@ -95,10 +64,30 @@ foreach my $agent ( sort {
           <%= $agent->agent %></A></TD>
         <TD><A HREF="<%=$p%>edit/agent_type.cgi?<%= $agent->typenum %>"><%= $agent->agent_type->atype %></A></TD>
         <TD>
-          <FONT COLOR="#00CC00"><B><%= $num_ncancelled %></B></FONT>
-            <A HREF="<%= $cust_main_link %>&showcancelledcustomers=0">active</A>
-          <BR><FONT COLOR="#FF0000"><B><%= $num_cancelled %></B></FONT>
-            <A HREF="<%= $cust_main_link %>&showcancelledcustomers=1&cancelled=1">cancelled</A>
+
+          <B>
+            <%= my $num_prospect = $agent->num_prospect_cust_main %>
+          </B>
+          <% if ( $num_prospect ) { %>
+            <A HREF="<%= $cust_main_link %>&prospect=1"><% } %>prospects<% if ($num_prospect ) { %></A><% } %>
+
+          <BR><FONT COLOR="#00CC00"><B>
+            <%= my $num_active = $agent->num_active_cust_main %>
+          </B></FONT>
+          <% if ( $num_active ) { %>
+            <A HREF="<%= $cust_main_link %>&active=1"><% } %>active<% if ( $num_active ) { %></A><% } %>
+
+          <BR><FONT COLOR="#FF9900"><B>
+            <%= my $num_susp = $agent->num_susp_cust_main %>
+          </B></FONT>
+          <% if ( $num_susp ) { %>
+            <A HREF="<%= $cust_main_link %>&suspended=1"><% } %>suspended<% if ( $num_susp ) { %></A><% } %>
+
+          <BR><FONT COLOR="#FF0000"><B>
+            <%= my $num_cancel = $agent->num_cancel_cust_main %>
+          </B></FONT>
+          <% if ( $num_cancel ) { %>
+            <A HREF="<%= $cust_main_link %>&showcancelledcustomers=1&cancelled=1"><% } %>cancelled<% if ( $num_cancel ) { %></A><% } %>
         </TD>
         <TD><%= $agent->freq %></TD>
         <TD><%= $agent->prog %></TD>