[freeside-commits] branch master updated. fa70a92d28794ffd206394c8f3a4eff669369c6d

[Ivan]

The branch, master has been updated
       via  fa70a92d28794ffd206394c8f3a4eff669369c6d (commit)
      from  96696ba55a8527765575756b78990acb92e55f16 (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 fa70a92d28794ffd206394c8f3a4eff669369c6d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Nov 7 17:20:06 2016 -0800

    show prospects on advertising source page, like customers and packages

diff --git a/httemplate/browse/part_referral.html b/httemplate/browse/part_referral.html
index c737467..27eb545 100755
--- a/httemplate/browse/part_referral.html
+++ b/httemplate/browse/part_referral.html
@@ -1,4 +1,4 @@
-<% include("/elements/header.html","Advertising source Listing" ) %>
+<& /elements/header.html, "Advertising source Listing" &>
 
 Where a customer heard about your service. Tracked for informational purposes.
 <BR><BR>
@@ -13,7 +13,11 @@ Where a customer heard about your service. Tracked for informational purposes.
            '( <a href="'. $cgi->self_url. '">show disabled advertising sources</a> )'; }
 %>
 
-<% include('/elements/table-grid.html') %>
+% ###
+% # Header
+% ###
+
+<& /elements/table-grid.html &>
 % my $bgcolor1 = '#eeeeee';
 %   my $bgcolor2 = '#ffffff';
 %   my $bgcolor = '';
@@ -29,7 +33,7 @@ Where a customer heard about your service. Tracked for informational purposes.
     <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2>Agent</TH>
 % } 
 
-  <TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=<% scalar(keys %after) %>>Customers and Packages</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=<% scalar(keys %after) %>>Prospects, Customers and Packages</TH>
 </TR>
 % for my $period ( keys %after ) { 
 
@@ -38,6 +42,10 @@ Where a customer heard about your service. Tracked for informational purposes.
 
 </TR>
 
+% ###
+% # Rows
+% ###
+
 %foreach my $part_referral ( FS::part_referral->all_part_referral(1,!scalar($cgi->param('showdisabled'))) ) {
 %
 %  if ( $bgcolor eq $bgcolor1 ) {
@@ -85,6 +93,8 @@ Where a customer heard about your service. Tracked for informational purposes.
 %                        $today-$after{$period},
 %                        $today+$before{$period},
 %                      );
+%          $prospect_sth->execute(@param) or die $prospect_sth->errstr;
+%          my $num_prospect = $prospect_sth->fetchrow_arrayref->[0];
 %          $cust_sth->execute(@param) or die $cust_sth->errstr;
 %          my $num_cust = $cust_sth->fetchrow_arrayref->[0];
 %          $pkg_sth->execute(@param) or die $pkg_sth->errstr;
@@ -93,6 +103,10 @@ Where a customer heard about your service. Tracked for informational purposes.
           <TD CLASS="inv" BGCOLOR="<% $bgcolor %>" ALIGN="right">
             <TABLE CLASS="inv" CELLSPACING=0 CELLPADDING=0>
               <TR>
+                <TD ALIGN="right"><B><% $num_prospect %></B></TD>
+                <TD ALIGN="left"> prospects </TD>
+              </TR>
+              <TR>
                 <TD ALIGN="right"><B><% $num_cust %></B></TD>
                 <TD ALIGN="left"> customers </TD>
               </TR>
@@ -106,10 +120,20 @@ Where a customer heard about your service. Tracked for informational purposes.
 
       </TR>
 % } 
+
+
+% ###
+% # Bottom Totals
+% ###
+
+%  $prospect_statement =~ s/AND refnum = \?//;
+%  $prospect_sth = dbh->prepare($prospect_statement)
+%    or die dbh->errstr;
 %
 %  $cust_statement =~ s/AND refnum = \?//;
 %  $cust_sth = dbh->prepare($cust_statement)
 %    or die dbh->errstr;
+%
 %  $pkg_statement =~ s/AND h_pkg_referral\.refnum = \?//;
 %  $pkg_sth = dbh->prepare($pkg_statement)
 %    or die dbh->errstr;
@@ -120,6 +144,8 @@ Where a customer heard about your service. Tracked for informational purposes.
 %          my @param = ( $today-$after{$period},
 %                        $today+$before{$period},
 %                      );
+%          $prospect_sth->execute(@param) or die $prospect_sth->errstr;
+%          my $num_prospect = $prospect_sth->fetchrow_arrayref->[0];
 %          $cust_sth->execute( @param ) or die $cust_sth->errstr;
 %          my $num_cust = $cust_sth->fetchrow_arrayref->[0];
 %          $pkg_sth->execute(@param) or die $pkg_sth->errstr;
@@ -128,6 +154,10 @@ Where a customer heard about your service. Tracked for informational purposes.
           <TD CLASS="inv" BGCOLOR="#dddddd" ALIGN="right">
             <TABLE CLASS="inv" CELLSPACING=0 CELLPADDING=0>
               <TR>
+                <TD ALIGN="right"><B><% $num_prospect %></B></TD>
+                <TD ALIGN="left"> prospects </TD>
+              </TR>
+              <TR>
                 <TD ALIGN="right"><B><% $num_cust %></B></TD>
                 <TD ALIGN="left"> customers </TD>
               </TR>
@@ -142,8 +172,8 @@ Where a customer heard about your service. Tracked for informational purposes.
 
       </TR>
     </TABLE>
-  </BODY>
-</HTML>
+
+<& /elements/footer.html &>
 <%init>
 
 die "access denied"
@@ -179,6 +209,15 @@ my $curuser = $FS::CurrentUser::CurrentUser;
 
 my $show_agentnums = ( scalar($curuser->agentnums) > 1 );
 
+my $prospect_statement = "SELECT COUNT(*) FROM h_prospect_main
+                           WHERE history_action = 'insert'
+                             AND refnum = ?
+                             AND history_date >= ?
+                             AND history_date < ?
+                             AND ". $curuser->agentnums_sql;
+my $prospect_sth = dbh->prepare($prospect_statement)
+  or die dbh->errstr;
+
 my $cust_statement = "SELECT COUNT(*) FROM h_cust_main
                        WHERE history_action = 'insert'
                          AND refnum = ?

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

Summary of changes:
 httemplate/browse/part_referral.html |   49 ++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 5 deletions(-)