X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fpart_pkg.html;h=57da9d45923dc19609efdb4a6a7bdf98fb644812;hb=64948ee373a03fa156ebc89cb39adfa6d4d2c3d5;hp=2c9bdee1c9457ffcc170eed13498337dceb6974c;hpb=f8e71b44a39cf7b4d8185c57a46045636e7cc2a4;p=freeside.git diff --git a/httemplate/search/part_pkg.html b/httemplate/search/part_pkg.html index 2c9bdee1c..57da9d459 100644 --- a/httemplate/search/part_pkg.html +++ b/httemplate/search/part_pkg.html @@ -34,6 +34,7 @@ my $name = 'package definition'; my $select = ''; my $addl_from = ''; my @where = (); +my @top_where = (); my @order_by = (); my @header = (); my @fields = (); @@ -65,7 +66,7 @@ if (1) { #commission reports $title = $access_user->name; - $match = 'cust_pkg.usernum = '. $access_user->usernum; + push @top_where, 'access_user.usernum = '. $access_user->usernum; } else { @@ -196,6 +197,8 @@ if (1) { #commission reports } elsif (0) { #agent commission reports push @arg, 'XXXagent_custnum'; #$agent->agent_custnum } + #warn $sql; + #warn join(',', @arg); my $sth = dbh->prepare($sql) or die dbh->errstr; $sth->execute(@arg) or die $sth->errstr; $money_char. sprintf('%.2f', $sth->fetchrow_arrayref->[0] ); @@ -207,7 +210,8 @@ if (1) { #commission reports push @order_by, 'pkgpart'; #pkg? $select ||= 'part_pkg.*'; -my $extra_sql = scalar(@where) ? 'WHERE ' . join(' AND ', @where) : ''; +push @top_where, @where; +my $extra_sql = scalar(@top_where) ? 'WHERE ' . join(' AND ', @top_where) : ''; $extra_sql .= "GROUP BY $group_by" if $group_by; my $order_by = join(', ', @order_by);