diff --git a/.idea/safekat.iml b/.idea/safekat.iml index 91d27d36..3e9830fc 100755 --- a/.idea/safekat.iml +++ b/.idea/safekat.iml @@ -2,8 +2,6 @@ - - diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index 2d83fb2d..68f8b2ae 100755 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -18,12 +18,12 @@ $routes->get('viewmode/(:alpha)', 'Viewmode::index/$1'); $routes->group('activity', ['namespace' => 'App\Controllers\Sistema'], function ($routes) { $routes->get('', 'Actividad::index', ['as' => 'activityList']); - $routes->post('datatable', 'Actividad::datatable', ['as' => 'dataTableOfActividad']); + $routes->post('datatable', 'Actividad::datatable', ['as' => 'activityDT']); }); $routes->group('settings', ['namespace' => 'App\Controllers\Sistema'], function ($routes) { - $routes->get('', 'Ajustes::settings', ['as' => 'settingsEdit']); - $routes->post('', 'Ajustes::settings', ['as' => 'settingsPost']); + $routes->get('', 'Ajustes::settings', ['as' => 'ajustesList']); + $routes->post('', 'Ajustes::settings', ['as' => 'ajustesEdit']); }); @@ -32,21 +32,27 @@ $routes->group('settings', ['namespace' => 'App\Controllers\Sistema'], function * Route Definitions * -------------------------------------------------------------------- */ -$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->post('create', 'Tarifaacabado::create', ['as' => 'ajaxCreateTarifaAcabado']); - $routes->put('(:num)/update', 'Tarifaacabado::update/$1', ['as' => 'ajaxUpdateTarifaAcabado']); - $routes->post('edit/(:num)', 'Tarifaacabado::edit/$1', ['as' => 'updateTarifaAcabado']); - $routes->get('delete/(:num)', 'Tarifaacabado::delete/$1', ['as' => 'deleteTarifaAcabado']); - $routes->post('datatable', 'Tarifaacabado::datatable', ['as' => 'dataTableOfTarifasAcabado']); - $routes->post('allmenuitems', 'Tarifaacabado::allItemsSelect', ['as' => 'select2ItemsOfTarifasAcabado']); - $routes->post('menuitems', 'Tarifaacabado::menuItems', ['as' => 'menuItemsOfTarifasAcabado']); + +/* Rutas para configuraciones */ +$routes->group('tarifas', ['namespace' => 'App\Controllers\Tarifas'], function ($routes) { + + /* Cliente */ + $routes->group('acabados', ['namespace' => 'App\Controllers\Tarifas\Acabados'], function ($routes) { + + $routes->get('', 'TarifaAcabados::index', ['as' => 'tarifaAcabadoList']); + $routes->match(['get', 'post'], 'add', 'TarifaAcabados::add', ['as' => 'tarifaAcabadoAdd']); + $routes->match(['get', 'post'], 'edit/(:num)', 'TarifaAcabados::edit/$1', ['as' => 'tarifaAcabadoEdit']); + $routes->get('delete/(:num)', 'TarifaAcabados::delete/$1', ['as' => 'tarifaAcabadoDelete']); + $routes->post('datatable', 'TarifaAcabados::datatable', ['as' => 'tarifaAcabadoDT']); + + $routes->group('lineas', ['namespace' => 'App\Controllers\Tarifas\Acabados'], function ($routes) { + $routes->post('datatable', 'TarifaAcabadosLineas::datatable', ['as' => 'tarifaAcabadoLineasDT']); + $routes->post('datatable_editor', 'TarifaAcabadosLineas::datatable_editor', ['as' => 'tarifaAcabadoLineasDTE']); + $routes->get('delete/(:num)', 'TarifaAcabadosLineas::delete/$1', ['as' => 'tarifaAcabadoLineasDelete']); + }); + }); + }); -$routes->resource('tarifaacabado', ['namespace' => 'App\Controllers\Tarifas', 'controller' => 'Tarifaacabado', 'except' => 'show,new,create,update']); $routes->group('users', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) { @@ -200,23 +206,6 @@ $routes->group('papelesimpresionmargenes', ['namespace' => 'App\Controllers\Conf }); $routes->resource('papelesimpresionmargenes', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Papelimpresionmargenes', 'except' => 'show,new,create,update']); - -$routes->group('tarifaacabadolineas', ['namespace' => 'App\Controllers\Tarifas'], function ($routes) { - $routes->get('', 'Tarifaacabadolineas::index', ['as' => 'tarifaAcabadoLineaList']); - $routes->get('add', 'Tarifaacabadolineas::add', ['as' => 'newTarifaAcabadoLinea']); - $routes->post('add', 'Tarifaacabadolineas::add', ['as' => 'createTarifaAcabadoLinea']); - $routes->post('create', 'Tarifaacabadolineas::create', ['as' => 'ajaxCreateTarifaAcabadoLinea']); - $routes->put('(:num)/update', 'Tarifaacabadolineas::update/$1', ['as' => 'ajaxUpdateTarifaAcabadoLinea']); - $routes->post('(:num)/edit', 'Tarifaacabadolineas::edit/$1', ['as' => 'updateTarifaAcabadoLinea']); - $routes->post('datatable', 'Tarifaacabadolineas::datatable', ['as' => 'dataTableOfTarifaAcabadoLineas']); - $routes->post('datatable_editor', 'Tarifaacabadolineas::datatable_editor', ['as' => 'editorOfTarifaAcabadoLineas']); - $routes->post('allmenuitems', 'Tarifaacabadolineas::allItemsSelect', ['as' => 'select2ItemsOfTarifaAcabadoLineas']); - $routes->post('menuitems', 'Tarifaacabadolineas::menuItems', ['as' => 'menuItemsOfTarifaAcabadoLineas']); - $routes->get('delete/(:num)', 'Tarifaacabadolineas::delete/$1', ['as' => 'deleteTarifaAcabadoLinea']); -}); -$routes->resource('tarifaacabadolineas', ['namespace' => 'App\Controllers\Tarifas', 'controller' => 'Tarifaacabadolineas', 'except' => 'show,new,create,update']); - - $routes->group('maquinas', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) { $routes->get('', 'Maquinas::index', ['as' => 'maquinaList']); $routes->get('add', 'Maquinas::add', ['as' => 'newMaquina']); @@ -282,13 +271,6 @@ $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']); }); diff --git a/ci4/app/Controllers/Clientes/Cliente.php b/ci4/app/Controllers/Clientes/Cliente.php index ab1e47a0..f41401c1 100755 --- a/ci4/app/Controllers/Clientes/Cliente.php +++ b/ci4/app/Controllers/Clientes/Cliente.php @@ -25,7 +25,7 @@ class Cliente extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'cliente'; - protected static $viewPath = 'themes/backend/vuexy/form/clientes/cliente/'; + protected static $viewPath = 'themes/vuexy/form/clientes/cliente/'; protected $indexRoute = 'clienteList'; diff --git a/ci4/app/Controllers/Clientes/ClientePrecios.php b/ci4/app/Controllers/Clientes/ClientePrecios.php index d2d751ec..2a73ba78 100755 --- a/ci4/app/Controllers/Clientes/ClientePrecios.php +++ b/ci4/app/Controllers/Clientes/ClientePrecios.php @@ -25,7 +25,7 @@ class ClientePrecios extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'ClientePrecios'; - protected static $viewPath = 'themes/backend/vuexy/form/clientes/cliente'; + protected static $viewPath = 'themes/vuexy/form/clientes/cliente'; protected $indexRoute = 'clientepreciosList'; diff --git a/ci4/app/Controllers/Clientes/Clientecontactos.php b/ci4/app/Controllers/Clientes/Clientecontactos.php index 05eec982..18eb4eef 100755 --- a/ci4/app/Controllers/Clientes/Clientecontactos.php +++ b/ci4/app/Controllers/Clientes/Clientecontactos.php @@ -27,7 +27,7 @@ class Clientecontactos extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'cliente-contactos'; - protected static $viewPath = 'themes/backend/vuexy/form/clientes/contactos/'; + protected static $viewPath = 'themes/vuexy/form/clientes/contactos/'; protected $indexRoute = 'contactoDeClienteList'; diff --git a/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php b/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php index e8577d0d..f2edea93 100755 --- a/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php +++ b/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php @@ -22,7 +22,7 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'clienteplantillaprecios'; - protected static $viewPath = 'themes/backend/vuexy/form/clientes/plantillaprecios/'; + protected static $viewPath = 'themes/vuexy/form/clientes/plantillaprecios/'; protected $indexRoute = 'clienteplantillapreciosList'; diff --git a/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php b/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php index 23856445..a2378aec 100755 --- a/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php +++ b/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php @@ -26,7 +26,7 @@ class Clienteplantillaprecioslineas extends \App\Controllers\BaseResourceControl protected static $controllerSlug = 'clienteplantillaprecioslineas'; - protected static $viewPath = 'themes/backend/vuexy/form/clientes/plantillaprecios/'; + protected static $viewPath = 'themes/vuexy/form/clientes/plantillaprecios/'; protected $indexRoute = 'clienteplantillapreciosList'; diff --git a/ci4/app/Controllers/Clientes/Clienteusuarios.php b/ci4/app/Controllers/Clientes/Clienteusuarios.php index 807bbb98..8e2cdaac 100644 --- a/ci4/app/Controllers/Clientes/Clienteusuarios.php +++ b/ci4/app/Controllers/Clientes/Clienteusuarios.php @@ -28,7 +28,7 @@ class Clienteusuarios extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'cliente-contactos'; - protected static $viewPath = 'themes/backend/vuexy/form/clientes/usuarios/'; + protected static $viewPath = 'themes/vuexy/form/clientes/usuarios/'; protected $indexRoute = 'contactoDeClienteList'; diff --git a/ci4/app/Controllers/Compras/Proveedores.php b/ci4/app/Controllers/Compras/Proveedores.php index fcbd1be3..0ac9be3e 100755 --- a/ci4/app/Controllers/Compras/Proveedores.php +++ b/ci4/app/Controllers/Compras/Proveedores.php @@ -21,7 +21,7 @@ class Proveedores extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'proveedores'; - protected static $viewPath = 'themes/backend/vuexy/form/compras/proveedores/'; + protected static $viewPath = 'themes/vuexy/form/compras/proveedores/'; protected $indexRoute = 'proveedorList'; diff --git a/ci4/app/Controllers/Compras/ProveedoresTipos.php b/ci4/app/Controllers/Compras/ProveedoresTipos.php index 5b245dbe..ebf4bf6d 100755 --- a/ci4/app/Controllers/Compras/ProveedoresTipos.php +++ b/ci4/app/Controllers/Compras/ProveedoresTipos.php @@ -21,7 +21,7 @@ class ProveedoresTipos extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'proveedorestipos'; - protected static $viewPath = 'themes/backend/vuexy/form/compras/proveedores/'; + protected static $viewPath = 'themes/vuexy/form/compras/proveedores/'; protected $indexRoute = 'proveedorTipoList'; diff --git a/ci4/app/Controllers/Configuracion/Comunidadesautonomas.php b/ci4/app/Controllers/Configuracion/Comunidadesautonomas.php index 05ed4593..86f8ae6b 100755 --- a/ci4/app/Controllers/Configuracion/Comunidadesautonomas.php +++ b/ci4/app/Controllers/Configuracion/Comunidadesautonomas.php @@ -24,7 +24,7 @@ class Comunidadesautonomas extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'comunidades-autonomas'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/comunidades-autonomas/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/comunidades-autonomas/'; protected $indexRoute = 'comunidadAutonomaList'; diff --git a/ci4/app/Controllers/Configuracion/Formaspagos.php b/ci4/app/Controllers/Configuracion/Formaspagos.php index 250ccc62..ef027110 100755 --- a/ci4/app/Controllers/Configuracion/Formaspagos.php +++ b/ci4/app/Controllers/Configuracion/Formaspagos.php @@ -22,7 +22,7 @@ class Formaspagos extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'formas-pagos'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/formasPagoViews/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/formasPagoViews/'; protected $indexRoute = 'formaDePagoList'; diff --git a/ci4/app/Controllers/Configuracion/Imposiciones.php b/ci4/app/Controllers/Configuracion/Imposiciones.php index aa7c6b5e..9fabc2c1 100755 --- a/ci4/app/Controllers/Configuracion/Imposiciones.php +++ b/ci4/app/Controllers/Configuracion/Imposiciones.php @@ -22,7 +22,7 @@ class Imposiciones extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'imposiciones'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/imposiciones/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/imposiciones/'; protected $indexRoute = 'imposicionList'; diff --git a/ci4/app/Controllers/Configuracion/Maquinas.php b/ci4/app/Controllers/Configuracion/Maquinas.php index 827c1ae4..65166b70 100755 --- a/ci4/app/Controllers/Configuracion/Maquinas.php +++ b/ci4/app/Controllers/Configuracion/Maquinas.php @@ -22,7 +22,7 @@ class Maquinas extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'maquinas'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/maquinas/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/maquinas/'; protected $indexRoute = 'maquinaList'; diff --git a/ci4/app/Controllers/Configuracion/Maquinasdefecto.php b/ci4/app/Controllers/Configuracion/Maquinasdefecto.php index e798a228..c4831b5c 100755 --- a/ci4/app/Controllers/Configuracion/Maquinasdefecto.php +++ b/ci4/app/Controllers/Configuracion/Maquinasdefecto.php @@ -24,7 +24,7 @@ class Maquinasdefecto extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'maquinasdefecto'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/maquinas/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/maquinas/'; protected $indexRoute = 'maquinaPorDefectoList'; diff --git a/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php b/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php index 5ebd428e..59d87354 100755 --- a/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php +++ b/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php @@ -37,7 +37,7 @@ class Maquinaspapelesimpresion extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'maquinaspapelesimpresion'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/maquinas/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/maquinas/'; protected $indexRoute = ''; diff --git a/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php b/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php index 56c08112..d7fe1bbc 100755 --- a/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php +++ b/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php @@ -28,7 +28,7 @@ class Maquinastarifasimpresion extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'maquinastarifasimpresion'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/maquinas/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/maquinas/'; protected $indexRoute = 'maquinasTarifaImpresionList'; diff --git a/ci4/app/Controllers/Configuracion/Paises.php b/ci4/app/Controllers/Configuracion/Paises.php index f88a1866..2e771c81 100755 --- a/ci4/app/Controllers/Configuracion/Paises.php +++ b/ci4/app/Controllers/Configuracion/Paises.php @@ -22,7 +22,7 @@ class Paises extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'paises'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/paises/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/paises/'; protected $indexRoute = 'paisList'; @@ -31,6 +31,13 @@ class Paises extends \App\Controllers\BaseResourceController { $this->viewData['pageTitle'] = lang('Paises.moduleTitle'); $this->viewData['usingSweetAlert'] = true; + + // Breadcrumbs (IMN) + $this->viewData['breadcrumb'] = [ + ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false], + ['title' => lang("App.menu_paises"), 'route' => site_url('configuracion/paises'), 'active' => true] + ]; + parent::initController($request, $response, $logger); } diff --git a/ci4/app/Controllers/Configuracion/Papelesgenericos.php b/ci4/app/Controllers/Configuracion/Papelesgenericos.php index 623fd161..d0b93c2b 100755 --- a/ci4/app/Controllers/Configuracion/Papelesgenericos.php +++ b/ci4/app/Controllers/Configuracion/Papelesgenericos.php @@ -24,7 +24,7 @@ class Papelesgenericos extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'papelesgenericos'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/papel/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/papel/'; protected $indexRoute = 'papelGenericoList'; diff --git a/ci4/app/Controllers/Configuracion/Papelesimpresion.php b/ci4/app/Controllers/Configuracion/Papelesimpresion.php index 3669b7eb..15f7160e 100755 --- a/ci4/app/Controllers/Configuracion/Papelesimpresion.php +++ b/ci4/app/Controllers/Configuracion/Papelesimpresion.php @@ -49,7 +49,7 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'papelesimpresion'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/papel/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/papel/'; protected $indexRoute = 'papelImpresionList'; diff --git a/ci4/app/Controllers/Configuracion/Papelformato.php b/ci4/app/Controllers/Configuracion/Papelformato.php index 7541426d..4c55dff7 100755 --- a/ci4/app/Controllers/Configuracion/Papelformato.php +++ b/ci4/app/Controllers/Configuracion/Papelformato.php @@ -21,7 +21,7 @@ class Papelformato extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'papelformato'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/papelformato/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/papelformato/'; protected $indexRoute = 'papelFormatoList'; diff --git a/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php b/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php index ad28ac7a..16fe3d07 100755 --- a/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php +++ b/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php @@ -32,7 +32,7 @@ class Papelimpresionmargenes extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'papelimpresionmargenes'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/papelesimpresion/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/papelesimpresion/'; protected $indexRoute = 'papelesImpresionList'; diff --git a/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php b/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php index ec701b66..52f235b0 100755 --- a/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php +++ b/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php @@ -35,7 +35,7 @@ class Papelimpresiontipologias extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'papelimpresiontipologias'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/papel/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/papel/'; protected $indexRoute = 'papelImpresionTipologiaList'; diff --git a/ci4/app/Controllers/Configuracion/Provincias.php b/ci4/app/Controllers/Configuracion/Provincias.php index b599a641..573a4a39 100755 --- a/ci4/app/Controllers/Configuracion/Provincias.php +++ b/ci4/app/Controllers/Configuracion/Provincias.php @@ -24,7 +24,7 @@ class Provincias extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'provincias'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/provincias/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/provincias/'; protected $indexRoute = 'provinciaList'; diff --git a/ci4/app/Controllers/Configuracion/Seriefactura.php b/ci4/app/Controllers/Configuracion/Seriefactura.php deleted file mode 100755 index 7215f566..00000000 --- a/ci4/app/Controllers/Configuracion/Seriefactura.php +++ /dev/null @@ -1,21 +0,0 @@ -user_model = new UserModel(); $this->viewData['pageTitle'] = lang('Users.moduleTitle'); + + // Breadcrumbs (IMN) + $this->viewData['breadcrumb'] = [ + ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false], + ['title' => lang("App.menu_users"), 'route' => site_url('configuracion/users'), 'active' => true] + ]; + parent::initController($request, $response, $logger); } diff --git a/ci4/app/Controllers/Js_loader.php b/ci4/app/Controllers/Js_loader.php index 6b7507eb..56e95cfd 100755 --- a/ci4/app/Controllers/Js_loader.php +++ b/ci4/app/Controllers/Js_loader.php @@ -17,7 +17,7 @@ class Js_loader extends BaseController function comparadorCosidoTapaBlanda_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/comparador.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/comparador.js'); } @@ -37,67 +37,67 @@ class Js_loader extends BaseController function datosLibro_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.js'); } function previsualizador_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/previews.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/previews.js'); } function lineasPresupuesto_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.js'); } function tiradasAlternativas_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.js'); } function datosServicios_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.js'); } function datosEnvios_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosEnvios.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/_datosEnvios.js'); } function resumenPresupuestos_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestos.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestos.js'); } function presupuestos_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/_presupuestos.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/_presupuestos.js'); } function presupuestoCliente_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cliente/presupuestoCliente.js'); + return view('themes/vuexy/form/presupuestos/cliente/presupuestoCliente.js'); } function presupuestoClienteTipoLibro_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cliente/tipoLibroItems.js'); + return view('themes/vuexy/form/presupuestos/cliente/tipoLibroItems.js'); } function presupuestoClienteDisenioLibro_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cliente/disenioLibro.js'); + return view('themes/vuexy/form/presupuestos/cliente/disenioLibro.js'); } function presupuestoClienteDirecciones_js() diff --git a/ci4/app/Controllers/Presupuestos/Buscador.php b/ci4/app/Controllers/Presupuestos/Buscador.php index 6c02de80..ef261dea 100644 --- a/ci4/app/Controllers/Presupuestos/Buscador.php +++ b/ci4/app/Controllers/Presupuestos/Buscador.php @@ -32,7 +32,7 @@ class Buscador extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'buscador'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/buscador/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/buscador/'; protected $indexRoute = 'buscadorPresupuestosList'; diff --git a/ci4/app/Controllers/Presupuestos/Calendarios.php b/ci4/app/Controllers/Presupuestos/Calendarios.php deleted file mode 100755 index 9054fb3d..00000000 --- a/ci4/app/Controllers/Presupuestos/Calendarios.php +++ /dev/null @@ -1,19 +0,0 @@ -> Calendarios [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Carteles.php b/ci4/app/Controllers/Presupuestos/Carteles.php deleted file mode 100755 index bb7a06a9..00000000 --- a/ci4/app/Controllers/Presupuestos/Carteles.php +++ /dev/null @@ -1,19 +0,0 @@ -> Carteles [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php b/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php index 37471d33..be81053d 100755 --- a/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php +++ b/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php @@ -2,26 +2,21 @@ namespace App\Controllers\Presupuestos; -use App\Controllers\BaseResourceController; -use App\Entities\Configuracion\Maquina; -use App\Models\Collection; - use App\Entities\Presupuestos\PresupuestoEntity; -use App\Models\Presupuestos\PresupuestoDireccionesModel; +use App\Models\Collection; +use App\Models\Configuracion\MaquinaModel; use App\Models\Configuracion\PapelGenericoModel; +use App\Models\Configuracion\PapelImpresionModel; use App\Models\Configuracion\TipoPresupuestoModel; -use App\Models\Presupuestos\PresupuestoModel; -use App\Models\Presupuestos\PresupuestoLineaModel; - -use App\Models\Presupuestos\PresupuestoEncuadernacionesModel; use App\Models\Presupuestos\PresupuestoAcabadosModel; +use App\Models\Presupuestos\PresupuestoDireccionesModel; +use App\Models\Presupuestos\PresupuestoEncuadernacionesModel; +use App\Models\Presupuestos\PresupuestoLineaModel; use App\Models\Presupuestos\PresupuestoManipuladosModel; +use App\Models\Presupuestos\PresupuestoModel; use App\Models\Presupuestos\PresupuestoPreimpresionesModel; use App\Models\Presupuestos\PresupuestoServiciosExtraModel; - use App\Services\PresupuestoService; -use App\Models\Configuracion\PapelImpresionModel; -use App\Models\Configuracion\MaquinaModel; use Exception; class Cosidotapablanda extends \App\Controllers\BaseResourceController @@ -37,7 +32,7 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'cosidotapablanda'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/cosidotapablanda/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/cosidotapablanda/'; protected $indexRoute = 'cosidotapablandaList'; @@ -1072,7 +1067,7 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController protected function getAcabadosCubierta() { - $model = model('App\Models\Tarifas\TarifaacabadoModel'); + $model = model('App\Models\Tarifas\Acabados\TarifaAcabadoModel'); $data = $model->getServiciosAcabadoCubierta(); array_unshift($data, (object)['id' => '', 'label' => lang('Basic.global.None')]); return $data; @@ -1080,7 +1075,7 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController protected function getAcabadosSobrecubierta() { - $model = model('App\Models\Tarifas\TarifaacabadoModel'); + $model = model('App\Models\Tarifas\Acabados\TarifaAcabadoModel'); $data = $model->getServiciosAcabadoSobrecubierta(); array_unshift($data, (object)['id' => '', 'label' => lang('Basic.global.None')]); return $data; @@ -1226,7 +1221,7 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController protected function getServiciosAcabado() { - $model = model('App\Models\Tarifas\TarifaacabadoModel'); + $model = model('App\Models\Tarifas\Acabados\TarifaAcabadoModel'); $data = $model->getServiciosAcabadoSelector(); return $data; } diff --git a/ci4/app/Controllers/Presupuestos/Cosidotapadura.php b/ci4/app/Controllers/Presupuestos/Cosidotapadura.php deleted file mode 100644 index a91815db..00000000 --- a/ci4/app/Controllers/Presupuestos/Cosidotapadura.php +++ /dev/null @@ -1,19 +0,0 @@ -> Libros >> Cosido tapa blanda [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Cuadripticos.php b/ci4/app/Controllers/Presupuestos/Cuadripticos.php deleted file mode 100755 index a9058de2..00000000 --- a/ci4/app/Controllers/Presupuestos/Cuadripticos.php +++ /dev/null @@ -1,19 +0,0 @@ -> Folletos >> Cuadrípticos [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Dipticos.php b/ci4/app/Controllers/Presupuestos/Dipticos.php deleted file mode 100755 index 379f4a23..00000000 --- a/ci4/app/Controllers/Presupuestos/Dipticos.php +++ /dev/null @@ -1,19 +0,0 @@ -> Folletos >> Dípticos [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Espiraltapablanda.php b/ci4/app/Controllers/Presupuestos/Espiraltapablanda.php deleted file mode 100644 index 66a65565..00000000 --- a/ci4/app/Controllers/Presupuestos/Espiraltapablanda.php +++ /dev/null @@ -1,19 +0,0 @@ -> Libros >> Espiral tapa blanda [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Espiraltapadura.php b/ci4/app/Controllers/Presupuestos/Espiraltapadura.php deleted file mode 100644 index 23e21d8e..00000000 --- a/ci4/app/Controllers/Presupuestos/Espiraltapadura.php +++ /dev/null @@ -1,19 +0,0 @@ -> Libros >> Espiral tapa dura [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Estuches.php b/ci4/app/Controllers/Presupuestos/Estuches.php deleted file mode 100755 index df99c581..00000000 --- a/ci4/app/Controllers/Presupuestos/Estuches.php +++ /dev/null @@ -1,19 +0,0 @@ -> Estuches [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Flyers.php b/ci4/app/Controllers/Presupuestos/Flyers.php deleted file mode 100755 index d1c82518..00000000 --- a/ci4/app/Controllers/Presupuestos/Flyers.php +++ /dev/null @@ -1,19 +0,0 @@ -> Flyers [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Fresadotapablanda.php b/ci4/app/Controllers/Presupuestos/Fresadotapablanda.php deleted file mode 100644 index d4b9213f..00000000 --- a/ci4/app/Controllers/Presupuestos/Fresadotapablanda.php +++ /dev/null @@ -1,19 +0,0 @@ -> Libros >> Fresado tapa blanda [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Fresadotapadura.php b/ci4/app/Controllers/Presupuestos/Fresadotapadura.php deleted file mode 100644 index 7369440a..00000000 --- a/ci4/app/Controllers/Presupuestos/Fresadotapadura.php +++ /dev/null @@ -1,19 +0,0 @@ -> Libros >> Fresado tapa dura [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Grapados.php b/ci4/app/Controllers/Presupuestos/Grapados.php deleted file mode 100644 index 53739edf..00000000 --- a/ci4/app/Controllers/Presupuestos/Grapados.php +++ /dev/null @@ -1,19 +0,0 @@ -> Libros grapados [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Invitaciones.php b/ci4/app/Controllers/Presupuestos/Invitaciones.php deleted file mode 100755 index 3f43ff6a..00000000 --- a/ci4/app/Controllers/Presupuestos/Invitaciones.php +++ /dev/null @@ -1,19 +0,0 @@ -> Invitaciones [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Marcapaginas.php b/ci4/app/Controllers/Presupuestos/Marcapaginas.php deleted file mode 100755 index 533b2daa..00000000 --- a/ci4/app/Controllers/Presupuestos/Marcapaginas.php +++ /dev/null @@ -1,19 +0,0 @@ -> Marcapaginas [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php b/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php index 625a0577..47f2eb68 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php @@ -23,7 +23,7 @@ class Presupuestoacabados extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'presupuesto-acabados'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/'; diff --git a/ci4/app/Controllers/Presupuestos/Presupuestocliente.php b/ci4/app/Controllers/Presupuestos/Presupuestocliente.php index 86c310e1..6b1222de 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestocliente.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestocliente.php @@ -2,27 +2,19 @@ namespace App\Controllers\Presupuestos; -use App\Models\Collection; - use App\Entities\Presupuestos\PresupuestoEntity; -use App\Models\Presupuestos\PresupuestoDireccionesModel; -use App\Models\Presupuestos\PresupuestoModel; - +use App\Models\Collection; +use App\Models\Configuracion\PapelGenericoModel; use App\Models\Configuracion\TipoPresupuestoModel; - -use App\Models\Presupuestos\PresupuestoLineaModel; - -use App\Models\Presupuestos\PresupuestoEncuadernacionesModel; use App\Models\Presupuestos\PresupuestoAcabadosModel; +use App\Models\Presupuestos\PresupuestoDireccionesModel; +use App\Models\Presupuestos\PresupuestoEncuadernacionesModel; +use App\Models\Presupuestos\PresupuestoLineaModel; use App\Models\Presupuestos\PresupuestoManipuladosModel; +use App\Models\Presupuestos\PresupuestoModel; use App\Models\Presupuestos\PresupuestoPreimpresionesModel; use App\Models\Presupuestos\PresupuestoServiciosExtraModel; - use App\Services\PresupuestoClienteService; -use App\Models\Configuracion\PapelGenericoModel; -use App\Models\Configuracion\PapelImpresionModel; -use App\Models\Configuracion\MaquinaModel; - use Exception; class Presupuestocliente extends \App\Controllers\BaseResourceController @@ -37,7 +29,7 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'presupuestocliente'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/cliente/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/cliente/'; protected $indexRoute = 'cosidotapablandaList'; @@ -1110,7 +1102,7 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController protected function getAcabadosCubierta() { - $model = model('App\Models\Tarifas\TarifaacabadoModel'); + $model = model('App\Models\Tarifas\Acabados\TarifaAcabadoModel'); $data = $model->getServiciosAcabadoCubierta(); array_unshift($data, (object)['id' => '', 'label' => lang('Basic.global.None')]); return $data; @@ -1118,7 +1110,7 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController protected function getAcabadosSobrecubierta() { - $model = model('App\Models\Tarifas\TarifaacabadoModel'); + $model = model('App\Models\Tarifas\Acabados\TarifaAcabadoModel'); $data = $model->getServiciosAcabadoSobrecubierta(); array_unshift($data, (object)['id' => '', 'label' => lang('Basic.global.None')]); return $data; diff --git a/ci4/app/Controllers/Presupuestos/Presupuestodirecciones.php b/ci4/app/Controllers/Presupuestos/Presupuestodirecciones.php index 125c034b..d99d9fd3 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestodirecciones.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestodirecciones.php @@ -23,7 +23,7 @@ class Presupuestodirecciones extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'presupuesto-direcciones'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/'; diff --git a/ci4/app/Controllers/Presupuestos/Presupuestoencuadernaciones.php b/ci4/app/Controllers/Presupuestos/Presupuestoencuadernaciones.php index fccc4889..323fd818 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestoencuadernaciones.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestoencuadernaciones.php @@ -23,7 +23,7 @@ class Presupuestoencuadernaciones extends \App\Controllers\BaseResourceControlle protected static $controllerSlug = 'presupuesto-encuadernaciones'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/'; public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) diff --git a/ci4/app/Controllers/Presupuestos/Presupuestomanipulados.php b/ci4/app/Controllers/Presupuestos/Presupuestomanipulados.php index 5ecd9dd1..0423bb19 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestomanipulados.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestomanipulados.php @@ -24,7 +24,7 @@ class Presupuestomanipulados extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'presupuesto-manipulado'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/'; public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) diff --git a/ci4/app/Controllers/Presupuestos/Presupuestopreimpresiones.php b/ci4/app/Controllers/Presupuestos/Presupuestopreimpresiones.php index 69d4a9b7..465ad7be 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestopreimpresiones.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestopreimpresiones.php @@ -19,7 +19,7 @@ class Presupuestopreimpresiones extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'presupuesto-preimpresiones'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/'; diff --git a/ci4/app/Controllers/Presupuestos/Presupuestoserviciosextra.php b/ci4/app/Controllers/Presupuestos/Presupuestoserviciosextra.php index 261de0bf..09497d14 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestoserviciosextra.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestoserviciosextra.php @@ -19,7 +19,7 @@ class Presupuestoserviciosextra extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'presupuesto-servicios-extra'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/'; diff --git a/ci4/app/Controllers/Presupuestos/Presupuestotiradasalternativas.php b/ci4/app/Controllers/Presupuestos/Presupuestotiradasalternativas.php index c36829f0..05702a7e 100644 --- a/ci4/app/Controllers/Presupuestos/Presupuestotiradasalternativas.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestotiradasalternativas.php @@ -22,7 +22,7 @@ class Presupuestotiradasalternativas extends \App\Controllers\BaseResourceContro protected static $controllerSlug = 'presupuesto-tiradas'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/'; public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) diff --git a/ci4/app/Controllers/Presupuestos/Tarjetascomerciales.php b/ci4/app/Controllers/Presupuestos/Tarjetascomerciales.php deleted file mode 100755 index bbec430f..00000000 --- a/ci4/app/Controllers/Presupuestos/Tarjetascomerciales.php +++ /dev/null @@ -1,19 +0,0 @@ -> Tarjetas Comerciales [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Tripticos.php b/ci4/app/Controllers/Presupuestos/Tripticos.php deleted file mode 100755 index bf58c9c3..00000000 --- a/ci4/app/Controllers/Presupuestos/Tripticos.php +++ /dev/null @@ -1,19 +0,0 @@ -> Folletos >> Trípticos [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Wireotapablanda.php b/ci4/app/Controllers/Presupuestos/Wireotapablanda.php deleted file mode 100644 index f19a18f1..00000000 --- a/ci4/app/Controllers/Presupuestos/Wireotapablanda.php +++ /dev/null @@ -1,19 +0,0 @@ -> Libros >> Wire-o tapa blanda [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Presupuestos/Wireotapadura.php b/ci4/app/Controllers/Presupuestos/Wireotapadura.php deleted file mode 100644 index 77d7899d..00000000 --- a/ci4/app/Controllers/Presupuestos/Wireotapadura.php +++ /dev/null @@ -1,19 +0,0 @@ -> Libros >> Wire-o tapa dura [en desarrollo].'; - } -} - \ No newline at end of file diff --git a/ci4/app/Controllers/Sistema/Actividad.php b/ci4/app/Controllers/Sistema/Actividad.php index 5bcf1627..263bd8dd 100644 --- a/ci4/app/Controllers/Sistema/Actividad.php +++ b/ci4/app/Controllers/Sistema/Actividad.php @@ -14,7 +14,7 @@ class Actividad extends BaseResourceController protected static $controllerSlug = 'activity'; - protected static $viewPath = 'themes/backend/vuexy/form/activity/'; + protected static $viewPath = 'themes/vuexy/form/activity/'; protected static $indexRoute = 'activityList'; diff --git a/ci4/app/Controllers/Sistema/Ajustes.php b/ci4/app/Controllers/Sistema/Ajustes.php index b70769e7..9165bf0e 100644 --- a/ci4/app/Controllers/Sistema/Ajustes.php +++ b/ci4/app/Controllers/Sistema/Ajustes.php @@ -13,20 +13,27 @@ class Ajustes extends BaseResourceController protected static $controllerSlug = 'settings'; - protected static $viewPath = 'themes/backend/vuexy/form/settings/'; + protected static $viewPath = 'themes/vuexy/form/settings/'; protected static string $formViewName = 'settingsForm'; protected static $singularObjectName = 'settings'; protected static $singularObjectNameCc = 'settings'; - protected $indexRoute = 'settingForm'; + protected $indexRoute = 'ajustesList'; public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) { $this->viewData['pageTitle'] = lang('Provincias.moduleTitle'); $this->viewData['usingSweetAlert'] = true; + + // Breadcrumbs (IMN) + $this->viewData['breadcrumb'] = [ + ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false], + ['title' => lang("App.menu_settings"), 'route' => route_to('ajustesList'), 'active' => true] + ]; + parent::initController($request, $response, $logger); } diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabado.php b/ci4/app/Controllers/Tarifas/Acabados/TarifaAcabados.php old mode 100755 new mode 100644 similarity index 92% rename from ci4/app/Controllers/Tarifas/Tarifaacabado.php rename to ci4/app/Controllers/Tarifas/Acabados/TarifaAcabados.php index b887c0a2..04bd3460 --- a/ci4/app/Controllers/Tarifas/Tarifaacabado.php +++ b/ci4/app/Controllers/Tarifas/Acabados/TarifaAcabados.php @@ -1,18 +1,14 @@ - static::$controllerSlug, 'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Tarifaacabado.tarifaacabado')]), - 'tarifaacabadoEntity' => new TarifaacabadoEntity(), + 'tarifaacabadoEntity' => new TarifaAcabadoEntity(), 'usingServerSideDataTable' => true, - ]; $viewData = array_merge($this->viewData, $viewData); // merge any possible values from the parent controller class @@ -118,8 +113,7 @@ class Tarifaacabado extends \App\Controllers\BaseResourceController if ($thenRedirect) : if (!empty($this->indexRoute)) : - return redirect()->to(site_url('/tarifas/tarifaacabado/edit/' . $id))->with('message', $message); - //return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message); + return redirect()->to(site_url('/tarifas/acabados/edit/' . $id))->with('message', $message); else: return $this->redirect2listView('sweet-success', $message); endif; @@ -131,18 +125,15 @@ class Tarifaacabado extends \App\Controllers\BaseResourceController endif; // ($requestMethod === 'post') - $this->viewData['tarifaacabadoEntity'] = isset($sanitizedData) ? new TarifaacabadoEntity($sanitizedData) : new TarifaacabadoEntity(); - - $this->viewData['formAction'] = route_to('createTarifaAcabado'); - + $this->viewData['tarifaacabadoEntity'] = isset($sanitizedData) ? new TarifaAcabadoEntity($sanitizedData) : new TarifaAcabadoEntity(); + $this->viewData['formAction'] = route_to('tarifaAcabadoAdd'); $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Tarifaacabado.moduleTitle') . ' ' . lang('Basic.global.addNewSuffix'); return $this->displayForm(__METHOD__); } // end function add() - public function edit($requestedId = null) - { + public function edit($requestedId = null) { if ($requestedId == null) : @@ -204,7 +195,7 @@ class Tarifaacabado extends \App\Controllers\BaseResourceController if ($noException && $successfulResult) : $id = $tarifaacabadoEntity->id ?? $id; - $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]).'.'; + $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) .'.'; if ($thenRedirect) : if (!empty($this->indexRoute)) : @@ -243,7 +234,7 @@ class Tarifaacabado extends \App\Controllers\BaseResourceController $length = $reqData['length'] ?? 5; $search = $reqData['search']['value']; $requestedOrder = $reqData['order']['0']['column'] ?? 1; - $order = TarifaacabadoModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 1]; + $order = TarifaAcabadoModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 1]; $dir = $reqData['order']['0']['dir'] ?? 'asc'; $resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject(); diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php b/ci4/app/Controllers/Tarifas/Acabados/TarifaAcabadosLineas.php old mode 100755 new mode 100644 similarity index 94% rename from ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php rename to ci4/app/Controllers/Tarifas/Acabados/TarifaAcabadosLineas.php index e2dd423c..15f7e901 --- a/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php +++ b/ci4/app/Controllers/Tarifas/Acabados/TarifaAcabadosLineas.php @@ -1,30 +1,12 @@ - static::$controllerSlug, 'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('TarifaAcabadoLineas.tarifaAcabadoLinea')]), - 'tarifaAcabadoLinea' => new TarifaAcabadoLinea(), + 'tarifaAcabadoLinea' => new TarifaAcabadoLineaEntity(), 'usingServerSideDataTable' => true, ]; @@ -125,7 +107,7 @@ class Tarifaacabadolineas extends \App\Controllers\BaseResourceController endif; // ($requestMethod === 'post') - $this->viewData['tarifaAcabadoLinea'] = isset($sanitizedData) ? new TarifaAcabadoLinea($sanitizedData) : new TarifaAcabadoLinea(); + $this->viewData['tarifaAcabadoLinea'] = isset($sanitizedData) ? new TarifaAcabadoLineaEntity($sanitizedData) : new TarifaAcabadoLineaEntity(); $this->viewData['tarifaAcabadoList'] = $this->getTarifaAcabadoListItems($tarifaAcabadoLinea->tarifa_acabado_id ?? null); $this->viewData['formAction'] = route_to('createTarifaAcabadoLinea'); @@ -422,7 +404,7 @@ class Tarifaacabadolineas extends \App\Controllers\BaseResourceController { $data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('Tarifaacabado.tarifaAcabado'))])]; if (!empty($selId)) : - $tarifaacabadoModel = model('App\Models\tarifas\TarifaacabadoModel'); + $tarifaacabadoModel = model('App\Models\Tarifas\Acabados\TarifaAcabadoModel'); $selOption = $tarifaacabadoModel->where('id', $selId)->findColumn('id'); if (!empty($selOption)) : diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php index 8790a749..4b104456 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php @@ -34,7 +34,7 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'tarifaencuadernacionlineas'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/encuadernacion/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/encuadernacion/'; protected $indexRoute = 'tarifaEncuadernacionLineaList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php index d6c14c06..7b306ebb 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php +++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php @@ -34,7 +34,7 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr protected static $controllerSlug = 'tarifaencuadernacionlineashoras'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/encuadernacion/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/encuadernacion/'; protected $indexRoute = 'tarifaEncuadernacionLineaHorasList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifaextra.php b/ci4/app/Controllers/Tarifas/Tarifaextra.php index 83c3b2dc..9dd27d9c 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaextra.php +++ b/ci4/app/Controllers/Tarifas/Tarifaextra.php @@ -15,7 +15,7 @@ class Tarifaextra extends \App\Controllers\GoBaseController protected static $pluralObjectName = 'Tarifasextra'; protected static $controllerSlug = 'tarifaextra'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/extra/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/extra/'; protected $indexRoute = 'tarifaextraList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php b/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php index 211e1791..cd668048 100755 --- a/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php @@ -34,7 +34,7 @@ class Tarifamanipuladolineas extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'tarifamanipuladolineas'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/manipulado/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/manipulado/'; protected $indexRoute = 'tarifaManipuladoLineaList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php index 259cf32c..429bcc19 100755 --- a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php +++ b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php @@ -15,7 +15,7 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController protected static $pluralObjectName = 'Tarifaspreimpresion'; protected static $controllerSlug = 'tarifapreimpresion'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/preimpresion/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/preimpresion/'; protected $indexRoute = 'tarifapreimpresionList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php b/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php index be72c4d0..4d2751dc 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php +++ b/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php @@ -26,7 +26,7 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'tarifaencuadernacion'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/encuadernacion/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/encuadernacion/'; protected $indexRoute = 'tarifaEncuadernacionList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifasenvios.php b/ci4/app/Controllers/Tarifas/Tarifasenvios.php index 497343b3..9bbb02a1 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasenvios.php +++ b/ci4/app/Controllers/Tarifas/Tarifasenvios.php @@ -27,7 +27,7 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'tarifasenvios'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/envios/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/envios/'; protected $indexRoute = 'tarifaEnvioList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php b/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php index 48454f0d..7a190c0b 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php +++ b/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php @@ -29,7 +29,7 @@ class Tarifasenviosprecios extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'tarifasenviosprecios'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/envios/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/envios/'; protected $indexRoute = 'tarifaEnvioPrecioList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php b/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php index 834337c1..3333e716 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php +++ b/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php @@ -30,7 +30,7 @@ class Tarifasenvioszonas extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'tarifasenvioszonas'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/envios/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/envios/'; protected $indexRoute = 'tarifaEnvioZonaList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php b/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php index 07d706a0..7528ebf4 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php +++ b/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php @@ -22,7 +22,7 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'tarifamanipulado'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/manipulado/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/manipulado/'; protected $indexRoute = 'tarifaManipuladoList'; diff --git a/ci4/app/Entities/Tarifas/TarifaacabadoEntity.php b/ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoEntity.php old mode 100755 new mode 100644 similarity index 86% rename from ci4/app/Entities/Tarifas/TarifaacabadoEntity.php rename to ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoEntity.php index 8a8a972d..0d5852a1 --- a/ci4/app/Entities/Tarifas/TarifaacabadoEntity.php +++ b/ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoEntity.php @@ -1,9 +1,9 @@ null, diff --git a/ci4/app/Entities/Tarifas/TarifaAcabadoLinea.php b/ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoLineaEntity.php old mode 100755 new mode 100644 similarity index 87% rename from ci4/app/Entities/Tarifas/TarifaAcabadoLinea.php rename to ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoLineaEntity.php index 0fcf0556..fb9ad299 --- a/ci4/app/Entities/Tarifas/TarifaAcabadoLinea.php +++ b/ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoLineaEntity.php @@ -1,9 +1,9 @@ null, diff --git a/ci4/app/Language/es/RolesPermisos.php b/ci4/app/Language/es/RolesPermisos.php index 7f0a9d4b..dbda75b9 100644 --- a/ci4/app/Language/es/RolesPermisos.php +++ b/ci4/app/Language/es/RolesPermisos.php @@ -33,6 +33,13 @@ return [ 'tarifaEncuadernacionSection' => 'Tarifas de encuadernación', 'tarifaEnvioSection' => 'Tarifas de envio', 'proveedoresSection' => 'Proveedores', + 'paisesSection' => 'Países', + 'maquinasSection' => 'Máquinas', + 'maquinasDefectoSection' => 'Máquinas por defecto', + 'papelGenericoSection' => 'Papel genérico', + 'papelImpresionSection' => 'Papel impresión', + 'usuariosSection' => 'Usuarios', + 'rolesPermisosSection' => 'Roles y permisos', 'ajustesSection' => 'Ajustes', 'actividadSection' => 'Accesos', diff --git a/ci4/app/Models/Clientes/ClienteModel.php b/ci4/app/Models/Clientes/ClienteModel.php index 1d67958e..0a211f29 100755 --- a/ci4/app/Models/Clientes/ClienteModel.php +++ b/ci4/app/Models/Clientes/ClienteModel.php @@ -301,7 +301,7 @@ class ClienteModel extends \App\Models\BaseModel ->orLike("t1.soporte_id", $search) ->orLike("t1.forma_pago_id", $search) ->orLike("t1.vencimiento", $search) - ->orLike("t5.id_user", $search) + ->orLike("t5.id", $search) ->orLike("t5.first_name", $search) ->orLike("t5.last_name", $search) ->orLike("t7.id", $search) diff --git a/ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php b/ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php index 37c937ff..9eadaf14 100755 --- a/ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php +++ b/ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php @@ -48,7 +48,7 @@ class PresupuestoAcabadosModel extends \App\Models\BaseModel public function getPrecioTarifa($tarifa_acabado_id, $tirada, $POD){ - $modelTarifa = model('App\Models\Tarifas\TarifaacabadoModel'); + $modelTarifa = model('App\Models\Tarifas\Acabados\TarifaAcabadoModel'); $tarifa_value = $modelTarifa->getTarifaPresupuestoAcabado($tarifa_acabado_id, $tirada); if (count($tarifa_value)>0) { diff --git a/ci4/app/Models/Tarifas/TarifaAcabadoLineaModel.php b/ci4/app/Models/Tarifas/Acabados/TarifaAcabadoLineaModel.php old mode 100755 new mode 100644 similarity index 99% rename from ci4/app/Models/Tarifas/TarifaAcabadoLineaModel.php rename to ci4/app/Models/Tarifas/Acabados/TarifaAcabadoLineaModel.php index 27898817..84e890cc --- a/ci4/app/Models/Tarifas/TarifaAcabadoLineaModel.php +++ b/ci4/app/Models/Tarifas/Acabados/TarifaAcabadoLineaModel.php @@ -1,5 +1,5 @@ include("themes/_commonPartialsBs/select2bs5") ?> include("themes/_commonPartialsBs/datatables") ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/vuexy/main/defaultlayout') ?> section('content'); ?> @@ -151,7 +151,6 @@ - @@ -171,13 +170,7 @@ const lastColNr = $('#activityTable').find("tr:first th").length - 1; - const actionBtns = function(data) { - return ` -
- -
- `; - }; + theTable = $('#activityTable').DataTable({ processing: true, serverSide: true, @@ -198,10 +191,10 @@ stateSave: true, order: [[1, 'asc']], language: { - url: "/themes/vuexy/vendors/libs/datatables-sk/plugins/i18n/es-ES.json" + url: "/themes/vuexy/vendor/libs/datatables-sk/plugins/i18n/es-ES.json" }, ajax : $.fn.dataTable.pipeline( { - url: '', + url: '', method: 'POST', headers: {'X-Requested-With': 'XMLHttpRequest'}, async: true, @@ -220,60 +213,8 @@ { 'data': 'ip' }, { 'data': 'os' }, { 'data': 'browser' }, - { 'data': 'created_at' }, - { 'data': actionBtns } + { 'data': 'created_at' } ] }); - theTable.on( 'draw.dt', function () { - const boolCols = [7]; - for (let coln of boolCols) { - theTable.column(coln, { page: 'current' }).nodes().each( function (cell, i) { - cell.innerHTML = cell.innerHTML == '1' ? '' : ''; - }); - } - }); - - - /*$(document).on('click', '.btn-delete', function(e) { - Swal.fire({ - title: '', - text: '', - icon: 'warning', - showCancelButton: true, - confirmButtonColor: '#3085d6', - confirmButtonText: '', - cancelButtonText: '', - cancelButtonColor: '#d33' - }) - .then((result) => { - const dataId = $(this).data('id'); - const row = $(this).closest('tr'); - if (result.value) { - $.ajax({ - url: `/${dataId}`, - method: 'DELETE', - }).done((data, textStatus, jqXHR) => { - Toast.fire({ - icon: 'success', - title: data.msg ?? jqXHR.statusText, - }); - - theTable.clearPipeline(); - theTable.row($(row)).invalidate().draw(); - }).fail((jqXHR, textStatus, errorThrown) => { - Toast.fire({ - icon: 'error', - title: jqXHR.responseJSON.messages.error, - }); - }) - } - }); - });*/ - - - - - - endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteDireccionesForm.php b/ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteDireccionesForm.php old mode 100755 new mode 100644 diff --git a/ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteFormItems.php b/ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteFormItems.php old mode 100755 new mode 100644 index e80c39cb..6a488651 --- a/ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteFormItems.php @@ -566,7 +566,7 @@
- +
@@ -628,7 +628,7 @@
- + diff --git a/ci4/app/Views/themes/vuexy/form/clientes/cliente/convert2templateModal.php b/ci4/app/Views/themes/vuexy/form/clientes/cliente/convert2templateModal.php old mode 100755 new mode 100644 diff --git a/ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteForm.php b/ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteForm.php old mode 100755 new mode 100644 index 09387422..6d5cabf2 --- a/ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteForm.php +++ b/ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteForm.php @@ -1,7 +1,7 @@ include("themes/_commonPartialsBs/datatables") ?> include("themes/_commonPartialsBs/select2bs5") ?> include("themes/_commonPartialsBs/sweetalert") ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/vuexy/main/defaultlayout') ?> section("content") ?>
@@ -15,7 +15,7 @@
getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> - +
include('themes/_commonPartialsBs/select2bs5') ?> include('themes/_commonPartialsBs/datatables') ?> include('themes/_commonPartialsBs/_confirm2delete') ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/vuexy/main/defaultlayout') ?> section('content'); ?>
diff --git a/ci4/app/Views/themes/vuexy/form/clientes/contactos/_contactoDeClienteFormItems.php b/ci4/app/Views/themes/vuexy/form/clientes/contactos/_contactoDeClienteFormItems.php old mode 100755 new mode 100644 diff --git a/ci4/app/Views/themes/vuexy/form/clientes/contactos/viewContactoDeClienteForm.php b/ci4/app/Views/themes/vuexy/form/clientes/contactos/viewContactoDeClienteForm.php old mode 100755 new mode 100644 index 29d2aaf8..d6ee543a --- a/ci4/app/Views/themes/vuexy/form/clientes/contactos/viewContactoDeClienteForm.php +++ b/ci4/app/Views/themes/vuexy/form/clientes/contactos/viewContactoDeClienteForm.php @@ -13,7 +13,7 @@
getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> - +
diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.php old mode 100755 new mode 100644 diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php old mode 100755 new mode 100644 diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoItems.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoItems.php old mode 100755 new mode 100644 diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php old mode 100755 new mode 100644 diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.php old mode 100755 new mode 100644 diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_presupuestoDireccionesForm.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_presupuestoDireccionesForm.php old mode 100755 new mode 100644 diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_previewItems.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_previewItems.php old mode 100755 new mode 100644 diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestoItems.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestoItems.php old mode 100755 new mode 100644 diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/comparador.js b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/comparador.js old mode 100755 new mode 100644 diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/previews.js b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/previews.js old mode 100755 new mode 100644 diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php old mode 100755 new mode 100644 index 13af1fbd..b94ec96d --- a/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php +++ b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php @@ -1,7 +1,7 @@ include('themes/_commonPartialsBs/datatables') ?> include("themes/_commonPartialsBs/select2bs5") ?> include("themes/_commonPartialsBs/sweetalert") ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/vuexy/main/defaultlayout') ?> section("content") ?> @@ -25,17 +25,17 @@ value=""> - - + + - - - - - - - - + + + + + + + + diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaList.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaList.php old mode 100755 new mode 100644 index 4efbc0b9..a7203545 --- a/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaList.php +++ b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaList.php @@ -2,7 +2,7 @@ include('themes/_commonPartialsBs/datatables') ?> include('themes/_commonPartialsBs/sweetalert') ?> include('themes/_commonPartialsBs/_confirm2delete') ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/vuexy/main/defaultlayout') ?> section('content'); ?>
diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/index.php b/ci4/app/Views/themes/vuexy/form/presupuestos/index.php old mode 100755 new mode 100644 index 0023dc5e..32145db7 --- a/ci4/app/Views/themes/vuexy/form/presupuestos/index.php +++ b/ci4/app/Views/themes/vuexy/form/presupuestos/index.php @@ -1,4 +1,4 @@ -extend('themes/backend/vuexy/main/presupuestos_layout') ?> +extend('themes/vuexy/main/presupuestos_layout') ?> section('content'); ?>
diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/tapa-blanda-encolada.php b/ci4/app/Views/themes/vuexy/form/presupuestos/tapa-blanda-encolada.php old mode 100755 new mode 100644 index 0c5e3176..5feb6af5 --- a/ci4/app/Views/themes/vuexy/form/presupuestos/tapa-blanda-encolada.php +++ b/ci4/app/Views/themes/vuexy/form/presupuestos/tapa-blanda-encolada.php @@ -1,4 +1,4 @@ -extend('themes/backend/vuexy/main/presupuestos_layout') ?> +extend('themes/vuexy/main/presupuestos_layout') ?> section('content'); ?>
diff --git a/ci4/app/Views/themes/vuexy/form/profile/index.php b/ci4/app/Views/themes/vuexy/form/profile/index.php old mode 100755 new mode 100644 index 5dec8ad8..e374bd92 --- a/ci4/app/Views/themes/vuexy/form/profile/index.php +++ b/ci4/app/Views/themes/vuexy/form/profile/index.php @@ -1,5 +1,5 @@ include("themes/_commonPartialsBs/select2bs5") ?> -extend('themes/backend/vuexy/main/general_settings_layout') ?> +extend('themes/vuexy/main/general_settings_layout') ?> section('content'); ?> diff --git a/ci4/app/Views/themes/vuexy/form/profile/index_old.php b/ci4/app/Views/themes/vuexy/form/profile/index_old.php old mode 100755 new mode 100644 diff --git a/ci4/app/Views/themes/vuexy/form/settings/viewSettingsForm.php b/ci4/app/Views/themes/vuexy/form/settings/viewSettingsForm.php index c20f054a..bbd62541 100644 --- a/ci4/app/Views/themes/vuexy/form/settings/viewSettingsForm.php +++ b/ci4/app/Views/themes/vuexy/form/settings/viewSettingsForm.php @@ -1,6 +1,6 @@ include("themes/_commonPartialsBs/select2bs5") ?> include("themes/_commonPartialsBs/sweetalert") ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/vuexy/main/defaultlayout') ?> section("content") ?>
@@ -12,7 +12,7 @@
getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> - +