agent browse shows # of active accounts & links to appropriate account search

2 files changed, 44 insertions, 21 deletions

diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index 8d35cb56a..80168728c 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -1,4 +1,9 @@
 <!-- mason kludge -->
+<%
+  my $accounts_sth = dbh->prepare("SELECT COUNT(*) FROM svc_acct
+                                     WHERE popnum = ?           ")
+    or die dbh->errstr;
+%>
 <%= header('Access Number Listing', menubar( 'Main Menu' => $p )) %>
 Points of Presence<BR><BR>
 <A HREF="<%= $p %>edit/svc_acct_pop.cgi"><I>Add new Access Number</I></A><BR><BR>
@@ -10,6 +15,7 @@ Points of Presence<BR><BR>
         <TH>Area code</TH>
         <TH>Exchange</TH>
         <TH>Local</TH>
+        <TH>Accounts</TH>
       </TR>
 
 <%
@@ -18,32 +24,38 @@ foreach my $svc_acct_pop ( sort {
   $a->state cmp $b->state || $a->city cmp $b->city
     || $a->ac <=> $b->ac || $a->exch <=> $b->exch || $a->loc <=> $b->loc
 } qsearch('svc_acct_pop',{}) ) {
-  my($hashref)=$svc_acct_pop->hashref;
-  print <<END;
+
+  my $svc_acct_pop_link = $p . 'edit/svc_acct_pop.cgi?'. $svc_acct_pop->popnum;
+
+  $accounts_sth->execute($svc_acct_pop->popnum) or die $accounts_sth->errstr;
+  my $num_accounts = $accounts_sth->fetchrow_arrayref->[0];
+
+  my $svc_acct_link = $p. 'search/svc_acct.cgi?popnum='. $svc_acct_pop->popnum;
+
+%>
       <TR>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{popnum}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{city}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{state}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{ac}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{exch}</A></TD>
-        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
-          $hashref->{loc}</A></TD>
+        <TD><A HREF="<%= $svc_acct_pop_link %>">
+          <%= $svc_acct_pop->popnum %></A></TD>
+        <TD><A HREF="<%= $svc_acct_pop_link %>">
+          <%= $svc_acct_pop->city %></A></TD>
+        <TD><A HREF="<%= $svc_acct_pop_link %>">
+          <%= $svc_acct_pop->state %></A></TD>
+        <TD><A HREF="<%= $svc_acct_pop_link %>">
+          <%= $svc_acct_pop->ac %></A></TD>
+        <TD><A HREF="<%= $svc_acct_pop_link %>">
+          <%= $svc_acct_pop->exch %></A></TD>
+        <TD><A HREF="<%= $svc_acct_pop_link %>">
+          <%= $svc_acct_pop->loc %></A></TD>
+        <TD>
+          <FONT COLOR="#00CC00"><B><%= $num_accounts %></B></FONT>
+            <A HREF="<%= $svc_acct_link %>&showcancelledcustomers=0">active</A>
+        </TD>
       </TR>
-END
+<% } %>
 
-}
-
-print <<END;
       <TR>
       </TR>
     </TABLE>
   </BODY>
 </HTML>
-END
 
-%>
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index e43f4f79b..0954bf652 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -48,12 +48,23 @@ if ( $query eq 'svcnum' ) {
   $sortby=\*uid_sort;
   $orderby = ( $unlinked ? 'AND' : 'WHERE' ).
              " ${tblname}uid IS NOT NULL ORDER BY ${tblname}uid";
+} elsif ( $query =~ /popnum=(\d+)/ ) {
+  my $popnum = $1;
+  $unlinked .= ( $unlinked ? 'AND' : 'WHERE' ).
+               " popnum = $popnum";
+  $sortby=\*username_sort;
+  $orderby = "ORDER BY ${tblname}username";
 } else {
   $sortby=\*uid_sort;
   @svc_acct = @{&usernamesearch};
 }
 
-if ( $query eq 'svcnum' || $query eq 'username' || $query eq 'uid' ) {
+
+if (    $query eq 'svcnum'
+     || $query eq 'username'
+     || $query eq 'uid'
+     || $query eq 'popnum'
+   ) {
 
   my $statement = "SELECT COUNT(*) FROM svc_acct $unlinked";
   my $sth = dbh->prepare($statement)