X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2F477partIIB.html;h=ce1ac03f040d9594b3f3c5e7c8e0d0eedc1bcdfb;hp=5b9b3076984be5ccae0b9f1eff6417ddba7032d9;hb=e9e0cf0989259b94d9758eceff448666a2e5a5cc;hpb=f3e0ac2b009c4edd5692cb587ff709dac2223ebe diff --git a/httemplate/search/477partIIB.html b/httemplate/search/477partIIB.html index 5b9b30769..ce1ac03f0 100755 --- a/httemplate/search/477partIIB.html +++ b/httemplate/search/477partIIB.html @@ -46,28 +46,29 @@ my $curuser = $FS::CurrentUser::CurrentUser; die "access denied" unless $curuser->access_right('List packages'); +my %opt = @_; my %search_hash = (); $search_hash{'agentnum'} = $cgi->param('agentnum'); $search_hash{'state'} = $cgi->param('state'); $search_hash{'classnum'} = [ $cgi->param('classnum') ]; -$search_hash{'status'} = 'active'; +$search_hash{'active'} = [ $opt{date}, $opt{date} ]; my @row_option; foreach ($cgi->param('part2b_row_option')) { push @row_option, (/^\d+$/ ? $_ : undef); } -my $is_residential = "AND COALESCE(cust_main.company, '') = ''"; +my $is_residential = " AND COALESCE(cust_main.company, '') = ''"; my $has_report_option = sub { map { defined($row_option[$_]) ? - "AND EXISTS( + " AND EXISTS( SELECT 1 FROM part_pkg_option WHERE part_pkg_option.pkgpart = part_pkg.pkgpart AND optionname = 'report_option_" . $row_option[$_]."' AND optionvalue = '1' - )" : 'AND FALSE' + )" : ' AND FALSE' } @_ }; @@ -120,7 +121,7 @@ foreach (@col_conds) { if ( $col_data[0] == 0 ) { $col_data[$row] = ''; # show nothing in this row, then } else { - $col_data[$row] = sprintf('%.2f', 100 * $count / $col_data[0]) . '%'; + $col_data[$row] = sprintf('%.3f', 100 * $count / $col_data[0]) . '%'; } } #if $row == 0 $row++;