@@ -26,14 +26,14 @@ discard block |
||
26 | 26 | |
27 | 27 | public function __call($method, $parameters) |
28 | 28 | { |
29 | - if($method == "getData") { |
|
29 | + if ($method == "getData") { |
|
30 | 30 | $key = $parameters[0]; |
31 | - if(isset($this->data[$key])) { |
|
31 | + if (isset($this->data[$key])) { |
|
32 | 32 | return $this->data[$key]; |
33 | - }else{ |
|
33 | + } else { |
|
34 | 34 | return null; |
35 | 35 | } |
36 | - }else{ |
|
36 | + } else { |
|
37 | 37 | return null; |
38 | 38 | } |
39 | 39 | } |
@@ -48,19 +48,19 @@ discard block |
||
48 | 48 | |
49 | 49 | $query->addSelect($this->data['table'].'.'.cb()->pk($this->data['table']).' as primary_key'); |
50 | 50 | |
51 | - if(isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index'])) |
|
51 | + if (isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index'])) |
|
52 | 52 | { |
53 | 53 | $query = call_user_func($this->data['hook_query_index'], $query); |
54 | 54 | } |
55 | 55 | |
56 | - $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true; |
|
57 | - if($softDelete === true && Schema::hasColumn($this->data['table'],'deleted_at')) { |
|
56 | + $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true; |
|
57 | + if ($softDelete === true && Schema::hasColumn($this->data['table'], 'deleted_at')) { |
|
58 | 58 | $query->whereNull($this->data['table'].'.deleted_at'); |
59 | 59 | } |
60 | 60 | |
61 | 61 | |
62 | - if(isset($joins)) { |
|
63 | - foreach($joins as $join) |
|
62 | + if (isset($joins)) { |
|
63 | + foreach ($joins as $join) |
|
64 | 64 | { |
65 | 65 | $query->join($join['target_table'], |
66 | 66 | $join['target_table_primary'], |
@@ -70,14 +70,14 @@ discard block |
||
70 | 70 | } |
71 | 71 | } |
72 | 72 | |
73 | - foreach($columns as $column) { |
|
73 | + foreach ($columns as $column) { |
|
74 | 74 | /** @var ColumnModel $column */ |
75 | - if($column->getType() != "custom") { |
|
76 | - if(strpos($column->getField(),".") === false) { |
|
77 | - if(Schema::hasColumn($this->data['table'], $column->getField())) { |
|
75 | + if ($column->getType() != "custom") { |
|
76 | + if (strpos($column->getField(), ".") === false) { |
|
77 | + if (Schema::hasColumn($this->data['table'], $column->getField())) { |
|
78 | 78 | $query->addSelect($this->data['table'].'.'.$column->getField()); |
79 | 79 | } |
80 | - }else{ |
|
80 | + } else { |
|
81 | 81 | $query->addSelect($column->getField()); |
82 | 82 | } |
83 | 83 | } |
@@ -85,20 +85,20 @@ discard block |
||
85 | 85 | $query = getTypeHook($column->getType())->query($query, $column); |
86 | 86 | } |
87 | 87 | |
88 | - if(request()->has('q')) |
|
88 | + if (request()->has('q')) |
|
89 | 89 | { |
90 | - if(isset($this->data['hook_search_query'])) { |
|
90 | + if (isset($this->data['hook_search_query'])) { |
|
91 | 91 | $query = call_user_func($this->data['hook_search_query'], $query); |
92 | - }else{ |
|
93 | - $query->where(function ($where) use ($columns) { |
|
92 | + } else { |
|
93 | + $query->where(function($where) use ($columns) { |
|
94 | 94 | /** |
95 | 95 | * @var $where Builder |
96 | 96 | */ |
97 | - foreach($columns as $column) |
|
97 | + foreach ($columns as $column) |
|
98 | 98 | { |
99 | - if(strpos($column->getField(),".") === false) { |
|
99 | + if (strpos($column->getField(), ".") === false) { |
|
100 | 100 | $field = $this->data['table'].'.'.$column->getField(); |
101 | - }else{ |
|
101 | + } else { |
|
102 | 102 | $field = $column->getField(); |
103 | 103 | } |
104 | 104 | $where->orWhere($field, 'like', '%'.request('q').'%'); |
@@ -107,17 +107,17 @@ discard block |
||
107 | 107 | } |
108 | 108 | } |
109 | 109 | |
110 | - if(isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index'])) { |
|
110 | + if (isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index'])) { |
|
111 | 111 | $query = call_user_func($this->data['hook_query_index'], $query); |
112 | 112 | } |
113 | 113 | |
114 | 114 | |
115 | - if(request()->has(['order_by','order_sort'])) |
|
115 | + if (request()->has(['order_by', 'order_sort'])) |
|
116 | 116 | { |
117 | - if(in_array(request('order_by'),columnSingleton()->getColumnNameOnly())) { |
|
117 | + if (in_array(request('order_by'), columnSingleton()->getColumnNameOnly())) { |
|
118 | 118 | $query->orderBy(request('order_by'), request('order_sort')); |
119 | 119 | } |
120 | - }else{ |
|
120 | + } else { |
|
121 | 121 | $query->orderBy($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), "desc"); |
122 | 122 | } |
123 | 123 | |
@@ -126,10 +126,10 @@ discard block |
||
126 | 126 | |
127 | 127 | public function getIndex() |
128 | 128 | { |
129 | - if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
129 | + if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area"); |
|
130 | 130 | |
131 | 131 | $query = $this->repository(); |
132 | - $result = $query->paginate( request("limit")?:cbConfig("LIMIT_TABLE_DATA") ); |
|
132 | + $result = $query->paginate(request("limit") ?: cbConfig("LIMIT_TABLE_DATA")); |
|
133 | 133 | $data['result'] = $result; |
134 | 134 | |
135 | 135 | return view("crudbooster::module.index.index", array_merge($data, $this->data)); |
@@ -141,29 +141,29 @@ discard block |
||
141 | 141 | */ |
142 | 142 | private function validation() |
143 | 143 | { |
144 | - if(isset($this->data['validation'])) { |
|
144 | + if (isset($this->data['validation'])) { |
|
145 | 145 | $validator = Validator::make(request()->all(), @$this->data['validation'], @$this->data['validation_messages']); |
146 | 146 | if ($validator->fails()) { |
147 | 147 | $message = $validator->messages(); |
148 | 148 | $message_all = $message->all(); |
149 | - throw new CBValidationException(implode(', ',$message_all)); |
|
149 | + throw new CBValidationException(implode(', ', $message_all)); |
|
150 | 150 | } |
151 | 151 | } |
152 | 152 | } |
153 | 153 | |
154 | 154 | public function getAdd() |
155 | 155 | { |
156 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
156 | + if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area"); |
|
157 | 157 | |
158 | 158 | $data = []; |
159 | 159 | $data['page_title'] = $this->data['page_title'].' : Add'; |
160 | 160 | $data['action_url'] = module()->addSaveURL(); |
161 | - return view('crudbooster::module.form.form',array_merge($data, $this->data)); |
|
161 | + return view('crudbooster::module.form.form', array_merge($data, $this->data)); |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | public function postAddSave() |
165 | 165 | { |
166 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
166 | + if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area"); |
|
167 | 167 | |
168 | 168 | try { |
169 | 169 | $this->validation(); |
@@ -171,28 +171,28 @@ discard block |
||
171 | 171 | $data = columnSingleton()->getAssignmentData(); |
172 | 172 | |
173 | 173 | //Clear data from Primary Key |
174 | - unset($data[ cb()->pk($this->data['table']) ]); |
|
174 | + unset($data[cb()->pk($this->data['table'])]); |
|
175 | 175 | |
176 | - if(Schema::hasColumn($this->data['table'], 'created_at')) { |
|
176 | + if (Schema::hasColumn($this->data['table'], 'created_at')) { |
|
177 | 177 | $data['created_at'] = date('Y-m-d H:i:s'); |
178 | 178 | } |
179 | 179 | |
180 | - if(isset($this->data['hook_before_insert']) && is_callable($this->data['hook_before_insert'])) { |
|
180 | + if (isset($this->data['hook_before_insert']) && is_callable($this->data['hook_before_insert'])) { |
|
181 | 181 | $data = call_user_func($this->data['hook_before_insert'], $data); |
182 | 182 | } |
183 | 183 | |
184 | 184 | $id = DB::table($this->data['table'])->insertGetId($data); |
185 | 185 | |
186 | - if(isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) { |
|
186 | + if (isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) { |
|
187 | 187 | call_user_func($this->data['hook_after_insert'], $id); |
188 | 188 | } |
189 | 189 | |
190 | 190 | } catch (CBValidationException $e) { |
191 | 191 | Log::debug($e); |
192 | - return cb()->redirectBack($e->getMessage(),'info'); |
|
192 | + return cb()->redirectBack($e->getMessage(), 'info'); |
|
193 | 193 | } catch (\Exception $e) { |
194 | 194 | Log::error($e); |
195 | - return cb()->redirectBack($e->getMessage(),'warning'); |
|
195 | + return cb()->redirectBack($e->getMessage(), 'warning'); |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | if (request('submit') == trans('crudbooster.button_save_more')) { |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | |
205 | 205 | public function getEdit($id) |
206 | 206 | { |
207 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
207 | + if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area"); |
|
208 | 208 | |
209 | 209 | $data = []; |
210 | 210 | $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first(); |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | |
216 | 216 | public function postEditSave($id) |
217 | 217 | { |
218 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
218 | + if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area"); |
|
219 | 219 | |
220 | 220 | try { |
221 | 221 | $this->validation(); |
@@ -223,13 +223,13 @@ discard block |
||
223 | 223 | $data = columnSingleton()->getAssignmentData(); |
224 | 224 | |
225 | 225 | //Clear data from Primary Key |
226 | - unset($data[ cb()->pk($this->data['table']) ]); |
|
226 | + unset($data[cb()->pk($this->data['table'])]); |
|
227 | 227 | |
228 | - if(Schema::hasColumn($this->data['table'], 'updated_at')) { |
|
228 | + if (Schema::hasColumn($this->data['table'], 'updated_at')) { |
|
229 | 229 | $data['updated_at'] = date('Y-m-d H:i:s'); |
230 | 230 | } |
231 | 231 | |
232 | - if(isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) { |
|
232 | + if (isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) { |
|
233 | 233 | $data = call_user_func($this->data['hook_before_update'], $id, $data); |
234 | 234 | } |
235 | 235 | |
@@ -237,16 +237,16 @@ discard block |
||
237 | 237 | ->where(cb()->pk($this->data['table']), $id) |
238 | 238 | ->update($data); |
239 | 239 | |
240 | - if(isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) { |
|
240 | + if (isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) { |
|
241 | 241 | call_user_func($this->data['hook_after_update'], $id); |
242 | 242 | } |
243 | 243 | |
244 | 244 | } catch (CBValidationException $e) { |
245 | 245 | Log::debug($e); |
246 | - return cb()->redirectBack($e->getMessage(),'info'); |
|
246 | + return cb()->redirectBack($e->getMessage(), 'info'); |
|
247 | 247 | } catch (\Exception $e) { |
248 | 248 | Log::error($e); |
249 | - return cb()->redirectBack($e->getMessage(),'warning'); |
|
249 | + return cb()->redirectBack($e->getMessage(), 'warning'); |
|
250 | 250 | } |
251 | 251 | |
252 | 252 | |
@@ -259,15 +259,15 @@ discard block |
||
259 | 259 | |
260 | 260 | public function getDelete($id) |
261 | 261 | { |
262 | - if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
262 | + if (!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area"); |
|
263 | 263 | |
264 | - if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) { |
|
264 | + if (isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) { |
|
265 | 265 | call_user_func($this->data['hook_before_delete'], $id); |
266 | 266 | } |
267 | 267 | |
268 | - $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true; |
|
268 | + $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true; |
|
269 | 269 | |
270 | - if ($softDelete === true && Schema::hasColumn($this->data['table'],'deleted_at')) { |
|
270 | + if ($softDelete === true && Schema::hasColumn($this->data['table'], 'deleted_at')) { |
|
271 | 271 | DB::table($this->data['table']) |
272 | 272 | ->where(getPrimaryKey($this->data['table']), $id) |
273 | 273 | ->update(['deleted_at' => date('Y-m-d H:i:s')]); |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | ->delete(); |
278 | 278 | } |
279 | 279 | |
280 | - if(isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) { |
|
280 | + if (isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) { |
|
281 | 281 | call_user_func($this->data['hook_after_delete'], $id); |
282 | 282 | } |
283 | 283 | |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | |
287 | 287 | public function getDetail($id) |
288 | 288 | { |
289 | - if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
289 | + if (!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area"); |
|
290 | 290 | |
291 | 291 | $data = []; |
292 | 292 | $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first(); |
@@ -30,10 +30,10 @@ discard block |
||
30 | 30 | $key = $parameters[0]; |
31 | 31 | if(isset($this->data[$key])) { |
32 | 32 | return $this->data[$key]; |
33 | - }else{ |
|
33 | + } else{ |
|
34 | 34 | return null; |
35 | 35 | } |
36 | - }else{ |
|
36 | + } else{ |
|
37 | 37 | return null; |
38 | 38 | } |
39 | 39 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | if(Schema::hasColumn($this->data['table'], $column->getField())) { |
78 | 78 | $query->addSelect($this->data['table'].'.'.$column->getField()); |
79 | 79 | } |
80 | - }else{ |
|
80 | + } else{ |
|
81 | 81 | $query->addSelect($column->getField()); |
82 | 82 | } |
83 | 83 | } |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | { |
90 | 90 | if(isset($this->data['hook_search_query'])) { |
91 | 91 | $query = call_user_func($this->data['hook_search_query'], $query); |
92 | - }else{ |
|
92 | + } else{ |
|
93 | 93 | $query->where(function ($where) use ($columns) { |
94 | 94 | /** |
95 | 95 | * @var $where Builder |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | { |
99 | 99 | if(strpos($column->getField(),".") === false) { |
100 | 100 | $field = $this->data['table'].'.'.$column->getField(); |
101 | - }else{ |
|
101 | + } else{ |
|
102 | 102 | $field = $column->getField(); |
103 | 103 | } |
104 | 104 | $where->orWhere($field, 'like', '%'.request('q').'%'); |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | if(in_array(request('order_by'),columnSingleton()->getColumnNameOnly())) { |
118 | 118 | $query->orderBy(request('order_by'), request('order_sort')); |
119 | 119 | } |
120 | - }else{ |
|
120 | + } else{ |
|
121 | 121 | $query->orderBy($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), "desc"); |
122 | 122 | } |
123 | 123 | |
@@ -126,7 +126,9 @@ discard block |
||
126 | 126 | |
127 | 127 | public function getIndex() |
128 | 128 | { |
129 | - if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
129 | + if(!module()->canBrowse()) { |
|
130 | + return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
131 | + } |
|
130 | 132 | |
131 | 133 | $query = $this->repository(); |
132 | 134 | $result = $query->paginate( request("limit")?:cbConfig("LIMIT_TABLE_DATA") ); |
@@ -153,7 +155,9 @@ discard block |
||
153 | 155 | |
154 | 156 | public function getAdd() |
155 | 157 | { |
156 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
158 | + if(!module()->canCreate()) { |
|
159 | + return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
160 | + } |
|
157 | 161 | |
158 | 162 | $data = []; |
159 | 163 | $data['page_title'] = $this->data['page_title'].' : Add'; |
@@ -163,7 +167,9 @@ discard block |
||
163 | 167 | |
164 | 168 | public function postAddSave() |
165 | 169 | { |
166 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
170 | + if(!module()->canCreate()) { |
|
171 | + return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
172 | + } |
|
167 | 173 | |
168 | 174 | try { |
169 | 175 | $this->validation(); |
@@ -204,7 +210,9 @@ discard block |
||
204 | 210 | |
205 | 211 | public function getEdit($id) |
206 | 212 | { |
207 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
213 | + if(!module()->canUpdate()) { |
|
214 | + return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
215 | + } |
|
208 | 216 | |
209 | 217 | $data = []; |
210 | 218 | $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first(); |
@@ -215,7 +223,9 @@ discard block |
||
215 | 223 | |
216 | 224 | public function postEditSave($id) |
217 | 225 | { |
218 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
226 | + if(!module()->canUpdate()) { |
|
227 | + return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
228 | + } |
|
219 | 229 | |
220 | 230 | try { |
221 | 231 | $this->validation(); |
@@ -259,7 +269,9 @@ discard block |
||
259 | 269 | |
260 | 270 | public function getDelete($id) |
261 | 271 | { |
262 | - if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
272 | + if(!module()->canDelete()) { |
|
273 | + return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
274 | + } |
|
263 | 275 | |
264 | 276 | if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) { |
265 | 277 | call_user_func($this->data['hook_before_delete'], $id); |
@@ -286,7 +298,9 @@ discard block |
||
286 | 298 | |
287 | 299 | public function getDetail($id) |
288 | 300 | { |
289 | - if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
301 | + if(!module()->canRead()) { |
|
302 | + return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area"); |
|
303 | + } |
|
290 | 304 | |
291 | 305 | $data = []; |
292 | 306 | $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first(); |