X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Fcust_pay_or_refund.html;h=81a012e018bf87cbcd3e87aa920daf8588d78ea0;hb=a9f4e76c1d2392514c4172dd869fd101e3a9c6ec;hp=4212daa2301250fa5ba0364f2e5b8c36ac8d8ce1;hpb=b4c6c58d3f10be9fcd18a449afd3c0d77fb67137;p=freeside.git

diff --git a/httemplate/search/elements/cust_pay_or_refund.html b/httemplate/search/elements/cust_pay_or_refund.html
index 4212daa23..81a012e01 100755
--- a/httemplate/search/elements/cust_pay_or_refund.html
+++ b/httemplate/search/elements/cust_pay_or_refund.html
@@ -252,9 +252,12 @@ if ( $cgi->param('magic') ) {
       $title = $part_referral->referral. " $title";
     }
 
-    if ( $cgi->param('cust_classnum') ) {
-      my @classnums = grep /^\d+$/, $cgi->param('cust_classnum');
-      push @search, 'cust_main.classnum IN('.join(',',@classnums).')'
+    # cust_classnum (false laziness w/ elements/cust_main_dayranges.html, prepaid_income.html, cust_bill_pay.html, cust_bill_pkg.html cust_bill_pkg_referral.html, unearned_detail.html, cust_credit.html, cust_credit_refund.html, cust_main::Search::search_sql)
+    if ( grep { $_ eq 'cust_classnum' } $cgi->param ) {
+      my @classnums = grep /^\d*$/, $cgi->param('cust_classnum');
+      push @where, 'COALESCE( cust_main.classnum, 0) IN ( '.
+                       join(',', map { $_ || '0' } @classnums ).
+                   ' )'
         if @classnums;
     }
 
@@ -376,7 +379,7 @@ if ( $cgi->param('magic') ) {
 
       }
 
-      push @search, join(' OR ', @all_payby_search) if @all_payby_search;
+      push @search, ' ( '. join(' OR ', @all_payby_search). ' ) ' if @all_payby_search;
 
     }
 
@@ -406,6 +409,7 @@ if ( $cgi->param('magic') ) {
     }
 
     my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+
     push @search, "_date >= $beginning ",
                   "_date <= $ending";
 
@@ -467,7 +471,7 @@ if ( $cgi->param('magic') ) {
   #here is the agent virtualization
   push @search, $curuser->agentnums_sql;
 
-  my $addl_from = FS::UI::Web::join_cust_main('cust_pay');
+  my $addl_from = FS::UI::Web::join_cust_main($table);
   my $group_by = '';
 
   if ( $cgi->param('tax_names') ) {