[freeside-commits] branch FREESIDE_3_BRANCH updated. 5a8eba4ab837f9f548f616d49dd4483a4a633ede

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


The branch, FREESIDE_3_BRANCH has been updated
       via  5a8eba4ab837f9f548f616d49dd4483a4a633ede (commit)
      from  b26d3c015c78d826fcd4ae9e7de8e761b379bcf4 (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 5a8eba4ab837f9f548f616d49dd4483a4a633ede
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Nov 2 13:58:13 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