jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'dev/presupuesto_cliente_2'

Browse Source 
Main

See merge request jjimenez/safekat!240
This commit is contained in:
Jaime Jimenez Ortega
2024-05-08 18:45:04 +00:00
parent feebbed24d b0731379c0
commit e04c978c38
210 changed files with 886 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/safekat.iml generated
View File

@ -2,8 +2,6 @@
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/ci4" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/ci4/app" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/ci4/app/ThirdParty/DatatablesEditor/" isTestSource="false" packagePrefix="DataTables\" />
</content>
<orderEntry type="inheritedJdk" />

64
ci4/app/Config/Routes.php
View File

@ -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']);
});

2
ci4/app/Controllers/Clientes/Cliente.php
View File

@ -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';

2
ci4/app/Controllers/Clientes/ClientePrecios.php
View File

@ -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';

2
ci4/app/Controllers/Clientes/Clientecontactos.php
View File

@ -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';

2
ci4/app/Controllers/Clientes/Clienteplantillaprecios.php
View File

@ -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';

2
ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php
View File

@ -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';

2
ci4/app/Controllers/Clientes/Clienteusuarios.php
View File

@ -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';

2
ci4/app/Controllers/Compras/Proveedores.php
View File

@ -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';

2
ci4/app/Controllers/Compras/ProveedoresTipos.php
View File

@ -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';

2
ci4/app/Controllers/Configuracion/Comunidadesautonomas.php
View File

@ -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';

2
ci4/app/Controllers/Configuracion/Formaspagos.php
View File

@ -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';

2
ci4/app/Controllers/Configuracion/Imposiciones.php
View File

@ -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';

2
ci4/app/Controllers/Configuracion/Maquinas.php
View File

@ -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';

2
ci4/app/Controllers/Configuracion/Maquinasdefecto.php
View File

@ -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';

2
ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php
View File

@ -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 = '';

2
ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php
View File

@ -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';

9
ci4/app/Controllers/Configuracion/Paises.php
View File

@ -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);
}

2
ci4/app/Controllers/Configuracion/Papelesgenericos.php
View File

@ -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';

2
ci4/app/Controllers/Configuracion/Papelesimpresion.php
View File

@ -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';

2
ci4/app/Controllers/Configuracion/Papelformato.php
View File

@ -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';

2
ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php
View File

@ -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';

2
ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php
View File

@ -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';

2
ci4/app/Controllers/Configuracion/Provincias.php
View File

@ -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';

21
ci4/app/Controllers/Configuracion/Seriefactura.php
View File

@ -1,21 +0,0 @@
<?php
namespace App\Controllers\Configuracion;
use App\Controllers\BaseController;
class Seriefactura extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Serie factura';
}
}

35
ci4/app/Controllers/Configuracion/Serviciocliente.php
View File

@ -1,35 +0,0 @@
<?php
namespace App\Controllers\Configuracion;
use App\Controllers\BaseController;
class Serviciocliente extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Servicio cliente';
}
public function edit()
{
}
public function add()
{
}
public function delete()
{
}
}

35
ci4/app/Controllers/Configuracion/Tamanioformatos.php
View File

@ -1,35 +0,0 @@
<?php
namespace App\Controllers\Configuracion;
use App\Controllers\BaseController;
class Tamanioformatos extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Tamaño formatos';
}
public function edit()
{
}
public function add()
{
}
public function delete()
{
}
}

35
ci4/app/Controllers/Configuracion/Tamaniolibros.php
View File

@ -1,35 +0,0 @@
<?php
namespace App\Controllers\Configuracion;
use App\Controllers\BaseController;
class Tamaniolibros extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Tamaño libros';
}
public function edit()
{
}
public function add()
{
}
public function delete()
{
}
}

35
ci4/app/Controllers/Configuracion/Tareaservicio.php
View File

@ -1,35 +0,0 @@
<?php
namespace App\Controllers\Configuracion;
use App\Controllers\BaseController;
class Tareaservicio extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Tarea servicio';
}
public function edit()
{
}
public function add()
{
}
public function delete()
{
}
}

2
ci4/app/Controllers/Configuracion/Tipologias.php
View File

@ -15,7 +15,7 @@ class Tipologias extends \App\Controllers\GoBaseController
protected static $pluralObjectName = 'Tipologias Libros';
protected static $controllerSlug = 'tipologiaslibros';
protected static $viewPath = 'themes/backend/vuexy/form/configuracion/tipologias/';
protected static $viewPath = 'themes/vuexy/form/configuracion/tipologias/';
protected $indexRoute = 'tipologiaLibrosList';

