mirror of
https://git.imnavajas.es/jjimenez/safekat.git
synced 2025-07-25 22:52:08 +00:00
Optimizada rutas de tarifa acabado y convertido a camelCase
This commit is contained in:
@ -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,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
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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\GoBaseResourceController
|
||||
@ -972,7 +964,7 @@ class Presupuestocliente extends \App\Controllers\GoBaseResourceController
|
||||
|
||||
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;
|
||||
@ -980,7 +972,7 @@ class Presupuestocliente extends \App\Controllers\GoBaseResourceController
|
||||
|
||||
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;
|
||||
|
||||
33
ci4/app/Controllers/Tarifas/Tarifaacabado.php → ci4/app/Controllers/Tarifas/Acabados/TarifaAcabados.php
Executable file → Normal file
33
ci4/app/Controllers/Tarifas/Tarifaacabado.php → ci4/app/Controllers/Tarifas/Acabados/TarifaAcabados.php
Executable file → Normal 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';
|
||||
@ -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();
|
||||
36
ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php → ci4/app/Controllers/Tarifas/Acabados/TarifaAcabadosLineas.php
Executable file → Normal file
36
ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php → ci4/app/Controllers/Tarifas/Acabados/TarifaAcabadosLineas.php
Executable file → Normal 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;
|
||||
@ -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)) :
|
||||
4
ci4/app/Entities/Tarifas/TarifaacabadoEntity.php → ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoEntity.php
Executable file → Normal file
4
ci4/app/Entities/Tarifas/TarifaacabadoEntity.php → ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoEntity.php
Executable file → Normal 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
4
ci4/app/Entities/Tarifas/TarifaAcabadoLinea.php → ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoLineaEntity.php
Executable file → Normal 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,
|
||||
@ -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
2
ci4/app/Models/Tarifas/TarifaAcabadoLineaModel.php → ci4/app/Models/Tarifas/Acabados/TarifaAcabadoLineaModel.php
Executable file → Normal 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
6
ci4/app/Models/Tarifas/TarifaacabadoModel.php → ci4/app/Models/Tarifas/Acabados/TarifaAcabadoModel.php
Executable file → Normal 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;
|
||||
@ -28,7 +28,7 @@
|
||||
</div><!-- //.card -->
|
||||
</div><!--//.col -->
|
||||
|
||||
<?php if($formAction == route_to('createTarifaAcabado')): ?>
|
||||
<?php if($formAction == route_to('tarifaAcabadoAdd')): ?>
|
||||
<div class="accordion mt-3" id="accordionAcabadoLineas" style="visibility:hidden" >
|
||||
<?php else: ?>
|
||||
<div class="accordion mt-3" id="accordionAcabadoLineas" style="visibility:visible" >
|
||||
@ -87,7 +87,7 @@
|
||||
|
||||
editor = new $.fn.dataTable.Editor( {
|
||||
ajax: {
|
||||
url: "<?= route_to('editorOfTarifaAcabadoLineas') ?>",
|
||||
url: "<?= route_to('tarifaAcabadoLineasDTE') ?>",
|
||||
headers: {
|
||||
<?= csrf_token() ?? "token" ?> : <?= csrf_token() ?>v,
|
||||
},
|
||||
@ -155,7 +155,7 @@
|
||||
info: false,
|
||||
dom: '<"mt-4"><"float-end"B><"float-start"l><t><"mt-4 mb-3"p>',
|
||||
ajax : $.fn.dataTable.pipeline( {
|
||||
url: '<?= route_to('dataTableOfTarifaAcabadoLineas') ?>',
|
||||
url: '<?= route_to('tarifaAcabadoLineasDT') ?>',
|
||||
data: {
|
||||
id_tarifaacabado: id,
|
||||
},
|
||||
@ -225,7 +225,7 @@
|
||||
const row = $(this).closest('tr');
|
||||
if ($.isNumeric(dataId)) {
|
||||
$.ajax({
|
||||
url: `/tarifas/tarifaacabadolineas/delete/${dataId}`,
|
||||
url: `/tarifas/acabados/lineas/delete/${dataId}`,
|
||||
method: 'GET',
|
||||
}).done((data, textStatus, jqXHR) => {
|
||||
$('#confirm2delete').modal('toggle');
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
<div class="card card-info">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title"><?= lang('Tarifaacabado.tarifaacabadoList') ?></h3>
|
||||
<?= anchor(route_to('newTarifaAcabado'), lang('Basic.global.addNew') . ' ' . lang('Tarifaacabado.tarifaacabado'), ['class' => 'btn btn-primary float-end']); ?>
|
||||
<?= anchor(route_to('tarifaAcabadoAdd'), lang('Basic.global.addNew') . ' ' . lang('Tarifaacabado.tarifaacabado'), ['class' => 'btn btn-primary float-end']); ?>
|
||||
</div><!--//.card-header -->
|
||||
<div class="card-body">
|
||||
<?= view('themes/_commonPartialsBs/_alertBoxes'); ?>
|
||||
@ -76,7 +76,7 @@
|
||||
url: "/themes/vuexy/vendor/libs/datatables-sk/plugins/i18n/es-ES.json"
|
||||
},
|
||||
ajax : $.fn.dataTable.pipeline( {
|
||||
url: '<?= route_to('dataTableOfTarifasAcabado') ?>',
|
||||
url: '<?= route_to('tarifaAcabadoDT') ?>',
|
||||
method: 'POST',
|
||||
headers: {'X-Requested-With': 'XMLHttpRequest'},
|
||||
async: true,
|
||||
@ -109,7 +109,7 @@
|
||||
});
|
||||
|
||||
$(document).on('click', '.btn-edit', function(e) {
|
||||
window.location.href = `/tarifas/tarifaacabado/edit/${$(this).attr('data-id')}`;
|
||||
window.location.href = `/tarifas/acabados/edit/${$(this).attr('data-id')}`;
|
||||
});
|
||||
|
||||
$(document).on('click', '.btn-delete', function(e) {
|
||||
@ -121,7 +121,7 @@
|
||||
const row = $(this).closest('tr');
|
||||
if ($.isNumeric(dataId)) {
|
||||
$.ajax({
|
||||
url: `/tarifas/tarifaacabado/delete/${dataId}`,
|
||||
url: `/tarifas/acabados/delete/${dataId}`,
|
||||
method: 'GET',
|
||||
}).done((data, textStatus, jqXHR) => {
|
||||
$('#confirm2delete').modal('toggle');
|
||||
|
||||
@ -390,41 +390,41 @@
|
||||
<li class="menu-item">
|
||||
<a href="javascript:void(0);" class="menu-link menu-toggle">
|
||||
<i class="menu-icon tf-icons ti ti-receipt"></i>
|
||||
<div data-i18n="<?= lang("App.menu_tarifas") ?>"><?= lang("App.menu_tarifas") ?></div>
|
||||
<?= lang("App.menu_tarifas") ?>
|
||||
</a>
|
||||
<ul class="menu-sub">
|
||||
<?php if (auth()->user()->can('tarifa-preimpresion.menu')) { ?>
|
||||
<li class="menu-item">
|
||||
<a href="<?= route_to("tarifapreimpresionList") ?>" class="menu-link">
|
||||
<div data-i18n="<?= lang("App.menu_tarifapreimpresion") ?>"><?= lang("App.menu_tarifapreimpresion") ?></div>
|
||||
<?= lang("App.menu_tarifapreimpresion") ?>
|
||||
</a>
|
||||
</li>
|
||||
<?php } ?>
|
||||
<?php if (auth()->user()->can('tarifa-manipulado.menu')) { ?>
|
||||
<li class="menu-item">
|
||||
<a href="<?= route_to("tarifaManipuladoList") ?>" class="menu-link">
|
||||
<div data-i18n="<?= lang("App.menu_tarifamanipulado") ?>"><?= lang("App.menu_tarifamanipulado") ?></div>
|
||||
<?= lang("App.menu_tarifamanipulado") ?>
|
||||
</a>
|
||||
</li>
|
||||
<?php } ?>
|
||||
<?php if (auth()->user()->can('tarifa-acabado.menu')) { ?>
|
||||
<li class="menu-item">
|
||||
<a href="<?= route_to('tarifaAcabadoList') ?>" class="menu-link">
|
||||
<div data-i18n="<?= lang("App.menu_tarifaacabado") ?>"><?= lang("App.menu_tarifaacabado") ?></div>
|
||||
<?= lang("App.menu_tarifaacabado") ?>
|
||||
</a>
|
||||
</li>
|
||||
<?php } ?>
|
||||
<?php if (auth()->user()->can('tarifa-encuadernacion.menu')) { ?>
|
||||
<li class="menu-item">
|
||||
<a href="<?= site_url("tarifas/tarifasencuadernacion") ?>" class="menu-link">
|
||||
<div data-i18n="<?= lang("App.menu_encuadernacion") ?>"><?= lang("App.menu_encuadernacion") ?></div>
|
||||
<?= lang("App.menu_encuadernacion") ?>
|
||||
</a>
|
||||
</li>
|
||||
<?php } ?>
|
||||
<?php if (auth()->user()->can('tarifa-envio.menu')) { ?>
|
||||
<li class="menu-item">
|
||||
<a href="<?= site_url("tarifas/tarifasenvios") ?>" class="menu-link">
|
||||
<div data-i18n="<?= lang("App.menu_tarifaenvio") ?>"><?= lang("App.menu_tarifaenvio") ?></div>
|
||||
<?= lang("App.menu_tarifaenvio") ?>
|
||||
</a>
|
||||
</li>
|
||||
<?php } ?>
|
||||
|
||||
Reference in New Issue
Block a user