Merge branch 'main' into 'dev/presupuesto_cliente_2'

Main

See merge request jjimenez/safekat!240
This commit is contained in:
2024-05-08 18:45:04 +00:00
210 changed files with 886 additions and 889 deletions

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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()
{
}
}

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()
{
}
}

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()
{
}
}

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()
{
}
}

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

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()
{
}
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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;

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

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)

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)

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

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

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)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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