X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=f6a3620d32b9f8acec092dca04fdac0faec52c45;hb=f3717767d19f9da888e190f87a04dfa245d658b4;hp=2a702801cca988b4e0ab260c5c31f5c3a1fd17b5;hpb=3a02c437eadd9a39f7e56056ca987a4846650209;p=freeside.git diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi index 2a702801c..f6a3620d3 100755 --- a/httemplate/search/cust_pkg.cgi +++ b/httemplate/search/cust_pkg.cgi @@ -39,8 +39,9 @@ shift->part_pkg->option('setup_fee'), ); }, - sub { sprintf( $money_char.'%.2f', - shift->part_pkg->base_recur + sub { my $c = shift; + sprintf( $money_char.'%.2f', + $c->part_pkg->base_recur($c) ); }, sub { #shift->part_pkg->freq_pretty; @@ -161,11 +162,19 @@ my $money_char = $conf->config('money_char') || '$'; $search_hash{'query'} = $cgi->keywords; - for my $param (qw(agentnum magic status classnum pkgpart)) { - $search_hash{$param} = $cgi->param($param) - if $cgi->param($param); + for ( qw(agentnum magic status classnum pkgpart custom ) ) { + $search_hash{$_} = $cgi->param($_) if $cgi->param($_); + } + + for my $param ( qw(censustract) ) { + $search_hash{$param} = $cgi->param($param) || '' + if ( grep { /$param/ } $cgi->param ); } +my @report_option = $cgi->param('report_option') + if $cgi->param('report_option'); +$search_hash{report_option} = join(',', @report_option) if @report_option; + ### # parse dates ###