@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | $result = $query; |
36 | 36 | $keys = explode('.', $filters[0]['key']); |
37 | 37 | if (collect($keys)->count() == 2) { |
38 | - $result = $result->orWhereHas($keys[0], function ($query) use ($filters, $keys) { |
|
38 | + $result = $result->orWhereHas($keys[0], function($query) use ($filters, $keys) { |
|
39 | 39 | foreach ($filters as $filter) { |
40 | 40 | $keys = explode('.', $filter['key']); |
41 | 41 | $query->where($keys[1], $filter['operator'], $filter['value']); |
@@ -141,12 +141,12 @@ discard block |
||
141 | 141 | public function addCondition(Builder $model, array $filters): Builder |
142 | 142 | { |
143 | 143 | $firstFilter = $filters[0]; |
144 | - $modelQuery = $model->where(function ($query) use ($firstFilter) { |
|
144 | + $modelQuery = $model->where(function($query) use ($firstFilter) { |
|
145 | 145 | $this->addWhereCondition($query, $firstFilter); |
146 | 146 | }); |
147 | 147 | unset($filters[0]); |
148 | 148 | foreach ($filters as $filter) { |
149 | - $modelQuery = $modelQuery->orWhere(function ($query) use ($filter) { |
|
149 | + $modelQuery = $modelQuery->orWhere(function($query) use ($filter) { |
|
150 | 150 | $this->addWhereCondition($query, $filter); |
151 | 151 | }); |
152 | 152 | } |
@@ -164,8 +164,8 @@ discard block |
||
164 | 164 | if ($filterKey == $this->queryFilterTitle) { |
165 | 165 | $model = $model->where($filtersValues); |
166 | 166 | } else { |
167 | - $model = $model->whereHas($filterKey, function (Builder $query) use ($model, $filtersValues) { |
|
168 | - $query = $this->addWhereCondition($query,$filtersValues); |
|
167 | + $model = $model->whereHas($filterKey, function(Builder $query) use ($model, $filtersValues) { |
|
168 | + $query = $this->addWhereCondition($query, $filtersValues); |
|
169 | 169 | }); |
170 | 170 | } |
171 | 171 | } |