diff --git a/src/QueryBuilderParser/QueryBuilderParser.php b/src/QueryBuilderParser/QueryBuilderParser.php index f7e30de..4924e6b 100644 --- a/src/QueryBuilderParser/QueryBuilderParser.php +++ b/src/QueryBuilderParser/QueryBuilderParser.php @@ -79,11 +79,17 @@ protected function loopThroughRules(array $rules, EloquentBuilder|Builder $query /* * If makeQuery does not see the correct fields, it will return the QueryBuilder without modifications */ - $querybuilder = $this->makeQuery($querybuilder, $rule, $queryCondition); - - if ($this->isNested($rule)) { - $querybuilder = $this->createNestedQuery($querybuilder, $rule, $queryCondition); - } + // $querybuilder = $this->makeQuery($querybuilder, $rule, $queryCondition); + // + // if ($this->isNested($rule)) { + // $querybuilder = $this->createNestedQuery($querybuilder, $rule, $queryCondition); + // } + + if ($this->isNested($rule)) { + $querybuilder = $this->createNestedQuery($querybuilder, $rule, $queryCondition); + } else { + $querybuilder = $this->makeQuery($querybuilder, $rule, $queryCondition); + } } return $querybuilder;