copiada la rama presu_cliente_v2 en esta para poder hacer el merge al main

2025-07-25 22:52:08 +00:00 · 2024-11-07 19:20:12 +01:00
parent aeb5f9106f
commit a880355012
84 changed files with 2983 additions and 1785 deletions
--- a/ci4/app/Entities/Presupuestos/PresupuestoEntity.php
+++ b/ci4/app/Entities/Presupuestos/PresupuestoEntity.php
@ -64,7 +64,7 @@ class PresupuestoEntity extends \CodeIgniter\Entity\Entity
        "created_at" => null,
        "updated_at" => null,
        "comp_tipo_impresion" => null,
-        "comp_pos_paginas_color" => null,
+        "pos_paginas_color" => null,
        "total_coste_papel" => null,
        "total_margen_papel" => null,
        "total_margenPercent_papel" => null,
@ -90,6 +90,11 @@ class PresupuestoEntity extends \CodeIgniter\Entity\Entity
        "acabado_cubierta_id" => null,
        "acabado_sobrecubierta_id" => null,
        "is_duplicado" => false,
+        'paginas_color_consecutivas' => null,
+        'papel_interior_diferente' => null,
+        'paginasCuadernillo' => null,
+        'lomo_redondo' => null,
+        'cabezada' => null,
    ];
    protected $casts = [
        "cliente_id" => "int",
@ -155,5 +160,9 @@ class PresupuestoEntity extends \CodeIgniter\Entity\Entity
        "acabado_cubierta_id" => "int",
        "acabado_sobrecubierta_id" => "int",
        "is_duplicado" => "boolean",
+        'paginas_color_consecutivas' => "boolean",
+        'papel_interior_diferente' => "boolean",
+        'paginasCuadernillo' => "int",
+        'lomo_redondo' => "boolean",
    ];
 }
