diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4b900032..21bbd9a6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,7 +6,15 @@ - + + + + + + + + + - + + + - - @@ -82,6 +90,14 @@ + + + + + + + + 1682339938559 diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index a4a08d87..afacc81b 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -53,6 +53,113 @@ $routes->setAutoRoute(true); // We get a performance increase by specifying the default // route since we don't have to scan directories. +$routes->group('', [], function($routes) { + + $routes->group('paises', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) { + $routes->get('', 'Paises::index', ['as' => 'paisList']); + $routes->get('index', 'Paises::index', ['as' => 'paisIndex']); + $routes->get('add', 'Paises::add', ['as' => 'newPais']); + $routes->post('add', 'Paises::add', ['as' => 'createPais']); + $routes->get('edit/(:num)', 'Paises::edit/$1', ['as' => 'editPais']); + $routes->post('edit/(:num)', 'Paises::edit/$1', ['as' => 'updatePais']); + $routes->get('delete/(:num)', 'Paises::delete/$1', ['as' => 'deletePais']); + $routes->post('allmenuitems', 'Paises::allItemsSelect', ['as' => 'select2ItemsOfPaises']); + $routes->post('menuitems', 'Paises::menuItems', ['as' => 'menuItemsOfPaises']); + }); + + $routes->group('tarifaacabado', ['namespace' => 'App\Controllers\Tarifas'], function ($routes) { + $routes->get('', 'Tarifaacabado::index', ['as' => 'tarifaacabadoList']); + $routes->get('index', 'Tarifaacabado::index', ['as' => 'tarifaacabadoIndex']); + $routes->get('list', 'Tarifaacabado::index', ['as' => 'tarifaacabadoList2']); + $routes->get('add', 'Tarifaacabado::add', ['as' => 'newTarifaacabado']); + $routes->post('add', 'Tarifaacabado::add', ['as' => 'createTarifaacabado']); + $routes->get('edit/(:num)', 'Tarifaacabado::edit/$1', ['as' => 'editTarifaacabado']); + $routes->post('edit/(:num)', 'Tarifaacabado::edit/$1', ['as' => 'updateTarifaacabado']); + $routes->get('delete/(:num)', 'Tarifaacabado::delete/$1', ['as' => 'deleteTarifaacabado']); + $routes->post('allmenuitems', 'Tarifaacabado::allItemsSelect', ['as' => 'select2ItemsOfTarifasacabado']); + $routes->post('menuitems', 'Tarifaacabado::menuItems', ['as' => 'menuItemsOfTarifasacabado']); + }); + + $routes->group('users', ['namespace' => 'App\Controllers\Usuarios'], function ($routes) { + $routes->get('', 'Users::index', ['as' => 'userList']); + $routes->get('index', 'Users::index', ['as' => 'userIndex']); + $routes->get('list', 'Users::index', ['as' => 'userList2']); + $routes->get('add', 'Users::add', ['as' => 'newUser']); + $routes->post('add', 'Users::add', ['as' => 'createUser']); + $routes->get('edit/(:num)', 'Users::edit/$1', ['as' => 'editUser']); + $routes->post('edit/(:num)', 'Users::edit/$1', ['as' => 'updateUser']); + $routes->get('delete/(:num)', 'Users::delete/$1', ['as' => 'deleteUser']); + $routes->post('allmenuitems', 'Users::allItemsSelect', ['as' => 'select2ItemsOfUsers']); + $routes->post('menuitems', 'Users::menuItems', ['as' => 'menuItemsOfUsers']); + }); + + $routes->group('group', ['namespace' => 'App\Controllers\Usuarios'], function ($routes) { + $routes->get('', 'Group::index', ['as' => 'userGroupList']); + $routes->get('index', 'Group::index', ['as' => 'groupIndex']); + $routes->post('edit/(:num)', 'Group::edit/$1', ['as' => 'updateGroup']); + $routes->get('edit/(:num)', 'Group::edit/$1', ['as' => 'editGroup']); + $routes->get('delete/(:num)', 'Group::delete/$1', ['as' => 'deleteGroup']); + $routes->get('add', 'Group::add', ['as' => 'newGroup']); + $routes->post('add', 'Group::add', ['as' => 'createGroup']); + }); + + $routes->group('tarifapreimpresion', ['namespace' => 'App\Controllers\Tarifas'], function ($routes) { + $routes->get('', 'Tarifapreimpresion::index', ['as' => 'tarifapreimpresionList']); + $routes->get('index', 'Tarifapreimpresion::index', ['as' => 'tarifapreimpresionIndex']); + $routes->get('list', 'Tarifapreimpresion::index', ['as' => 'tarifapreimpresionList2']); + $routes->get('add', 'Tarifapreimpresion::add', ['as' => 'newTarifapreimpresion']); + $routes->post('add', 'Tarifapreimpresion::add', ['as' => 'createTarifapreimpresion']); + $routes->get('edit/(:num)', 'Tarifapreimpresion::edit/$1', ['as' => 'editTarifapreimpresion']); + $routes->post('edit/(:num)', 'Tarifapreimpresion::edit/$1', ['as' => 'updateTarifapreimpresion']); + $routes->get('delete/(:num)', 'Tarifapreimpresion::delete/$1', ['as' => 'deleteTarifapreimpresion']); + $routes->post('allmenuitems', 'Tarifapreimpresion::allItemsSelect', ['as' => 'select2ItemsOfTarifaspreimpresion']); + $routes->post('menuitems', 'Tarifapreimpresion::menuItems', ['as' => 'menuItemsOfTarifaspreimpresion']); + }); + + + $routes->group('tarifamanipulado', ['namespace' => 'App\Controllers\Tarifas'], function ($routes) { + $routes->get('', 'Tarifamanipulado::index', ['as' => 'tarifamanipuladoList']); + $routes->get('index', 'Tarifamanipulado::index', ['as' => 'tarifamanipuladoIndex']); + $routes->get('list', 'Tarifamanipulado::index', ['as' => 'tarifamanipuladoList2']); + $routes->get('add', 'Tarifamanipulado::add', ['as' => 'newTarifamanipulado']); + $routes->post('add', 'Tarifamanipulado::add', ['as' => 'createTarifamanipulado']); + $routes->get('edit/(:num)', 'Tarifamanipulado::edit/$1', ['as' => 'editTarifamanipulado']); + $routes->post('edit/(:num)', 'Tarifamanipulado::edit/$1', ['as' => 'updateTarifamanipulado']); + $routes->get('delete/(:num)', 'Tarifamanipulado::delete/$1', ['as' => 'deleteTarifamanipulado']); + $routes->post('allmenuitems', 'Tarifamanipulado::allItemsSelect', ['as' => 'select2ItemsOfTarifasmanipulado']); + $routes->post('menuitems', 'Tarifamanipulado::menuItems', ['as' => 'menuItemsOfTarifasmanipulado']); + }); + + + $routes->group('tipologiaslibros', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) { + $routes->get('', 'Tipologias::index', ['as' => 'tipologiaLibrosList']); + $routes->get('index', 'Tipologias::index', ['as' => 'tipologiaLibrosIndex']); + $routes->get('list', 'Tipologias::index', ['as' => 'tipologiaLibrosList2']); + $routes->get('add', 'Tipologias::add', ['as' => 'newTipologiaLibros']); + $routes->post('add', 'Tipologias::add', ['as' => 'createTipologiaLibros']); + $routes->get('edit/(:num)', 'Tipologias::edit/$1', ['as' => 'editTipologiaLibros']); + $routes->post('edit/(:num)', 'Tipologias::edit/$1', ['as' => 'updateTipologiaLibros']); + $routes->get('delete/(:num)', 'Tipologias::delete/$1', ['as' => 'deleteTipologiaLibros']); + $routes->post('allmenuitems', 'Tipologias::allItemsSelect', ['as' => 'select2ItemsOfTipologiasLibros']); + $routes->post('menuitems', 'Tipologias::menuItems', ['as' => 'menuItemsOfTipologiasLibros']); + }); + + $routes->group('profile', ['namespace' => 'App\Controllers'], function ($routes) { + $routes->get('', 'Profile::index', ['as' => 'profileList']); + $routes->get('index', 'Profile::index', ['as' => 'profileIndex']); + $routes->get('list', 'Profile::index', ['as' => 'profileList2']); +// $routes->get('add', 'Profile::add', ['as' => 'newProfile']); +// $routes->post('add', 'Profile::add', ['as' => 'createProfile']); +// $routes->get('edit/(:num)', 'Profile::edit/$1', ['as' => 'editTipologiaLibros']); +// $routes->post('edit/(:num)', 'Profile::edit/$1', ['as' => 'updateTipologiaLibros']); +// $routes->get('delete/(:num)', 'Profile::delete/$1', ['as' => 'deleteTipologiaLibros']); +// $routes->post('allmenuitems', 'Profile::allItemsSelect', ['as' => 'select2ItemsOfTipologiasLibros']); +// $routes->post('menuitems', 'Profile::menuItems', ['as' => 'menuItemsOfTipologiasLibros']); + }); + + + + }); $routes->group('paises', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) { diff --git a/ci4/app/Controllers/Profile.php b/ci4/app/Controllers/Profile.php index e72c0640..a8f3c8ae 100644 --- a/ci4/app/Controllers/Profile.php +++ b/ci4/app/Controllers/Profile.php @@ -56,8 +56,9 @@ class Profile extends BaseController $session = session(); $data['obj'] = $this->user_model->where('id_user',$this->id_user)->first(); - if(!empty($data['obj']['date_birth'])){ - $data['obj']['date_birth'] = dateFormatWeb($data['obj']['date_birth']); + + if(!empty($data['obj']->date_birth)){ + $data['obj']->date_birth = dateFormatWeb($data['obj']->date_birth); } $data['country'] = $this->countries_model->select('code,name')->where('data_lang',session()->get('lang')??'en')->findAll(); @@ -95,9 +96,8 @@ class Profile extends BaseController } } - echo view(getenv('theme.path').'main/header'); echo view(getenv('theme.path').'form/profile/index', $data); - echo view(getenv('theme.path').'main/footer'); + } public function store() diff --git a/ci4/app/Controllers/Settings.php b/ci4/app/Controllers/Settings.php index 26f82681..25033d98 100644 --- a/ci4/app/Controllers/Settings.php +++ b/ci4/app/Controllers/Settings.php @@ -54,20 +54,6 @@ class Settings extends BaseController ['title' => lang("App.menu_settings"), 'route' => "", 'active' => true] ]; - $data['btn_return'] = [ - 'title' => lang("App.global_come_back"), - 'route' => '/home', - 'class' => 'btn btn-dark mr-1', - 'icon' => 'fas fa-angle-left' - ]; - - $data['btn_submit'] = [ - 'title' => lang("App.global_save"), - 'route' => '', - 'class' => 'btn btn-primary mr-1', - 'icon' => 'fas fa-save' - ]; - $data['obj'] = $this->settings_model->first(); $data['countries'] = $this->countries_model->select('id_country,code,name')->where('data_lang',session()->get('lang')??'en')->findAll(); $data['theme'] = $this->theme_model->select('id_theme,type,name')->findAll(); @@ -78,9 +64,8 @@ class Settings extends BaseController $data['tables'] = $db->listTables(); $data['user'] = $this->user_model->select('token,first_name,email')->where('status',true)->findAll(); - echo view(getenv('theme.path').'main/header'); echo view(getenv('theme.path').'form/settings/index', $data); - echo view(getenv('theme.path').'main/footer'); + } public function store() diff --git a/ci4/app/Controllers/Usuarios/Group.php b/ci4/app/Controllers/Usuarios/Group.php index 2ca3d446..572c8fcc 100644 --- a/ci4/app/Controllers/Usuarios/Group.php +++ b/ci4/app/Controllers/Usuarios/Group.php @@ -4,6 +4,7 @@ use App\Entities\Usuarios\UserGroupEntity; use App\Controllers\GoBaseResourceController; use App\Models\Usuarios\UserGroupModel; +use App\Models\Usuarios\GroupUserModel; class Group extends \App\Controllers\GoBaseController { @@ -21,6 +22,8 @@ class Group extends \App\Controllers\GoBaseController protected $indexRoute = 'userGroupList'; + private $group_user_model; + public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) { $this->viewData['pageTitle'] = lang('Group.moduleTitle'); self::$viewPath = getenv('theme.path').'form/group/'; @@ -33,6 +36,9 @@ class Group extends \App\Controllers\GoBaseController { $this->viewData['usingClientSideDataTable'] = true; $this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Groups.group')]); + // IMN + $this->group_user_model = new GroupUserModel(); + $this->viewData['model'] = $this->group_user_model; parent::index(); } diff --git a/ci4/app/Filters/LoginAuthFilter.php b/ci4/app/Filters/LoginAuthFilter.php index 4069d72a..36c9b871 100644 --- a/ci4/app/Filters/LoginAuthFilter.php +++ b/ci4/app/Filters/LoginAuthFilter.php @@ -141,7 +141,7 @@ class LoginAuthFilter implements FilterInterface 'Test', 'GoBaseController', 'GoBaseResourceController', - 'Settings', 'My', 'Activity', 'Notification' // PARA LA DEMO + 'My', 'Activity', 'Notification' // PARA LA DEMO ]; } diff --git a/ci4/app/Helpers/general_helper.php b/ci4/app/Helpers/general_helper.php index 278c3457..495703c6 100644 --- a/ci4/app/Helpers/general_helper.php +++ b/ci4/app/Helpers/general_helper.php @@ -465,7 +465,8 @@ function escape_only($value='') { } function unescape($value='') { - return html_entity_decode($value,null,'UTF-8');; + //return html_entity_decode($value,null,'UTF-8');; + return html_entity_decode($value,ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401,'UTF-8'); } function redirect_to( $location = NULL ) { diff --git a/ci4/app/Language/es/App.php b/ci4/app/Language/es/App.php index 0da4d429..d7fe13c2 100644 --- a/ci4/app/Language/es/App.php +++ b/ci4/app/Language/es/App.php @@ -395,7 +395,7 @@ return [ "settings_label_api" => "API", "settings_label_api_title" => "Configuración de API", "settings_label_api_subtitle_1" => "Establezca a continuación si desea habilitar el uso de API:", - "settings_label_logs" => "Registros", + "settings_label_logs" => "Logs", "settings_label_logs_title" => "Configuración de registros", "settings_label_logs_subtitle_1" => "Defina a continuación si desea borrar los registros de acceso con frecuencia:", "settings_field_title" => "Título de la página", @@ -422,7 +422,7 @@ return [ "settings_field_seo_keywords" => "Palabras clave (SEO)", "settings_field_test_send" => "Realice un envío de prueba para verificar que la configuración anterior sea correcta.", "settings_field_test_send_btn" => "Mandar", - "settings_field_email_gateway" => "Puerta de enlace de correo electrónico", + "settings_field_email_gateway" => "Protocolo", "settings_field_email_gateway_smtp" => "SMTP", "settings_field_email_name" => "Nombre en el correo electrónico", "settings_field_email_name_ph" => "Ingrese el nombre en el correo electrónico", diff --git a/ci4/app/Models/Usuarios/GroupUserModel.php b/ci4/app/Models/Usuarios/GroupUserModel.php index 5dc9265e..b93cf80e 100644 --- a/ci4/app/Models/Usuarios/GroupUserModel.php +++ b/ci4/app/Models/Usuarios/GroupUserModel.php @@ -12,7 +12,7 @@ class GroupUserModel extends BaseModel ]; public function getUsersWithRol($token_group){ - + $result = $this->select('token_user')->where('token_group', $token_group)->countAllResults(); return $result; } diff --git a/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php b/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php index 581b5c4c..f32d8b4b 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php @@ -43,7 +43,7 @@
-
Total 4 users
+
getUsersWithRol($item->token); ?> usuarios en total
diff --git a/ci4/app/Views/themes/backend/vuexy/form/profile/index.php b/ci4/app/Views/themes/backend/vuexy/form/profile/index.php index 636201d9..bdf468de 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/profile/index.php +++ b/ci4/app/Views/themes/backend/vuexy/form/profile/index.php @@ -1,325 +1,280 @@ - -" rel="stylesheet"> - +include("themes/_commonPartialsBs/select2bs5") ?> +extend('themes/backend/vuexy/main/general_settings_layout') ?> + +section('content'); ?> -
-
-
-
-
-

