[freeside-commits] branch master updated. cf4e690746ef76895e50d057b9e3f0e660f8e21e

Ivan ivan at 420.am
Sat Nov 2 13:58:13 PDT 2013


The branch, master has been updated
       via  cf4e690746ef76895e50d057b9e3f0e660f8e21e (commit)
      from  caad814a67620dad4aa97f0c5be8adb324956cc1 (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 cf4e690746ef76895e50d057b9e3f0e660f8e21e
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Nov 2 13:58:12 2013 -0700

    contact search, RT#25687 (also possibly #25583 and #22991)

diff --git a/FS/FS/cust_main/Search.pm b/FS/FS/cust_main/Search.pm
index 362a6aa..16db712 100644
--- a/FS/FS/cust_main/Search.pm
+++ b/FS/FS/cust_main/Search.pm
@@ -433,15 +433,30 @@ sub smart_search {
             'first'  => $first }, #
           %fuzopts
         );
-      }
+        push @cust_main, FS::cust_main::Search->fuzzy_search(
+          { 'contact.last'   => $last,    #fuzzy hashref
+            'contact.first'  => $first }, #
+          %fuzopts
+        );
+     }
       foreach my $field ( 'first', 'last', 'company' ) {
-        push @cust_main,
-          FS::cust_main::Search->fuzzy_search( { $field => $value }, %fuzopts );
+        push @cust_main, FS::cust_main::Search->fuzzy_search(
+          { $field => $value },
+          %fuzopts
+        );
+      }
+      foreach my $field ( 'first', 'last' ) {
+        push @cust_main, FS::cust_main::Search->fuzzy_search(
+          { "contact.$field" => $value },
+          %fuzopts
+        );
       }
       if ( $conf->exists('address1-search') ) {
         push @cust_main,
           FS::cust_main::Search->fuzzy_search(
-            { 'cust_location.address1' => $value }, %fuzopts );
+            { 'cust_location.address1' => $value },
+            %fuzopts
+        );
       }
 
     }

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

Summary of changes:
 FS/FS/cust_main/Search.pm |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)




More information about the freeside-commits mailing list