--- a/ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoEntity.php
+++ b/ci4/app/Entities/Tarifas/Acabados/TarifaAcabadoEntity.php
@ -8,6 +8,8 @@ class TarifaAcabadoEntity extends \CodeIgniter\Entity\Entity
    protected $attributes = [
        "id" => null,
        "nombre" => null,
+        "code" => null,
+        "comment" => null,
        "precio_min" => 0,
        "importe_fijo" => 0,
        "mostrar_en_presupuesto" => 1,
@ -22,6 +24,8 @@ class TarifaAcabadoEntity extends \CodeIgniter\Entity\Entity
    ];
    protected $casts = [
        "precio_min" => "float",
+        "comment" => "string",
+        "code" => "string",
        "importe_fijo" => "float",
        "user_created_id" => "int",
        "user_updated_id" => "int",
--- a/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php
+++ b/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php
@ -9,6 +9,7 @@ class TarifaEncuadernacionEntity extends \CodeIgniter\Entity\Entity
    protected $attributes = [
        "id" => null,
        "nombre" => null,
+        "code" => null,
        "mostrar_en_presupuesto" => 1,
        "tipo_encuadernacion" => 0,
        "servicio_encuadernacion" => 0,
@ -22,6 +23,7 @@ class TarifaEncuadernacionEntity extends \CodeIgniter\Entity\Entity
    ];
    protected $casts = [
        "mostrar_en_presupuesto" => "int",
+        "code" => "string",
        "tipo_encuadernacion" => "int",
        "servicio_encuadernacion" => "int",
        "por_horas" => "int",
--- a/ci4/app/Entities/Tarifas/TarifaEncuadernacionLinea.php
+++ b/ci4/app/Entities/Tarifas/TarifaEncuadernacionLinea.php
@ -15,6 +15,7 @@ class TarifaEncuadernacionLinea extends \CodeIgniter\Entity\Entity
        "precio_max" => 0,
        "tirada_min" => 0,
        "tirada_max" => 0,
+        "total_min" => 0,
        "margen" => 0,
        "user_created_id" => 0,
        "user_updated_id" => 0,
@ -31,6 +32,7 @@ class TarifaEncuadernacionLinea extends \CodeIgniter\Entity\Entity
        "precio_max" => "float",
        "tirada_min" => "float",
        "tirada_max" => "float",
+        "total_min" => "float",
        "margen" => "float",
        "user_created_id" => "int",
        "user_updated_id" => "int",
--- a/ci4/app/Entities/Tarifas/TarifaEncuadernacionLineaHoras.php
+++ b/ci4/app/Entities/Tarifas/TarifaEncuadernacionLineaHoras.php
@ -11,6 +11,7 @@ class TarifaEncuadernacionLineaHoras extends \CodeIgniter\Entity\Entity
        "tiempo_min" => 0,
        "tiempo_max" => 0,
        "precio_hora" => 0,
+        "total_min" => 0,
        "margen" => 0,
        "user_created_id" => 0,
        "user_updated_id" => 0,
@ -22,6 +23,7 @@ class TarifaEncuadernacionLineaHoras extends \CodeIgniter\Entity\Entity
        "tirada_encuadernacion_id" => "int",
        "tiempo_min" => "float",
        "tiempo_max" => "float",
+        "total_min" => "float",
        "precio_hora" => "float",
        "margen" => "float",
        "user_created_id" => "int",
--- a/ci4/app/Entities/Tarifas/TarifaEncuadernacionTirada.php
+++ b/ci4/app/Entities/Tarifas/TarifaEncuadernacionTirada.php
@ -11,7 +11,6 @@ class TarifaEncuadernacionTirada extends \CodeIgniter\Entity\Entity
        "tirada_min" => 0,
        "tirada_max" => 0,
        "proveedor_id" => 0,
-        "precio_min" => 0,
        "importe_fijo" => 0,
        "user_created_id" => 0,
        "user_updated_id" => 0,
@ -24,7 +23,6 @@ class TarifaEncuadernacionTirada extends \CodeIgniter\Entity\Entity
        "tirada_min" => "float",
        "tirada_max" => "float",
        "proveedor_id" => "int",
-        "precio_min" => "float",
        "importe_fijo" => "float",
        "user_created_id" => "int",
        "user_updated_id" => "int",
--- a/ci4/app/Entities/Tarifas/TarifaEnvioEntity.php
+++ b/ci4/app/Entities/Tarifas/TarifaEnvioEntity.php
@ -9,6 +9,8 @@ class TarifaEnvioEntity extends \CodeIgniter\Entity\Entity
        "id" => null,
        "pais_id" => null,
        "nombre" => null,
+        "code" => null,
+        "comment" => null,
        "user_created_id" => 0,
        "user_updated_id" => 0,
        "is_deleted" => 0,
@ -17,6 +19,8 @@ class TarifaEnvioEntity extends \CodeIgniter\Entity\Entity
    ];
    protected $casts = [
        "pais_id" => "?int",
+        "code" => "string",
+        "comment" => "string",
        "user_created_id" => "int",
        "user_updated_id" => "int",
        "is_deleted" => "int",
--- a/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php
+++ b/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php
@ -9,6 +9,8 @@ class TarifaManipuladoEntity extends \CodeIgniter\Entity\Entity
    protected $attributes = [
        "id" => null,
        "nombre" => null,
+        "code" => null,
+        "comment" => null,
        "precio_min" => 0,
        "importe_fijo" => 0,
        "mostrar_en_presupuesto" => 1,
@ -22,6 +24,8 @@ class TarifaManipuladoEntity extends \CodeIgniter\Entity\Entity
    protected $casts = [
        "precio_min" => "float",
        "importe_fijo" => "float",
+        "code" => "string",
+        "comment" => "string",
        "mostrar_en_presupuesto" => "int",
        "user_created_id" => "int",
        "user_updated_id" => "int",
--- a/ci4/app/Entities/Tarifas/TarifaextraEntity.php
+++ b/ci4/app/Entities/Tarifas/TarifaextraEntity.php
@ -8,6 +8,8 @@ class TarifaextraEntity extends \CodeIgniter\Entity\Entity
    protected $attributes = [
        "id" => null,
        "nombre" => null,
+        "code" => null,
+        "comment" => null,
        "precio" => null,
        "margen" => 0,
        "mostrar_en_presupuesto" => 1,
@ -20,6 +22,8 @@ class TarifaextraEntity extends \CodeIgniter\Entity\Entity
    ];
    protected $casts = [
        "precio" => "float",
+        "code" => "string",
+        "comment" => "string",
        "margen" => "float",
        "mostrar_en_presupuesto" => "int",
        "user_created_id" => "int",
--- a/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php
+++ b/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php
@ -8,6 +8,8 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity
    protected $attributes = [
        "id" => null,
        "nombre" => null,
+        "code" => null,
+        "comment" => null,
        "precio" => null,
        "margen" => 0,
        "mostrar_en_presupuesto" => 1,
@ -21,6 +23,8 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity
    protected $casts = [
        "precio" => "float",
        "margen" => "float",
+        "code" => "string",
+        "comment" => "string",
        "mostrar_en_presupuesto" => "int",
        "user_created_id" => "int",
        "user_update_id" => "int",