- -
-
-
-
    - - -
    2. - -
    3. - - -
-
-
-
-
-
-
-

-
-
- -
" method="post"> - -
-
-
- -
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " id="date_birth" name="date_birth" value=""> -
-
-
-
- - " value="" disabled> -
-
-
-
- - " value=""> -
-
-
-
- - "> -
-
-
-
- - "> -
-
-
-
-
- -
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
-
- - - - -
-
+
+
+ + +
+
Profile Details
+ +
+
+ user-avatar +
+ + + +
Allowed JPG, GIF or PNG. Max size of 800K
-
-
-
-

-
-
-
-
- -
-
-
- -
-
- -
- - + +
+
Delete Account
+
+
+
+
Are you sure you want to delete your account?
+

Once you delete your account, there is no going back. Please be certain.

+
+
+ + +
+ +
- get('settings'); ?> - -
" method="post" id="sendFormTFA"> - -
+ + +
+ + + + get('settings'); ?> + + + " method="post" id="sendFormTFA"> + +
-

+

- > - + > +
-
+
GetQR("{$settings['title']} ({$name})", $tfa_secret); - } else { - $tfa_secret = $tfa->createSecret(); - $qrcode = $tfa->GetQR("{$settings['title']} ({$name})", $tfa_secret); - } + $tfa = new \App\Libraries\Authenticator(); + $name = $obj['first_name'] ?? ''; + if ($obj['tfa'] && !empty($obj['tfa_secret'])) { + $tfa_secret = $obj['tfa_secret'] ?? ''; + $qrcode = $tfa->GetQR("{$settings['title']} ({$name})", $tfa_secret); + } else { + $tfa_secret = $tfa->createSecret(); + $qrcode = $tfa->GetQR("{$settings['title']} ({$name})", $tfa_secret); + } ?>
-

