diff --git a/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php b/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php index 8f4d084b..87d18ebe 100755 --- a/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php @@ -9,8 +9,6 @@ class TarifaEncuadernacionEntity extends \CodeIgniter\Entity\Entity protected $attributes = [ "id" => null, "nombre" => null, - "precio_min" => 0, - "importe_fijo" => 0, "mostrar_en_presupuesto" => 1, "tipo_encuadernacion" => 0, "servicio_encuadernacion" => 0, @@ -23,8 +21,6 @@ class TarifaEncuadernacionEntity extends \CodeIgniter\Entity\Entity "updated_at" => null, ]; protected $casts = [ - "precio_min" => "float", - "importe_fijo" => "float", "mostrar_en_presupuesto" => "int", "tipo_encuadernacion" => "int", "servicio_encuadernacion" => "int", diff --git a/ci4/app/Entities/Tarifas/TarifaEncuadernacionTirada.php b/ci4/app/Entities/Tarifas/TarifaEncuadernacionTirada.php index b432686f..1a65fe07 100755 --- a/ci4/app/Entities/Tarifas/TarifaEncuadernacionTirada.php +++ b/ci4/app/Entities/Tarifas/TarifaEncuadernacionTirada.php @@ -11,6 +11,8 @@ 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, "is_deleted" => 0, @@ -22,6 +24,8 @@ 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", "is_deleted" => "int", diff --git a/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php b/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php index 7dc92afe..38585ac2 100755 --- a/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php +++ b/ci4/app/Models/Tarifas/TarifaEncuadernacionModel.php @@ -14,18 +14,14 @@ class TarifaEncuadernacionModel extends \App\Models\GoBaseModel const SORTABLE = [ 0 => "t1.nombre", - 1 => "t1.precio_min", - 2 => "t1.importe_fijo", - 3 => "t1.mostrar_en_presupuesto", - 4 => "t1.tipo_encuadernacion", - 5 => "t1.servicio_encuadernacion", + 1 => "t1.mostrar_en_presupuesto", + 2 => "t1.tipo_encuadernacion", + 3 => "t1.servicio_encuadernacion", ]; protected $allowedFields = [ "nombre", - "precio_min", - "importe_fijo", "mostrar_en_presupuesto", "tipo_encuadernacion", "servicio_encuadernacion", @@ -51,30 +47,13 @@ class TarifaEncuadernacionModel extends \App\Models\GoBaseModel "label" => "Tarifaencuadernacion.nombre", "rules" => "trim|required|max_length[255]", ], - - "precio_min" => [ - "label" => "Tarifaencuadernacion.precioMin", - "rules" => "required|decimal", - ], - "importe_fijo" => [ - "label" => "Tarifaencuadernacion.importeFijo", - "rules" => "required|decimal", - ], ]; protected $validationMessages = [ "nombre" => [ "max_length" => "Tarifaencuadernacion.validation.nombre.max_length", "required" => "Tarifaencuadernacion.validation.nombre.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", - ], + ] ]; /** @@ -87,7 +66,7 @@ class TarifaEncuadernacionModel extends \App\Models\GoBaseModel 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.mostrar_en_presupuesto AS mostrar_en_presupuesto, + 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"); @@ -144,7 +123,7 @@ class TarifaEncuadernacionModel extends \App\Models\GoBaseModel $builder = $this->db ->table($this->table . " t1") ->select( - "t1.id AS tarifa_enc_id, t1.nombre AS tarifa_enc_nombre, t1.precio_min AS tarifa_precio_min, t1.importe_fijo AS tarifa_importe_fijo, + "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, 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" @@ -180,7 +159,7 @@ class TarifaEncuadernacionModel extends \App\Models\GoBaseModel $builder = $this->db ->table($this->table . " t1") ->select( - "t1.id AS tarifa_enc_id, t1.nombre AS tarifa_enc_nombre, t1.precio_min AS tarifa_precio_min, t1.importe_fijo AS tarifa_importe_fijo, + "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, 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" ) diff --git a/ci4/app/Models/Tarifas/TarifaEncuadernacionTiradaModel.php b/ci4/app/Models/Tarifas/TarifaEncuadernacionTiradaModel.php index d51f52f7..eac2515e 100755 --- a/ci4/app/Models/Tarifas/TarifaEncuadernacionTiradaModel.php +++ b/ci4/app/Models/Tarifas/TarifaEncuadernacionTiradaModel.php @@ -14,8 +14,10 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel const SORTABLE = [ 0 => "t3.nombre", - 1 => "t1.tirada_min", - 2 => "t1.tirada_max", + 1 => "t1.precio_min", + 2 => "t1.importe_fijo", + 3 => "t1.tirada_min", + 4 => "t1.tirada_max", ]; @@ -24,6 +26,8 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel "tirada_min", "tirada_max", "proveedor_id", + "precio_min", + "importe_fijo", "user_created_id", "user_updated_id", "is_deleted", @@ -49,7 +53,15 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel "tirada_min" => [ "label" => "TarifaEncuadernacionTiradas.tiradaMin", "rules" => "required|integer", - ] + ], + "precio_min" => [ + "label" => "Tarifaencuadernacion.precioMin", + "rules" => "required|decimal", + ], + "importe_fijo" => [ + "label" => "Tarifaencuadernacion.importeFijo", + "rules" => "required|decimal", + ], ]; protected $validationMessages = [ @@ -60,7 +72,15 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel "tirada_min" => [ "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", + ], ]; /** @@ -75,8 +95,10 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel $builder = $this->db ->table($this->table . " t1") ->select( - "t1.id AS id, t1.tarifa_encuadernacion_id AS tarifa_encuadernacion_id, 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" + "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.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" ); //JJO $builder->where('tarifa_encuadernacion_id', $tarifa_encuadernacion_id); @@ -92,10 +114,14 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel ->groupStart() ->Like("t1.tirada_min", $search) ->orLike("t1.tirada_max", $search) + ->orLike("t1.precio_min", $search) + ->orLike("t1.importe_fijo", $search) ->orLike("t3.nombre", $search) ->orLike("t1.tirada_min", $search) ->orLike("t1.tirada_max", $search) ->orLike("t3.nombre", $search) + ->orLike("t1.precio_min", $search) + ->orLike("t1.importe_fijo", $search) ->groupEnd(); } diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php index 4801ba9d..24e86283 100755 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php @@ -7,21 +7,7 @@ - -
- - -
- -
- - -
- + diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php index c7b305fd..1e35d631 100755 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php @@ -47,6 +47,8 @@ + + @@ -659,6 +661,10 @@ name: "tirada_min" }, { name: "tirada_max" + }, { + name: "precio_min" + }, { + name: "importe_fijo" }, { "name": "tarifa_encuadernacion_id", "type": "hidden" @@ -738,6 +744,8 @@ return value['label']; }, }, + { 'data': 'precio_min' }, + { 'data': 'importe_fijo' }, { 'data': 'tirada_min' }, { 'data': 'tirada_max' }, {