diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..03d9549e --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/ci4/app/Controllers/Clientes/Cliente.php b/ci4/app/Controllers/Clientes/Cliente.php index cd427deb..dc4ac6cb 100644 --- a/ci4/app/Controllers/Clientes/Cliente.php +++ b/ci4/app/Controllers/Clientes/Cliente.php @@ -171,9 +171,6 @@ class Cliente extends \App\Controllers\GoBaseResourceController if ($this->request->getPost('credito_asegurado') == null) { $sanitizedData['credito_asegurado'] = false; } - if ($this->request->getPost('disponible_fe') == null) { - $sanitizedData['disponible_fe'] = false; - } if ($this->request->getPost('message_tracking') == null) { $sanitizedData['message_tracking'] = false; } @@ -183,10 +180,6 @@ class Cliente extends \App\Controllers\GoBaseResourceController if ($this->request->getPost('tirada_flexible') == null) { $sanitizedData['tirada_flexible'] = false; } - if ($this->request->getPost('lineasEnvioFactura') == null) { - $sanitizedData['lineasEnvioFactura'] = false; - } - $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : diff --git a/ci4/app/Entities/Clientes/ClienteEntity.php b/ci4/app/Entities/Clientes/ClienteEntity.php index 5adbd4b6..417871e4 100644 --- a/ci4/app/Entities/Clientes/ClienteEntity.php +++ b/ci4/app/Entities/Clientes/ClienteEntity.php @@ -24,28 +24,20 @@ class ClienteEntity extends \CodeIgniter\Entity\Entity "vencimiento" => 15, "fecha_vencimiento" => null, "margen" => 40.0, - "margen_pod" => null, "descuento" => 0.0, "limite_credito" => 0.0, "limite_credito_user_id" => 1, "limite_credito_change_at" => null, - "credito_solunion" => null, "credito_asegurado" => false, "ccc" => null, "ccc_cliente" => null, "num_cuenta" => null, - "disponible_fe" => false, "message_tracking" => true, "message_production_start" => true, "tirada_flexible" => false, "descuento_tirada_flexible" => 20.0, "comentarios_tirada_flexible" => null, - "saturacion" => 100.0, - "tienda_id" => null, "margen_plantilla_id" => null, - "comentarios_produccion" => null, - "ps_customer_id" => null, - "lineasEnvioFactura" => true, "comentarios" => null, "is_deleted" => 0, "deleted_at" => null, @@ -63,21 +55,15 @@ class ClienteEntity extends \CodeIgniter\Entity\Entity "forma_pago_id" => "?int", "vencimiento" => "int", "margen" => "float", - "margen_pod" => "?float", "descuento" => "float", "limite_credito" => "float", "limite_credito_user_id" => "int", "credito_asegurado" => "?boolean", - "disponible_fe" => "boolean", "message_tracking" => "boolean", "message_production_start" => "boolean", "tirada_flexible" => "boolean", "descuento_tirada_flexible" => "float", - "saturacion" => "float", - "tienda_id" => "?int", "margen_plantilla_id" => "?int", - "ps_customer_id" => "?int", - "lineasEnvioFactura" => "boolean", "is_deleted" => "int", "user_created_id" => "int", "user_update_id" => "int", diff --git a/ci4/app/Language/es/Clientes.php b/ci4/app/Language/es/Clientes.php index 9878be9c..ea299358 100644 --- a/ci4/app/Language/es/Clientes.php +++ b/ci4/app/Language/es/Clientes.php @@ -4,7 +4,7 @@ return [ 'alias' => 'Alias', - 'ccc' => 'CCC', + 'ccc' => 'Nº cuenta Safekat', 'cccCliente' => 'CC Cliente (IBAN)', 'cif' => 'CIF', 'ciudad' => 'Ciudad', @@ -12,19 +12,16 @@ return [ 'clienteList' => 'Listado de Clientes', 'clientes' => 'Clientes', 'comentarios' => 'Comentarios', - 'comentariosProduccion' => 'Comentarios producción', 'comentariosTiradaFlexible' => 'Comentarios Tirada Flexible', 'comercialId' => 'Comercial', 'comunidadAutonomaId' => 'Comunidad autónoma', 'cp' => 'Código Postal', 'createdAt' => 'Creado en', 'creditoAsegurado' => 'Crédito asegurado', - 'creditoSolunion' => 'Crédito Solunion', 'deletedAt' => 'Deleted At', 'descuento' => 'Descuento (porcentaje)', 'descuentoTiradaFlexible' => 'Descuento Tirada Flexible', 'direccion' => 'Dirección', - 'disponibleFe' => 'Disponible Fe', 'email' => 'Email', 'fechaVencimiento' => 'Cuando', 'formaPagoId' => 'Forma de Pago', @@ -33,22 +30,17 @@ return [ 'limiteCredito' => 'Limite Crédito', 'limiteCreditoChangeAt' => 'Limite Crédito Change At', 'limiteCreditoUserId' => 'Limite Crédito User ID', - 'lineasenviofactura' => 'Lineas envéo factura', - 'margen' => 'Margen', + 'margen' => 'Margen presupuesto (antiguo)', 'margenPlantillaId' => 'Plantilla de márgenes', - 'margenPod' => 'Margen Pod', 'messageProductionStart' => 'Avisos de producción', 'messageTracking' => 'Enviar trackings de envíos', 'moduleTitle' => 'Cliente', 'nombre' => 'Nombre', - 'numCuenta' => 'Nº cuenta Safekat', + 'numCuenta' => 'Nº Cuenta Plan Contable', 'paisId' => 'Pais', 'provinciaId' => 'Provincia', - 'psCustomerId' => 'Ps Customer ID', - 'saturacion' => 'Saturación', 'soporteId' => 'Soporte', 'telefono' => 'Teléfono', - 'tiendaId' => 'Tienda ID', 'tiradaFlexible' => 'Tirada Flexible', 'updatedAt' => 'Actualizado en', 'userCreatedId' => 'User Created ID', @@ -75,21 +67,11 @@ return [ ], - 'comentarios_produccion' => [ - 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.', - - ], - 'cp' => [ 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.', ], - 'credito_solunion' => [ - 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.', - - ], - 'direccion' => [ 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.', @@ -105,31 +87,16 @@ return [ ], - 'margen_pod' => [ - 'decimal' => 'El campo {field} debe contener un número decimal.', - - ], - 'num_cuenta' => [ 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.', ], - 'ps_customer_id' => [ - 'integer' => 'El campo {field} debe contener un número entero.', - - ], - 'telefono' => [ 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.', ], - 'tienda_id' => [ - 'integer' => 'El campo {field} debe contener un número entero.', - - ], - 'alias' => [ 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.', 'required' => 'El campo {field} es obligatorio.', @@ -202,12 +169,6 @@ return [ ], - 'saturacion' => [ - 'decimal' => 'El campo {field} debe contener un número decimal.', - 'required' => 'El campo {field} es obligatorio.', - - ], - 'user_created_id' => [ 'integer' => 'El campo {field} debe contener un número entero.', 'required' => 'El campo {field} es obligatorio.', diff --git a/ci4/app/Models/Clientes/ClienteModel.php b/ci4/app/Models/Clientes/ClienteModel.php index 4e63c478..836fcb62 100644 --- a/ci4/app/Models/Clientes/ClienteModel.php +++ b/ci4/app/Models/Clientes/ClienteModel.php @@ -40,28 +40,20 @@ class ClienteModel extends \App\Models\GoBaseModel "vencimiento", "fecha_vencimiento", "margen", - "margen_pod", "descuento", "limite_credito", "limite_credito_user_id", "limite_credito_change_at", - "credito_solunion", "credito_asegurado", "ccc", "ccc_cliente", "num_cuenta", - "disponible_fe", "message_tracking", "message_production_start", "tirada_flexible", "descuento_tirada_flexible", "comentarios_tirada_flexible", - "saturacion", - "tienda_id", "margen_plantilla_id", - "comentarios_produccion", - "ps_customer_id", - "lineasEnvioFactura", "comentarios", "is_deleted", "deleted_at", @@ -99,10 +91,6 @@ class ClienteModel extends \App\Models\GoBaseModel "label" => "Clientes.comentarios", "rules" => "trim|max_length[16313]", ], - "comentarios_produccion" => [ - "label" => "Clientes.comentariosProduccion", - "rules" => "trim|max_length[16313]", - ], "comentarios_tirada_flexible" => [ "label" => "Clientes.comentariosTiradaFlexible", "rules" => "trim|required|max_length[16313]", @@ -111,10 +99,6 @@ class ClienteModel extends \App\Models\GoBaseModel "label" => "Clientes.cp", "rules" => "trim|max_length[10]", ], - "credito_solunion" => [ - "label" => "Clientes.creditoSolunion", - "rules" => "trim|max_length[100]", - ], "descuento" => [ "label" => "Clientes.descuento", "rules" => "required|decimal", @@ -159,10 +143,6 @@ class ClienteModel extends \App\Models\GoBaseModel "label" => "Clientes.margenPlantillaId", "rules" => "integer|permit_empty", ], - "margen_pod" => [ - "label" => "Clientes.margenPod", - "rules" => "decimal|permit_empty", - ], "nombre" => [ "label" => "Clientes.nombre", "rules" => "trim|required|max_length[255]", @@ -171,22 +151,10 @@ class ClienteModel extends \App\Models\GoBaseModel "label" => "Clientes.numCuenta", "rules" => "trim|max_length[10]", ], - "ps_customer_id" => [ - "label" => "Clientes.psCustomerId", - "rules" => "integer|permit_empty", - ], - "saturacion" => [ - "label" => "Clientes.saturacion", - "rules" => "required|decimal", - ], "telefono" => [ "label" => "Clientes.telefono", "rules" => "trim|max_length[60]", ], - "tienda_id" => [ - "label" => "Clientes.tiendaId", - "rules" => "integer|permit_empty", - ], "user_created_id" => [ "label" => "Clientes.userCreatedId", "rules" => "required|integer", @@ -222,9 +190,6 @@ class ClienteModel extends \App\Models\GoBaseModel "comentarios" => [ "max_length" => "Clientes.validation.comentarios.max_length", ], - "comentarios_produccion" => [ - "max_length" => "Clientes.validation.comentarios_produccion.max_length", - ], "comentarios_tirada_flexible" => [ "max_length" => "Clientes.validation.comentarios_tirada_flexible.max_length", "required" => "Clientes.validation.comentarios_tirada_flexible.required", @@ -232,9 +197,6 @@ class ClienteModel extends \App\Models\GoBaseModel "cp" => [ "max_length" => "Clientes.validation.cp.max_length", ], - "credito_solunion" => [ - "max_length" => "Clientes.validation.credito_solunion.max_length", - ], "descuento" => [ "decimal" => "Clientes.validation.descuento.decimal", "required" => "Clientes.validation.descuento.required", @@ -276,9 +238,6 @@ class ClienteModel extends \App\Models\GoBaseModel "margen_plantilla_id" => [ "integer" => "Clientes.validation.margen_plantilla_id.integer", ], - "margen_pod" => [ - "decimal" => "Clientes.validation.margen_pod.decimal", - ], "nombre" => [ "max_length" => "Clientes.validation.nombre.max_length", "required" => "Clientes.validation.nombre.required", @@ -286,13 +245,6 @@ class ClienteModel extends \App\Models\GoBaseModel "num_cuenta" => [ "max_length" => "Clientes.validation.num_cuenta.max_length", ], - "ps_customer_id" => [ - "integer" => "Clientes.validation.ps_customer_id.integer", - ], - "saturacion" => [ - "decimal" => "Clientes.validation.saturacion.decimal", - "required" => "Clientes.validation.saturacion.required", - ], "telefono" => [ "max_length" => "Clientes.validation.telefono.max_length", ], 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 346f4c91..46b7dc02 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteFormItems.php @@ -28,7 +28,7 @@ Contactos - +
    • +
    @@ -232,48 +233,11 @@ value="email) ?>" >
    -
    - - -
    -
    - - -
    +

    @@ -395,6 +360,113 @@ +
    +

    + +

    +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + +
    +
    +

    -
    -

    Usuario Creación: user_created_id ?> @ created_at ?>

    -

    Usuario Última Edición: user_update_id ?> @ updated_at ?>

    -
    - - -
    -
    + + + +
    + +
    + + +
    + +*/ ?> -
    - - -
    - -
    - - -
    - -
    - - -
    - - - - -
    - -
    - - -
    - - */ ?> - -
    - - -
    - - -
    -
    - - -
    - -
    - - -
    - -
    - - -
    - -
    - - -
    - -
    - - -
    - -
    -
    - - -
    -
    - - -
    - - section("additionalInlineJs") ?>