+

-

+

'.$item.''; + if (!empty($obj['tfa_code'] ?? '')) { + $codes = explode(',', $obj['tfa_code'] ?? ''); + foreach ($codes as $item) { + echo '' . $item . ''; } - }else{ + } else { $codes = array(); - for($i = 1 ; $i <= 8 ; $i++) { + for ($i = 1; $i <= 8; $i++) { $code = random_string('numeric', 6); $codes[] = $code; - echo ''.$code.''; + echo '' . $code . ''; } } ?> -


- - - +


+ + +
@@ -327,41 +282,31 @@
- - -
+ +
- - - - - - - - - - - - - - - - - + + +endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/profile/index_old.php b/ci4/app/Views/themes/backend/vuexy/form/profile/index_old.php new file mode 100644 index 00000000..c0aadbd7 --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/form/profile/index_old.php @@ -0,0 +1,444 @@ + +" + rel="stylesheet"> + + +
+
+
+
+
+

+ +
+
+
+
    + + +
    2. + +
    3. + + +
+
+
+
+
+
+
+

+
+
+ +
" method="post"> + +
+
+
+ +
+
+
+ + " + value="first_name : set_value('first_name'); ?>"> +
+
+
+
+ + " + value="last_name : set_value('last_name'); ?>"> +
+
+
+
+ + " + id="date_birth" name="date_birth" + value="date_birth : set_value('date_birth'); ?>"> +
+
+
+
+ + " + value="email : set_value('email'); ?>" + disabled> +
+
+
+
+ + " + value="mobile : set_value('mobile'); ?>"> +
+
+
+
+ + "> +
+
+
+
+ + "> +
+
+
+
+
+ +
+
+
+ + " + value="address : set_value('address'); ?>"> +
+
+
+
+ + " + value="city : set_value('city'); ?>"> +
+
+
+
+ + " + value="state : set_value('state'); ?>"> +
+
+
+
+ + country ?? [] : set_value('country'); ?> + +
+
+
+
+ + language ?? [] : set_value('language'); ?> + +
+
+
+
+
+ + + + +
+
+
+
+
+
+
+
+

