diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index b30da853..3c6ebf21 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -381,6 +381,7 @@ $routes->resource('tarifaencuadernacionlineas', ['namespace' => 'App\Controller $routes->group('tarifaencuadernaciontiradas', ['namespace' => 'App\Controllers\Tarifas'], function ($routes) { $routes->post('datatable', 'Tarifaencuadernaciontiradas::datatable', ['as' => 'dataTableOfTarifaEncuadernacionTiradas']); $routes->post('datatable_editor', 'Tarifaencuadernaciontiradas::datatable_editor', ['as' => 'editorOfTarifaEncuadernacionTiradas']); + $routes->post('menuitems', 'Tarifaencuadernaciontiradas::menuItems', ['as' => 'menuItemsOfTarifaencuadernaciontiradas']); }); $routes->resource('tarifaencuadernaciontiradas', ['namespace' => 'App\Controllers\Tarifas', 'controller' => 'Tarifaencuadernaciontiradas', 'except' => 'show,new,create,update']); diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php index 4d5a0f6e..ab32c9ab 100644 --- a/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php +++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php @@ -8,6 +8,8 @@ use App\Models\Collection; use App\Entities\Tarifas\TarifaEncuadernacionTirada; use App\Models\Tarifas\TarifaEncuadernacionTiradaModel; +use App\Models\Compras\ProveedorModel; +use App\Models\Compras\ProveedorTipoModel; use DataTables\Editor, @@ -34,42 +36,28 @@ class Tarifaencuadernaciontiradas extends \App\Controllers\GoBaseResourceControl // Build our Editor instance and process the data coming from _POST $response = Editor::inst($db, 'tarifa_encuadernacion_tiradas') ->fields( - Field::inst('paginas_min') + Field::inst('tirada_min') ->validator('Validate::numeric', array( 'message' => lang('TarifaAcabadoLineas.validation.paginas_min.decimal')) ) ->validator('Validate::notEmpty', array( 'message' => lang('TarifaAcabadoLineas.validation.paginas_min.required')) ), - Field::inst('paginas_max') + Field::inst('tirada_max') ->validator('Validate::numeric', array( 'message' => lang('TarifaAcabadoLineas.validation.paginas_max.decimal')) ) ->validator('Validate::notEmpty', array( 'message' => lang('TarifaAcabadoLineas.validation.paginas_max.required')) ), - Field::inst('precio_min') - ->validator('Validate::numeric', array( - 'message' => lang('TarifaAcabadoLineas.validation.precio_min.decimal')) - ) - ->validator('Validate::notEmpty', array( - 'message' => lang('TarifaAcabadoLineas.validation.precio_min.required')) - ), - Field::inst('precio_max') - ->validator('Validate::numeric', array( - 'message' => lang('TarifaAcabadoLineas.validation.precio_max.decimal')) - ) - ->validator('Validate::notEmpty', array( - 'message' => lang('TarifaAcabadoLineas.validation.precio_max.required')) - ), - Field::inst('margen') - ->validator('Validate::numeric', array( - 'message' => lang('TarifaAcabadoLineas.validation.margen.decimal')) - ) - ->validator('Validate::notEmpty', array( - 'message' => lang('TarifaAcabadoLineas.validation.margen.required')) - ), - Field::inst('tirada_encuadernacion_id'), + Field::inst('proveedor') + ->options( Options::inst() + ->table( 'lg_proveedores' ) + ->value( 'id' ) + ->label( 'nombre' ) + ), + Field::inst('tarifa_encuadernacion_id'), + Field::inst('proveedor_id'), Field::inst('user_created_id'), Field::inst('created_at'), Field::inst('user_updated_id'), @@ -78,7 +66,7 @@ class Tarifaencuadernaciontiradas extends \App\Controllers\GoBaseResourceControl Field::inst('deleted_at'), ) - ->validator(function ($editor, $action, $data) { + /*->validator(function ($editor, $action, $data) { if ($action === Editor::ACTION_CREATE || $action === Editor::ACTION_EDIT) { foreach ($data['data'] as $pkey => $values) { // Si no se quiere borrar... @@ -93,7 +81,7 @@ class Tarifaencuadernaciontiradas extends \App\Controllers\GoBaseResourceControl } } } - }) + })*/ ->on('preCreate', function ($editor, &$values) { $session = session(); $datetime = (new \CodeIgniter\I18n\Time("now")); @@ -162,5 +150,29 @@ class Tarifaencuadernaciontiradas extends \App\Controllers\GoBaseResourceControl return $this->failUnauthorized('Invalid request', 403); } } + + + public function menuItems() + { + if ($this->request->isAJAX()) { + + $provTipoModel = new ProveedorTipoModel(); + $provModel = new ProveedorModel(); + + $tipoId = $provTipoModel->getTipoId("Encuadernacion"); + $provList = $provModel->getProvList($tipoId); + + $newTokenHash = csrf_hash(); + $csrfTokenName = csrf_token(); + $data = [ + 'data' => $provList, + $csrfTokenName => $newTokenHash + ]; + return $this->respond($data); + } else { + return $this->failUnauthorized('Invalid request', 403); + } + } + } diff --git a/ci4/app/Models/Compras/ProveedorModel.php b/ci4/app/Models/Compras/ProveedorModel.php index 0d21344f..bb77ee7f 100644 --- a/ci4/app/Models/Compras/ProveedorModel.php +++ b/ci4/app/Models/Compras/ProveedorModel.php @@ -199,4 +199,15 @@ class ProveedorModel extends \App\Models\GoBaseModel ->orLike("t4.nombre", $search) ->groupEnd(); } + + public function getProvList(int $tipoId = -1){ + + $builder = $this->db + ->table($this->table . " t1") + ->select( + "t1.id AS proveedor_id, t1.nombre AS proveedor") + ->where("tipo_id", $tipoId); + + return $builder->getResult('array'); + } } diff --git a/ci4/app/Models/Compras/ProveedorTipoModel.php b/ci4/app/Models/Compras/ProveedorTipoModel.php index d2ffb31a..1c8c9a99 100644 --- a/ci4/app/Models/Compras/ProveedorTipoModel.php +++ b/ci4/app/Models/Compras/ProveedorTipoModel.php @@ -72,4 +72,15 @@ class ProveedorTipoModel extends \App\Models\GoBaseModel ->orLike("t1.updated_at", $search) ->groupEnd(); } + + + public function getTipoId(string $tipo = ""){ + + $builder = $this->db + ->table($this->table . " t1") + ->select("t1.id AS id") + ->where("t1.nombre", $tipo); + + return $builder->get()->getResultObject(); + } } diff --git a/ci4/app/Models/Tarifas/TarifaEncuadernacionTiradaModel.php b/ci4/app/Models/Tarifas/TarifaEncuadernacionTiradaModel.php index 59b0b621..3b7174a9 100644 --- a/ci4/app/Models/Tarifas/TarifaEncuadernacionTiradaModel.php +++ b/ci4/app/Models/Tarifas/TarifaEncuadernacionTiradaModel.php @@ -76,7 +76,7 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel ->table($this->table . " t1") ->select( "t1.id AS id, t1.tarifa_encuadernacion_id AS tarifa_encuadernacion_id, t1.tirada_min AS tirada_min, - t1.tirada_max AS tirada_max, t3.nombre AS proveedor, t2.id AS tarifa_encuadernacion" + t1.tirada_max AS tirada_max, t3.nombre AS proveedor, t3.id AS proveedor_id, t2.id AS tarifa_encuadernacion" ); //JJO $builder->where('tarifa_encuadernacion_id', $tarifa_encuadernacion_id); @@ -90,11 +90,9 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel ? $builder : $builder ->groupStart() - ->like("t1.id", $search) - ->orLike("t1.tirada_min", $search) + ->Like("t1.tirada_min", $search) ->orLike("t1.tirada_max", $search) ->orLike("t3.nombre", $search) - ->orLike("t1.id", $search) ->orLike("t1.tirada_min", $search) ->orLike("t1.tirada_max", $search) ->orLike("t3.nombre", $search) diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php index 7658efc9..a86aec52 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php @@ -46,7 +46,6 @@ - @@ -339,7 +338,8 @@ table : "#tableOfTarifaencuadernaciontiradas", idSrc: 'id', fields: [ { - name: "proveedor" + name: "proveedor", + "type": "select" }, { name: "tirada_min" }, { @@ -348,6 +348,9 @@ "name": "tarifa_encuadernacion_id", "type": "hidden" },{ + name: "proveedor_id", + "type": "hidden" + }, { "name": "deleted_at", "type": "hidden" },{ @@ -382,6 +385,7 @@ theTable.draw(); }); + var theTable2 = $('#tableOfTarifaencuadernaciontiradas').DataTable( { serverSide: true, processing: true, @@ -393,6 +397,7 @@ lengthChange: true, searching: false, paging: true, + select: true, info: false, dom: '<"mt-4"><"float-end"B><"float-start"l><"mt-4 mb-3"p>', ajax : $.fn.dataTable.pipeline( { @@ -405,9 +410,6 @@ async: true, }), columns: [ - { - className: 'dt-body-center' - }, { 'data': 'proveedor' }, { 'data': 'tirada_min' }, { 'data': 'tirada_max' }, @@ -421,15 +423,8 @@ orderable: false, searchable: false, targets: [lastColNr2] - }, - { - orderable: false, - className: 'select-checkbox', - targets: 0 - } - //], - - // {"orderData": [ 0, 1 ], "targets": 0 }, + }, + {"orderData": [ 0, 1 ], "targets": 1 }, ], language: { @@ -443,18 +438,14 @@ submitTrigger: -1, submitHtml: '' } - } ], - select: { - style: 'single', - selector: 'td:first-child' - } + } ] } ); // Activate an inline edit on click of a table cell $('#tableOfTarifaencuadernaciontiradas').on( 'click', 'tbody span.edit', function (e) { - editor.inline( - theTable.cells(this.parentNode.parentNode, '*').nodes(), + editor2.inline( + theTable2.cells(this.parentNode.parentNode, '*').nodes(), { cancelHtml: '', cancelTrigger: 'span.cancel', @@ -502,8 +493,10 @@ section('css') ?> + + endSection() ?> @@ -516,6 +509,6 @@ - + endSection() ?>