Merge branch 'dev/ui-cliente_contactos' into 'main'

Dev/ui cliente contactos See merge request jjimenez/safekat!52
2025-07-25 22:52:08 +00:00 · 2023-08-18 13:46:30 +00:00
parent aab3b89cfc 9750dc6887
commit 73c3e40bab
6 changed files with 315 additions and 40 deletions
--- a/ci4/app/Controllers/Clientes/Cliente.php
+++ b/ci4/app/Controllers/Clientes/Cliente.php
@ -47,6 +47,7 @@ class Cliente extends \App\Controllers\GoBaseResourceController
        // Se indica el flag para los ficheros borrados
        $this->delete_flag = 1;

+        $this->viewData = ['usingServerSideDataTable' => true]; // JJO

        // Breadcrumbs (IMN)
        $this->viewData['breadcrumb'] = [
@ -136,7 +137,7 @@ class Cliente extends \App\Controllers\GoBaseResourceController
        $this->viewData['userList2'] = $this->getUserListItems2($clienteEntity->soporte_id ?? null);
        $this->viewData['formaDePagoList'] = $this->getFormaDePagoListItems($clienteEntity->forma_pago_id ?? null);

-        $this->viewData['formAction'] = route_to('createCliente');
+        $this->viewData['formAction'] = site_url('cliente/add'); // route_to('createCliente'); IMN

        $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Clientes.moduleTitle') . ' ' . lang('Basic.global.addNewSuffix');

--- a/ci4/app/Controllers/Clientes/Clientecontactos.php
+++ b/ci4/app/Controllers/Clientes/Clientecontactos.php
@ -10,6 +10,9 @@ use App\Entities\Clientes\ClienteContactoEntity;
 use App\Models\Clientes\ClienteModel;

 use App\Models\Clientes\ClienteContactoModel;
+use DataTables\Editor;
+use DataTables\Editor\Field;
+use DataTables\Editor\Validate;

 class Clientecontactos extends \App\Controllers\GoBaseResourceController
 {
@ -206,26 +209,88 @@ class Clientecontactos extends \App\Controllers\GoBaseResourceController
            $length = $reqData['length'] ?? 5;
            $search = $reqData['search']['value'];
            $requestedOrder = $reqData['order']['0']['column'] ?? 1;
-            $order = ClienteContactoModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 1];
+            $order = ClienteContactoModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 1];
            $dir = $reqData['order']['0']['dir'] ?? 'asc';

-            $resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
+            $id_C = $reqData['id_cliente'] ?? -1;
+
+            $resourceData = $this->model->getResource("", $id_C)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
+
+            /*$resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
            foreach ($resourceData as $item) :
                if (isset($item->apellidos) && strlen($item->apellidos) > 100) :
                    $item->apellidos = character_limiter($item->apellidos, 100);
                endif;
-            endforeach;
+            endforeach;*/

            return $this->respond(Collection::datatable(
                $resourceData,
                $this->model->getResource()->countAllResults(),
-                $this->model->getResource($search)->countAllResults()
+                $this->model->getResource("", $id_C)->countAllResults()
            ));
        } else {
            return $this->failUnauthorized('Invalid request', 403);
        }
    }