+
+
+
+
+ +
+
+ first_name ?? '' ?>
+ email ?? '' ?> +
+
+ +
+ + +
+
+
+
+
+ get('settings'); ?> + + +
" method="post" id="sendFormTFA"> + +
+
+
+
+
+
+

+
+
+
+ > + +
+
+
+
+
+
+ GetQR("{$settings['title']} ({$name})", $tfa_secret); + } else { + $tfa_secret = $tfa->createSecret(); + $qrcode = $tfa->GetQR("{$settings['title']} ({$name})", $tfa_secret); + } + ?> +
+
+

+ +
+
+

+ ' . $item . ''; + } + } else { + $codes = array(); + for ($i = 1; $i <= 8; $i++) { + $code = random_string('numeric', 6); + $codes[] = $code; + echo '' . $code . ''; + } + } + ?> +


+ + + +
+
+
+
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + diff --git a/ci4/app/Views/themes/backend/vuexy/form/settings/index.php b/ci4/app/Views/themes/backend/vuexy/form/settings/index.php index 226e0ddb..3818b102 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/settings/index.php +++ b/ci4/app/Views/themes/backend/vuexy/form/settings/index.php @@ -1,999 +1,1313 @@ - -" rel="stylesheet"> -" rel="stylesheet"> +include("themes/_commonPartialsBs/select2bs5") ?> +include("themes/_commonPartialsBs/datatables") ?> +extend('themes/backend/vuexy/main/general_settings_layout') ?> + +section('content'); ?> -
-
-
-
-
-

