[freeside-commits] branch master updated. 70a5e47201ffd625d0b146af9ce407d285619690

[Christopher Burger]

The branch, master has been updated
       via  70a5e47201ffd625d0b146af9ce407d285619690 (commit)
      from  1ac968c34d6656307d23080a2b55de1a8caa6bf4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 70a5e47201ffd625d0b146af9ce407d285619690
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Fri Feb 15 09:22:47 2019 -0500

    RT# 82854 - fixed pagination error

diff --git a/FS/FS/cust_main/Search.pm b/FS/FS/cust_main/Search.pm
index 26f6f0394..9cd870b96 100644
--- a/FS/FS/cust_main/Search.pm
+++ b/FS/FS/cust_main/Search.pm
@@ -1063,6 +1063,55 @@ sub search {
   }
 
   ##
+  # contacts
+  ##
+  if (keys %{ $params->{'contacts'} }) {
+    my $contact_params = $params->{'contacts'};
+
+    if ($contact_params->{'contacts_firstname'} || $contact_params->{'contacts_lastname'}) {
+      my $first_query = " AND contact.first = '" . $contact_params->{'contacts_firstname'} . "'"
+        unless !$contact_params->{'contacts_firstname'};
+      my $last_query = " AND contact.last = '" . $contact_params->{'contacts_lastname'} . "'"
+        unless !$contact_params->{'contacts_lastname'};
+      push @where,
+      "EXISTS ( SELECT 1 FROM contact
+                JOIN cust_contact USING (contactnum)
+                WHERE cust_contact.custnum = cust_main.custnum
+                $first_query $last_query
+              ) ";
+    }
+
+    if ($contact_params->{'contacts_email'}) {
+      push @where,
+      "EXISTS ( SELECT 1 FROM contact_email
+                JOIN cust_contact USING (contactnum)
+                WHERE cust_contact.custnum = cust_main.custnum
+                AND contact_email.emailaddress = '" . $contact_params->{'contacts_email'} . "'
+              ) ";
+    }
+
+    if ($contact_params->{'contacts_homephone'} || $contact_params->{'contacts_workphone'} || $contact_params->{'contacts_mobilephone'}) {
+      foreach my $phone (qw( contacts_homephone contacts_workphone contacts_mobilephone )) {
+        (my $num = $contact_params->{$phone}) =~ s/\W//g;
+        if ( $num =~ /^1?(\d{3})(\d{3})(\d{4})(\d*)$/ ) { $contact_params->{$phone} = "$1$2$3"; }
+      }
+      my $home_query = " AND ( contact_phone.phonetypenum = '2' AND contact_phone.phonenum = '" . $contact_params->{'contacts_homephone'} . "' )"
+        unless !$contact_params->{'contacts_homephone'};
+      my $work_query = " AND ( contact_phone.phonetypenum = '1' AND contact_phone.phonenum = '" . $contact_params->{'contacts_workphone'} . "' )"
+        unless !$contact_params->{'contacts_workphone'};
+      my $mobile_query = " AND ( contact_phone.phonetypenum = '3' AND contact_phone.phonenum = '" . $contact_params->{'contacts_mobilephone'} . "' )"
+        unless !$contact_params->{'contacts_mobilephone'};
+      push @where,
+      "EXISTS ( SELECT 1 FROM contact_phone
+                JOIN cust_contact USING (contactnum)
+                WHERE cust_contact.custnum = cust_main.custnum
+                $home_query $work_query $mobile_query
+              ) ";
+    }
+}
+
+
+  ##
   # setup queries, subs, etc. for the search
   ##
 
@@ -1099,45 +1148,6 @@ sub search {
   my @extra_fields      = ();
   my @extra_sort_fields = ();
 
-  ## search contacts
-  if ($params->{'contacts'}) {
-    my $contact_params = $params->{'contacts'};
-
-    $addl_from .=
-      ' LEFT JOIN cust_contact ON ( cust_main.custnum = cust_contact.custnum ) ';
-
-    if ($contact_params->{'contacts_firstname'} || $contact_params->{'contacts_lastname'}) {
-      $addl_from .= ' LEFT JOIN contact ON ( cust_contact.contactnum = contact.contactnum ) ';
-      my $first_query = " AND contact.first = '" . $contact_params->{'contacts_firstname'} . "'"
-        unless !$contact_params->{'contacts_firstname'};
-      my $last_query = " AND contact.last = '" . $contact_params->{'contacts_lastname'} . "'"
-        unless !$contact_params->{'contacts_lastname'};
-      $extra_sql .= " AND ( '1' $first_query $last_query )";
-    }
-
-    if ($contact_params->{'contacts_email'}) {
-      $addl_from .= ' LEFT JOIN contact_email ON ( cust_contact.contactnum = contact_email.contactnum ) ';
-      $extra_sql .= " AND ( contact_email.emailaddress = '" . $contact_params->{'contacts_email'} . "' )";
-    }
-
-    if ($contact_params->{'contacts_homephone'} || $contact_params->{'contacts_workphone'} || $contact_params->{'contacts_mobilephone'}) {
-      $addl_from .= ' LEFT JOIN contact_phone ON ( cust_contact.contactnum = contact_phone.contactnum ) ';
-      my $contacts_mobilephone;
-      foreach my $phone (qw( contacts_homephone contacts_workphone contacts_mobilephone )) {
-        (my $num = $contact_params->{$phone}) =~ s/\W//g;
-        if ( $num =~ /^1?(\d{3})(\d{3})(\d{4})(\d*)$/ ) { $contact_params->{$phone} = "$1$2$3"; }
-      }
-      my $home_query = " AND ( contact_phone.phonetypenum = '2' AND contact_phone.phonenum = '" . $contact_params->{'contacts_homephone'} . "' )"
-        unless !$contact_params->{'contacts_homephone'};
-      my $work_query = " AND ( contact_phone.phonetypenum = '1' AND contact_phone.phonenum = '" . $contact_params->{'contacts_workphone'} . "' )"
-        unless !$contact_params->{'contacts_workphone'};
-      my $mobile_query = " AND ( contact_phone.phonetypenum = '3' AND contact_phone.phonenum = '" . $contact_params->{'contacts_mobilephone'} . "' )"
-        unless !$contact_params->{'contacts_mobilephone'};
-      $extra_sql .= " AND ( '1' $home_query $work_query $mobile_query )";
-    }
-
-  }
-
   my $count_query = "SELECT COUNT(DISTINCT cust_main.custnum) FROM cust_main $addl_from $extra_sql";
 
   if ($params->{'flattened_pkgs'}) {
@@ -1203,7 +1213,8 @@ sub search {
 
   }
 
-  my $select = join(', ', @select);
+  # set select a customer only once. some joins create multiple customer records.
+  my $select = 'DISTINCT ON (cust_main.custnum) ' . join(', ', @select);
 
   my $sql_query = {
     'table'             => 'cust_main',

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main/Search.pm | 91 ++++++++++++++++++++++++++---------------------
 1 file changed, 51 insertions(+), 40 deletions(-)