@@ -29,17 +29,17 @@ |
||
| 29 | 29 | $query->where(function (Builder $query) use ($field, $value) { |
| 30 | 30 | $query->where(function (Builder $query) use ($field, $value) { |
| 31 | 31 | $query->where("{$field}_min", '<=', $value[0]) |
| 32 | - ->where("{$field}_max", '>=', $value[1]); |
|
| 32 | + ->where("{$field}_max", '>=', $value[1]); |
|
| 33 | 33 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 34 | 34 | $query->where("{$field}_min", '<=', $value[0]) |
| 35 | - ->where("{$field}_max", '>=', $value[0]); |
|
| 35 | + ->where("{$field}_max", '>=', $value[0]); |
|
| 36 | 36 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 37 | 37 | $query->where("{$field}_min", '>=', $value[0]) |
| 38 | - ->where("{$field}_max", '<=', $value[1]); |
|
| 38 | + ->where("{$field}_max", '<=', $value[1]); |
|
| 39 | 39 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 40 | 40 | $query->where("{$field}_min", '>=', $value[0]) |
| 41 | - ->where("{$field}_max", '>=', $value[1]) |
|
| 42 | - ->where("{$field}_min", '<=', $value[1]); |
|
| 41 | + ->where("{$field}_max", '>=', $value[1]) |
|
| 42 | + ->where("{$field}_min", '<=', $value[1]); |
|
| 43 | 43 | }); |
| 44 | 44 | }); |
| 45 | 45 | break; |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | protected function parserSearchAndRelationClosure($value, $relation, $field, $condition) |
| 18 | 18 | { |
| 19 | 19 | $this->model = |
| 20 | - $this->model->whereHas($relation, function (Builder $query) use ($field, $condition, $value) { |
|
| 20 | + $this->model->whereHas($relation, function(Builder $query) use ($field, $condition, $value) { |
|
| 21 | 21 | switch ($condition) { |
| 22 | 22 | case 'in': |
| 23 | 23 | $query->whereIn($field, $value); |
@@ -26,17 +26,17 @@ discard block |
||
| 26 | 26 | $query->whereBetween($field, $value); |
| 27 | 27 | break; |
| 28 | 28 | case 'cross': |
| 29 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 30 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 29 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 30 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 31 | 31 | $query->where("{$field}_min", '<=', $value[0]) |
| 32 | 32 | ->where("{$field}_max", '>=', $value[1]); |
| 33 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 33 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 34 | 34 | $query->where("{$field}_min", '<=', $value[0]) |
| 35 | 35 | ->where("{$field}_max", '>=', $value[0]); |
| 36 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 36 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 37 | 37 | $query->where("{$field}_min", '>=', $value[0]) |
| 38 | 38 | ->where("{$field}_max", '<=', $value[1]); |
| 39 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 39 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 40 | 40 | $query->where("{$field}_min", '>=', $value[0]) |
| 41 | 41 | ->where("{$field}_max", '>=', $value[1]) |
| 42 | 42 | ->where("{$field}_min", '<=', $value[1]); |
@@ -28,17 +28,17 @@ |
||
| 28 | 28 | $this->model = $this->model->orWhere(function (Builder $query) use ($field, $value) { |
| 29 | 29 | $query->where(function (Builder $query) use ($field, $value) { |
| 30 | 30 | $query->where("{$field}_min", '<=', $value[0]) |
| 31 | - ->where("{$field}_max", '>=', $value[1]); |
|
| 31 | + ->where("{$field}_max", '>=', $value[1]); |
|
| 32 | 32 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 33 | 33 | $query->where("{$field}_min", '<=', $value[0]) |
| 34 | - ->where("{$field}_max", '>=', $value[0]); |
|
| 34 | + ->where("{$field}_max", '>=', $value[0]); |
|
| 35 | 35 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 36 | 36 | $query->where("{$field}_min", '>=', $value[0]) |
| 37 | - ->where("{$field}_max", '<=', $value[1]); |
|
| 37 | + ->where("{$field}_max", '<=', $value[1]); |
|
| 38 | 38 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 39 | 39 | $query->where("{$field}_min", '>=', $value[0]) |
| 40 | - ->where("{$field}_max", '>=', $value[1]) |
|
| 41 | - ->where("{$field}_min", '<=', $value[1]); |
|
| 40 | + ->where("{$field}_max", '>=', $value[1]) |
|
| 41 | + ->where("{$field}_min", '<=', $value[1]); |
|
| 42 | 42 | }); |
| 43 | 43 | }); |
| 44 | 44 | break; |
@@ -25,17 +25,17 @@ |
||
| 25 | 25 | $this->model = $this->model->orWhereBetween($modelTableName.'.'.$field, $value); |
| 26 | 26 | break; |
| 27 | 27 | case 'cross': |
| 28 | - $this->model = $this->model->orWhere(function (Builder $query) use ($field, $value) { |
|
| 29 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 28 | + $this->model = $this->model->orWhere(function(Builder $query) use ($field, $value) { |
|
| 29 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 30 | 30 | $query->where("{$field}_min", '<=', $value[0]) |
| 31 | 31 | ->where("{$field}_max", '>=', $value[1]); |
| 32 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 32 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 33 | 33 | $query->where("{$field}_min", '<=', $value[0]) |
| 34 | 34 | ->where("{$field}_max", '>=', $value[0]); |
| 35 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 35 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 36 | 36 | $query->where("{$field}_min", '>=', $value[0]) |
| 37 | 37 | ->where("{$field}_max", '<=', $value[1]); |
| 38 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 38 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 39 | 39 | $query->where("{$field}_min", '>=', $value[0]) |
| 40 | 40 | ->where("{$field}_max", '>=', $value[1]) |
| 41 | 41 | ->where("{$field}_min", '<=', $value[1]); |
@@ -27,17 +27,17 @@ |
||
| 27 | 27 | $this->model = $this->model->where(function (Builder $query) use ($field, $value) { |
| 28 | 28 | $query->where(function (Builder $query) use ($field, $value) { |
| 29 | 29 | $query->where("{$field}_min", '<=', $value[0]) |
| 30 | - ->where("{$field}_max", '>=', $value[1]); |
|
| 30 | + ->where("{$field}_max", '>=', $value[1]); |
|
| 31 | 31 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 32 | 32 | $query->where("{$field}_min", '<=', $value[0]) |
| 33 | - ->where("{$field}_max", '>=', $value[0]); |
|
| 33 | + ->where("{$field}_max", '>=', $value[0]); |
|
| 34 | 34 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 35 | 35 | $query->where("{$field}_min", '>=', $value[0]) |
| 36 | - ->where("{$field}_max", '<=', $value[1]); |
|
| 36 | + ->where("{$field}_max", '<=', $value[1]); |
|
| 37 | 37 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 38 | 38 | $query->where("{$field}_min", '>=', $value[0]) |
| 39 | - ->where("{$field}_max", '>=', $value[1]) |
|
| 40 | - ->where("{$field}_min", '<=', $value[1]); |
|
| 39 | + ->where("{$field}_max", '>=', $value[1]) |
|
| 40 | + ->where("{$field}_min", '<=', $value[1]); |
|
| 41 | 41 | }); |
| 42 | 42 | }); |
| 43 | 43 | break; |
@@ -24,17 +24,17 @@ |
||
| 24 | 24 | $this->model = $this->model->whereBetween($field, $value); |
| 25 | 25 | break; |
| 26 | 26 | case 'cross': |
| 27 | - $this->model = $this->model->where(function (Builder $query) use ($field, $value) { |
|
| 28 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 27 | + $this->model = $this->model->where(function(Builder $query) use ($field, $value) { |
|
| 28 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 29 | 29 | $query->where("{$field}_min", '<=', $value[0]) |
| 30 | 30 | ->where("{$field}_max", '>=', $value[1]); |
| 31 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 31 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 32 | 32 | $query->where("{$field}_min", '<=', $value[0]) |
| 33 | 33 | ->where("{$field}_max", '>=', $value[0]); |
| 34 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 34 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 35 | 35 | $query->where("{$field}_min", '>=', $value[0]) |
| 36 | 36 | ->where("{$field}_max", '<=', $value[1]); |
| 37 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 37 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 38 | 38 | $query->where("{$field}_min", '>=', $value[0]) |
| 39 | 39 | ->where("{$field}_max", '>=', $value[1]) |
| 40 | 40 | ->where("{$field}_min", '<=', $value[1]); |
@@ -28,17 +28,17 @@ |
||
| 28 | 28 | $query->where(function (Builder $query) use ($field, $value) { |
| 29 | 29 | $query->where(function (Builder $query) use ($field, $value) { |
| 30 | 30 | $query->where("{$field}_min", '<=', $value[0]) |
| 31 | - ->where("{$field}_max", '>=', $value[1]); |
|
| 31 | + ->where("{$field}_max", '>=', $value[1]); |
|
| 32 | 32 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 33 | 33 | $query->where("{$field}_min", '<=', $value[0]) |
| 34 | - ->where("{$field}_max", '>=', $value[0]); |
|
| 34 | + ->where("{$field}_max", '>=', $value[0]); |
|
| 35 | 35 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 36 | 36 | $query->where("{$field}_min", '>=', $value[0]) |
| 37 | - ->where("{$field}_max", '<=', $value[1]); |
|
| 37 | + ->where("{$field}_max", '<=', $value[1]); |
|
| 38 | 38 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 39 | 39 | $query->where("{$field}_min", '>=', $value[0]) |
| 40 | - ->where("{$field}_max", '>=', $value[1]) |
|
| 41 | - ->where("{$field}_min", '<=', $value[1]); |
|
| 40 | + ->where("{$field}_max", '>=', $value[1]) |
|
| 41 | + ->where("{$field}_min", '<=', $value[1]); |
|
| 42 | 42 | }); |
| 43 | 43 | }); |
| 44 | 44 | break; |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | { |
| 17 | 17 | protected function parserSearchOrRelationClosure($value, $relation, $field, $condition) |
| 18 | 18 | { |
| 19 | - $this->model = $this->model->orWhereHas($relation, function (Builder $query) use ($field, $condition, $value) { |
|
| 19 | + $this->model = $this->model->orWhereHas($relation, function(Builder $query) use ($field, $condition, $value) { |
|
| 20 | 20 | switch ($condition) { |
| 21 | 21 | case 'in': |
| 22 | 22 | $query->whereIn($field, $value); |
@@ -25,17 +25,17 @@ discard block |
||
| 25 | 25 | $query->whereBetween($field, $value); |
| 26 | 26 | break; |
| 27 | 27 | case 'cross': |
| 28 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 29 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 28 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 29 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 30 | 30 | $query->where("{$field}_min", '<=', $value[0]) |
| 31 | 31 | ->where("{$field}_max", '>=', $value[1]); |
| 32 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 32 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 33 | 33 | $query->where("{$field}_min", '<=', $value[0]) |
| 34 | 34 | ->where("{$field}_max", '>=', $value[0]); |
| 35 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 35 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 36 | 36 | $query->where("{$field}_min", '>=', $value[0]) |
| 37 | 37 | ->where("{$field}_max", '<=', $value[1]); |
| 38 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 38 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 39 | 39 | $query->where("{$field}_min", '>=', $value[0]) |
| 40 | 40 | ->where("{$field}_max", '>=', $value[1]) |
| 41 | 41 | ->where("{$field}_min", '<=', $value[1]); |
@@ -38,8 +38,8 @@ |
||
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | $this->model = $this->model->leftJoin($sortTable, $keyName, '=', $sortTable.'.id') |
| 41 | - ->orderBy($sortColumn, $this->sortedBy) |
|
| 42 | - ->addSelect($table.'.*'); |
|
| 41 | + ->orderBy($sortColumn, $this->sortedBy) |
|
| 42 | + ->addSelect($table.'.*'); |
|
| 43 | 43 | } else { |
| 44 | 44 | $this->model = $this->model->orderBy($this->orderBy, $this->sortedBy); |
| 45 | 45 | } |