- -
-
-
-
    - - -
    2. - -
    3. - - -
-
+
+ + +
+
+
    +
  • + +
    • +
  • + +
    • + +
  • + +
    • +
  • + +
    • +
  • + +
    • + +
  • + +
    • +
  • + +
    • + +
  • + +
    • +
  • + +
    • + +
  • + +
    • +
  • + +
    • +
+
+ + + +
" method="post"> -
-
+
+ +
+
+
+ + + +
+
+

+ +

+
+
-
-
-
-
- - - - - - - - - - - -
-
-
-
-
-
-
-
-
-
-
- -
-
-
- - " value=""> -
-
-
-
- - - -
-
-
-
- - -
-
-
-
- - -
-
-
- -
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- - - -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - - -
-
-
- -
-
-
- -
- "> -
- -
-
- -
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
- -
-
-
- - -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
- -
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- -
- > - -
-
-
-
-
-
- -
-
-
- -
- > - -
-
-
-
-
- - " value=""> -
-
-
-
- -
- " value=""> -
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- - - -
-
-
-
-
- -
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - " value=""> -
-
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
-
- " class="btn btn-primary mt-2"> -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- - - -
-
-
-
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
- - " value=""> -
-
-
-
- -
- " value=""> -
- -
-
-
-
-
-
- - " value=""> -
-
-
-
- - - -
-
-
- -
-
- " class="btn btn-warning pull-right"> -
-
-
-
-

