From: Ivan Kohler Date: Tue, 8 Nov 2016 01:33:47 +0000 (-0800) Subject: add advertising source selection and display to prospect report X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=b4b4fac1ad93e05d3e2b6723f0ad011b38e06cbe add advertising source selection and display to prospect report --- diff --git a/FS/FS/prospect_main.pm b/FS/FS/prospect_main.pm index 1c47a80c2..a6b593d56 100644 --- a/FS/FS/prospect_main.pm +++ b/FS/FS/prospect_main.pm @@ -11,6 +11,7 @@ use FS::cust_location; use FS::cust_main; use FS::contact; use FS::qual; +use FS::part_referral; $DEBUG = 0; @@ -323,6 +324,17 @@ sub agent { qsearchs( 'agent', { 'agentnum' => $self->agentnum } ); } +=item part_referral + +Returns the advertising source (see L) for this customer. + +=cut + +sub part_referral { + my $self = shift; + qsearchs( 'part_referral', { 'refnum' => $self->refnum } ); +} + =item convert_cust_main Converts this prospect to a customer. @@ -394,15 +406,18 @@ sub search { my @where = (); my $orderby; - ## - # parse agent - ## - + #agent if ( $params->{'agentnum'} =~ /^(\d+)$/ and $1 ) { push @where, "prospect_main.agentnum = $1"; } + #refnum + if ( $params->{'refnum'} =~ /^(\d+)$/ and $1 ) { + push @where, + "prospect_main.refnum = $1"; + } + ## # setup queries, subs, etc. for the search ## diff --git a/httemplate/search/prospect_main.html b/httemplate/search/prospect_main.html index 4798f58f2..feb1e11fd 100644 --- a/httemplate/search/prospect_main.html +++ b/httemplate/search/prospect_main.html @@ -6,6 +6,7 @@ 'header' => [ '#', 'Prospect', 'Contact(s)', + 'Advertising source', ], 'fields' => [ 'prospectnum', 'name', @@ -16,11 +17,17 @@ } $pm->contact ]; + '' + }, + sub { + my $pr = shift->part_referral; + $pr ? $pr->referral : ''; }, ], 'links' => [ '', $link, '', #link to contact edit??? + '', ], 'agent_virt' => 1, 'disableable' => 1, @@ -37,7 +44,7 @@ my %search_hash = (); #scalars my @scalars = qw ( - agentnum + agentnum refnum ); for my $param ( @scalars ) { diff --git a/httemplate/search/report_prospect_main.html b/httemplate/search/report_prospect_main.html index 4834c2047..f2e617f88 100644 --- a/httemplate/search/report_prospect_main.html +++ b/httemplate/search/report_prospect_main.html @@ -1,4 +1,4 @@ -<% include('/elements/header.html', 'Prospect Report' ) %> +<& /elements/header.html, 'Prospect Report' &>
@@ -8,11 +8,16 @@ Search options - <% include( '/elements/tr-select-agent.html', - 'curr_value' => scalar($cgi->param('agentnum')), - 'disable_empty' => 0, - ) - %> + <& /elements/tr-select-agent.html, + 'curr_value' => scalar($cgi->param('agentnum')), + 'disable_empty' => 0, + &> + + <& /elements/tr-select-part_referral.html, + 'curr_value' => scalar($cgi->param('refnum')), + 'empty_label' => 'all', + 'disable_empty' => 0, + &> @@ -21,7 +26,7 @@
-<% include('/elements/footer.html') %> +<& /elements/footer.html &> <%init> die "access denied"