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/Models/Tarifas/Acabados/TarifaAcabadoModel.php
+++ b/ci4/app/Models/Tarifas/Acabados/TarifaAcabadoModel.php
@ -21,6 +21,8 @@ class TarifaAcabadoModel extends \App\Models\BaseModel

    protected $allowedFields = [
        "nombre",
+        "code",
+        "comment",
        "precio_min",
        "importe_fijo",
        "mostrar_en_presupuesto",
@ -83,13 +85,13 @@ class TarifaAcabadoModel extends \App\Models\BaseModel
    public function getResource(string $search = "")
    {
        $builder = $this->db->table($this->table . " t1")->select(
-            "t1.id AS id, t1.nombre AS nombre, t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo, 
+            "t1.id AS id, t1.nombre AS nombre,t1.code AS code, t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo, 
            t1.mostrar_en_presupuesto AS mostrar_en_presupuesto, t1.acabado_cubierta AS acabado_cubierta, t1.acabado_sobrecubierta AS acabado_sobrecubierta"
        );

        //JJO
        $builder->where("t1.is_deleted", 0);
-        
+
        return empty($search)
            ? $builder
            : $builder
@ -114,8 +116,9 @@ class TarifaAcabadoModel extends \App\Models\BaseModel
        return $builder->orderBy("t1.nombre", "asc")->get()->getResultObject();
    }

-    public function getTarifaPresupuestoAcabado($tarifa_id, $tirada, $proveedor_id = -1){
-      
+    public function getTarifaPresupuestoAcabado($tarifa_id, $tirada, $proveedor_id = -1)
+    {
+
        $builder = $this->db
            ->table($this->table . " t1")
            ->select(
@ -128,18 +131,18 @@ class TarifaAcabadoModel extends \App\Models\BaseModel
            ->where("t1.is_deleted", 0)
            //->where("t1.mostrar_en_presupuesto", 1)
            ->where("t2.is_deleted", 0);
-            
+
        $builder->where('t1.id =', $tarifa_id);
        $builder->where('t2.tirada_min <=', $tirada);
        $builder->where('t2.tirada_max >=', $tirada);
-        
-        if($proveedor_id != -1){
+
+        if ($proveedor_id != -1) {
            $builder->where('t2.proveedor_id', $proveedor_id);
        }
        return $builder->get()->getResultObject();
    }

-    public function getNombreTarifaAcabado($id=-1)
+    public function getNombreTarifaAcabado($id = -1)
    {
        /*
            Todos los servicios de encuadernacion activas que se pueden usar en presupuestos
@ -184,4 +187,23 @@ class TarifaAcabadoModel extends \App\Models\BaseModel

        return $builder->orderBy("t1.id", "asc")->get()->getResultObject();
    }
+
+    public function getCodeFromId($id = 0)
+    {
+
+        $builder = $this->db
+            ->table($this->table . " t1")
+            ->select(
+                "t1.code AS code"
+            )
+            ->where("t1.id", $id)
+            ->where("t1.is_deleted", 0);
+
+        $data = $builder->get()->getResultObject();
+        if (count($data) > 0) {
+            return $data[0]->code;
+        } else {
+            return "";
+        }
+    }
 }
--- a/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaHorasModel.php
+++ b/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaHorasModel.php
@ -17,7 +17,8 @@ class TarifaEncuadernacionLineaHorasModel extends \App\Models\BaseModel
        1 => "t1.tiempo_min",
        2 => "t1.tiempo_max",
        3 => "t1.precio_hora",
-        4 => "t1.margen",
+        4 => "t1.total_min",
+        5 => "t1.margen",
    ];

    protected $allowedFields = [
@ -25,6 +26,7 @@ class TarifaEncuadernacionLineaHorasModel extends \App\Models\BaseModel
        "tiempo_min",
        "tiempo_max",
        "precio_hora",
+        "total_min",
        "margen",
        "user_created_id",
        "is_deleted",
@ -54,6 +56,10 @@ class TarifaEncuadernacionLineaHorasModel extends \App\Models\BaseModel
            "label" => "TarifaEncuadernacionLineas.precioHora",
            "rules" => "required|decimal",
        ],
+        "total_min" => [
+            "label" => "TarifaEncuadernacionLineas.precioHora",
+            "rules" => "required|decimal",
+        ],
        "margen" => [
            "label" => "TarifaEncuadernacionLineas.margen",
            "rules" => "required|decimal",
@ -73,6 +79,10 @@ class TarifaEncuadernacionLineaHorasModel extends \App\Models\BaseModel
            "decimal" => "TarifaEncuadernacionLineas.validation.tirada_max.decimal",
            "required" => "TarifaEncuadernacionLineas.validation.tirada_max.required",
        ],
+        "total_min" => [
+            "decimal" => "TarifaEncuadernacionLineas.validation.tirada_max.decimal",
+            "required" => "TarifaEncuadernacionLineas.validation.tirada_max.required",
+        ],
        "margen" => [
            "decimal" => "TarifaEncuadernacionLineas.validation.margen.decimal",
            "required" => "TarifaEncuadernacionLineas.validation.margen.required",
@ -92,7 +102,7 @@ class TarifaEncuadernacionLineaHorasModel extends \App\Models\BaseModel
            ->table($this->table . " t1")
            ->select(
                "t1.id AS id, t1.tirada_encuadernacion_id AS tirada_encuadernacion_id, t1.tiempo_min AS tiempo_min, 
-                t1.tiempo_max AS tiempo_max, t1.precio_hora AS precio_hora, t1.margen AS margen, 
+                t1.tiempo_max AS tiempo_max, t1.precio_hora AS precio_hora, t1.total_min AS total_min, t1.margen AS margen, 
                t2.id AS tarifa_encuadernacion"
            );
        //JJO
--- a/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php
+++ b/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php
@ -19,6 +19,8 @@ class TarifaEncuadernacionLineaModel extends \App\Models\BaseModel
        3 => "t1.paginas_libro_max",
        4 => "t1.precio_min",
        5 => "t1.precio_max",
+        6 => "t1.total_min",
+        7 => "t1.margen",
    ]; 

    protected $allowedFields = [
@ -30,6 +32,8 @@ class TarifaEncuadernacionLineaModel extends \App\Models\BaseModel
        "precio_max",
        "tirada_min",
        "tirada_max",
+        "margen",
+        "total_min",
        "user_created_id",
        "is_deleted",

@ -62,6 +66,10 @@ class TarifaEncuadernacionLineaModel extends \App\Models\BaseModel
            "label" => "TarifaEncuadernacionLineas.tiradaMin",
            "rules" => "required|decimal",
        ],
+        "total_min" => [
+            "label" => "TarifaEncuadernacionLineas.precioMin",
+            "rules" => "required|decimal",
+        ],
        "paginas_libro_max" => [
            "label" => "TarifaEncuadernacionLineas.paginasMax",
            "rules" => "required|decimal",
@ -93,6 +101,10 @@ class TarifaEncuadernacionLineaModel extends \App\Models\BaseModel
            "decimal" => "TarifaEncuadernacionLineas.validation.tirada_min.decimal",
            "required" => "TarifaEncuadernacionLineas.validation.tirada_min.required",
        ],
+        "total_min" => [
+            "decimal" => "TarifaEncuadernacionLineas.validation.precio_min.decimal",
+            "required" => "TarifaEncuadernacionLineas.validation.precio_min.required",
+        ],
        "paginas_libro_max" => [
            "decimal" => "TarifaEncuadernacionLineas.validation.paginas_libro_max.decimal",
            "required" => "TarifaEncuadernacionLineas.validation.paginas_libro_max.required",
@ -120,7 +132,7 @@ class TarifaEncuadernacionLineaModel extends \App\Models\BaseModel
            ->table($this->table . " t1")
            ->select(
                "t1.id AS id, t1.tirada_encuadernacion_id AS tirada_encuadernacion_id, t1.paginas_libro_min AS paginas_libro_min, t1.paginas_libro_max AS paginas_libro_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.tirada_min AS tirada_min, 
-                t1.tirada_max AS tirada_max, t1.margen AS margen, t2.id AS tarifa_encuadernacion, t3.id AS dimensiones_id, t3.ancho_min, t3.ancho_max, , t3.alto_min, t3.alto_max, t3.descripcion as descripcion"
+                t1.tirada_max AS tirada_max, t1.total_min as total_min, t1.margen AS margen, t2.id AS tarifa_encuadernacion, t3.id AS dimensiones_id, t3.ancho_min, t3.ancho_max, , t3.alto_min, t3.alto_max, t3.descripcion as descripcion"
            );
        //JJO
        $builder->where('tirada_encuadernacion_id', $tirada_encuadernacion_id);    
@ -190,6 +202,7 @@ class TarifaEncuadernacionLineaModel extends \App\Models\BaseModel

        return $builder;
    }
+    

    public function removeAllEncuadernacionLineasForTarifa($tarifaId = -1, $datetime = null, $delete_flag=1){
        
--- a/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php
+++ b/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php
@ -22,6 +22,8 @@ class TarifaEncuadernacionModel extends \App\Models\BaseModel

    protected $allowedFields = [
        "nombre",
+        "code",
+        "comment",
        "mostrar_en_presupuesto",
        "tipo_encuadernacion",
        "servicio_encuadernacion",
@ -65,7 +67,7 @@ class TarifaEncuadernacionModel extends \App\Models\BaseModel
     */
    public function getResource(string $search = "")
    {
-        $builder = $this->db->table($this->table . " t1")->select("t1.id AS id, t1.nombre AS nombre, 
+        $builder = $this->db->table($this->table . " t1")->select("t1.id AS id, t1.nombre AS nombre, t1.code AS code,
                t1.mostrar_en_presupuesto AS mostrar_en_presupuesto,
                t1.tipo_encuadernacion AS tipo_encuadernacion, t1.servicio_encuadernacion AS servicio_encuadernacion,
                t1.por_horas AS por_horas");
@ -123,7 +125,7 @@ class TarifaEncuadernacionModel extends \App\Models\BaseModel
        $builder = $this->db
            ->table($this->table . " t1")
            ->select(
-                "t1.id AS tarifa_enc_id, t1.nombre AS tarifa_enc_nombre, t2.precio_min AS tarifa_precio_min, t2.importe_fijo AS tarifa_importe_fijo,
+                "t1.id AS tarifa_enc_id, t1.nombre AS tarifa_enc_nombre, t3.total_min AS tarifa_precio_min, t2.importe_fijo AS tarifa_importe_fijo,
                t2.id AS tarifa_tirada_id, t2.proveedor_id AS proveedor_id, t5.nombre AS proveedor_nombre, t2.tirada_min AS tirada_min, t2.tirada_max AS tirada_max,
                t3.id AS tarifa_linea_id, t3.paginas_libro_min AS paginas_min, t3.paginas_libro_max AS paginas_max, t3.precio_min AS precio_min, t3.precio_max AS precio_max, t3.margen AS margen,
                t4.ancho_min AS ancho_min, t4.ancho_max AS ancho_max, t4.alto_min AS alto_min, t4.alto_max AS alto_max"
@ -159,7 +161,7 @@ class TarifaEncuadernacionModel extends \App\Models\BaseModel
        $builder = $this->db
            ->table($this->table . " t1")
            ->select(
-                "t1.id AS tarifa_enc_id, t1.nombre AS tarifa_enc_nombre, t2.precio_min AS tarifa_precio_min, t2.importe_fijo AS tarifa_importe_fijo,
+                "t1.id AS tarifa_enc_id, t1.nombre AS tarifa_enc_nombre, t3.total_min AS tarifa_precio_min, t2.importe_fijo AS tarifa_importe_fijo,
                t2.id AS tarifa_tirada_id, t2.proveedor_id AS proveedor_id, t5.nombre AS proveedor_nombre, t2.tirada_min AS tirada_min, t2.tirada_max AS tirada_max,
                t3.id AS tarifa_linea_id, t3.tiempo_min AS tiempo_min, t3.tiempo_max AS tiempo_max, t3.precio_hora AS precio_hora, t3.margen AS margen"
            )
--- a/ci4/app/Models/Tarifas/TarifaEncuadernacionTiradaModel.php
+++ b/ci4/app/Models/Tarifas/TarifaEncuadernacionTiradaModel.php
@ -16,7 +16,6 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\BaseModel
        0 => "t3.nombre",
        1 => "t1.tirada_min",
        2 => "t1.tirada_max",
-        3 => "t1.precio_min",
        4 => "t1.importe_fijo",        
    ];

@ -25,7 +24,6 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\BaseModel
        "tirada_min",
        "tirada_max",
        "proveedor_id", 
-        "precio_min",
        "importe_fijo",
        "user_created_id",
        "user_updated_id",
@ -53,10 +51,6 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\BaseModel
            "label" => "TarifaEncuadernacionTiradas.tiradaMin",
            "rules" => "required|integer",
        ],
-        "precio_min" => [
-            "label" => "Tarifaencuadernacion.precioMin",
-            "rules" => "required|decimal",
-        ],
        "importe_fijo" => [
            "label" => "Tarifaencuadernacion.importeFijo",
            "rules" => "required|decimal",
@ -72,10 +66,6 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\BaseModel
            "integer" => "TarifaEncuadernacionTiradas.validation.tirada_min.integer",
            "required" => "TarifaEncuadernacionTiradas.validation.tirada_min.required",
        ],
-        "precio_min" => [
-            "required" => "Tarifaencuadernacion.validation.precio_min.required",
-            "decimal" => "Tarifaencuadernacion.validation.precio_min.decimal",
-        ],
        "importe_fijo" => [
            "required" => "Tarifaencuadernacion.validation.importe_fijo.required",
            "decimal" => "Tarifaencuadernacion.validation.importe_fijo.decimal",
@ -95,7 +85,7 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\BaseModel
            ->table($this->table . " t1")
            ->select(
                "t1.id AS id, t1.tarifa_encuadernacion_id AS tarifa_encuadernacion_id, 
-                t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo,
+                t1.importe_fijo AS importe_fijo,
                t1.tirada_min AS tirada_min, t1.tirada_max AS tirada_max, 
                t3.nombre AS proveedor, t3.id AS proveedor_id, t2.id AS tarifa_encuadernacion"
            );
--- a/ci4/app/Models/Tarifas/TarifaEnvioModel.php
+++ b/ci4/app/Models/Tarifas/TarifaEnvioModel.php
@ -1,4 +1,5 @@
 <?php
+
 namespace App\Models\Tarifas;

 class TarifaEnvioModel extends \App\Models\BaseModel
@ -17,7 +18,7 @@ class TarifaEnvioModel extends \App\Models\BaseModel
        1 => "t2.nombre",
    ];

-    protected $allowedFields = ["pais_id", "nombre","deleted_at","is_deleted"];
+    protected $allowedFields = ["pais_id", "nombre", "code", "comment", "deleted_at", "is_deleted"];
    protected $returnType = "App\Entities\Tarifas\TarifaEnvioEntity";

    protected $useTimestamps = true;
@ -73,7 +74,7 @@ class TarifaEnvioModel extends \App\Models\BaseModel
     */
    public function getResource(string $search = "")
    {
-        $builder = $this->db->table($this->table . " t1")->select("t1.id as id, t1.nombre AS nombre, t2.nombre AS pais_id");
+        $builder = $this->db->table($this->table . " t1")->select("t1.id as id, t1.nombre AS nombre,t1.code AS code, t2.nombre AS pais_id");
        $builder->join("lg_paises t2", "t1.pais_id = t2.id", "left");

        //JJO
@ -82,43 +83,44 @@ class TarifaEnvioModel extends \App\Models\BaseModel
        return empty($search)
            ? $builder
            : $builder
-                ->groupStart()
-                ->like("t1.nombre", $search)
-                ->orLike("t2.id", $search)
-                ->orLike("t1.pais_id", $search)
-                ->orLike("t1.nombre", $search)
-                ->orLike("t2.nombre", $search)
-                ->groupEnd();
+            ->groupStart()
+            ->like("t1.nombre", $search)
+            ->orLike("t2.code", $search)
+            ->orLike("t2.id", $search)
+            ->orLike("t1.pais_id", $search)
+            ->orLike("t1.nombre", $search)
+            ->orLike("t2.nombre", $search)
+            ->groupEnd();
    }

-    public function getTarifaEnvio($paisId, string $cp, $peso, $tipo_envio){
+    public function getTarifaEnvio($paisId, string $cp, $peso, $tipo_envio)
+    {
        // Si el pais es españa se tienen que tener en cuenta los postales
        // Se busca primero la tarifa a la que corresponde
        $builder = $this->db->table($this->table . " t1")
-                ->select("t1.id AS tarifa_envio_id, t2.importe_fijo as importe_fijo")
-                ->join("tarifas_envios_zonas t2", "t1.id = t2.tarifa_envio_id")
-                ->where("t1.pais_id", $paisId)
-                ->where("t1.is_deleted", 0)
-                ->where("t2.is_deleted", 0);
-        
-        if($paisId == 1) {// España
+            ->select("t1.id AS tarifa_envio_id, t2.importe_fijo as importe_fijo")
+            ->join("tarifas_envios_zonas t2", "t1.id = t2.tarifa_envio_id")
+            ->where("t1.pais_id", $paisId)
+            ->where("t1.is_deleted", 0)
+            ->where("t2.is_deleted", 0);
+
+        if ($paisId == 1) { // España
            $builder->where("CAST(t2.cp_inicial AS UNSIGNED)<=", intval($cp))
-                    ->where("CAST(t2.cp_final AS UNSIGNED) >=", intval($cp));
+                ->where("CAST(t2.cp_final AS UNSIGNED) >=", intval($cp));
        }
        $tarifas = $builder->get()->getResultObject();

        $resultado = [];
-        
+
        $model = model('App\Models\Tarifas\TarifaEnvioPrecioModel');
-        foreach($tarifas as $tarifa){
+        foreach ($tarifas as $tarifa) {
            $precio_tarifas = $model->getEnvioPrecio($tarifa->tarifa_envio_id, $peso, $tipo_envio);
-            foreach($precio_tarifas as $precio_tarifa){
+            foreach ($precio_tarifas as $precio_tarifa) {
                $precio_tarifa->importe_fijo = $tarifa->importe_fijo;
                array_push($resultado, $precio_tarifa);
            }
        }

        return $resultado;
-        
    }
 }
--- a/ci4/app/Models/Tarifas/TarifaManipuladoModel.php
+++ b/ci4/app/Models/Tarifas/TarifaManipuladoModel.php
@ -22,6 +22,8 @@ class TarifaManipuladoModel extends \App\Models\BaseModel
    protected $allowedFields = [
        "nombre",
        "precio_min",
+        "code",
+        "comment",
        "importe_fijo",
        "mostrar_en_presupuesto",
        "deleted_at",
@ -80,7 +82,7 @@ class TarifaManipuladoModel extends \App\Models\BaseModel
     */
    public function getResource(string $search = "")
    {
-        $builder = $this->db->table($this->table . " t1")->select("t1.id AS id, t1.nombre AS nombre, t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo
+        $builder = $this->db->table($this->table . " t1")->select("t1.id AS id,t1.code AS code, t1.nombre AS nombre, t1.precio_min AS precio_min, t1.importe_fijo AS importe_fijo
        ,t1.mostrar_en_presupuesto AS mostrar_en_presupuesto");

        //JJO
--- a/ci4/app/Models/Tarifas/TarifaextraModel.php
+++ b/ci4/app/Models/Tarifas/TarifaextraModel.php
@ -13,7 +13,9 @@ class TarifaextraModel extends \App\Models\BaseModel
    protected $useAutoIncrement = true;

    protected $allowedFields = [
-        "nombre", 
+        "nombre",
+        "code", 
+        "comment",
        "precio",
        "margen",
        "mostrar_en_presupuesto",
--- a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php
+++ b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php
@ -13,7 +13,9 @@ class TarifapreimpresionModel extends \App\Models\BaseModel
    protected $useAutoIncrement = true;

    protected $allowedFields = [
-        "nombre", 
+        "nombre",
+        "code",
+        "comment",
        "precio",
        "margen",
        "mostrar_en_presupuesto",
@ -37,6 +39,14 @@ class TarifapreimpresionModel extends \App\Models\BaseModel
            "label" => "Tarifapreimpresion.nombre",
            "rules" => "trim|required|max_length[255]",
        ],
+        "code" => [
+            "label" => "Tarifapreimpresion.code",
+            "rules" => "trim|required|max_length[5]",
+        ],
+        "comment" => [
+            "label" => "Tarifapreimpresion.comment",
+            "rules" => "trim|max_length[255]",
+        ],
        "precio" => [
            "label" => "Tarifapreimpresion.precio",
            "rules" => "required|decimal",
@ -52,6 +62,14 @@ class TarifapreimpresionModel extends \App\Models\BaseModel
            "max_length" => "Tarifapreimpresion.validation.nombre.max_length",
            "required" => "Tarifapreimpresion.validation.nombre.required",
        ],
+        "code" => [
+            "max_length" => "Tarifapreimpresion.validation.code.max_length",
+            "required" => "Tarifapreimpresion.validation.code.required",
+        ],
+        "comment" => [
+            "max_length" => "Tarifapreimpresion.validation.comment.max_length",
+            "required" => "Tarifapreimpresion.validation.comment.required",
+        ],
        "precio" => [
            "decimal" => "Tarifapreimpresion.validation.precio.decimal",
            "required" => "Tarifapreimpresion.validation.precio.required",