@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | |
55 | 55 | if(Str::contains(strtolower($item),["title","name","label"])) { |
56 | 56 | $display = true; |
57 | - }else{ |
|
57 | + } else{ |
|
58 | 58 | $display = false; |
59 | 59 | } |
60 | 60 | |
@@ -83,7 +83,9 @@ discard block |
||
83 | 83 | if($column != $pk) { |
84 | 84 | |
85 | 85 | // Skip Column |
86 | - if($column == 'deleted_at') continue; |
|
86 | + if($column == 'deleted_at') { |
|
87 | + continue; |
|
88 | + } |
|
87 | 89 | |
88 | 90 | // Check if any relation table candidate |
89 | 91 | $optionTable = ""; |
@@ -92,7 +94,7 @@ discard block |
||
92 | 94 | if(Schema::hasTable($relationTable)) { |
93 | 95 | $optionTable = $relationTable; |
94 | 96 | } |
95 | - }elseif (Str::substr(strtolower($column),0,3) == "id_") { |
|
97 | + } elseif (Str::substr(strtolower($column),0,3) == "id_") { |
|
96 | 98 | $relationTable = Str::substr($column,3); |
97 | 99 | if(Schema::hasTable($relationTable)) { |
98 | 100 | $optionTable = $relationTable; |
@@ -105,15 +107,15 @@ discard block |
||
105 | 107 | |
106 | 108 | if(Str::contains(strtolower($label),["photo","image","picture","gambar"])) { |
107 | 109 | $type = "image"; |
108 | - }elseif (Str::contains(strtolower($label),["email","mail"])) { |
|
110 | + } elseif (Str::contains(strtolower($label),["email","mail"])) { |
|
109 | 111 | $type = "email"; |
110 | - }elseif (Str::contains(strtolower($label),["description","content","detail"])) { |
|
112 | + } elseif (Str::contains(strtolower($label),["description","content","detail"])) { |
|
111 | 113 | $type = "wysiwyg"; |
112 | - }elseif (Str::contains(strtolower($label),["price","money","grand_total","tax"])) { |
|
114 | + } elseif (Str::contains(strtolower($label),["price","money","grand_total","tax"])) { |
|
113 | 115 | $type = "money"; |
114 | - }elseif (Str::contains(strtolower($label),["quantity","qty","total","phone","telp"])) { |
|
116 | + } elseif (Str::contains(strtolower($label),["quantity","qty","total","phone","telp"])) { |
|
115 | 117 | $type = "number"; |
116 | - }elseif (Str::contains(strtolower($label),["date"])) { |
|
118 | + } elseif (Str::contains(strtolower($label),["date"])) { |
|
117 | 119 | $type = "date"; |
118 | 120 | } |
119 | 121 | |
@@ -219,7 +221,7 @@ discard block |
||
219 | 221 | |
220 | 222 | if($item['length']) { |
221 | 223 | $structureItems .= "\$table->".$item['type_data']."('".$item['field_name']."', ".$item['length'].")$nullable;\n\t\t\t"; |
222 | - }else{ |
|
224 | + } else{ |
|
223 | 225 | $structureItems .= "\$table->".$item['type_data']."('".$item['field_name']."')$nullable;\n\t\t\t"; |
224 | 226 | } |
225 | 227 | } |
@@ -31,13 +31,13 @@ discard block |
||
31 | 31 | public function getIndex() { |
32 | 32 | $data = []; |
33 | 33 | $data['result'] = DB::table("cb_modules")->get(); |
34 | - return view($this->view.'.index',$data); |
|
34 | + return view($this->view.'.index', $data); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | public function getAdd() { |
38 | 38 | $data = []; |
39 | 39 | $data['tables'] = cb()->listAllTable(); |
40 | - $data['module'] = (request('modules_id'))?cb()->find("cb_modules", request("modules_id")):null; |
|
40 | + $data['module'] = (request('modules_id')) ?cb()->find("cb_modules", request("modules_id")) : null; |
|
41 | 41 | return view($this->view.'.add', $data); |
42 | 42 | } |
43 | 43 | |
@@ -50,17 +50,17 @@ discard block |
||
50 | 50 | $data = cb()->listAllColumns($table); |
51 | 51 | $pk = cb()->findPrimaryKey($table); |
52 | 52 | $result = []; |
53 | - foreach($data as $item) { |
|
53 | + foreach ($data as $item) { |
|
54 | 54 | |
55 | - if(Str::contains(strtolower($item),["title","name","label"])) { |
|
55 | + if (Str::contains(strtolower($item), ["title", "name", "label"])) { |
|
56 | 56 | $display = true; |
57 | - }else{ |
|
57 | + } else { |
|
58 | 58 | $display = false; |
59 | 59 | } |
60 | 60 | |
61 | 61 | $result[] = [ |
62 | 62 | "column"=>$item, |
63 | - "primary_key"=>($pk==$item)?true:false, |
|
63 | + "primary_key"=>($pk == $item) ?true:false, |
|
64 | 64 | "display"=>$display |
65 | 65 | ]; |
66 | 66 | } |
@@ -69,9 +69,9 @@ discard block |
||
69 | 69 | |
70 | 70 | public function getColumns($table) |
71 | 71 | { |
72 | - if(request("modules_id")) { |
|
73 | - $module = cb()->find("cb_modules",request("modules_id")); |
|
74 | - if($module->last_column_build) { |
|
72 | + if (request("modules_id")) { |
|
73 | + $module = cb()->find("cb_modules", request("modules_id")); |
|
74 | + if ($module->last_column_build) { |
|
75 | 75 | return response()->json(json_decode($module->last_column_build)); |
76 | 76 | } |
77 | 77 | } |
@@ -79,56 +79,56 @@ discard block |
||
79 | 79 | $columns = cb()->listAllColumns($table); |
80 | 80 | $pk = cb()->findPrimaryKey($table); |
81 | 81 | $result = []; |
82 | - foreach($columns as $column) { |
|
83 | - if($column != $pk) { |
|
82 | + foreach ($columns as $column) { |
|
83 | + if ($column != $pk) { |
|
84 | 84 | |
85 | 85 | // Skip Column |
86 | - if($column == 'deleted_at') continue; |
|
86 | + if ($column == 'deleted_at') continue; |
|
87 | 87 | |
88 | 88 | // Check if any relation table candidate |
89 | 89 | $optionTable = ""; |
90 | - if(Str::substr(strtolower($column),-3,3) == "_id") { |
|
91 | - $relationTable = Str::substr($column,0,-3); |
|
92 | - if(Schema::hasTable($relationTable)) { |
|
90 | + if (Str::substr(strtolower($column), -3, 3) == "_id") { |
|
91 | + $relationTable = Str::substr($column, 0, -3); |
|
92 | + if (Schema::hasTable($relationTable)) { |
|
93 | 93 | $optionTable = $relationTable; |
94 | 94 | } |
95 | - }elseif (Str::substr(strtolower($column),0,3) == "id_") { |
|
96 | - $relationTable = Str::substr($column,3); |
|
97 | - if(Schema::hasTable($relationTable)) { |
|
95 | + }elseif (Str::substr(strtolower($column), 0, 3) == "id_") { |
|
96 | + $relationTable = Str::substr($column, 3); |
|
97 | + if (Schema::hasTable($relationTable)) { |
|
98 | 98 | $optionTable = $relationTable; |
99 | 99 | } |
100 | 100 | } |
101 | 101 | |
102 | - $label = trim(Str::title(str_replace(["id_","_id","_"]," ",$column))); |
|
102 | + $label = trim(Str::title(str_replace(["id_", "_id", "_"], " ", $column))); |
|
103 | 103 | $label = Str::singular($label); |
104 | 104 | $type = "text"; |
105 | 105 | |
106 | - if(Str::contains(strtolower($label),["photo","image","picture","gambar"])) { |
|
106 | + if (Str::contains(strtolower($label), ["photo", "image", "picture", "gambar"])) { |
|
107 | 107 | $type = "image"; |
108 | - }elseif (Str::contains(strtolower($label),["email","mail"])) { |
|
108 | + }elseif (Str::contains(strtolower($label), ["email", "mail"])) { |
|
109 | 109 | $type = "email"; |
110 | - }elseif (Str::contains(strtolower($label),["description","content","detail"])) { |
|
111 | - $type = "wysiwyg"; |
|
112 | - }elseif (Str::contains(strtolower($label),["price","money","grand_total","tax"])) { |
|
110 | + }elseif (Str::contains(strtolower($label), ["description", "content", "detail"])) { |
|
111 | + $type = "wysiwyg"; |
|
112 | + }elseif (Str::contains(strtolower($label), ["price", "money", "grand_total", "tax"])) { |
|
113 | 113 | $type = "money"; |
114 | - }elseif (Str::contains(strtolower($label),["quantity","qty","total","phone","telp"])) { |
|
114 | + }elseif (Str::contains(strtolower($label), ["quantity", "qty", "total", "phone", "telp"])) { |
|
115 | 115 | $type = "number"; |
116 | - }elseif (Str::contains(strtolower($label),["date"])) { |
|
116 | + }elseif (Str::contains(strtolower($label), ["date"])) { |
|
117 | 117 | $type = "date"; |
118 | 118 | } |
119 | 119 | |
120 | - if (Str::substr(strtolower($column),-3,3) == "_id") { |
|
120 | + if (Str::substr(strtolower($column), -3, 3) == "_id") { |
|
121 | 121 | $type = "select_table"; |
122 | 122 | } elseif (Str::substr($column, -3, 3) == "_at") { |
123 | 123 | $type = "datetime"; |
124 | - } elseif (Str::substr($column,0, 3) == "id_") { |
|
124 | + } elseif (Str::substr($column, 0, 3) == "id_") { |
|
125 | 125 | $type = "select_table"; |
126 | 126 | } |
127 | 127 | |
128 | 128 | $columnAdd = "on"; |
129 | 129 | $columnEdit = "on"; |
130 | 130 | $columnMandatory = "on"; |
131 | - if(in_array($column,['created_at','updated_at'])) { |
|
131 | + if (in_array($column, ['created_at', 'updated_at'])) { |
|
132 | 132 | $columnAdd = ""; |
133 | 133 | $columnEdit = ""; |
134 | 134 | $columnMandatory = ""; |
@@ -187,39 +187,39 @@ discard block |
||
187 | 187 | public function postCreateMigration() |
188 | 188 | { |
189 | 189 | try { |
190 | - cb()->validation(['table_name','structures']); |
|
190 | + cb()->validation(['table_name', 'structures']); |
|
191 | 191 | |
192 | 192 | $tableName = request("table_name"); |
193 | 193 | |
194 | - if(!Schema::hasTable($tableName)) { |
|
194 | + if (!Schema::hasTable($tableName)) { |
|
195 | 195 | $filenameMigration = date("Y_m_d_His")."_".$tableName.".php"; |
196 | 196 | $createTemplate = file_get_contents(base_path("vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/create.stub")); |
197 | 197 | $className = Str::studly($tableName); |
198 | 198 | $createTemplate = str_replace("DummyClass", $className, $createTemplate); |
199 | 199 | $createTemplate = str_replace("DummyTable", $tableName, $createTemplate); |
200 | - $createTemplate = str_replace("\$table->increments('id');","",$createTemplate); |
|
200 | + $createTemplate = str_replace("\$table->increments('id');", "", $createTemplate); |
|
201 | 201 | |
202 | 202 | $structureItems = ""; |
203 | 203 | |
204 | - if(request("timestamp")) { |
|
204 | + if (request("timestamp")) { |
|
205 | 205 | $structureItems .= "\$table->timestamps();\n\t\t\t"; |
206 | 206 | } |
207 | 207 | |
208 | - if(request("soft_deletes")) { |
|
208 | + if (request("soft_deletes")) { |
|
209 | 209 | $structureItems .= "\$table->softDeletes();\n\t\t\t"; |
210 | 210 | } |
211 | 211 | |
212 | - foreach(request("structures") as $item) { |
|
212 | + foreach (request("structures") as $item) { |
|
213 | 213 | |
214 | 214 | $nullable = ""; |
215 | 215 | |
216 | - if(!in_array($item['type_data'],["bigIncrements","increments","mediumIncrements","smallIncrements"])) { |
|
216 | + if (!in_array($item['type_data'], ["bigIncrements", "increments", "mediumIncrements", "smallIncrements"])) { |
|
217 | 217 | $nullable = "->nullable()"; |
218 | 218 | } |
219 | 219 | |
220 | - if($item['length']) { |
|
220 | + if ($item['length']) { |
|
221 | 221 | $structureItems .= "\$table->".$item['type_data']."('".$item['field_name']."', ".$item['length'].")$nullable;\n\t\t\t"; |
222 | - }else{ |
|
222 | + } else { |
|
223 | 223 | $structureItems .= "\$table->".$item['type_data']."('".$item['field_name']."')$nullable;\n\t\t\t"; |
224 | 224 | } |
225 | 225 | } |
@@ -238,12 +238,12 @@ discard block |
||
238 | 238 | } |
239 | 239 | |
240 | 240 | } catch (CBValidationException $e) { |
241 | - return response()->json(['status'=>false,'message'=>$e->getMessage()]); |
|
241 | + return response()->json(['status'=>false, 'message'=>$e->getMessage()]); |
|
242 | 242 | } catch (\Exception $e) { |
243 | - return response()->json(['status'=>false,'message'=>$e->getMessage()]); |
|
243 | + return response()->json(['status'=>false, 'message'=>$e->getMessage()]); |
|
244 | 244 | } |
245 | 245 | |
246 | - return response()->json(['status'=>true,'message'=>'Migration successfully!']); |
|
246 | + return response()->json(['status'=>true, 'message'=>'Migration successfully!']); |
|
247 | 247 | } |
248 | 248 | |
249 | 249 | public function postCheckExistModule() |
@@ -251,12 +251,12 @@ discard block |
||
251 | 251 | try { |
252 | 252 | cb()->validation(['name', 'table']); |
253 | 253 | |
254 | - if(DB::table("cb_modules")->where("table_name",request("table"))->where("name",request("name"))->count()) { |
|
254 | + if (DB::table("cb_modules")->where("table_name", request("table"))->where("name", request("name"))->count()) { |
|
255 | 255 | return response()->json(['status'=>true]); |
256 | 256 | } |
257 | 257 | |
258 | 258 | } catch (CBValidationException $e) { |
259 | - return response()->json(['status'=>false,'message'=>$e->getMessage()]); |
|
259 | + return response()->json(['status'=>false, 'message'=>$e->getMessage()]); |
|
260 | 260 | } |
261 | 261 | |
262 | 262 | return response()->json(['status'=>false]); |
@@ -265,30 +265,30 @@ discard block |
||
265 | 265 | public function postAddSave() { |
266 | 266 | |
267 | 267 | try { |
268 | - cb()->validation(['name', 'table','icon','columns']); |
|
268 | + cb()->validation(['name', 'table', 'icon', 'columns']); |
|
269 | 269 | |
270 | 270 | $module = (new ModuleGenerator(request('table'), request('name'), request('icon'), request("columns"), request("rebuild")))->make(); |
271 | 271 | |
272 | 272 | } catch (CBValidationException $e) { |
273 | - return response()->json(['status'=>false,'message'=>$e->getMessage()]); |
|
273 | + return response()->json(['status'=>false, 'message'=>$e->getMessage()]); |
|
274 | 274 | } |
275 | 275 | |
276 | 276 | return response()->json(['status'=>true, 'message'=>'Please remember that you can still modify the structure by edit the controller file '.$module['controller'].' :)']); |
277 | 277 | } |
278 | 278 | |
279 | 279 | public function getDelete($id) { |
280 | - $module = cb()->find("cb_modules",$id); |
|
280 | + $module = cb()->find("cb_modules", $id); |
|
281 | 281 | @unlink(app_path("Http/Controllers/".$module->controller.".php")); |
282 | 282 | DB::table("cb_modules")->where("id", $id)->delete(); |
283 | 283 | DB::table("cb_menus")->where("cb_modules_id", $id)->delete(); |
284 | - return cb()->redirectBack("The module has been deleted!","success"); |
|
284 | + return cb()->redirectBack("The module has been deleted!", "success"); |
|
285 | 285 | } |
286 | 286 | |
287 | 287 | public function getDeleteSoft($id) { |
288 | - $module = cb()->find("cb_modules",$id); |
|
288 | + $module = cb()->find("cb_modules", $id); |
|
289 | 289 | DB::table("cb_modules")->where("id", $id)->delete(); |
290 | 290 | DB::table("cb_menus")->where("cb_modules_id", $id)->delete(); |
291 | - return cb()->redirectBack("The module has been deleted!","success"); |
|
291 | + return cb()->redirectBack("The module has been deleted!", "success"); |
|
292 | 292 | } |
293 | 293 | |
294 | 294 | } |
295 | 295 | \ No newline at end of file |
@@ -37,15 +37,15 @@ discard block |
||
37 | 37 | } |
38 | 38 | |
39 | 39 | public function make() { |
40 | - $name = trim(($this->name)?:ucwords(str_replace("_"," ",$this->table))); |
|
40 | + $name = trim(($this->name) ?: ucwords(str_replace("_", " ", $this->table))); |
|
41 | 41 | |
42 | 42 | $template = file_get_contents(__DIR__."/../templates/FooBarController.stub"); |
43 | 43 | |
44 | 44 | //Replace table |
45 | - $template = str_replace("{table}",'"'.$this->table.'"', $template); |
|
45 | + $template = str_replace("{table}", '"'.$this->table.'"', $template); |
|
46 | 46 | |
47 | 47 | //Replace permalink |
48 | - $permalink = strtolower(Str::slug($name,"_")); |
|
48 | + $permalink = strtolower(Str::slug($name, "_")); |
|
49 | 49 | $template = str_replace("{permalink}", '"'.$permalink.'"', $template); |
50 | 50 | |
51 | 51 | //Replace Page title |
@@ -53,20 +53,20 @@ discard block |
||
53 | 53 | |
54 | 54 | //Replace scaffolding |
55 | 55 | $scaffold = ""; |
56 | - foreach($this->columns as $field) { |
|
56 | + foreach ($this->columns as $field) { |
|
57 | 57 | $label = $field['column_label']; |
58 | 58 | $column = $field['column_field']; |
59 | - $help = isset($field['column_help'])?"->help(\"".$field['column_help']."\")":""; |
|
60 | - $required = ($field['column_mandatory']=="on")?"":"->required(false)"; |
|
61 | - $indexShow = ($field['column_browse']=="on")?"":"->showIndex(false)"; |
|
62 | - $detailShow = ($field['column_detail']=="on")?"":"->showDetail(false)"; |
|
63 | - $editShow = ($field['column_edit']=="on")?"":"->showEdit(false)"; |
|
64 | - $addShow = ($field['column_add']=="on")?"":"->showAdd(false)"; |
|
59 | + $help = isset($field['column_help']) ? "->help(\"".$field['column_help']."\")" : ""; |
|
60 | + $required = ($field['column_mandatory'] == "on") ? "" : "->required(false)"; |
|
61 | + $indexShow = ($field['column_browse'] == "on") ? "" : "->showIndex(false)"; |
|
62 | + $detailShow = ($field['column_detail'] == "on") ? "" : "->showDetail(false)"; |
|
63 | + $editShow = ($field['column_edit'] == "on") ? "" : "->showEdit(false)"; |
|
64 | + $addShow = ($field['column_add'] == "on") ? "" : "->showAdd(false)"; |
|
65 | 65 | $optionTable = $field['column_option_table']; |
66 | 66 | $optionValue = $field['column_option_value']; |
67 | 67 | $optionDisplay = $field['column_option_display']; |
68 | 68 | $optionSqlCondition = $field['column_option_sql_condition']; |
69 | - $optionSqlCondition = str_replace('"',"'", $optionSqlCondition); |
|
69 | + $optionSqlCondition = str_replace('"', "'", $optionSqlCondition); |
|
70 | 70 | $sqlRawQuery = $field['column_sql_query']; |
71 | 71 | $options = $field['column_options']; |
72 | 72 | $imageResizeWidth = $field['column_image_width']; |
@@ -82,45 +82,45 @@ discard block |
||
82 | 82 | $moneyDecimalSeparator = $field['column_money_decimal_separator']; |
83 | 83 | |
84 | 84 | // Additional Attributes |
85 | - $additional = $required . $indexShow . $detailShow . $addShow . $editShow . $help ; |
|
85 | + $additional = $required.$indexShow.$detailShow.$addShow.$editShow.$help; |
|
86 | 86 | |
87 | 87 | // Additional money |
88 | - $additional .= ($moneyPrefix && $field['column_type']=='money')?"->prefix('".$moneyPrefix."')":""; |
|
89 | - $additional .= ($moneyPrecision && $field['column_type']=='money')?"->precision('".$moneyPrecision."')":""; |
|
90 | - $additional .= ($moneyThousandSeparator && $field['column_type']=='money')?"->thousandSeparator('".$moneyThousandSeparator."')":""; |
|
91 | - $additional .= ($moneyDecimalSeparator && $field['column_type']=='money')?"->decimalSeparator('".$moneyDecimalSeparator."')":""; |
|
88 | + $additional .= ($moneyPrefix && $field['column_type'] == 'money') ? "->prefix('".$moneyPrefix."')" : ""; |
|
89 | + $additional .= ($moneyPrecision && $field['column_type'] == 'money') ? "->precision('".$moneyPrecision."')" : ""; |
|
90 | + $additional .= ($moneyThousandSeparator && $field['column_type'] == 'money') ? "->thousandSeparator('".$moneyThousandSeparator."')" : ""; |
|
91 | + $additional .= ($moneyDecimalSeparator && $field['column_type'] == 'money') ? "->decimalSeparator('".$moneyDecimalSeparator."')" : ""; |
|
92 | 92 | |
93 | 93 | // Additional for image & file type |
94 | - $additional .= ($fileEncrypt && in_array($field['column_type'],['file','image']))?"->encrypt(true)":""; |
|
95 | - $additional .= ($imageResizeWidth && in_array($field['column_type'],['file','image']))?"->resize(".$imageResizeWidth.",".$imageResizeHeight.")":""; |
|
94 | + $additional .= ($fileEncrypt && in_array($field['column_type'], ['file', 'image'])) ? "->encrypt(true)" : ""; |
|
95 | + $additional .= ($imageResizeWidth && in_array($field['column_type'], ['file', 'image'])) ? "->resize(".$imageResizeWidth.",".$imageResizeHeight.")" : ""; |
|
96 | 96 | |
97 | 97 | // Additional for date & datetime |
98 | - $additional .= ($dateFormat && in_array($field['column_type'],['date','datetime']))?"->format('".$dateFormat."')":""; |
|
98 | + $additional .= ($dateFormat && in_array($field['column_type'], ['date', 'datetime'])) ? "->format('".$dateFormat."')" : ""; |
|
99 | 99 | |
100 | 100 | // Additional for text |
101 | - $additional .= ($textDisplayLimit!="" && in_array($field['column_type'],['text','text_area','wysiwyg']))?"->strLimit(".$textDisplayLimit.")":""; |
|
102 | - $additional .= ($maxCharacter!="" && in_array($field['column_type'],['text','text_area']))?"->maxLength(".$maxCharacter.")":""; |
|
103 | - $additional .= ($minCharacter!="" && in_array($field['column_type'],['text','text_area']))?"->minLength(".$minCharacter.")":""; |
|
101 | + $additional .= ($textDisplayLimit != "" && in_array($field['column_type'], ['text', 'text_area', 'wysiwyg'])) ? "->strLimit(".$textDisplayLimit.")" : ""; |
|
102 | + $additional .= ($maxCharacter != "" && in_array($field['column_type'], ['text', 'text_area'])) ? "->maxLength(".$maxCharacter.")" : ""; |
|
103 | + $additional .= ($minCharacter != "" && in_array($field['column_type'], ['text', 'text_area'])) ? "->minLength(".$minCharacter.")" : ""; |
|
104 | 104 | |
105 | 105 | $methodName = Str::studly($field['column_type']); |
106 | - if($label && $column) { |
|
107 | - if(in_array($field['column_type'],['radio','select_option','checkbox'])) { |
|
108 | - if($options) { |
|
106 | + if ($label && $column) { |
|
107 | + if (in_array($field['column_type'], ['radio', 'select_option', 'checkbox'])) { |
|
108 | + if ($options) { |
|
109 | 109 | $optResult = []; |
110 | - foreach($options as $opt) { |
|
110 | + foreach ($options as $opt) { |
|
111 | 111 | $optResult[$opt['key']] = $opt['label']; |
112 | 112 | } |
113 | - $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '")->options('.min_var_export($optResult).')' . $additional . ';' . "\n\t\t"; |
|
113 | + $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")->options('.min_var_export($optResult).')'.$additional.';'."\n\t\t"; |
|
114 | 114 | } |
115 | - }elseif (in_array($field['column_type'],['radio_table','select_table'])) { |
|
115 | + }elseif (in_array($field['column_type'], ['radio_table', 'select_table'])) { |
|
116 | 116 | if ($optionTable && $optionValue && $optionDisplay) { |
117 | - $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '",["table"=>"' . $optionTable . '","value_option"=>"' . $optionValue . '","display_option"=>"' . $optionDisplay . '","sql_condition"=>"' . $optionSqlCondition . '"])' . $additional . ';' . "\n\t\t"; |
|
117 | + $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'",["table"=>"'.$optionTable.'","value_option"=>"'.$optionValue.'","display_option"=>"'.$optionDisplay.'","sql_condition"=>"'.$optionSqlCondition.'"])'.$additional.';'."\n\t\t"; |
|
118 | 118 | } |
119 | 119 | }elseif ($field['column_type'] == "select_query") { |
120 | - if($sqlRawQuery && Str::contains($sqlRawQuery,["as `key`","as `label`"])) { |
|
121 | - $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '","'.$sqlRawQuery.'")' . $additional . ';' . "\n\t\t"; |
|
120 | + if ($sqlRawQuery && Str::contains($sqlRawQuery, ["as `key`", "as `label`"])) { |
|
121 | + $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'","'.$sqlRawQuery.'")'.$additional.';'."\n\t\t"; |
|
122 | 122 | } |
123 | - }else{ |
|
123 | + } else { |
|
124 | 124 | $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")'.$additional.';'."\n\t\t"; |
125 | 125 | } |
126 | 126 | } |
@@ -143,10 +143,10 @@ discard block |
||
143 | 143 | $module['controller'] = $filename; |
144 | 144 | $module['last_column_build'] = json_encode($this->columns); |
145 | 145 | |
146 | - if($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name",$this->table)->first()) { |
|
147 | - DB::table("cb_modules")->where("id",$moduleData->id)->update($module); |
|
146 | + if ($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name", $this->table)->first()) { |
|
147 | + DB::table("cb_modules")->where("id", $moduleData->id)->update($module); |
|
148 | 148 | $id_modules = $moduleData->id; |
149 | - }else{ |
|
149 | + } else { |
|
150 | 150 | $id_modules = DB::table('cb_modules')->insertGetId($module); |
151 | 151 | } |
152 | 152 | |
@@ -155,9 +155,9 @@ discard block |
||
155 | 155 | $menu['name'] = $module['name']; |
156 | 156 | $menu['type'] = 'module'; |
157 | 157 | $menu['cb_modules_id'] = $id_modules; |
158 | - if(isset($moduleData)) { |
|
159 | - DB::table("cb_menus")->where("cb_modules_id",$moduleData->id)->update($menu); |
|
160 | - }else{ |
|
158 | + if (isset($moduleData)) { |
|
159 | + DB::table("cb_menus")->where("cb_modules_id", $moduleData->id)->update($menu); |
|
160 | + } else { |
|
161 | 161 | DB::table('cb_menus')->insertGetId($menu); |
162 | 162 | } |
163 | 163 |
@@ -112,15 +112,15 @@ discard block |
||
112 | 112 | } |
113 | 113 | $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '")->options('.min_var_export($optResult).')' . $additional . ';' . "\n\t\t"; |
114 | 114 | } |
115 | - }elseif (in_array($field['column_type'],['radio_table','select_table'])) { |
|
115 | + } elseif (in_array($field['column_type'],['radio_table','select_table'])) { |
|
116 | 116 | if ($optionTable && $optionValue && $optionDisplay) { |
117 | 117 | $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '",["table"=>"' . $optionTable . '","value_option"=>"' . $optionValue . '","display_option"=>"' . $optionDisplay . '","sql_condition"=>"' . $optionSqlCondition . '"])' . $additional . ';' . "\n\t\t"; |
118 | 118 | } |
119 | - }elseif ($field['column_type'] == "select_query") { |
|
119 | + } elseif ($field['column_type'] == "select_query") { |
|
120 | 120 | if($sqlRawQuery && Str::contains($sqlRawQuery,["as `key`","as `label`"])) { |
121 | 121 | $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '","'.$sqlRawQuery.'")' . $additional . ';' . "\n\t\t"; |
122 | 122 | } |
123 | - }else{ |
|
123 | + } else{ |
|
124 | 124 | $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")'.$additional.';'."\n\t\t"; |
125 | 125 | } |
126 | 126 | } |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | if($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name",$this->table)->first()) { |
147 | 147 | DB::table("cb_modules")->where("id",$moduleData->id)->update($module); |
148 | 148 | $id_modules = $moduleData->id; |
149 | - }else{ |
|
149 | + } else{ |
|
150 | 150 | $id_modules = DB::table('cb_modules')->insertGetId($module); |
151 | 151 | } |
152 | 152 | |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | $menu['cb_modules_id'] = $id_modules; |
158 | 158 | if(isset($moduleData)) { |
159 | 159 | DB::table("cb_menus")->where("cb_modules_id",$moduleData->id)->update($menu); |
160 | - }else{ |
|
160 | + } else{ |
|
161 | 161 | DB::table('cb_menus')->insertGetId($menu); |
162 | 162 | } |
163 | 163 |
@@ -31,9 +31,9 @@ discard block |
||
31 | 31 | /* |
32 | 32 | * For security reason we have limit the upload file formats bellow |
33 | 33 | */ |
34 | - 'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif','pdf','xls','xlsx','doc','docx','txt','zip','rar','rtf'], |
|
34 | + 'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif', 'pdf', 'xls', 'xlsx', 'doc', 'docx', 'txt', 'zip', 'rar', 'rtf'], |
|
35 | 35 | |
36 | - 'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif'], |
|
36 | + 'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif'], |
|
37 | 37 | |
38 | 38 | /* |
39 | 39 | * Override Local FileSystem From Storage To Another |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * You can define in this array what the tables you want to include in "php artisan crudbooster:data_migration" |
70 | 70 | * The default is all cb_ prefix will be include in data migration |
71 | 71 | */ |
72 | - 'ADDITIONAL_DATA_MIGRATION'=>['users','migrations'], |
|
72 | + 'ADDITIONAL_DATA_MIGRATION'=>['users', 'migrations'], |
|
73 | 73 | |
74 | 74 | |
75 | 75 | /* |
@@ -27,14 +27,14 @@ discard block |
||
27 | 27 | |
28 | 28 | public function __call($method, $parameters) |
29 | 29 | { |
30 | - if($method == "getData") { |
|
30 | + if ($method == "getData") { |
|
31 | 31 | $key = $parameters[0]; |
32 | - if(isset($this->data[$key])) { |
|
32 | + if (isset($this->data[$key])) { |
|
33 | 33 | return $this->data[$key]; |
34 | - }else{ |
|
34 | + } else { |
|
35 | 35 | return null; |
36 | 36 | } |
37 | - }else{ |
|
37 | + } else { |
|
38 | 38 | return null; |
39 | 39 | } |
40 | 40 | } |
@@ -48,13 +48,13 @@ discard block |
||
48 | 48 | |
49 | 49 | $query->addSelect($this->data['table'].'.'.cb()->pk($this->data['table']).' as primary_key'); |
50 | 50 | |
51 | - $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true; |
|
52 | - if($softDelete === true && Schema::hasColumn($this->data['table'],'deleted_at')) { |
|
51 | + $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true; |
|
52 | + if ($softDelete === true && Schema::hasColumn($this->data['table'], 'deleted_at')) { |
|
53 | 53 | $query->whereNull($this->data['table'].'.deleted_at'); |
54 | 54 | } |
55 | 55 | |
56 | - if(isset($joins)) { |
|
57 | - foreach($joins as $join) |
|
56 | + if (isset($joins)) { |
|
57 | + foreach ($joins as $join) |
|
58 | 58 | { |
59 | 59 | $query->join($join['target_table'], |
60 | 60 | $join['target_table_primary'], |
@@ -64,14 +64,14 @@ discard block |
||
64 | 64 | } |
65 | 65 | } |
66 | 66 | |
67 | - foreach($columns as $column) { |
|
67 | + foreach ($columns as $column) { |
|
68 | 68 | /** @var ColumnModel $column */ |
69 | - if($column->getType() != "custom") { |
|
70 | - if(strpos($column->getField(),".") === false) { |
|
71 | - if(Schema::hasColumn($this->data['table'], $column->getField())) { |
|
69 | + if ($column->getType() != "custom") { |
|
70 | + if (strpos($column->getField(), ".") === false) { |
|
71 | + if (Schema::hasColumn($this->data['table'], $column->getField())) { |
|
72 | 72 | $query->addSelect($this->data['table'].'.'.$column->getField()); |
73 | 73 | } |
74 | - }else{ |
|
74 | + } else { |
|
75 | 75 | $query->addSelect($column->getField()); |
76 | 76 | } |
77 | 77 | } |
@@ -79,20 +79,20 @@ discard block |
||
79 | 79 | $query = getTypeHook($column->getType())->query($query, $column); |
80 | 80 | } |
81 | 81 | |
82 | - if(request()->has('q')) |
|
82 | + if (request()->has('q')) |
|
83 | 83 | { |
84 | - if(isset($this->data['hook_search_query'])) { |
|
84 | + if (isset($this->data['hook_search_query'])) { |
|
85 | 85 | $query = call_user_func($this->data['hook_search_query'], $query); |
86 | - }else{ |
|
87 | - $query->where(function ($where) use ($columns) { |
|
86 | + } else { |
|
87 | + $query->where(function($where) use ($columns) { |
|
88 | 88 | /** |
89 | 89 | * @var $where Builder |
90 | 90 | */ |
91 | - foreach($columns as $column) |
|
91 | + foreach ($columns as $column) |
|
92 | 92 | { |
93 | - if(strpos($column->getField(),".") === false) { |
|
93 | + if (strpos($column->getField(), ".") === false) { |
|
94 | 94 | $field = $this->data['table'].'.'.$column->getField(); |
95 | - }else{ |
|
95 | + } else { |
|
96 | 96 | $field = $column->getField(); |
97 | 97 | } |
98 | 98 | $where->orWhere($field, 'like', '%'.request('q').'%'); |
@@ -101,17 +101,17 @@ discard block |
||
101 | 101 | } |
102 | 102 | } |
103 | 103 | |
104 | - if(isset($this->data['hook_index_query']) && is_callable($this->data['hook_index_query'])) { |
|
104 | + if (isset($this->data['hook_index_query']) && is_callable($this->data['hook_index_query'])) { |
|
105 | 105 | $query = call_user_func($this->data['hook_index_query'], $query); |
106 | 106 | } |
107 | 107 | |
108 | 108 | |
109 | - if(request()->has(['order_by','order_sort'])) |
|
109 | + if (request()->has(['order_by', 'order_sort'])) |
|
110 | 110 | { |
111 | - if(in_array(request('order_by'),columnSingleton()->getColumnNameOnly())) { |
|
111 | + if (in_array(request('order_by'), columnSingleton()->getColumnNameOnly())) { |
|
112 | 112 | $query->orderBy(request('order_by'), request('order_sort')); |
113 | 113 | } |
114 | - }else{ |
|
114 | + } else { |
|
115 | 115 | $query->orderBy($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), "desc"); |
116 | 116 | } |
117 | 117 | |
@@ -120,10 +120,10 @@ discard block |
||
120 | 120 | |
121 | 121 | public function getIndex() |
122 | 122 | { |
123 | - if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
123 | + if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area")); |
|
124 | 124 | |
125 | 125 | $query = $this->repository(); |
126 | - $result = $query->paginate( request("limit")?:cbConfig("LIMIT_TABLE_DATA") ); |
|
126 | + $result = $query->paginate(request("limit") ?: cbConfig("LIMIT_TABLE_DATA")); |
|
127 | 127 | $data['result'] = $result; |
128 | 128 | |
129 | 129 | return view("crudbooster::module.index.index", array_merge($data, $this->data)); |
@@ -135,29 +135,29 @@ discard block |
||
135 | 135 | */ |
136 | 136 | private function validation() |
137 | 137 | { |
138 | - if(isset($this->data['validation'])) { |
|
138 | + if (isset($this->data['validation'])) { |
|
139 | 139 | $validator = Validator::make(request()->all(), @$this->data['validation'], @$this->data['validation_messages']); |
140 | 140 | if ($validator->fails()) { |
141 | 141 | $message = $validator->messages(); |
142 | 142 | $message_all = $message->all(); |
143 | - throw new CBValidationException(implode(', ',$message_all)); |
|
143 | + throw new CBValidationException(implode(', ', $message_all)); |
|
144 | 144 | } |
145 | 145 | } |
146 | 146 | } |
147 | 147 | |
148 | 148 | public function getAdd() |
149 | 149 | { |
150 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
150 | + if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area")); |
|
151 | 151 | |
152 | 152 | $data = []; |
153 | 153 | $data['page_title'] = $this->data['page_title'].' : '.cbLang('add'); |
154 | 154 | $data['action_url'] = module()->addSaveURL(); |
155 | - return view('crudbooster::module.form.form',array_merge($data, $this->data)); |
|
155 | + return view('crudbooster::module.form.form', array_merge($data, $this->data)); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | public function postAddSave() |
159 | 159 | { |
160 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
160 | + if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area")); |
|
161 | 161 | |
162 | 162 | try { |
163 | 163 | $this->validation(); |
@@ -165,35 +165,35 @@ discard block |
||
165 | 165 | $data = columnSingleton()->getAssignmentData(); |
166 | 166 | |
167 | 167 | //Clear data from Primary Key |
168 | - unset($data[ cb()->pk($this->data['table']) ]); |
|
168 | + unset($data[cb()->pk($this->data['table'])]); |
|
169 | 169 | |
170 | - if(Schema::hasColumn($this->data['table'], 'created_at')) { |
|
170 | + if (Schema::hasColumn($this->data['table'], 'created_at')) { |
|
171 | 171 | $data['created_at'] = date('Y-m-d H:i:s'); |
172 | 172 | } |
173 | 173 | |
174 | - if(Schema::hasColumn($this->data['table'], 'updated_at')) { |
|
174 | + if (Schema::hasColumn($this->data['table'], 'updated_at')) { |
|
175 | 175 | $data['updated_at'] = date('Y-m-d H:i:s'); |
176 | 176 | } |
177 | 177 | |
178 | - if(isset($this->data['hook_before_insert']) && is_callable($this->data['hook_before_insert'])) { |
|
178 | + if (isset($this->data['hook_before_insert']) && is_callable($this->data['hook_before_insert'])) { |
|
179 | 179 | $data = call_user_func($this->data['hook_before_insert'], $data); |
180 | 180 | } |
181 | 181 | |
182 | 182 | $id = DB::table($this->data['table'])->insertGetId($data); |
183 | 183 | |
184 | - if(isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) { |
|
184 | + if (isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) { |
|
185 | 185 | call_user_func($this->data['hook_after_insert'], $id); |
186 | 186 | } |
187 | 187 | |
188 | 188 | } catch (CBValidationException $e) { |
189 | 189 | Log::debug($e); |
190 | - return cb()->redirectBack($e->getMessage(),'info'); |
|
190 | + return cb()->redirectBack($e->getMessage(), 'info'); |
|
191 | 191 | } catch (\Exception $e) { |
192 | 192 | Log::error($e); |
193 | - return cb()->redirectBack(cbLang("something_went_wrong"),'warning'); |
|
193 | + return cb()->redirectBack(cbLang("something_went_wrong"), 'warning'); |
|
194 | 194 | } |
195 | 195 | |
196 | - if (Str::contains(request("submit"),cbLang("more"))) { |
|
196 | + if (Str::contains(request("submit"), cbLang("more"))) { |
|
197 | 197 | return cb()->redirect(module()->addURL(), cbLang("the_data_has_been_added"), 'success'); |
198 | 198 | } else { |
199 | 199 | return cb()->redirect(module()->url(), cbLang("the_data_has_been_added"), 'success'); |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | |
203 | 203 | public function getEdit($id) |
204 | 204 | { |
205 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
205 | + if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area")); |
|
206 | 206 | |
207 | 207 | $data = []; |
208 | 208 | $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first(); |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | |
214 | 214 | public function postEditSave($id) |
215 | 215 | { |
216 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
216 | + if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area")); |
|
217 | 217 | |
218 | 218 | try { |
219 | 219 | $this->validation(); |
@@ -221,51 +221,51 @@ discard block |
||
221 | 221 | $data = columnSingleton()->getAssignmentData(); |
222 | 222 | |
223 | 223 | // Make sure the Primary Key is not included |
224 | - unset($data[ cb()->pk($this->data['table']) ]); |
|
224 | + unset($data[cb()->pk($this->data['table'])]); |
|
225 | 225 | |
226 | - if(Schema::hasColumn($this->data['table'], 'updated_at')) { |
|
226 | + if (Schema::hasColumn($this->data['table'], 'updated_at')) { |
|
227 | 227 | $data['updated_at'] = date('Y-m-d H:i:s'); |
228 | 228 | } |
229 | 229 | |
230 | 230 | unset($data['created_at']); |
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 | |
236 | 236 | cb()->update($this->data['table'], $id, $data); |
237 | 237 | |
238 | - if(isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) { |
|
238 | + if (isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) { |
|
239 | 239 | call_user_func($this->data['hook_after_update'], $id); |
240 | 240 | } |
241 | 241 | |
242 | 242 | } catch (CBValidationException $e) { |
243 | 243 | Log::debug($e); |
244 | - return cb()->redirectBack($e->getMessage(),'info'); |
|
244 | + return cb()->redirectBack($e->getMessage(), 'info'); |
|
245 | 245 | } catch (\Exception $e) { |
246 | 246 | Log::error($e); |
247 | - return cb()->redirectBack(cbLang("something_went_wrong"),'warning'); |
|
247 | + return cb()->redirectBack(cbLang("something_went_wrong"), 'warning'); |
|
248 | 248 | } |
249 | 249 | |
250 | 250 | |
251 | 251 | if (Str::contains(request("submit"), cbLang("more"))) { |
252 | - return cb()->redirectBack( cbLang("the_data_has_been_updated"), 'success'); |
|
252 | + return cb()->redirectBack(cbLang("the_data_has_been_updated"), 'success'); |
|
253 | 253 | } else { |
254 | - return cb()->redirect(module()->url(), cbLang("the_data_has_been_updated"), 'success'); |
|
254 | + return cb()->redirect(module()->url(), cbLang("the_data_has_been_updated"), 'success'); |
|
255 | 255 | } |
256 | 256 | } |
257 | 257 | |
258 | 258 | public function getDelete($id) |
259 | 259 | { |
260 | - if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
260 | + if (!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area")); |
|
261 | 261 | |
262 | - if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) { |
|
262 | + if (isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) { |
|
263 | 263 | call_user_func($this->data['hook_before_delete'], $id); |
264 | 264 | } |
265 | 265 | |
266 | - $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true; |
|
266 | + $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true; |
|
267 | 267 | |
268 | - if ($softDelete === true && Schema::hasColumn($this->data['table'],'deleted_at')) { |
|
268 | + if ($softDelete === true && Schema::hasColumn($this->data['table'], 'deleted_at')) { |
|
269 | 269 | DB::table($this->data['table']) |
270 | 270 | ->where(getPrimaryKey($this->data['table']), $id) |
271 | 271 | ->update(['deleted_at' => date('Y-m-d H:i:s')]); |
@@ -275,16 +275,16 @@ discard block |
||
275 | 275 | ->delete(); |
276 | 276 | } |
277 | 277 | |
278 | - if(isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) { |
|
278 | + if (isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) { |
|
279 | 279 | call_user_func($this->data['hook_after_delete'], $id); |
280 | 280 | } |
281 | 281 | |
282 | - return cb()->redirectBack( cbLang("the_data_has_been_deleted"), 'success'); |
|
282 | + return cb()->redirectBack(cbLang("the_data_has_been_deleted"), 'success'); |
|
283 | 283 | } |
284 | 284 | |
285 | 285 | public function getDetail($id) |
286 | 286 | { |
287 | - if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
287 | + if (!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area")); |
|
288 | 288 | |
289 | 289 | $data = []; |
290 | 290 | $data['row'] = $this->repository()->where($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), $id)->first(); |
@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | $key = $parameters[0]; |
32 | 32 | if(isset($this->data[$key])) { |
33 | 33 | return $this->data[$key]; |
34 | - }else{ |
|
34 | + } else{ |
|
35 | 35 | return null; |
36 | 36 | } |
37 | - }else{ |
|
37 | + } else{ |
|
38 | 38 | return null; |
39 | 39 | } |
40 | 40 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | if(Schema::hasColumn($this->data['table'], $column->getField())) { |
72 | 72 | $query->addSelect($this->data['table'].'.'.$column->getField()); |
73 | 73 | } |
74 | - }else{ |
|
74 | + } else{ |
|
75 | 75 | $query->addSelect($column->getField()); |
76 | 76 | } |
77 | 77 | } |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | { |
84 | 84 | if(isset($this->data['hook_search_query'])) { |
85 | 85 | $query = call_user_func($this->data['hook_search_query'], $query); |
86 | - }else{ |
|
86 | + } else{ |
|
87 | 87 | $query->where(function ($where) use ($columns) { |
88 | 88 | /** |
89 | 89 | * @var $where Builder |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | { |
93 | 93 | if(strpos($column->getField(),".") === false) { |
94 | 94 | $field = $this->data['table'].'.'.$column->getField(); |
95 | - }else{ |
|
95 | + } else{ |
|
96 | 96 | $field = $column->getField(); |
97 | 97 | } |
98 | 98 | $where->orWhere($field, 'like', '%'.request('q').'%'); |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | if(in_array(request('order_by'),columnSingleton()->getColumnNameOnly())) { |
112 | 112 | $query->orderBy(request('order_by'), request('order_sort')); |
113 | 113 | } |
114 | - }else{ |
|
114 | + } else{ |
|
115 | 115 | $query->orderBy($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), "desc"); |
116 | 116 | } |
117 | 117 | |
@@ -120,7 +120,9 @@ discard block |
||
120 | 120 | |
121 | 121 | public function getIndex() |
122 | 122 | { |
123 | - if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
123 | + if(!module()->canBrowse()) { |
|
124 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
125 | + } |
|
124 | 126 | |
125 | 127 | $query = $this->repository(); |
126 | 128 | $result = $query->paginate( request("limit")?:cbConfig("LIMIT_TABLE_DATA") ); |
@@ -147,7 +149,9 @@ discard block |
||
147 | 149 | |
148 | 150 | public function getAdd() |
149 | 151 | { |
150 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
152 | + if(!module()->canCreate()) { |
|
153 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
154 | + } |
|
151 | 155 | |
152 | 156 | $data = []; |
153 | 157 | $data['page_title'] = $this->data['page_title'].' : '.cbLang('add'); |
@@ -157,7 +161,9 @@ discard block |
||
157 | 161 | |
158 | 162 | public function postAddSave() |
159 | 163 | { |
160 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
164 | + if(!module()->canCreate()) { |
|
165 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
166 | + } |
|
161 | 167 | |
162 | 168 | try { |
163 | 169 | $this->validation(); |
@@ -202,7 +208,9 @@ discard block |
||
202 | 208 | |
203 | 209 | public function getEdit($id) |
204 | 210 | { |
205 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
211 | + if(!module()->canUpdate()) { |
|
212 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
213 | + } |
|
206 | 214 | |
207 | 215 | $data = []; |
208 | 216 | $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first(); |
@@ -213,7 +221,9 @@ discard block |
||
213 | 221 | |
214 | 222 | public function postEditSave($id) |
215 | 223 | { |
216 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
224 | + if(!module()->canUpdate()) { |
|
225 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
226 | + } |
|
217 | 227 | |
218 | 228 | try { |
219 | 229 | $this->validation(); |
@@ -257,7 +267,9 @@ discard block |
||
257 | 267 | |
258 | 268 | public function getDelete($id) |
259 | 269 | { |
260 | - if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
270 | + if(!module()->canDelete()) { |
|
271 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
272 | + } |
|
261 | 273 | |
262 | 274 | if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) { |
263 | 275 | call_user_func($this->data['hook_before_delete'], $id); |
@@ -284,7 +296,9 @@ discard block |
||
284 | 296 | |
285 | 297 | public function getDetail($id) |
286 | 298 | { |
287 | - if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
299 | + if(!module()->canRead()) { |
|
300 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
301 | + } |
|
288 | 302 | |
289 | 303 | $data = []; |
290 | 304 | $data['row'] = $this->repository()->where($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), $id)->first(); |
@@ -18,8 +18,8 @@ |
||
18 | 18 | public function handle($request, Closure $next) |
19 | 19 | { |
20 | 20 | |
21 | - if(session()->get("developer") != getSetting('developer_username')) { |
|
22 | - return cb()->redirect(cb()->getDeveloperUrl("login"),"Please login for first"); |
|
21 | + if (session()->get("developer") != getSetting('developer_username')) { |
|
22 | + return cb()->redirect(cb()->getDeveloperUrl("login"), "Please login for first"); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | return $next($request); |
@@ -25,15 +25,15 @@ |
||
25 | 25 | { |
26 | 26 | |
27 | 27 | try { |
28 | - if(@$this->command->option("password") == "AUTO" || !@$this->command->option("password")) { |
|
28 | + if (@$this->command->option("password") == "AUTO" || !@$this->command->option("password")) { |
|
29 | 29 | $password = Str::random(16); |
30 | - }else{ |
|
30 | + } else { |
|
31 | 31 | $password = $this->command->option("password"); |
32 | 32 | } |
33 | 33 | |
34 | - if(@$this->command->option("username") == "AUTO" || !@$this->command->option("username")) { |
|
34 | + if (@$this->command->option("username") == "AUTO" || !@$this->command->option("username")) { |
|
35 | 35 | $username = Str::random(5); |
36 | - }else{ |
|
36 | + } else { |
|
37 | 37 | $username = $this->command->option("username"); |
38 | 38 | } |
39 | 39 | } catch (\Exception $e) { |
@@ -27,13 +27,13 @@ |
||
27 | 27 | try { |
28 | 28 | if(@$this->command->option("password") == "AUTO" || !@$this->command->option("password")) { |
29 | 29 | $password = Str::random(16); |
30 | - }else{ |
|
30 | + } else{ |
|
31 | 31 | $password = $this->command->option("password"); |
32 | 32 | } |
33 | 33 | |
34 | 34 | if(@$this->command->option("username") == "AUTO" || !@$this->command->option("username")) { |
35 | 35 | $username = Str::random(5); |
36 | - }else{ |
|
36 | + } else{ |
|
37 | 37 | $username = $this->command->option("username"); |
38 | 38 | } |
39 | 39 | } catch (\Exception $e) { |
@@ -25,13 +25,13 @@ discard block |
||
25 | 25 | // Register views |
26 | 26 | $this->loadViewsFrom(__DIR__.'/views', 'crudbooster'); |
27 | 27 | $this->loadViewsFrom(__DIR__.'/types', 'types'); |
28 | - $this->loadTranslationsFrom(__DIR__."/localization","cb"); |
|
28 | + $this->loadTranslationsFrom(__DIR__."/localization", "cb"); |
|
29 | 29 | |
30 | 30 | // Publish the files |
31 | - $this->publishes([__DIR__.'/configs/crudbooster.php' => config_path('crudbooster.php')],'cb_config'); |
|
32 | - $this->publishes([__DIR__.'/database' => base_path('database')],'cb_migration'); |
|
33 | - $this->publishes([__DIR__.'/templates/CBHook.stub'=> app_path('Http/CBHook.php')],'cb_hook'); |
|
34 | - $this->publishes([__DIR__ . '/assets' =>public_path('cb_asset')],'cb_asset'); |
|
31 | + $this->publishes([__DIR__.'/configs/crudbooster.php' => config_path('crudbooster.php')], 'cb_config'); |
|
32 | + $this->publishes([__DIR__.'/database' => base_path('database')], 'cb_migration'); |
|
33 | + $this->publishes([__DIR__.'/templates/CBHook.stub'=> app_path('Http/CBHook.php')], 'cb_hook'); |
|
34 | + $this->publishes([__DIR__.'/assets' =>public_path('cb_asset')], 'cb_asset'); |
|
35 | 35 | |
36 | 36 | // Override Local FileSystem |
37 | 37 | Config::set("filesystems.disks.local.root", cbConfig("LOCAL_FILESYSTEM_PATH", public_path("storage"))); |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | require __DIR__.'/helpers/Helper.php'; |
54 | 54 | |
55 | 55 | // Singletons |
56 | - $this->app->singleton('crudbooster', function () |
|
56 | + $this->app->singleton('crudbooster', function() |
|
57 | 57 | { |
58 | 58 | return true; |
59 | 59 | }); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | } |
72 | 72 | |
73 | 73 | // Merging configuration |
74 | - $this->mergeConfigFrom(__DIR__.'/configs/crudbooster.php','crudbooster'); |
|
74 | + $this->mergeConfigFrom(__DIR__.'/configs/crudbooster.php', 'crudbooster'); |
|
75 | 75 | |
76 | 76 | // Register additional library |
77 | 77 | $this->app->register('Intervention\Image\ImageServiceProvider'); |
@@ -83,11 +83,11 @@ discard block |
||
83 | 83 | private function registerPlugin() |
84 | 84 | { |
85 | 85 | $views = scandir(app_path("CBPlugins")); |
86 | - foreach($views as $view) { |
|
87 | - if($view != "." && $view != "..") { |
|
86 | + foreach ($views as $view) { |
|
87 | + if ($view != "." && $view != "..") { |
|
88 | 88 | $basename = basename($view); |
89 | 89 | // register view |
90 | - $this->loadViewsFrom(app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Views"),$basename); |
|
90 | + $this->loadViewsFrom(app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Views"), $basename); |
|
91 | 91 | // register route |
92 | 92 | require app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Routes".DIRECTORY_SEPARATOR."Route.php"); |
93 | 93 | } |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | |
97 | 97 | private function registerTypeRoutes() { |
98 | 98 | $routes = rglob(__DIR__.DIRECTORY_SEPARATOR."types".DIRECTORY_SEPARATOR."Route.php"); |
99 | - foreach($routes as $route) { |
|
99 | + foreach ($routes as $route) { |
|
100 | 100 | require $route; |
101 | 101 | } |
102 | 102 | } |
@@ -15,26 +15,26 @@ discard block |
||
15 | 15 | |
16 | 16 | public static function has($key) |
17 | 17 | { |
18 | - if(file_exists(app_path("CBPlugins/".$key))) return true; |
|
18 | + if (file_exists(app_path("CBPlugins/".$key))) return true; |
|
19 | 19 | else return false; |
20 | 20 | } |
21 | 21 | |
22 | 22 | public static function isNeedUpgrade($pluginKey, $versionToCompare) |
23 | 23 | { |
24 | 24 | $pluginJson = json_decode(file_get_contents(app_path("CBPlugins/".$pluginKey."/plugin.json")), true); |
25 | - if($pluginJson) { |
|
26 | - return version_compare($pluginJson['version'], $versionToCompare,"!="); |
|
27 | - }else{ |
|
25 | + if ($pluginJson) { |
|
26 | + return version_compare($pluginJson['version'], $versionToCompare, "!="); |
|
27 | + } else { |
|
28 | 28 | return false; |
29 | 29 | } |
30 | 30 | } |
31 | 31 | |
32 | 32 | public static function registerDefaultRoute($dir) |
33 | 33 | { |
34 | - Route::group(['middleware' => ['web',\crocodicstudio\crudbooster\middlewares\CBDeveloper::class], |
|
34 | + Route::group(['middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBDeveloper::class], |
|
35 | 35 | 'prefix'=>"developer/".getSetting('developer_path'), |
36 | - 'namespace' => 'App\CBPlugins\\'.basename(dirname("./../".$dir)).'\Controllers'], function () use ($dir) { |
|
37 | - cb()->routeController("plugins/".basename(dirname("./../".$dir)),"\App\CBPlugins\\".basename(dirname("./../".$dir))."\Controllers\\".basename(dirname("./../".$dir))."Controller"); |
|
36 | + 'namespace' => 'App\CBPlugins\\'.basename(dirname("./../".$dir)).'\Controllers'], function() use ($dir) { |
|
37 | + cb()->routeController("plugins/".basename(dirname("./../".$dir)), "\App\CBPlugins\\".basename(dirname("./../".$dir))."\Controllers\\".basename(dirname("./../".$dir))."Controller"); |
|
38 | 38 | }); |
39 | 39 | } |
40 | 40 | |
@@ -43,11 +43,11 @@ discard block |
||
43 | 43 | $plugins = scandir(app_path("CBPlugins")); |
44 | 44 | |
45 | 45 | $result = []; |
46 | - foreach($plugins as $plugin) { |
|
47 | - if($plugin != "." && $plugin != "..") { |
|
46 | + foreach ($plugins as $plugin) { |
|
47 | + if ($plugin != "." && $plugin != "..") { |
|
48 | 48 | $basename = basename($plugin); |
49 | 49 | $row = json_decode(file_get_contents(app_path("CBPlugins".DIRECTORY_SEPARATOR.$plugin.DIRECTORY_SEPARATOR."plugin.json")), true); |
50 | - if($row) { |
|
50 | + if ($row) { |
|
51 | 51 | $result[] = [ |
52 | 52 | "name"=>$row['name'], |
53 | 53 | "version"=>$row['version'], |
@@ -15,8 +15,11 @@ discard block |
||
15 | 15 | |
16 | 16 | public static function has($key) |
17 | 17 | { |
18 | - if(file_exists(app_path("CBPlugins/".$key))) return true; |
|
19 | - else return false; |
|
18 | + if(file_exists(app_path("CBPlugins/".$key))) { |
|
19 | + return true; |
|
20 | + } else { |
|
21 | + return false; |
|
22 | + } |
|
20 | 23 | } |
21 | 24 | |
22 | 25 | public static function isNeedUpgrade($pluginKey, $versionToCompare) |
@@ -24,7 +27,7 @@ discard block |
||
24 | 27 | $pluginJson = json_decode(file_get_contents(app_path("CBPlugins/".$pluginKey."/plugin.json")), true); |
25 | 28 | if($pluginJson) { |
26 | 29 | return version_compare($pluginJson['version'], $versionToCompare,"!="); |
27 | - }else{ |
|
30 | + } else{ |
|
28 | 31 | return false; |
29 | 32 | } |
30 | 33 | } |
@@ -18,7 +18,7 @@ |
||
18 | 18 | public function getIndex() { |
19 | 19 | $data = []; |
20 | 20 | $data['page_title'] = "Dashboard"; |
21 | - return view('crudbooster::dev_layouts.modules.dashboard',$data); |
|
21 | + return view('crudbooster::dev_layouts.modules.dashboard', $data); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | public function postSkipTutorial() |