-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
-

-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- -
- > - -
-
-
-
-
- -
- " value=""> -
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-

- -
-
-

-
-
- - - - - - - - - - - - -
-
-
-
-
-
-
-
+
+
+ +
+
+ + " + value="" + /> +
+
+ + + +
+
+ + +
+
+
+ +
-
-
-
- - - - + +
+ +
+ +
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + +
+
+
+
+ + +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+ +
+
+ + + +
+
+ + " + value="" + > +
+
+ + " + value="" + > +
+
+ + + +
+
+ + " + value="" + > +
+
+ + " + value="" + > +
+ +
+ + " + value="" + > +
+
+ +
+
+ +
+ " + > +
+ +
+
+ +
+
+
+
+ + +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+ +
+
+ + + +
+
+ + " + value="" + > +
+
+ + " + value="" + > +
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+
+ + +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+ + " + value="" + /> +
+
+ +
+ " + value="" + /> + +
+
+
+
+
+ + +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+
+ +
+
+ + + +
+
+
+
+ +
+
+ + " + value="" + /> +
+
+ + " + value="" + /> +
+
+ + " + value="" + /> +
+
+ + " + value="" + /> +
+
+ + " + value="" + /> +
+
+
+
+
+ + +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+
+ +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + " + value="" + /> +
+
+
+ +
+
+
+ +
+
+
+
+ " class="btn btn-primary mt-2"> + + +
+
+
+
+
+ + +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+ + +
+
+
+
+
+ + +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+
+ +
+
+ + + +
+
+
+ +
+
+
+ +
+
+
+
+
+ + +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+ + " + value="" + /> +
+
+ +
+ " + value="" + /> + +
+
+
+ + " + value="" + /> +
+
+ + + +
+
+ +
+
+ " class="btn btn-warning pull-right"> + + +
+
+
+
+

