[freeside-commits] branch master updated. 6a38629bcb54a2ad9b8a5de6cac9f478bc4a7e66

[Ivan]

The branch, master has been updated
       via  6a38629bcb54a2ad9b8a5de6cac9f478bc4a7e66 (commit)
      from  9b3e40ffd129991d4567a3439eb2060c64cfa885 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6a38629bcb54a2ad9b8a5de6cac9f478bc4a7e66
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Feb 6 00:05:07 2014 -0800

    add "Ordered" status to customer number/link on agent browse, RT#27442

diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index b476847..0fdc5f5 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -419,6 +419,28 @@ sub cust_main_sql {
   );
 }
 
+=item num_ordered_cust_main
+
+Returns the number of ordered customers for this agent (customers with packages
+ordered, but not yet billed).
+
+=cut
+
+sub num_ordered_cust_main {
+  shift->num_sql(FS::cust_main->ordered_sql);
+}
+
+=item active_cust_main
+
+Returns the active customers for this agent, as cust_main objects.
+
+=cut
+
+sub active_cust_main {
+  shift->cust_main_sql(FS::cust_main->active_sql);
+}
+
+
 =item num_active_cust_main
 
 Returns the number of active customers for this agent (customers with active
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 6f28641..2552432 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -182,6 +182,26 @@ inactive
 
             <TR>
               <TH ALIGN="right" WIDTH="40%">
+                <FONT COLOR="#009999">
+                  <% my $num_ordered = $agent->num_ordered_cust_main %> 
+                </FONT>
+              </TH>
+
+              <TD>
+% if ( $num_ordered ) { 
+
+                  <A HREF="<% $cust_main_link %>&ordered=1">
+% } 
+ordered
+% if ($num_ordered ) { 
+</A>
+% } 
+
+              <TD>
+            </TR>
+
+            <TR>
+              <TH ALIGN="right" WIDTH="40%">
                 <FONT COLOR="#00CC00">
                   <% my $num_active = $agent->num_active_cust_main %> 
                 </FONT>
@@ -266,6 +286,11 @@ inactive
               </TD>
             </TR>
 
+            <!--ordered-->
+            <TR>
+              <TD> </TD>
+            </TR>
+
             <TR>
               <TH ALIGN="right" WIDTH="40%">
                 <FONT COLOR="#00CC00">
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index ee1dd85..0b0dd4f 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -393,6 +393,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->ordered_sql  if $cgi->param('ordered');
   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');

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/agent.pm                  |   22 ++++++++++++++++++++++
 httemplate/browse/agent.cgi     |   25 +++++++++++++++++++++++++
 httemplate/search/cust_main.cgi |    1 +
 3 files changed, 48 insertions(+), 0 deletions(-)