From 0f2d1070bc6f1521ab50dd07e475587f1117eec6 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Thu, 2 Aug 2012 15:54:31 -0700 Subject: [PATCH] sales by ad source report: filter by ad source, #17971 --- httemplate/elements/tr-select-part_referral.html | 8 +------- httemplate/search/cust_bill_pkg_referral.html | 10 ++++++++++ httemplate/search/report_cust_bill_pkg_referral.html | 5 +++++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/httemplate/elements/tr-select-part_referral.html b/httemplate/elements/tr-select-part_referral.html index 765aa8400..5041f7f73 100644 --- a/httemplate/elements/tr-select-part_referral.html +++ b/httemplate/elements/tr-select-part_referral.html @@ -14,13 +14,7 @@ % } else { - - -% if ( $opt{'label'} ) { - <% $opt{'label'} %> -% } else { - <%$r%><% mt('Advertising source') |h %> -% } + <& /elements/tr-td-label.html, label => 'Advertising source', %opt &> <& /elements/select-part_referral.html, 'curr_value' => $refnum, diff --git a/httemplate/search/cust_bill_pkg_referral.html b/httemplate/search/cust_bill_pkg_referral.html index 3cb434caa..77b486021 100644 --- a/httemplate/search/cust_bill_pkg_referral.html +++ b/httemplate/search/cust_bill_pkg_referral.html @@ -146,6 +146,16 @@ if ( @status_where ) { ') IN (' . join(',', @status_where) .')'; } +my @refnum; +foreach my $refnum ($cgi->param('refnum')) { + if ( $refnum =~ /^\d+$/ ) { + push @refnum, $refnum; + } +} +if ( @refnum ) { + push @where, 'cust_main.refnum IN ('.join(',', @refnum).')'; +} + if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { push @where, "cust_main.agentnum = $1"; } diff --git a/httemplate/search/report_cust_bill_pkg_referral.html b/httemplate/search/report_cust_bill_pkg_referral.html index ff2caa1fa..b4716d4fc 100644 --- a/httemplate/search/report_cust_bill_pkg_referral.html +++ b/httemplate/search/report_cust_bill_pkg_referral.html @@ -18,6 +18,11 @@ 'disable_empty' => 1, &> +<& /elements/tr-select-part_referral.html, + 'multiple' => 1, + 'disable_empty' => 1, +&> + <& /elements/tr-select-pkg_class.html, 'pre_options' => [ '' => 'all', '0' => '(empty class)' ], 'disable_empty' => 1, -- 2.11.0