RT#71995: Cancel Packages [turned off debug in email_search]

[freeside.git] / FS / FS / cust_main / Search.pm

diff --git a/FS/FS/cust_main/Search.pm b/FS/FS/cust_main/Search.pm
index cc23f50..e021140 100644 (file)
--- a/FS/FS/cust_main/Search.pm
+++ b/FS/FS/cust_main/Search.pm
@@ -514,11 +514,9 @@ none or one).
 sub email_search {
   my %options = @_;
 
-  local($DEBUG) = 1;
-
   my $email = delete $options{'email'};
 
-  #we're only being used by RT at the moment... no agent virtualization yet
+  #no agent virtualization yet
   #my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql;
 
   my @cust_main = ();
@@ -620,10 +618,6 @@ listref (list returned by FS::UI::Web::parse_lt_gt($cgi, 'current_balance'))
 
 bool
 
-=item select_referral
-
-bool, join to part_referral and select part_referral.referral
-
 =back
 
 =cut
@@ -1017,6 +1011,10 @@ sub search {
       'ON (cust_main.'.$pre.'locationnum = '.$pre.'location.locationnum) ';
   }
 
+  # always make referral available in results
+  #   (maybe we should be using FS::UI::Web::join_cust_main instead?)
+  $addl_from .= ' LEFT JOIN (select refnum, referral from part_referral) AS part_referral_x ON (cust_main.refnum = part_referral_x.refnum) ';
+
   my $count_query = "SELECT COUNT(*) FROM cust_main $addl_from $extra_sql";
 
   my @select = (
@@ -1031,13 +1029,6 @@ sub search {
   my(@extra_headers) = ();
   my(@extra_fields)  = ();
 
-  if ($params->{'select_referral'}) {
-    $addl_from .= ' LEFT JOIN part_referral ON ( cust_main.refnum = part_referral.refnum ) ';
-    push @select, 'part_referral.referral';
-    push @extra_headers, 'Advertising Source';
-    push @extra_fields, 'referral';
-  }
-    
   if ($params->{'flattened_pkgs'}) {
 
     #my $pkg_join = '';