35
ci4/app/Controllers/Configuracion/Trabajo.php
View File

@ -1,35 +0,0 @@
<?php
namespace App\Controllers\Configuracion;
use App\Controllers\BaseController;
class Trabajo extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Trabajo';
}
public function edit()
{
}
public function add()
{
}
public function delete()
{
}
}

9
ci4/app/Controllers/Configuracion/Users.php
View File

@ -25,7 +25,7 @@ class Users extends \App\Controllers\GoBaseController {
protected static $pluralObjectName = 'Users';
protected static $controllerSlug = 'users';
protected static $viewPath = 'themes/backend/vuexy/form/user/';
protected static $viewPath = 'themes/vuexy/form/user/';
protected $indexRoute = 'userList';
@ -38,6 +38,13 @@ class Users extends \App\Controllers\GoBaseController {
$this->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);
}

24
ci4/app/Controllers/Js_loader.php
View File

@ -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()

2
ci4/app/Controllers/Presupuestos/Buscador.php
View File

@ -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';

19
ci4/app/Controllers/Presupuestos/Calendarios.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Calendarios extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Calendarios [en desarrollo].';
}
}

19
ci4/app/Controllers/Presupuestos/Carteles.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Carteles extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Carteles [en desarrollo].';
}
}

27
ci4/app/Controllers/Presupuestos/Cosidotapablanda.php
View File

@ -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;
}

19
ci4/app/Controllers/Presupuestos/Cosidotapadura.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Cosidotapadura extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Libros >> Cosido tapa blanda [en desarrollo].';
}
}

19
ci4/app/Controllers/Presupuestos/Cuadripticos.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Cuadripticos extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Folletos >> Cuadrípticos [en desarrollo].';
}
}

19
ci4/app/Controllers/Presupuestos/Dipticos.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Dipticos extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Folletos >> Dípticos [en desarrollo].';
}
}

19
ci4/app/Controllers/Presupuestos/Espiraltapablanda.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Espiraltapablanda extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Libros >> Espiral tapa blanda [en desarrollo].';
}
}

19
ci4/app/Controllers/Presupuestos/Espiraltapadura.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Espiraltapadura extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Libros >> Espiral tapa dura [en desarrollo].';
}
}

19
ci4/app/Controllers/Presupuestos/Estuches.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Estuches extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Estuches [en desarrollo].';
}
}

19
ci4/app/Controllers/Presupuestos/Flyers.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Flyers extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Flyers [en desarrollo].';
}
}

19
ci4/app/Controllers/Presupuestos/Fresadotapablanda.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Fresadotapablanda extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Libros >> Fresado tapa blanda [en desarrollo].';
}
}

19
ci4/app/Controllers/Presupuestos/Fresadotapadura.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Fresadotapadura extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Libros >> Fresado tapa dura [en desarrollo].';
}
}

19
ci4/app/Controllers/Presupuestos/Grapados.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Grapados extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Libros grapados [en desarrollo].';
}
}

19
ci4/app/Controllers/Presupuestos/Invitaciones.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Invitaciones extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Invitaciones [en desarrollo].';
}
}

19
ci4/app/Controllers/Presupuestos/Marcapaginas.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Marcapaginas extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Marcapaginas [en desarrollo].';
}
}

2
ci4/app/Controllers/Presupuestos/Presupuestoacabados.php
View File

@ -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/';

26
ci4/app/Controllers/Presupuestos/Presupuestocliente.php
View File

@ -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;

2
ci4/app/Controllers/Presupuestos/Presupuestodirecciones.php
View File

@ -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/';

2
ci4/app/Controllers/Presupuestos/Presupuestoencuadernaciones.php
View File

@ -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)

2
ci4/app/Controllers/Presupuestos/Presupuestomanipulados.php
View File

@ -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)

2
ci4/app/Controllers/Presupuestos/Presupuestopreimpresiones.php
View File

@ -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/';

2
ci4/app/Controllers/Presupuestos/Presupuestoserviciosextra.php
View File

@ -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/';

2
ci4/app/Controllers/Presupuestos/Presupuestotiradasalternativas.php
View File

@ -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)

