@@ -54,7 +54,7 @@ |
||
| 54 | 54 | * |
| 55 | 55 | * @param bool $toArray |
| 56 | 56 | * |
| 57 | - * @return array|Collection|mixed |
|
| 57 | + * @return Collection |
|
| 58 | 58 | */ |
| 59 | 59 | public function applyFilter($toArray = true) |
| 60 | 60 | { |
@@ -135,6 +135,9 @@ discard block |
||
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | + /** |
|
| 139 | + * @param string $pattern |
|
| 140 | + */ |
|
| 138 | 141 | protected function applyWhereLikeQuery($column, $or, $pattern) |
| 139 | 142 | { |
| 140 | 143 | $connectionType = $this->model()->eloquent()->getConnection()->getDriverName(); |
@@ -145,6 +148,10 @@ discard block |
||
| 145 | 148 | $this->model()->{$method}($column, $likeOperator, $pattern); |
| 146 | 149 | } |
| 147 | 150 | |
| 151 | + /** |
|
| 152 | + * @param string $function |
|
| 153 | + * @param string $value |
|
| 154 | + */ |
|
| 148 | 155 | protected function applyWhereDatetimeQuery($column, $or, $function, $value) |
| 149 | 156 | { |
| 150 | 157 | $method = ($or ? 'orWhere' : 'where') . ucfirst($function); |
@@ -152,6 +159,10 @@ discard block |
||
| 152 | 159 | $this->model()->$method($column, $value); |
| 153 | 160 | } |
| 154 | 161 | |
| 162 | + /** |
|
| 163 | + * @param string $not |
|
| 164 | + * @param string $values |
|
| 165 | + */ |
|
| 155 | 166 | protected function applyWhereInQuery($column, $or, $not, $values) |
| 156 | 167 | { |
| 157 | 168 | $values = explode(',', $values); |
@@ -167,6 +178,10 @@ discard block |
||
| 167 | 178 | $this->model()->$method($column, $values); |
| 168 | 179 | } |
| 169 | 180 | |
| 181 | + /** |
|
| 182 | + * @param string $start |
|
| 183 | + * @param string $end |
|
| 184 | + */ |
|
| 170 | 185 | protected function applyWhereBetweenQuery($column, $or, $start, $end) |
| 171 | 186 | { |
| 172 | 187 | $method = $or ? 'orWhereBetween' : 'whereBetween'; |
@@ -174,6 +189,10 @@ discard block |
||
| 174 | 189 | $this->model()->$method($column, [$start, $end]); |
| 175 | 190 | } |
| 176 | 191 | |
| 192 | + /** |
|
| 193 | + * @param string $operator |
|
| 194 | + * @param string $value |
|
| 195 | + */ |
|
| 177 | 196 | protected function applyWhereQuery($column, $or, $operator, $value) |
| 178 | 197 | { |
| 179 | 198 | $method = $or ? 'orWhere' : 'where'; |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | protected function mappingColumnAndConditions($queries) |
| 67 | 67 | { |
| 68 | - $columnMap = $this->columns->mapWithKeys(function (Column $column) { |
|
| 68 | + $columnMap = $this->columns->mapWithKeys(function(Column $column) { |
|
| 69 | 69 | |
| 70 | 70 | $label = $column->getLabel(); |
| 71 | 71 | $name = $column->getName(); |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | return [$label => $name, $name => $name]; |
| 74 | 74 | }); |
| 75 | 75 | |
| 76 | - return collect($queries)->map(function ($query) use ($columnMap) { |
|
| 76 | + return collect($queries)->map(function($query) use ($columnMap) { |
|
| 77 | 77 | $segments = explode(':', $query, 2); |
| 78 | 78 | |
| 79 | 79 | if (count($segments) != 2) { |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | protected function applyWhereDatetimeQuery($column, $or, $function, $value) |
| 149 | 149 | { |
| 150 | - $method = ($or ? 'orWhere' : 'where') . ucfirst($function); |
|
| 150 | + $method = ($or ? 'orWhere' : 'where').ucfirst($function); |
|
| 151 | 151 | |
| 152 | 152 | $this->model()->$method($column, $value); |
| 153 | 153 | } |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | Arr::forget($query, HasQuickSearch::$searchKey); |
| 23 | 23 | |
| 24 | 24 | $vars = [ |
| 25 | - 'action' => request()->url() . '?' . http_build_query($query), |
|
| 25 | + 'action' => request()->url().'?'.http_build_query($query), |
|
| 26 | 26 | 'key' => HasQuickSearch::$searchKey, |
| 27 | 27 | 'value' => request(HasQuickSearch::$searchKey), |
| 28 | 28 | ]; |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | $column = new Column($column, $label); |
| 359 | 359 | $column->setGrid($this); |
| 360 | 360 | |
| 361 | - return tap($column, function ($value) { |
|
| 361 | + return tap($column, function($value) { |
|
| 362 | 362 | $this->columns->push($value); |
| 363 | 363 | }); |
| 364 | 364 | } |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | $column = new Column($column, $label); |
| 423 | 423 | $column->setGrid($this); |
| 424 | 424 | |
| 425 | - return tap($column, function ($value) { |
|
| 425 | + return tap($column, function($value) { |
|
| 426 | 426 | $this->columns->prepend($value); |
| 427 | 427 | }); |
| 428 | 428 | } |
@@ -587,7 +587,7 @@ discard block |
||
| 587 | 587 | |
| 588 | 588 | $data = $collection->toArray(); |
| 589 | 589 | |
| 590 | - $this->columns->map(function (Column $column) use (&$data) { |
|
| 590 | + $this->columns->map(function(Column $column) use (&$data) { |
|
| 591 | 591 | $data = $column->fill($data); |
| 592 | 592 | |
| 593 | 593 | $this->columnNames[] = $column->getName(); |
@@ -607,7 +607,7 @@ discard block |
||
| 607 | 607 | */ |
| 608 | 608 | protected function buildRows(array $data) |
| 609 | 609 | { |
| 610 | - $this->rows = collect($data)->map(function ($model, $number) { |
|
| 610 | + $this->rows = collect($data)->map(function($model, $number) { |
|
| 611 | 611 | return new Row($number, $model); |
| 612 | 612 | }); |
| 613 | 613 | |