combine ticket notification scrips, #15353

[freeside.git] / httemplate / search / cust_pkg.cgi

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index d48ba19..297edee 100755 (executable)
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -150,18 +150,23 @@ for (qw( agentnum custnum magic status custom cust_fields pkgbatch )) {
 }
 
 #arrays
-for (qw( pkgpart classnum )) {
-  $search_hash{$_} = [ $cgi->param($_) ];
+for my $param (qw( pkgpart classnum )) {
+  $search_hash{$param} = [ $cgi->param($param) ]
+    if grep { $_ eq $param } $cgi->param;
 }
 
-for my $param ( qw(censustract) ) {
+#scalars that need to be passed if empty
+for my $param (qw( censustract censustract2 )) {
   $search_hash{$param} = $cgi->param($param) || ''
-    if ( grep { /$param/ } $cgi->param );
+    if grep { $_ eq $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;
+my $report_option = $cgi->param('report_option');
+$search_hash{report_option} = $report_option if $report_option;
+
+for my $param (grep /^report_option_any/, $cgi->param) {
+  $search_hash{$param} = $cgi->param($param);
+}
 
 ###
 # parse dates
@@ -247,7 +252,7 @@ my $html_init = sub {
     $text .= include( '/elements/email-link.html',
                 'search_hash' => \%search_hash,
                 'table'       => 'cust_pkg',
-                );
+                ). '<BR><BR>';
   }
   return $text;
 };