diff --git a/.idea/deployment.xml b/.idea/deployment.xml index 326a3499..987a08cf 100644 --- a/.idea/deployment.xml +++ b/.idea/deployment.xml @@ -1,6 +1,6 @@ - + @@ -9,6 +9,13 @@ + + + + + + + diff --git a/.idea/webServers.xml b/.idea/webServers.xml index 60c0bb4b..82acebb1 100644 --- a/.idea/webServers.xml +++ b/.idea/webServers.xml @@ -9,6 +9,13 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b10d751f..453dc552 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,11 +5,15 @@ - + + - - - + + + + + + - { + "keyToString": { + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "WebServerToolWindowFactoryState": "false", + "last_opened_file_path": "C:/temp-sk/safekat/ci4/app/Views/themes/backend/vuexy/main", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "vue.rearranger.settings.migration": "true" } -}]]> +} @@ -79,6 +83,7 @@ + 1682339938559 diff --git a/ci4/app/Config/Basics.php b/ci4/app/Config/Basics.php index e7686d06..02535dfc 100644 --- a/ci4/app/Config/Basics.php +++ b/ci4/app/Config/Basics.php @@ -28,7 +28,7 @@ class Basics extends BaseConfig { public $appName = 'Safekat'; - public $i18n = 'Spanish'; + public $i18n = 'es-ES'; public $languages = [ 'en' => 'English', diff --git a/ci4/app/Controllers/Integration.php b/ci4/app/Controllers/Integration.php index 878b27a9..05a84d56 100644 --- a/ci4/app/Controllers/Integration.php +++ b/ci4/app/Controllers/Integration.php @@ -131,23 +131,23 @@ class Integration extends BaseController foreach (keywordEmail()??[] as $item){ $field = str_replace(['[','user_',']'],'',$item); - $template = str_replace('['.$item.']',$user[$field],$template); + $template = str_replace('['.$item.']',$user->$field ?? "",$template); } $token = random_string("alnum", 50); - $url = base_url().'/login/recovery/'.$token; + $url = base_url().'login/recovery/'.$token; $this->pass_recovery_model->save([ - 'user' => $user['token'], + 'user' => $user->token, 'token' => $token ]); $title = $template['subject']??''; $msg = $template['body']??''; $msg = str_replace('[recovery_password]',$url,$msg); - $email = $user['email']; + $email = $user->email; - $this->setLog('recovery','recovery-password',$user['token']); + $this->setLog('recovery','recovery-password',$user->token); $send = $this->sendMail($title,$msg,$email); if($send){ $session->setFlashdata('toast', ['success',lang("App.login_alert_send"),lang("App.login_alert_send_pass")]); diff --git a/ci4/app/Controllers/Pedidos/Pedido.php b/ci4/app/Controllers/Pedidos/Pedido.php index 7d188276..38096993 100644 --- a/ci4/app/Controllers/Pedidos/Pedido.php +++ b/ci4/app/Controllers/Pedidos/Pedido.php @@ -16,20 +16,20 @@ class Pedido extends BaseController echo 'Pedido'; } - public function delete_files() - { - - } - - public function pedidos_maquetacion() - { - - } - - public function pedidos_prestashop() - { - - } +// public function delete_files() +// { +// +// } +// +// public function pedidos_maquetacion() +// { +// +// } +// +// public function pedidos_prestashop() +// { +// +// } } \ No newline at end of file diff --git a/ci4/app/Filters/LoginAuthFilter.php b/ci4/app/Filters/LoginAuthFilter.php index 8e1e268a..8343f613 100644 --- a/ci4/app/Filters/LoginAuthFilter.php +++ b/ci4/app/Filters/LoginAuthFilter.php @@ -140,7 +140,8 @@ class LoginAuthFilter implements FilterInterface 'Migrate', 'Test', 'GoBaseController', - 'GoBaseResourceController' + 'GoBaseResourceController', + 'Settings', 'My', 'Activity', 'Notification' // PARA LA DEMO ]; } diff --git a/ci4/app/Views/themes/_commonPartialsBs/datatables.php b/ci4/app/Views/themes/_commonPartialsBs/datatables.php index fee4d44b..f36b6b6d 100644 --- a/ci4/app/Views/themes/_commonPartialsBs/datatables.php +++ b/ci4/app/Views/themes/_commonPartialsBs/datatables.php @@ -160,7 +160,7 @@ "scrollX": true, "stateSave": true, "language": { - //url: "//cdn.datatables.net/plug-ins/1.10.25/i18n/languages[$currentLocale] ?? config('Basics')->i18n ?>.json" + url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" }, "columnDefs": [ { diff --git a/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php b/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php index 5dce7459..a66b6690 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php @@ -78,7 +78,6 @@ - @@ -90,7 +89,9 @@ + class="form-check-input" + rules, $item['name'], $subitem)?'checked':''?> + > @@ -113,7 +114,9 @@ + class="form-check-input" + rules, $item['name'], $subitem)?'checked':''?> + >