+    public function datatable_editor() {
+        if ($this->request->isAJAX()) {
+
+            include(APPPATH . "ThirdParty/DatatablesEditor/DataTables.php");
+
+            // Build our Editor instance and process the data coming from _POST
+            $response = Editor::inst( $db, 'cliente_contactos' )
+                ->fields(
+                    Field::inst( 'nombre' )
+                        ->validator( 'Validate::notEmpty',array(
+                                'message' =>  'Falta nombre' )
+                        ),
+                    Field::inst( 'apellidos' )
+                        ->validator( 'Validate::notEmpty',array(
+                                'message' =>  'Falta apellidos' )
+                        ),
+                    Field::inst( 'cargo' )
+                        ->validator( 'Validate::notEmpty',array(
+                                'message' =>  'Falta cargp' )
+                        ),
+                    Field::inst( 'telefono' )
+                        ->validator( 'Validate::notEmpty',array(
+                                'message' =>  'Falta telefono' )
+                        ),
+                    Field::inst( 'email' )
+                        ->validator( 'Validate::notEmpty',array(
+                                'message' =>  'Falta email' )
+                        ),
+
+                    Field::inst( 'cliente_id' ),
+
+                )
+                ->validator( function($editor, $action, $data){
+                    if ($action === Editor::ACTION_CREATE || $action === Editor::ACTION_EDIT){
+                        /*foreach ($data['data'] as $pkey => $values ){
+                            // No se pueden duplicar valores al crear o al editar
+                            if (!empty($response)){
+                                return $response;
+                            }
+                        }*/
+                    }
+                })
+                ->debug(true)
+                ->process( $_POST )
+                ->data();
+
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+
+            $response[$csrfTokenName] = $newTokenHash;
+
+            echo json_encode($response);
+
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
    public function allItemsSelect()
    {
        if ($this->request->isAJAX()) {
--- a/ci4/app/Models/Clientes/ClienteContactoModel.php
+++ b/ci4/app/Models/Clientes/ClienteContactoModel.php
@ -1,4 +1,5 @@
 <?php
+
 namespace App\Models\Clientes;

 class ClienteContactoModel extends \App\Models\GoBaseModel
@ -13,14 +14,11 @@ class ClienteContactoModel extends \App\Models\GoBaseModel
    protected $useAutoIncrement = true;

    const SORTABLE = [
-        1 => "t1.id",
-        2 => "t1.cliente_id",
-        3 => "t1.cargo",
-        4 => "t1.nombre",
-        5 => "t1.apellidos",
-        6 => "t1.telefono",
-        7 => "t1.email",
-        8 => "t2.nombre",
+        0 => "t1.nombre",
+        1 => "t1.apellidos",
+        2 => "t1.cargo",
+        3 => "t1.telefono",
+        4 => "t1.email",
    ];

    protected $allowedFields = ["cliente_id", "cargo", "nombre", "apellidos", "telefono", "email"];
@ -105,34 +103,27 @@ class ClienteContactoModel extends \App\Models\GoBaseModel
     *
     * @return \CodeIgniter\Database\BaseBuilder
     */
-    public function getResource(string $search = "")
+    public function getResource(string $search = "", $cliente_id = -1)
    {
        $builder = $this->db
            ->table($this->table . " t1")
            ->select(
-                "t1.id AS id, t1.cargo AS cargo, t1.nombre AS nombre, t1.apellidos AS apellidos, t1.telefono AS telefono, t1.email AS email, t2.nombre AS cliente_id"
+                "t1.id AS id, t1.cargo AS cargo, t1.nombre AS nombre, t1.apellidos AS apellidos, t1.telefono AS telefono, t1.email AS email, t1.cliente_id AS cliente_id"
            );
+
+        $builder->where('t1.cliente_id', $cliente_id);
+        $builder->where("t1.is_deleted", 0);
        $builder->join("clientes t2", "t1.cliente_id = t2.id", "left");

        return empty($search)
            ? $builder
            : $builder
                ->groupStart()
-                ->like("t1.id", $search)
-                ->orLike("t1.cargo", $search)
+                ->like("t1.cargo", $search)
                ->orLike("t1.nombre", $search)
                ->orLike("t1.apellidos", $search)
                ->orLike("t1.telefono", $search)
                ->orLike("t1.email", $search)
-                ->orLike("t2.id", $search)
-                ->orLike("t1.id", $search)
-                ->orLike("t1.cliente_id", $search)
-                ->orLike("t1.cargo", $search)
-                ->orLike("t1.nombre", $search)
-                ->orLike("t1.apellidos", $search)
-                ->orLike("t1.telefono", $search)
-                ->orLike("t1.email", $search)
-                ->orLike("t2.nombre", $search)
                ->groupEnd();
    }
 }
--- a/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteFormItems.php
+++ b/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteFormItems.php
@ -15,6 +15,7 @@
                        Ficha de Cliente
                    </button>
                </li>
+                <?php if ($formAction !== site_url('cliente/add')){ ?>
                <li class="nav-item">
                    <button
                            type="button"
@ -27,6 +28,7 @@
                        Contactos
                    </button>
                </li>
+                <?php } ?>
                <li class="nav-item">
                    <button
                            type="button"
@ -135,8 +137,7 @@
                                                      name="direccion"
                                                      style="height: 10em;"
                                                      class="form-control"
-                                            >
-                                                <?= old('direccion', $clienteEntity->direccion) ?>
+                                            ><?= old('direccion', $clienteEntity->direccion) ?>
                                            </textarea>
                                        </div>
                                        <div class="col-md-4">
@ -417,7 +418,8 @@
                                        <div class="col-md-3">
                                            <div class="form-check">
                                                <label for="disponibleFe" class="form-check-label">
-                                                    <input type="checkbox" id="disponibleFe" name="disponible_fe" value="1"
+                                                    <input type="checkbox" id="disponibleFe" name="disponible_fe"
+                                                           value="1"
                                                           class="form-check-input"<?= $clienteEntity->disponible_fe == true ? 'checked' : ''; ?>>
                                                    <?= lang('Clientes.disponibleFe') ?>
                                                </label>
@ -426,7 +428,8 @@
                                        <div class="col-md-3">
                                            <div class="form-check">
                                                <label for="messageTracking" class="form-check-label">
-                                                    <input type="checkbox" id="messageTracking" name="message_tracking" value="1"
+                                                    <input type="checkbox" id="messageTracking" name="message_tracking"
+                                                           value="1"
                                                           class="form-check-input"<?= $clienteEntity->message_tracking == true ? 'checked' : ''; ?>>
                                                    <?= lang('Clientes.messageTracking') ?>
                                                </label>
@ -435,7 +438,8 @@
                                        <div class="col-md-3">
                                            <div class="form-check">
                                                <label for="messageProductionStart" class="form-check-label">
-                                                    <input type="checkbox" id="messageProductionStart" name="message_production_start" value="1"
+                                                    <input type="checkbox" id="messageProductionStart"
+                                                           name="message_production_start" value="1"
                                                           class="form-check-input"<?= $clienteEntity->message_production_start == true ? 'checked' : ''; ?>>
                                                    <?= lang('Clientes.messageProductionStart') ?>
                                                </label>
@ -444,7 +448,8 @@
                                        <div class="col-md-3">
                                            <div class="form-check">
                                                <label for="tiradaFlexible" class="form-check-label">
-                                                    <input type="checkbox" id="tiradaFlexible" name="tirada_flexible" value="1"
+                                                    <input type="checkbox" id="tiradaFlexible" name="tirada_flexible"
+                                                           value="1"
                                                           class="form-check-input"<?= $clienteEntity->tirada_flexible == true ? 'checked' : ''; ?>>
                                                    <?= lang('Clientes.tiradaFlexible') ?>
                                                </label>
@ -479,9 +484,25 @@
                    </div>
                </div>

+                <?php if ($formAction !== site_url('cliente/add')){ ?>
                <div class="tab-pane fade" id="contactos" role="tabpanel">
-                    <h3>Proximanente</h3>
+                    <table id="tableOfClienteContactos"
+                           class="table table-striped table-hover" style="width: 100%;">
+                        <thead>
+                        <tr>
+                            <th><?= lang('ClienteContactos.nombre') ?></th>
+                            <th><?= lang('ClienteContactos.apellidos') ?></th>
+                            <th><?= lang('ClienteContactos.cargo') ?></th>
+                            <th><?= lang('ClienteContactos.telefono') ?></th>
+                            <th><?= lang('ClienteContactos.email') ?></th>
+                            <th class="text-nowrap"><?= lang('Basic.global.Action') ?></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        </tbody>
+                    </table>
                </div>
+                <?php } ?>

                <div class="tab-pane fade" id="domicilio-entrega" role="tabpanel">
                    <h3>Proximanente</h3>
@ -509,7 +530,6 @@
    </div>


-
 </div>

 <div class="row">
@ -536,11 +556,12 @@
            <label for="descuento" class="form-label">
                <?= lang('Clientes.descuento') ?>*
            </label>
-            <input type="number" id="descuento" name="descuento" required placeholder="0.00" maxLength="8" step="0.01"
+            <input type="number" id="descuento" name="descuento" required placeholder="0.00" maxLength="8"
+                   step="0.01"
                   class="form-control" value="<?= old('descuento', $clienteEntity->descuento) ?>">
        </div><!--//.mb-3 -->

-    <?php /* A implementar en el controller
+        <?php /* A implementar en el controller
        <div class="mb-3">
            <label for="limiteCreditoUserId" class="form-label">
                <?= lang('Clientes.limiteCreditoUserId') ?>*
@ -591,7 +612,8 @@
            <label for="margenPlantillaId" class="form-label">
                <?= lang('Clientes.margenPlantillaId') ?>
            </label>
-            <input type="number" id="margenPlantillaId" name="margen_plantilla_id" maxLength="10" class="form-control"
+            <input type="number" id="margenPlantillaId" name="margen_plantilla_id" maxLength="10"
+                   class="form-control"
                   value="<?= old('margen_plantilla_id', $clienteEntity->margen_plantilla_id) ?>">
        </div><!--//.mb-3 -->

@ -627,5 +649,200 @@

 </div><!-- //.row -->

+<?php if ($formAction !== site_url('cliente/add')){ ?>
+<?= $this->section("additionalInlineJs") ?>
+    const lastColNr = $('#tableOfClienteContactos').find("tr:first th").length - 1;
+    const url = window.location.href;
+    const url_parts = url.split('/');
+    if(url_parts[url_parts.length-2] == 'edit'){
+        id = url_parts[url_parts.length-1];
+    }
+    else{
+        id = -1;
+    }
+
+    const actionBtns = function(data) {
+        return `
+                    <span class="edit"><a href="javascript:void(0);"><i class="ti ti-pencil ti-sm btn-edit mx-2" data-id="${data.id}"></i></a></span>
+                    <a href="javascript:void(0);"><i class="ti ti-trash ti-sm btn-delete mx-2" data-id="${data.id}" data-bs-toggle="modal" data-bs-target="#confirm2delete"></i></a>
+                    <span class="cancel"></span>
+                `;
+    };
+
+    editor = new $.fn.dataTable.Editor( {
+        ajax: {
+            url: "<?= route_to('editorOfClienteContactos') ?>",
+            headers: {
+                <?= csrf_token() ?? "token" ?> : <?= csrf_token() ?>v,
+            },
+        },
+        table   : "#tableOfClienteContactos",
+        idSrc:  'id',
+        fields: [ {
+                name: "nombre"
+            }, {
+                name: "apellidos"
+            }, {
+                name: "cargo"
+            }, {
+                name: "telefono"
+            }, {
+                name: "email"
+            }, {
+                "name": "cliente_id",
+                "type": "hidden"
+            },{
+                "name": "deleted_at",
+                "type": "hidden"
+            },{
+                "name": "is_deleted",
+                "type": "hidden"
+            },
+        ]
+    } );
+
+    editor.on( 'preSubmit', function ( e, d, type ) {
+        if ( type === 'create'){
+            d.data[0]['cliente_id'] = id;
+        }
+        else if(type === 'edit' ) {
+            for (v in d.data){
+                d.data[v]['cliente_id'] = id;
+            }
+        }
+    });


+    editor.on( 'postSubmit', function ( e, json, data, action ) {
+
+        yeniden(json.<?= csrf_token() ?>);
+    });
+
+    editor.on( 'submitSuccess', function ( e, json, data, action ) {
+
+        theTable.clearPipeline();
+        theTable.draw();
+    });
+
+    // Activate an inline edit on click of a table cell
+    $('#tableOfClienteContactos').on( 'click', 'tbody span.edit', function (e) {
+        editor.inline(
+            theTable.cells(this.parentNode.parentNode, '*').nodes(),
+            {
+                cancelHtml: '<a href="javascript:void(0);"><i class="ti ti-x"></i></a>',
+                cancelTrigger: 'span.cancel',
+                submitHtml: '<a href="javascript:void(0);"><i class="ti ti-device-floppy"></i></a>',
+                submitTrigger: 'span.edit',
+                submit: 'allIfChanged'
+            }
+        );
+    } );
+
+
+    // Delete row
+    $('#tableOfClienteContactos').on( 'click', 'tbody span.remove', function (e) {
+
+        Swal.fire({
+            title: '<?= lang('Basic.global.sweet.sureToDeleteTitle', [mb_strtolower(lang('Basic.global.sweet.line'))]) ?>',
+            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) {
+                editor
+                    .create( false )
+                    .edit( this.parentNode, false)
+                    .set( 'deleted_at', new Date().toISOString().slice(0, 19).replace('T', ' ') )
+                    .set( 'is_deleted', 1 )
+                    .submit();
+
+            }
+        });
+    });
+
+	var theTable = $('#tableOfClienteContactos').DataTable( {
+		serverSide: true,
+        processing: true,
+        autoWidth: true,
+        responsive: true,
+        lengthMenu: [ 5, 10, 25],
+        order: [[ 0, "asc" ], [ 1, "asc" ]],
+        pageLength: 10,
+        lengthChange: true,
+        searching: false,
+        paging: true,
+        info: false,
+        dom: '<"mt-4"><"float-end"B><"float-start"l><t><"mt-4 mb-3"p>',
+		ajax : $.fn.dataTable.pipeline( {
+            url: '<?= route_to('dataTableOfClienteContactos') ?>',
+            data: {
+                id_cliente: id,
+            },
+            method: 'POST',
+            headers: {'X-Requested-With': 'XMLHttpRequest'},
+            async: true,
+        }),
+        columns: [
+            { 'data': 'nombre' },
+            { 'data': 'apellidos' },
+            { 'data': 'cargo' },
+            { 'data': 'telefono' },
+            { 'data': 'email' },
+            {
+                data: actionBtns,
+                className: 'row-edit dt-center'
+            }
+        ],
+        columnDefs: [
+            {
+                orderable: false,
+                searchable: false,
+                targets: [lastColNr]
+            },
+            {
+                "orderData": [ 0, 1 ],
+                "targets": 0
+            },
+
+        ],
+        language: {
+            url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/<?= config('Basics')->i18n ?>.json"
+        },
+        buttons: [ {
+            className: 'btn btn-primary float-end me-sm-3 me-1',
+            extend: "createInline",
+            editor: editor,
+            formOptions: {
+                submitTrigger: -1,
+                submitHtml: '<i class="ti ti-device-floppy"/>'
+            }
+        } ]
+    } );
+
+
+<?=$this->endSection() ?>
+
+<?=$this->section('css') ?>
+    <link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.2.3/css/buttons.bootstrap5.min.css">
+    <link rel="stylesheet" href="<?= site_url('themes/vuexy/css/datatables-editor/editor.dataTables.min.css') ?>">
+<?=$this->endSection() ?>
+
+<?= $this->section('additionalExternalJs') ?>
+    <script src="https://cdn.datatables.net/buttons/2.2.3/js/dataTables.buttons.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/2.2.3/js/buttons.bootstrap5.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/2.2.3/js/buttons.html5.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/2.2.3/js/buttons.print.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.0/jszip.min.js" integrity="sha512-xcHCGC5tQ0SHlRX8Anbz6oy/OullASJkEhb4gjkneVpGE3/QGYejf14CUO5n5q5paiHfRFTa9HKgByxzidw2Bw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.5/pdfmake.min.js" integrity="sha512-rDbVu5s98lzXZsmJoMa0DjHNE+RwPJACogUCLyq3Xxm2kJO6qsQwjbE5NDk2DqmlKcxDirCnU1wAzVLe12IM3w==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.5/vfs_fonts.js" integrity="sha512-cktKDgjEiIkPVHYbn8bh/FEyYxmt4JDJJjOCu5/FQAkW4bc911XtKYValiyzBiJigjVEvrIAyQFEbRJZyDA1wQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="<?= site_url('themes/vuexy/js/datatables-editor/dataTables.editor.min.js') ?>"></script>
+<?=$this->endSection() ?>
+
+<?php } ?>
--- a/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/viewClienteForm.php
+++ b/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/viewClienteForm.php
@ -1,3 +1,4 @@
+<?= $this->include("themes/_commonPartialsBs/datatables") ?>
 <?= $this->include("themes/_commonPartialsBs/select2bs5") ?>
 <?= $this->include("themes/_commonPartialsBs/sweetalert") ?>
 <?=$this->extend('themes/backend/vuexy/main/defaultlayout') ?>
@ -26,7 +27,7 @@
                    <?= anchor(route_to("clienteList"), lang("Basic.global.Cancel"), ["class" => "btn btn-secondary float-start"]) ?>
                </div><!-- /.card-footer -->
 			</form>
-    </div><!-- //.card -->
+        </div><!-- //.card -->
    </div><!--//.col -->
 </div><!--//.row -->
 <?= $this->endSection() ?>
@ -208,5 +209,5 @@
        }
    });

-
 <?= $this->endSection() ?>
+
--- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php
+++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php
@ -26,7 +26,7 @@
 				
 			</div><!-- /.card-footer -->
 			</form>
-    </div><!-- //.card -->
+        </div><!-- //.card -->
    </div><!--//.col -->