+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+
+

+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+ + +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+ " + value="" + /> + +
+
+
+
+
+
+ + +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+
+ +
+ +
+

+ +
+
+

+
+
+ + + + + + + + + + + + +
+
+
+
+
+
+ +
+
+ + + +
+ + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - +endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/settings/index_bk.php b/ci4/app/Views/themes/backend/vuexy/form/settings/index_bk.php new file mode 100644 index 00000000..69c2d05b --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/form/settings/index_bk.php @@ -0,0 +1,1173 @@ + +" rel="stylesheet"> +" rel="stylesheet"> + +
+
+
+
+
+

+ +
+
+
+
    + + +
    2. + +
    3. + + +
+
+
+
" method="post"> + +
+
+
+
+
+
+
+ + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + " value=""> +
+
+
+
+ + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+ + + +
+
+
+ +
+
+
+ +
+ "> +
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+ +
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+ > + +
+
+
+
+
+
+ +
+
+
+ +
+ > + +
+
+
+
+
+ + " value=""> +
+
+
+
+ +
+ " value=""> +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + +
+
+
+
+
+ +
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + " value=""> +
+
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+
+ " class="btn btn-primary mt-2"> +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + +
+
+
+
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+ + " value=""> +
+
+
+
+ +
+ " value=""> +
+ +
+
+
+
+
+
+ + " value=""> +
+
+
+
+ + + +
+
+
+ +
+
+ " class="btn btn-warning pull-right"> +
+
+
+
+

+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+
+

+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+ > + +
+
+
+
+
+ +
+ " value=""> +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+

+ +
+
+

+
+
+ + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + +
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoForm.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoForm.php index 1aba3ba5..92ff8f02 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoForm.php @@ -1,25 +1,27 @@ include("themes/_commonPartialsBs/select2bs5") ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> section("content") ?>
-
-
-

-
-
- -
- - getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> - -
-
- "btn btn-secondary float-start"]) ?> - "> -
-
-
+
+
+

+
+
+ + + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> + +
+ " + /> + "btn btn-secondary"]) ?> +
+
+
endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoList.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoList.php index 0f535112..61d8d38d 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoList.php @@ -85,8 +85,8 @@ */ ?> - id), lang('Basic.global.edit'), ['class'=>'btn btn-sm btn-warning btn-edit me-1', 'data-id'=>$item->id,]); ?> - 'btn btn-sm btn-danger btn-delete ms-1', 'data-href'=>route_to('deleteTarifaacabado', $item->id), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?> + id), "", ['class'=>'text-body', 'data-id'=>$item->id,]); ?> + ", ['class'=>'text-body', 'data-href'=>route_to('deleteTarifaacabado', $item->id), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionForm.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionForm.php index 43edc2bc..266655af 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionForm.php @@ -1,27 +1,29 @@ include("themes/_commonPartialsBs/select2bs5") ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> section("content") ?>
-
-
-