19
ci4/app/Controllers/Presupuestos/Tarjetascomerciales.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Tarjetascomerciales extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Tarjetas Comerciales [en desarrollo].';
}
}

19
ci4/app/Controllers/Presupuestos/Tripticos.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Tripticos extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Folletos >> Trípticos [en desarrollo].';
}
}

19
ci4/app/Controllers/Presupuestos/Wireotapablanda.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Wireotapablanda extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Libros >> Wire-o tapa blanda [en desarrollo].';
}
}

19
ci4/app/Controllers/Presupuestos/Wireotapadura.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Controllers\Presupuestos;
use App\Controllers\BaseController;
class Wireotapadura extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Presupuesto >> Libros >> Wire-o tapa dura [en desarrollo].';
}
}

2
ci4/app/Controllers/Sistema/Actividad.php
View File

@ -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';

11
ci4/app/Controllers/Sistema/Ajustes.php
View File

@ -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);
}

35
ci4/app/Controllers/Tarifas/Tarifaacabado.php → ci4/app/Controllers/Tarifas/Acabados/TarifaAcabados.php Executable file → Normal file
View File

@ -1,18 +1,14 @@
<?php namespace App\Controllers\tarifas;
<?php namespace App\Controllers\Tarifas\Acabados;
use App\Controllers\BaseResourceController;
use App\Entities\Tarifas\Acabados\TarifaAcabadoEntity;
use App\Models\Collection;
use App\Models\Tarifas\Acabados\TarifaAcabadoModel;
use App\Entities\Tarifas\TarifaacabadoEntity;
use App\Models\Tarifas\TarifaacabadoModel;
class Tarifaacabado extends \App\Controllers\BaseResourceController
class TarifaAcabados extends BaseResourceController
{
protected $modelName = TarifaacabadoModel::class;
protected $modelName = TarifaAcabadoModel::class;
protected $format = 'json';
protected static $singularObjectName = 'Tarifa Acabado';
@ -22,7 +18,7 @@ class Tarifaacabado extends \App\Controllers\BaseResourceController
protected static $controllerSlug = 'tarifasacabado';
protected static $viewPath = 'themes/backend/vuexy/form/tarifas/acabado/';
protected static $viewPath = 'themes/vuexy/form/tarifas/acabado/';
protected $indexRoute = 'tarifaAcabadoList';
@ -55,9 +51,8 @@ class Tarifaacabado extends \App\Controllers\BaseResourceController
$viewData = [
'currentModule' => 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();

38
ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php → ci4/app/Controllers/Tarifas/Acabados/TarifaAcabadosLineas.php Executable file → Normal file
View File

@ -1,30 +1,12 @@
<?php namespace App\Controllers\Tarifas;
use App\Controllers\BaseResourceController;
<?php namespace App\Controllers\Tarifas\Acabados;
use App\Entities\Tarifas\Acabados\TarifaAcabadoLineaEntity;
use App\Models\Collection;
use App\Models\Tarifas\Acabados\TarifaAcabadoLineaModel;
use DataTables\Editor;
use DataTables\Editor\Field;
use App\Entities\Tarifas\TarifaAcabadoLinea;
use App\Models\tarifas\TarifaacabadoModel;
use App\Models\Tarifas\TarifaAcabadoLineaModel;
use
DataTables\Editor,
DataTables\Database,
DataTables\Editor\Field,
DataTables\Editor\Format,
DataTables\Editor\Mjoin,
DataTables\Editor\Options,
DataTables\Editor\Upload,
DataTables\Editor\Validate,
DataTables\Editor\ValidateOptions;
use function PHPUnit\Framework\isEmpty;
class Tarifaacabadolineas extends \App\Controllers\BaseResourceController
class TarifaAcabadosLineas extends \App\Controllers\BaseResourceController
{
protected $modelName = TarifaAcabadoLineaModel::class;
@ -37,7 +19,7 @@ class Tarifaacabadolineas extends \App\Controllers\BaseResourceController
protected static $controllerSlug = 'tarifa-acabado-lineas';
protected static $viewPath = 'themes/backend/vuexy/form/tarifas/acabado/';
protected static $viewPath = 'themes/vuexy/form/tarifas/acabado/';
protected $indexRoute = 'tarifaAcabadoLineaList';
@ -61,7 +43,7 @@ class Tarifaacabadolineas extends \App\Controllers\BaseResourceController
$viewData = [
'currentModule' => 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)) :

2
ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php
View File

@ -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';

2
ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php
View File

@ -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';

2
ci4/app/Controllers/Tarifas/Tarifaextra.php
View File

@ -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';

2
ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php
View File

@ -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';

2
ci4/app/Controllers/Tarifas/Tarifapreimpresion.php
View File

@ -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';

2
ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php
View File

@ -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';

2
ci4/app/Controllers/Tarifas/Tarifasenvios.php
View File

@ -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';

2
ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php
View File

@ -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';

2
ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php
View File

@ -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';

2
ci4/app/Controllers/Tarifas/Tarifasmanipulado.php
View File

@ -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';

4
ci4/app/Entities/Tarifas/TarifaacabadoEntity.php → ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoEntity.php Executable file → Normal file
View File

@ -1,9 +1,9 @@
<?php
namespace App\Entities\tarifas;
namespace App\Entities\Tarifas\Acabados;
use CodeIgniter\Entity;
class TarifaacabadoEntity extends \CodeIgniter\Entity\Entity
class TarifaAcabadoEntity extends \CodeIgniter\Entity\Entity
{
protected $attributes = [
"id" => null,

4
ci4/app/Entities/Tarifas/TarifaAcabadoLinea.php → ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoLineaEntity.php Executable file → Normal file
View File

@ -1,9 +1,9 @@
<?php
namespace App\Entities\Tarifas;
namespace App\Entities\Tarifas\Acabados;
use CodeIgniter\Entity;
class TarifaAcabadoLinea extends \CodeIgniter\Entity\Entity
class TarifaAcabadoLineaEntity extends \CodeIgniter\Entity\Entity
{
protected $attributes = [
"id" => null,

7
ci4/app/Language/es/RolesPermisos.php
View File

@ -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',

2
ci4/app/Models/Clientes/ClienteModel.php
View File

@ -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)

2
ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php
View File

@ -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) {

2
ci4/app/Models/Tarifas/TarifaAcabadoLineaModel.php → ci4/app/Models/Tarifas/Acabados/TarifaAcabadoLineaModel.php Executable file → Normal file
View File

@ -1,5 +1,5 @@
<?php
namespace App\Models\Tarifas;
namespace App\Models\Tarifas\Acabados;
class TarifaAcabadoLineaModel extends \App\Models\BaseModel
{

6
ci4/app/Models/Tarifas/TarifaacabadoModel.php → ci4/app/Models/Tarifas/Acabados/TarifaAcabadoModel.php Executable file → Normal file
View File

@ -1,7 +1,7 @@
<?php
namespace App\Models\tarifas;
namespace App\Models\Tarifas\Acabados;
class TarifaacabadoModel extends \App\Models\BaseModel
class TarifaAcabadoModel extends \App\Models\BaseModel
{
protected $table = "lg_tarifa_acabado";
@ -31,7 +31,7 @@ class TarifaacabadoModel extends \App\Models\BaseModel
"user_created_id",
"user_updated_id",
];
protected $returnType = 'App\Entities\Tarifas\TarifaacabadoEntity';
protected $returnType = 'App\Entities\Tarifas\Acabados\TarifaAcabadoEntity';
protected $useTimestamps = true;
protected $useSoftDeletes = false;

69
ci4/app/Views/themes/vuexy/form/activity/activityList.php
View File

@ -1,6 +1,6 @@
<?= $this->include("themes/_commonPartialsBs/select2bs5") ?>
<?= $this->include("themes/_commonPartialsBs/datatables") ?>
<?= $this->extend('themes/backend/vuexy/main/defaultlayout') ?>
<?= $this->extend('themes/vuexy/main/defaultlayout') ?>
<?= $this->section('content'); ?>
<!--Content Body-->
@ -151,7 +151,6 @@
<th><?=lang("Actividad.os")?></th>
<th><?=lang("Actividad.browser")?></th>
<th><?=lang("Actividad.createdAt")?></th>
<th class="text-nowrap"><?= lang('Basic.global.Action') ?></th>
</tr>
</thead>
<tbody>
@ -171,13 +170,7 @@
const lastColNr = $('#activityTable').find("tr:first th").length - 1;
const actionBtns = function(data) {
return `<td class="text-right py-0 align-middle">
<div class="btn-group btn-group-sm">
<button class="btn btn-sm btn-danger btn-delete ms-1" data-id="${data.id}"><?= lang('Basic.global.Delete') ?></button>
</div>
</td>`;
};
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: '<?= route_to('dataTableOfActividad') ?>',
url: '<?= route_to('activityDT') ?>',
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' ? '<i class="text-success bi bi-check-lg"></i>' : '';
});
}
});
/*$(document).on('click', '.btn-delete', function(e) {
Swal.fire({
title: '<?= lang('Basic.global.sweet.sureToDeleteTitle', [mb_strtolower(lang('Paises.pais'))]) ?>',
text: '<?= lang('Basic.global.sweet.sureToDeleteText') ?>',
icon: 'warning',
showCancelButton: true,
confirmButtonColor: '#3085d6',
confirmButtonText: '<?= lang('Basic.global.sweet.deleteConfirmationButton') ?>',
cancelButtonText: '<?= lang('Basic.global.Cancel') ?>',
cancelButtonColor: '#d33'
})
.then((result) => {
const dataId = $(this).data('id');
const row = $(this).closest('tr');
if (result.value) {
$.ajax({
url: `<?= route_to('activityList') ?>/${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,
});
})
}
});
});*/
<?= $this->endSection() ?>

0
ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteDireccionesForm.php Executable file → Normal file
View File

4
ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteFormItems.php Executable file → Normal file
View File

@ -566,7 +566,7 @@
<?php if ($formAction !== route_to('clienteAdd')){ ?>
<div class="tab-pane fade" id="tarifascliente" role="tabpanel">
<?= view("themes/backend/vuexy/form/clientes/cliente/convert2templateModal") ?>
<?= view("themes/vuexy/form/clientes/cliente/convert2templateModal") ?>
<div class='row'>
<div class="col-md-12 col-lg-4 px-4">
<div class="mb-3">
@ -628,7 +628,7 @@
</div>
<div class="tab-pane fade" id="domicilio-entrega" role="tabpanel">
<?= view("themes/backend/vuexy/form/clientes/cliente/_clienteDireccionesForm") ?>
<?= view("themes/vuexy/form/clientes/cliente/_clienteDireccionesForm") ?>
<table id="tableOfDireccionesEnvio" class="table dt-responsive dataTable" style="width: 100%;">
<thead>
<tr>

0
ci4/app/Views/themes/vuexy/form/clientes/cliente/convert2templateModal.php Executable file → Normal file
View File

4
ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteForm.php Executable file → Normal file
View File

@ -1,7 +1,7 @@
<?= $this->include("themes/_commonPartialsBs/datatables") ?>
<?= $this->include("themes/_commonPartialsBs/select2bs5") ?>
<?= $this->include("themes/_commonPartialsBs/sweetalert") ?>
<?=$this->extend('themes/backend/vuexy/main/defaultlayout') ?>
<?=$this->extend('themes/vuexy/main/defaultlayout') ?>
<?= $this->section("content") ?>
<div class="row">
@ -15,7 +15,7 @@
<div class="card-body">
<?= view("themes/_commonPartialsBs/_alertBoxes") ?>
<?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
<?= view("themes/backend/vuexy/form/clientes/cliente/_clienteFormItems") ?>
<?= view("themes/vuexy/form/clientes/cliente/_clienteFormItems") ?>
</div><!-- /.card-body -->
<div class="pt-4">
<input

2
ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteList.php Executable file → Normal file
View File

@ -1,7 +1,7 @@
<?= $this->include('themes/_commonPartialsBs/select2bs5') ?>
<?= $this->include('themes/_commonPartialsBs/datatables') ?>
<?= $this->include('themes/_commonPartialsBs/_confirm2delete') ?>
<?= $this->extend('themes/backend/vuexy/main/defaultlayout') ?>
<?= $this->extend('themes/vuexy/main/defaultlayout') ?>
<?= $this->section('content'); ?>
<div class="row">

0
ci4/app/Views/themes/vuexy/form/clientes/contactos/_contactoDeClienteFormItems.php Executable file → Normal file
View File

2
ci4/app/Views/themes/vuexy/form/clientes/contactos/viewContactoDeClienteForm.php Executable file → Normal file
View File

@ -13,7 +13,7 @@
<div class="card-body">
<?= view("Themes/_commonPartialsBs/_alertBoxes") ?>
<?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
<?= view("themes/backend/vuexy/form/clientes/contactos/_contactoDeClienteFormItems") ?>
<?= view("themes/vuexy/form/clientes/contactos/_contactoDeClienteFormItems") ?>
</div><!-- /.card-body -->
<div class="card-footer">
<?= anchor(route_to("contactoDeClienteList"), lang("Basic.global.Cancel"), [

0
ci4/app/Views/themes/vuexy/form/clientes/contactos/viewContactoDeClienteList.php Executable file → Normal file
View File

0
ci4/app/Views/themes/vuexy/form/clientes/distribuidores/_distribuidorDeClienteFormItems.php Executable file → Normal file
View File

2
ci4/app/Views/themes/vuexy/form/clientes/distribuidores/viewDistribuidorDeClienteForm.php Executable file → Normal file
View File

@ -13,7 +13,7 @@
<div class="card-body">
<?= view("Themes/_commonPartialsBs/_alertBoxes") ?>
<?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
<?= view("themes/backend/vuexy/form/clientes/distribuidores/_distribuidorDeClienteFormItems") ?>
<?= view("themes/vuexy/form/clientes/distribuidores/_distribuidorDeClienteFormItems") ?>
</div><!-- /.card-body -->
<div class="card-footer">
<?= anchor(route_to("distribuidorDeClienteList"), lang("Basic.global.Cancel"), [

0
ci4/app/Views/themes/vuexy/form/clientes/distribuidores/viewDistribuidorDeClienteList.php Executable file → Normal file
View File

0
ci4/app/Views/themes/vuexy/form/clientes/plantillaprecios/_ClienteplantillapreciosFormItems.php Executable file → Normal file
View File

4
ci4/app/Views/themes/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosForm.php Executable file → Normal file
View File

@ -1,7 +1,7 @@
<?= $this->include("themes/_commonPartialsBs/datatables") ?>
<?= $this->include("themes/_commonPartialsBs/select2bs5") ?>
<?= $this->include("themes/_commonPartialsBs/sweetalert") ?>
<?= $this->extend('themes/backend/vuexy/main/defaultlayout') ?>
<?= $this->extend('themes/vuexy/main/defaultlayout') ?>
<?= $this->section("content") ?>
<div class="row">
@ -14,7 +14,7 @@
<?= csrf_field() ?>
<?= view("themes/_commonPartialsBs/_alertBoxes") ?>
<?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
<?= view("themes/backend/vuexy/form/clientes/plantillaprecios/_ClienteplantillapreciosFormItems") ?>
<?= view("themes/vuexy/form/clientes/plantillaprecios/_ClienteplantillapreciosFormItems") ?>
<div class="pt-4">
<input
type="submit"

2
ci4/app/Views/themes/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosList.php Executable file → Normal file
View File

@ -1,6 +1,6 @@
<?=$this->include('themes/_commonPartialsBs/datatables') ?>
<?= $this->include('themes/_commonPartialsBs/_confirm2delete') ?>
<?=$this->extend('themes/backend/vuexy/main/defaultlayout') ?>
<?=$this->extend('themes/vuexy/main/defaultlayout') ?>
<?=$this->section('content'); ?>
<div class="row">
<div class="col-md-12">

0
ci4/app/Views/themes/vuexy/form/compras/proveedores/_proveedorFormItems.php Executable file → Normal file
View File

0
ci4/app/Views/themes/vuexy/form/compras/proveedores/_proveedorTipoFormItems.php Executable file → Normal file
View File

4
ci4/app/Views/themes/vuexy/form/compras/proveedores/viewProveedorForm.php Executable file → Normal file
View File

@ -1,6 +1,6 @@
<?= $this->include("themes/_commonPartialsBs/select2bs5") ?>
<?= $this->include("themes/_commonPartialsBs/sweetalert") ?>
<?= $this->extend('themes/backend/vuexy/main/defaultlayout') ?>
<?= $this->extend('themes/vuexy/main/defaultlayout') ?>
<?= $this->section("content") ?>
<div class="row">
<div class="col-12">
@ -13,7 +13,7 @@
<div class="card-body">
<?= view("themes/_commonPartialsBs/_alertBoxes") ?>
<?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
<?= view("themes/backend/vuexy/form/compras/proveedores/_proveedorFormItems") ?>
<?= view("themes/vuexy/form/compras/proveedores/_proveedorFormItems") ?>
</div><!-- /.card-body -->
<div class="pt-4">

Some files were not shown because too many files have changed in this diff Show More