diff options
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/cust_pkg.pm | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index e0a2eeb44..4a66ddcc6 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -3012,25 +3012,29 @@ sub search { } @report_option; } - my @report_option_any = (); - if ( exists($params->{'report_option_any'}) ) { - if ( ref($params->{'report_option_any'}) eq 'ARRAY' ) { - @report_option_any = @{ $params->{'report_option_any'} }; - } elsif ( $params->{'report_option_any'} =~ /^([,\d]*)$/ ) { - @report_option_any = split(',', $1); + foreach my $any ( grep /^report_option_any/ keys %$params ) { + + my @report_option_any = (); + if ( exists($params->{$any}) ) { + if ( ref($params->{$any}) eq 'ARRAY' ) { + @report_option_any = @{ $params->{$any} }; + } elsif ( $params->{$any} =~ /^([,\d]*)$/ ) { + @report_option_any = split(',', $1); + } + } - } + if (@report_option_any) { + # this will result in the empty set for the dangling comma case as it should + push @where, ' ( '. join(' OR ', + map{ "0 < ( SELECT count(*) FROM part_pkg_option + WHERE part_pkg_option.pkgpart = part_pkg.pkgpart + AND optionname = 'report_option_$_' + AND optionvalue = '1' )" + } @report_option_any + ). ' ) '; + } - if (@report_option_any) { - # this will result in the empty set for the dangling comma case as it should - push @where, ' ( '. join(' OR ', - map{ "0 < ( SELECT count(*) FROM part_pkg_option - WHERE part_pkg_option.pkgpart = part_pkg.pkgpart - AND optionname = 'report_option_$_' - AND optionvalue = '1' )" - } @report_option_any - ). ' ) '; } ### |