@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | */ |
79 | 79 | public function filter($criteria = []) |
80 | 80 | { |
81 | - $criteria= $this->order($criteria); |
|
81 | + $criteria = $this->order($criteria); |
|
82 | 82 | |
83 | 83 | /** @var Entity $latest */ |
84 | 84 | $latest = $this->model->with($this->with); |
@@ -88,12 +88,12 @@ discard block |
||
88 | 88 | |
89 | 89 | if (isset($criteria['search'])) { |
90 | 90 | foreach ($this->model->searchable as $method => $columns) { |
91 | - if(method_exists($this->model,$method)) |
|
91 | + if (method_exists($this->model, $method)) |
|
92 | 92 | { |
93 | - $latest->whereHas($method,function ($query) use ($criteria,$columns) |
|
93 | + $latest->whereHas($method, function($query) use ($criteria, $columns) |
|
94 | 94 | { |
95 | 95 | /** @var $query Builder */ |
96 | - $query->where(function ($query2) use($criteria,$columns){ |
|
96 | + $query->where(function($query2) use($criteria, $columns){ |
|
97 | 97 | /** @var $query2 Builder */ |
98 | 98 | foreach ((array) $columns as $column) |
99 | 99 | { |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | * |
128 | 128 | * @return array |
129 | 129 | */ |
130 | - private function order($criteria=[]){ |
|
130 | + private function order($criteria = []) { |
|
131 | 131 | |
132 | 132 | if (isset($criteria['order'])) { |
133 | 133 | $this->order = $criteria['order']; |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | { |
175 | 175 | $item = $this->model->findOrFail('id'); |
176 | 176 | |
177 | - if($item->update($attributes)) |
|
177 | + if ($item->update($attributes)) |
|
178 | 178 | { |
179 | 179 | return $item; |
180 | 180 | } |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | */ |
238 | 238 | public function find($entityId = 0, $columns = ['*']) |
239 | 239 | { |
240 | - return $this->model->with($this->with)->find($entityId,$columns); |
|
240 | + return $this->model->with($this->with)->find($entityId, $columns); |
|
241 | 241 | } |
242 | 242 | |
243 | 243 | /** |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | */ |
249 | 249 | public function findOrFail($entityId = 0, $columns = ['*']) |
250 | 250 | { |
251 | - return $this->model->with($this->with)->findOrFail($entityId,$columns); |
|
251 | + return $this->model->with($this->with)->findOrFail($entityId, $columns); |
|
252 | 252 | } |
253 | 253 | /** |
254 | 254 | * @param array $filter |
@@ -101,9 +101,9 @@ |
||
101 | 101 | } |
102 | 102 | }); |
103 | 103 | }); |
104 | + } else { |
|
105 | + $latest->where($columns, 'like', "%" . $criteria['search'] . "%", 'or'); |
|
104 | 106 | } |
105 | - else |
|
106 | - $latest->where($columns, 'like', "%" . $criteria['search'] . "%", 'or'); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | unset($criteria['search']); |