-
-
- -
- - getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> - -
-
- "btn btn-secondary float-start", - ]) ?> - "> -
-
-
+
+
+

+
+
+ + + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> + +
+ " + /> + "btn btn-secondary"]) ?> + +
+
+
endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php index 90483867..8bacdd86 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php @@ -58,8 +58,8 @@ */ ?> - id), lang('Basic.global.edit'), ['class'=>'btn btn-sm btn-warning btn-edit me-1', 'data-id'=>$item->id,]); ?> - 'btn btn-sm btn-danger btn-delete ms-1', 'data-href'=>route_to('deleteTarifapreimpresion', $item->id), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?> + id), "", ['class'=>'text-body', 'data-id'=>$item->id,]); ?> + ", ['class'=>'text-body', 'data-href'=>route_to('deleteTarifapreimpresion', $item->id), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php b/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php index 417ed876..9349948e 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php @@ -14,8 +14,12 @@ getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
- "> + " + > "btn btn-secondary"]) ?>
diff --git a/ci4/app/Views/themes/backend/vuexy/form/user/viewUserList.php b/ci4/app/Views/themes/backend/vuexy/form/user/viewUserList.php index 7cf110c5..beb87e71 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/user/viewUserList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/user/viewUserList.php @@ -122,8 +122,8 @@ */ ?> - id_user), lang('Basic.global.edit'), ['class'=>'btn btn-sm btn-warning btn-edit me-1', 'data-id'=>$item->id_user,]); ?> - 'btn btn-sm btn-danger btn-delete ms-1', 'data-href'=>route_to('deleteUser', $item->id_user), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?> + id_user), "", ['class'=>'text-body', 'data-id'=>$item->id_user,]); ?> + ", ['class'=>'text-body', 'data-href'=>route_to('deleteUser', $item->id_user), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?> diff --git a/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php b/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php new file mode 100644 index 00000000..1074339e --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php @@ -0,0 +1,291 @@ +get('token') ?? ''; +$tfa = $session->get('tfa') ?? false; +$settings = $session->get('settings'); + +$picture = session()->get('picture'); +$pulse = session()->get('pulse'); +$notification = session()->get('notification'); + +if (!empty($token) && $tfa == false) { + //echo ""; +} +?> + + + + + + + + + + <?= lang("App.dashboard_title") ?> - <?= $settings['title'] ?? '' ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + renderSection('css') ?> + + + + + + + + + + + +
+
+ + + + +
+ + + + + + +
+ + +
+

Account Settings / Account

+ + renderSection('content') ?> + +
+ + + + + + +
+
+ +
+ +
+ + +
+ + +
+
+ + +renderSection('footerAdditions') ?> + + + + + + + + + + + + +renderSection('additionalExternalJs') ?> + + + + + + + + + + + + + diff --git a/ci4/app/Views/themes/backend/vuexy/main/header.php b/ci4/app/Views/themes/backend/vuexy/main/header.php index e1129698..1da49cfa 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/header.php +++ b/ci4/app/Views/themes/backend/vuexy/main/header.php @@ -10,7 +10,7 @@ $pulse = session()->get('pulse'); $notification = session()->get('notification'); if (!empty($token) && $tfa == false) { - echo ""; + //echo ""; } ?> diff --git a/ci4/app/Views/themes/backend/vuexy/main/menu.php b/ci4/app/Views/themes/backend/vuexy/main/menu.php index b147f0e1..f432f2da 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/menu.php +++ b/ci4/app/Views/themes/backend/vuexy/main/menu.php @@ -514,7 +514,6 @@ - + 0): ?> + +
  • + Ajustes del Sistema +
    • +
  • + " class="menu-link"> + +
    ">
    +     +
    • + + + -