pass $search to scope and don't search like when the scope is specificed

vuthaihoc · Apr 28, 2023 · bc63d2f · bc63d2f
1 parent 2009e63
commit bc63d2f
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/Http/Controllers/AdvancedRelationController.php b/src/Http/Controllers/AdvancedRelationController.php
@@ -76,6 +76,7 @@ private function buildersItems(
     )
     {
         if ($scope !== null) {
+            $scope['parameters'][] = $search;
             /** @var Collection|array $model */
             $model = $model->{$scope['name']}(...$scope['parameters']);
         }
@@ -88,14 +89,16 @@ private function buildersItems(
             return $model->take($chunk)->pluck($append ?? $name, $key);
         }
 
-        $model = $model->where(function ($query) use ($name, $search, $searchColumns) {
-            $query->where($name, 'like', '%' . $search . '%');
-            if ($searchColumns !== null) {
-                foreach ($searchColumns as $column) {
-                    $query->orWhere($column, 'like', '%' . $search . '%');
+        if($scope == null){
+            $model = $model->where(function ($query) use ($name, $search, $searchColumns) {
+                $query->where($name, 'like', '%' . $search . '%');
+                if ($searchColumns !== null) {
+                    foreach ($searchColumns as $column) {
+                        $query->orWhere($column, 'like', '%' . $search . '%');
+                    }
                 }
-            }
-        });
+            });
+        }
 
         return $model
             ->limit($chunk)