From 5df2ad2510f575ccba197f664023774f9ccdbcaf Mon Sep 17 00:00:00 2001 From: imnavajas Date: Sun, 7 Jan 2024 10:42:02 +0100 Subject: [PATCH] Eliminado campo Comunidades_Autonomas del formulario direcciones de envio del sistema (DDBB, PHP, JS) --- .../Controllers/Clientes/Clientedirecciones.php | 13 ------------- ci4/app/Language/es/ClienteDirecciones.php | 4 +--- .../Models/Clientes/ClienteDireccionesModel.php | 7 +------ .../cliente/_clienteDireccionesForm.php | 17 ----------------- .../form/clientes/cliente/_clienteFormItems.php | 11 ----------- .../form/clientes/cliente/viewClienteForm.php | 1 + 6 files changed, 3 insertions(+), 50 deletions(-) diff --git a/ci4/app/Controllers/Clientes/Clientedirecciones.php b/ci4/app/Controllers/Clientes/Clientedirecciones.php index 7ee9a681..06942793 100755 --- a/ci4/app/Controllers/Clientes/Clientedirecciones.php +++ b/ci4/app/Controllers/Clientes/Clientedirecciones.php @@ -31,7 +31,6 @@ class Clientedirecciones extends \App\Controllers\GoBaseResourceController $email = $reqData['email'] ?? ""; $direccion = $reqData['direccion'] ?? ""; $pais_id = $reqData['paisId'] ?? -1; - $ccaa_id = $reqData['ccaaId'] ?? -1; $provincia = $reqData['provincia'] ?? ""; $municipio = $reqData['municipio'] ?? ""; $cp = $reqData['cp'] ?? ""; @@ -44,7 +43,6 @@ class Clientedirecciones extends \App\Controllers\GoBaseResourceController "email" => $email, "direccion" => $direccion, "pais_id" => $pais_id, - "ccaa_id" => $ccaa_id, "provincia" => $provincia, "municipio" => $municipio, "cp" => $cp, @@ -208,17 +206,6 @@ class Clientedirecciones extends \App\Controllers\GoBaseResourceController return true; } ), - Field::inst('ccaa_id') - ->validator( function ( $val, $data, $field, $host ) { - if ($data['pais_id'] == 1) { // Si es españa provincia y CCAA es obligatorio - if (strlen( $val ) > 100) - lang('ClienteDirecciones.validation.required'); - else - return true; - } - return true; - } - ), Field::inst('pais_id')->validator('Validate::notEmpty', array( 'message' => lang('ClienteDirecciones.validation.required'))), Field::inst('cliente_id'), diff --git a/ci4/app/Language/es/ClienteDirecciones.php b/ci4/app/Language/es/ClienteDirecciones.php index 38f58b34..8257ee47 100755 --- a/ci4/app/Language/es/ClienteDirecciones.php +++ b/ci4/app/Language/es/ClienteDirecciones.php @@ -7,11 +7,10 @@ return [ 'alias' => 'Alias', 'att' => 'Att.', 'email' => 'Email', - 'direccion' => 'Direccion', + 'direccion' => 'Dirección', 'cp' => 'CP', 'municipio' => 'Ciudad', 'provincia' => 'Provincia', - 'ccaa' => 'CCAA', 'pais' => 'País', 'telefono' => 'Teléfono', 'validation' => [ @@ -21,7 +20,6 @@ return [ ], 'selectPais' => 'Seleccione País', - 'selectCcaa' => 'Seleccione CCAA', 'selectProvincia' => 'Seleccione Provincia', 'selectMunicipio' => 'Seleccione Municipio', ]; \ No newline at end of file diff --git a/ci4/app/Models/Clientes/ClienteDireccionesModel.php b/ci4/app/Models/Clientes/ClienteDireccionesModel.php index 4d0b7d0f..3b75ba4c 100755 --- a/ci4/app/Models/Clientes/ClienteDireccionesModel.php +++ b/ci4/app/Models/Clientes/ClienteDireccionesModel.php @@ -33,8 +33,7 @@ class ClienteDireccionesModel extends \App\Models\GoBaseModel "email", "direccion", "pais_id", - "ccaa_id", - "provincia", + "provincia", "municipio", "cp", "telefono", @@ -101,14 +100,12 @@ class ClienteDireccionesModel extends \App\Models\GoBaseModel ->select( "t1.id AS id, t1.cliente_id AS cliente_id, t2.nombre as cliente_nombre, t1.att AS att, t1.alias AS alias, t1.email AS email, t1.direccion AS direccion, t1.pais_id AS pais_id, t3.nombre AS pais, - t1.ccaa_id AS ccaa_id, t4.nombre AS ccaa_nombre, t1.municipio AS municipio, t1.provincia AS provincia, t1.cp AS cp, t1.telefono AS telefono" ); $builder->where('t1.cliente_id', $cliente_id); $builder->join("clientes t2", "t1.cliente_id = t2.id", "left"); $builder->join("lg_paises t3", "t1.pais_id = t3.id", "left"); - $builder->join("lg_comunidades_autonomas t4", "t1.ccaa_id = t4.id", "left"); return empty($search) @@ -134,14 +131,12 @@ class ClienteDireccionesModel extends \App\Models\GoBaseModel ->select( "t1.id AS id, t1.cliente_id AS cliente_id, t2.nombre as cliente_nombre, t1.att AS att, t1.alias AS alias, t1.email AS email, t1.direccion AS direccion, t1.pais_id AS pais_id, t3.nombre AS pais, - t1.ccaa_id AS ccaa_id, t4.nombre AS ccaa_nombre, t1.municipio AS municipio, t1.provincia AS provincia, t1.cp AS cp, t1.telefono AS telefono" ); $builder->where('t1.id', $id); $builder->join("clientes t2", "t1.cliente_id = t2.id", "left"); $builder->join("lg_paises t3", "t1.pais_id = t3.id", "left"); - $builder->join("lg_comunidades_autonomas t4", "t1.ccaa_id = t4.id", "left"); return $builder->get()->getResultObject(); diff --git a/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteDireccionesForm.php b/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteDireccionesForm.php index 0954474a..9bdc786b 100755 --- a/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteDireccionesForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteDireccionesForm.php @@ -48,21 +48,6 @@ - @@ -139,7 +124,6 @@ $('#saveAdd').on('click', function(){ - $('#add_pais_id').on('change', function(){ var nombre_pais = $("#add_pais_id option:selected" ).text().trim(); if(nombre_pais.localeCompare('España')==0){ @@ -162,7 +146,6 @@ $('#addressForm').on('hidden.bs.modal', function () { $('#add_email').val("") $('#add_direccion').val("") $("#add_pais_id").val("").change() - $("#add_ccaa").val("").change() $('#add_municipio').val("") $('#add_provincia').val("") $('#add_cp').val("") diff --git a/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteFormItems.php index eedcb9d1..ec556457 100755 --- a/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteFormItems.php @@ -642,7 +642,6 @@ - @@ -1264,7 +1263,6 @@ function saveAdd_callback(){ .set( 'email', $('#add_email').val() ) .set( 'direccion', $('#add_direccion').val() ) .set( 'pais_id', $("#add_pais_id option:selected").val()) - .set( 'ccaa_id', $("#add_ccaa option:selected").val()) .set( 'municipio', $('#add_municipio').val() ) .set( 'provincia', $('#add_provincia').val() ) .set( 'cp', $('#add_cp').val() ) @@ -1280,7 +1278,6 @@ function saveAdd_callback(){ .set( 'email', $('#add_email').val() ) .set( 'direccion', $('#add_direccion').val() ) .set( 'pais_id', $("#add_pais_id option:selected").val()) - .set( 'ccaa_id', $("#add_ccaa option:selected").val()) .set( 'municipio', $('#add_municipio').val() ) .set( 'provincia', $('#add_provincia').val() ) .set( 'cp', $('#add_cp').val() ) @@ -1312,8 +1309,6 @@ const editorAddress = new DataTable.Editor({ name: "municipio" }, { name: "provincia" - }, { - name: "ccaa_id" }, { name: "pais_id" }, { @@ -1392,11 +1387,6 @@ var tableDirecciones = $('#tableOfDireccionesEnvio').DataTable( { { 'data': 'cp' }, { 'data': 'municipio' }, { 'data': 'provincia' }, - { 'data': 'ccaa_id' , - "render": function (data, type, row, meta) { - return row.ccaa_nombre; - } - }, { 'data': 'pais_id' , "render": function (data, type, row, meta) { return row.pais; @@ -1444,7 +1434,6 @@ $('#tableOfDireccionesEnvio').on( 'click', 'tbody span.edit-add', function (e) { $('#add_email').val(data.email) $('#add_direccion').val(data.direccion) $("#add_pais_id").val(data.pais_id).change() - $("#add_ccaa").val(data.ccaa_id).change() $('#add_municipio').val(data.municipio) $('#add_provincia').val(data.provincia) $('#add_cp').val(data.cp) diff --git a/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/viewClienteForm.php b/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/viewClienteForm.php index bda6dbe2..a26a09b0 100755 --- a/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/viewClienteForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/viewClienteForm.php @@ -237,3 +237,4 @@ endSection() ?> +