fix: fix search when prefix table is used (#3107)

CHANGELOG.md

@@ -11,6 +11,7 @@
 
 ### Fixes:
 
+* Fix search when prefix table is used
 * Fix storage page not being displayed if a contact does not exist anymore
 
 

app/Http/Controllers/ContactsController.php

@@ -511,7 +511,7 @@ public function search(Request $request)
             return;
         }
 
-        $results = SearchHelper::searchContacts($needle, 20, '`contacts`.`created_at`');
+        $results = SearchHelper::searchContacts($needle, 20, '`'.DB::connection()->getTablePrefix().'contacts`.`created_at`');
 
         if (count($results) !== 0) {
             return ContactResource::collection($results);

app/Traits/Searchable.php

@@ -35,11 +35,13 @@ public function scopeSearch(Builder $builder, $needle, $accountId, $limitPerPage
 
         $builder->whereRaw("`$tablePrefix{$this->getTable()}`.`account_id` = $accountId AND ($queryString) $whereCondition");
         $builder->orderByRaw($orderBy);
+
         if ($sortOrder) {
             $builder->sortedBy($sortOrder);
         }
-        $builder->select(array_map(function ($column) use ($tablePrefix) {
-            return "$tablePrefix{$this->getTable()}.$column";
+
+        $builder->select(array_map(function ($column) {
+            return "{$this->getTable()}.$column";
         }, $this->return_from_search));
 
         return $builder->paginate($limitPerPage);