@@ -145,20 +145,20 @@ discard block |
||
| 145 | 145 | //set default pagination |
| 146 | 146 | |
| 147 | 147 | //set page size |
| 148 | - if (!isset($request->toArray()['page']['size'])){ |
|
| 148 | + if (!isset($request->toArray()['page']['size'])) { |
|
| 149 | 149 | $pageSize = $this->DEFAULT_RESULT_PER_PAGE; |
| 150 | - }elseif(($request->get('page')['size'])==0){ |
|
| 150 | + }elseif (($request->get('page')['size']) == 0) { |
|
| 151 | 151 | $pageSize = $this->DEFAULT_RESULT_PER_PAGE; |
| 152 | - }else{ |
|
| 152 | + } else { |
|
| 153 | 153 | $pageSize = $request->get('page')['size']; |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | //set page number |
| 157 | - if (!isset($request->get('page')['number'])){ |
|
| 157 | + if (!isset($request->get('page')['number'])) { |
|
| 158 | 158 | $pageNumber = $this->DEFAULT_RESULT_PER_PAGE; |
| 159 | - }elseif(($request->get('page')['number'])==0){ |
|
| 159 | + }elseif (($request->get('page')['number']) == 0) { |
|
| 160 | 160 | $pageNumber = $this->DEFAULT_RESULT_PER_PAGE; |
| 161 | - }else{ |
|
| 161 | + } else { |
|
| 162 | 162 | $pageNumber = $request->get('page')['number']; |
| 163 | 163 | } |
| 164 | 164 | $request['page'] = $pageNumber; |
@@ -187,8 +187,7 @@ discard block |
||
| 187 | 187 | $this->model |
| 188 | 188 | ->whereKey(collect($this->model |
| 189 | 189 | ->search(($request->get('query'))) |
| 190 | - ->raw())->get('ids')) : |
|
| 191 | - $this->model; |
|
| 190 | + ->raw())->get('ids')) : $this->model; |
|
| 192 | 191 | if (array_key_exists('file', $request->toArray())) { |
| 193 | 192 | //TODO add relation on top if here and create a tree flatter array in array helper |
| 194 | 193 | return (new ExcelHelper())->setOptions([ |
@@ -147,18 +147,18 @@ |
||
| 147 | 147 | //set page size |
| 148 | 148 | if (!isset($request->toArray()['page']['size'])){ |
| 149 | 149 | $pageSize = $this->DEFAULT_RESULT_PER_PAGE; |
| 150 | - }elseif(($request->get('page')['size'])==0){ |
|
| 150 | + } elseif(($request->get('page')['size'])==0){ |
|
| 151 | 151 | $pageSize = $this->DEFAULT_RESULT_PER_PAGE; |
| 152 | - }else{ |
|
| 152 | + } else{ |
|
| 153 | 153 | $pageSize = $request->get('page')['size']; |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | //set page number |
| 157 | 157 | if (!isset($request->get('page')['number'])){ |
| 158 | 158 | $pageNumber = $this->DEFAULT_RESULT_PER_PAGE; |
| 159 | - }elseif(($request->get('page')['number'])==0){ |
|
| 159 | + } elseif(($request->get('page')['number'])==0){ |
|
| 160 | 160 | $pageNumber = $this->DEFAULT_RESULT_PER_PAGE; |
| 161 | - }else{ |
|
| 161 | + } else{ |
|
| 162 | 162 | $pageNumber = $request->get('page')['number']; |
| 163 | 163 | } |
| 164 | 164 | $request['page'] = $pageNumber; |