jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

modificaciones en tarifas: añadido margen, cambiado tirada por paginas y añadidas tarifas encuadernacion

Browse Source
This commit is contained in:
Jaime Jimenez
2023-07-21 18:07:46 +02:00
parent 2a30e2d8a2
commit 4d1fd30cb1
44 changed files with 2018 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
ci4/app/Models/Tarifas/TarifaAcabadoLineaModel.php
View File

@ -13,17 +13,19 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
protected $useAutoIncrement = true;
const SORTABLE = [
0 => "t1.tirada_min",
1 => "t1.tirada_max",
0 => "t1.paginas_min",
1 => "t1.paginas_max",
2 => "t1.precio_min",
3 => "t1.precio_max",
4 => "t1.margen",
];
protected $allowedFields = [
"tirada_min",
"tirada_max",
"paginas_min",
"paginas_max",
"precio_min",
"precio_max",
"margen",
"user_created_id",
"is_deleted",
];
@ -51,11 +53,11 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
"label" => "TarifaAcabadoLineas.precioMin",
"rules" => "required|decimal",
],
"tirada_max" => [
"paginas_max" => [
"label" => "TarifaAcabadoLineas.tiradaMax",
"rules" => "required|integer",
],
"tirada_min" => [
"paginas_min" => [
"label" => "TarifaAcabadoLineas.tiradaMin",
"rules" => "required|integer",
],
@ -78,13 +80,17 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
"decimal" => "TarifaAcabadoLineas.validation.precio_min.decimal",
"required" => "TarifaAcabadoLineas.validation.precio_min.required",
],
"tirada_max" => [
"integer" => "TarifaAcabadoLineas.validation.tirada_max.integer",
"required" => "TarifaAcabadoLineas.validation.tirada_max.required",
"paginas_max" => [
"integer" => "TarifaAcabadoLineas.validation.paginas_max.integer",
"required" => "TarifaAcabadoLineas.validation.paginas_max.required",
],
"tirada_min" => [
"integer" => "TarifaAcabadoLineas.validation.tirada_min.integer",
"required" => "TarifaAcabadoLineas.validation.tirada_min.required",
"paginas_min" => [
"integer" => "TarifaAcabadoLineas.validation.paginas_min.integer",
"required" => "TarifaAcabadoLineas.validation.paginas_min.required",
],
"margen" => [
"integer" => "TarifaAcabadoLineas.validation.margen.integer",
"required" => "TarifaAcabadoLineas.validation.margen.required",
],
"user_created_id" => [
"integer" => "TarifaAcabadoLineas.validation.user_created_id.integer",
@ -125,7 +131,7 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS id, t1.tirada_min AS tirada_min, t1.tirada_max AS tirada_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.user_created_id AS user_created_id, t1.user_updated_id AS user_updated_id, t1.is_deleted AS is_deleted, t1.created_at AS created_at, t1.updated_at AS updated_at, t2.id AS tarifa_acabado"
"t1.id AS id, t1.paginas_min AS paginas_min, t1.paginas_max AS paginas_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.margen AS margen, t2.id AS tarifa_acabado"
);
//JJO
@ -139,26 +145,14 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
? $builder
: $builder
->groupStart()
->like("t1.tirada_min", $search)
->orLike("t1.tirada_max", $search)
->like("t1.paginas_min", $search)
->orLike("t1.paginas_max", $search)
->orLike("t1.precio_min", $search)
->orLike("t1.precio_max", $search)
->orLike("t1.user_created_id", $search)
->orLike("t1.user_updated_id", $search)
->orLike("t1.is_deleted", $search)
->orLike("t1.created_at", $search)
->orLike("t1.updated_at", $search)
->orLike("t2.id", $search)
->orLike("t1.tirada_min", $search)
->orLike("t1.tirada_max", $search)
->orLike("t1.paginas_min", $search)
->orLike("t1.paginas_max", $search)
->orLike("t1.precio_min", $search)
->orLike("t1.precio_max", $search)
->orLike("t1.user_created_id", $search)
->orLike("t1.user_updated_id", $search)
->orLike("t1.is_deleted", $search)
->orLike("t1.created_at", $search)
->orLike("t1.updated_at", $search)
->orLike("t2.id", $search)
->groupEnd();
}
@ -178,13 +172,13 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
helper('general');
if(floatval($data["tirada_min"])>= floatval($data["tirada_max"])){
return lang('TarifaAcabadoLineas.validation.error_tirada_range');
if(floatval($data["paginas_min"])>= floatval($data["paginas_max"])){
return lang('TarifaAcabadoLineas.validation.error_paginas_range');
}
$rows = $this->db
->table($this->table)
->select("id, tirada_min, tirada_max")
->select("id, paginas_min, paginas_max")
->where("is_deleted", 0)
->where("tarifa_acabado_id", $id_tarifa_acabado)
->get()->getResultObject();
@ -196,9 +190,9 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
continue;
}
}
if(check_overlap(floatval($data["tirada_min"]), floatval($data["tirada_max"]),
$row->tirada_min, $row->tirada_max)){
return lang('TarifaAcabadoLineas.validation.error_tirada_overlap');
if(check_overlap(floatval($data["paginas_min"]), floatval($data["paginas_max"]),
$row->paginas_min, $row->paginas_max)){
return lang('TarifaAcabadoLineas.validation.error_paginas_overlap');
}
}