Skip to content

Fixes #729 Allow searching by phone number (of contact fields in general) #735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
djaiss merged 12 commits into from
Jan 2, 2018
Merged

Fixes #729 Allow searching by phone number (of contact fields in general) #735

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e7ed9a7
add DB_PREFIX
turtles2 Dec 26, 2017
30c44c5
Update database.php
turtles2 Dec 26, 2017
6f8aae1
Merge pull request #1 from monicahq/master
turtles2 Dec 27, 2017
19039e6
Clean Up Commit
turtles2 Dec 27, 2017
c780dd7
Merge pull request #2 from monicahq/master
turtles2 Dec 28, 2017
7081fbe
Fixes #350
turtles2 Dec 28, 2017
050eebd
Revert "Fixes #350"
turtles2 Jan 1, 2018
76d0a3b
Fixes #720 and adds test for fix
turtles2 Jan 1, 2018
678cb30
remove tests as method is not testable
turtles2 Jan 2, 2018
81fa1fe
Fix Style
turtles2 Jan 2, 2018
6f23632
Style Fix 2
turtles2 Jan 2, 2018
32d4873
Merge branch 'master' into 729
djaiss Jan 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion app/Http/Controllers/ContactsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use App\Tag;
use Validator;
use App\Contact;
use App\ContactFieldType;
use App\Jobs\ResizeAvatars;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
Expand Down Expand Up @@ -354,7 +355,24 @@ public function search(Request $request)
return;
}

$results = Contact::search($needle, $accountId);
if (preg_match('/(.{1,})[:](.{1,})/', $needle, $matches)) {
$search_field = $matches[1];
$search_term = $matches[2];

$field = ContactFieldType::where('name', 'LIKE', $search_field)->first();

$field_id = $field->id;

$results = Contact::whereHas('contactFields', function ($query) use ($field_id,$search_term) {
$query->where([
['data', 'like', "$search_term%"],
['contact_field_type_id', $field_id],
]);
})->get();
} else {
$results = Contact::search($needle, $accountId);
}

if (count($results) !== 0) {
return $results;
} else {
Expand Down