mirror of
https://git.imnavajas.es/jjimenez/safekat.git
synced 2025-07-25 22:52:08 +00:00
trabajando tabla tiradas!
This commit is contained in:
Jaime Jiménez
@ -20,7 +20,7 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
|
||||
];
|
||||
|
||||
protected $allowedFields = [
|
||||
"tarifa_encuadernacion_id",
|
||||
"tirada_encuadernacion_id",
|
||||
"paginas_min",
|
||||
"paginas_max",
|
||||
"precio_min",
|
||||
@ -29,7 +29,7 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
|
||||
"is_deleted",
|
||||
|
||||
];
|
||||
protected $returnType = "App\Entities\Tarifas\TarifaManipuladoLinea";
|
||||
protected $returnType = "App\Entities\Tarifas\TarifaEncuadernacionLinea";
|
||||
|
||||
protected $useTimestamps = true;
|
||||
protected $useSoftDeletes = false;
|
||||
@ -38,51 +38,51 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
|
||||
|
||||
protected $updatedField = "updated_at";
|
||||
|
||||
public static $labelField = "tarifa_encuadernacion_id";
|
||||
public static $labelField = "tirada_encuadernacion_id";
|
||||
|
||||
protected $validationRules = [
|
||||
"precio_max" => [
|
||||
"label" => "TarifaManipuladoLineas.precioMax",
|
||||
"label" => "TarifaEncuadernacionLineas.precioMax",
|
||||
"rules" => "required|decimal",
|
||||
],
|
||||
"precio_min" => [
|
||||
"label" => "TarifaManipuladoLineas.precioMin",
|
||||
"label" => "TarifaEncuadernacionLineas.precioMin",
|
||||
"rules" => "required|decimal",
|
||||
],
|
||||
"paginas_max" => [
|
||||
"label" => "TarifaManipuladoLineas.paginasMax",
|
||||
"label" => "TarifaEncuadernacionLineas.paginasMax",
|
||||
"rules" => "required|decimal",
|
||||
],
|
||||
"paginas_min" => [
|
||||
"label" => "TarifaManipuladoLineas.paginasMin",
|
||||
"label" => "TarifaEncuadernacionLineas.paginasMin",
|
||||
"rules" => "required|decimal",
|
||||
],
|
||||
"margen" => [
|
||||
"label" => "TarifaManipuladoLineas.margen",
|
||||
"label" => "TarifaEncuadernacionLineas.margen",
|
||||
"rules" => "required|decimal",
|
||||
],
|
||||
];
|
||||
|
||||
protected $validationMessages = [
|
||||
"precio_max" => [
|
||||
"decimal" => "TarifaManipuladoLineas.validation.precio_max.decimal",
|
||||
"required" => "TarifaManipuladoLineas.validation.precio_max.required",
|
||||
"decimal" => "TarifaEncuadernacionLineas.validation.precio_max.decimal",
|
||||
"required" => "TarifaEncuadernacionLineas.validation.precio_max.required",
|
||||
],
|
||||
"precio_min" => [
|
||||
"decimal" => "TarifaManipuladoLineas.validation.precio_min.decimal",
|
||||
"required" => "TarifaManipuladoLineas.validation.precio_min.required",
|
||||
"decimal" => "TarifaEncuadernacionLineas.validation.precio_min.decimal",
|
||||
"required" => "TarifaEncuadernacionLineas.validation.precio_min.required",
|
||||
],
|
||||
"paginas_max" => [
|
||||
"decimal" => "TarifaManipuladoLineas.validation.paginas_max.decimal",
|
||||
"required" => "TarifaManipuladoLineas.validation.paginas_max.required",
|
||||
"decimal" => "TarifaEncuadernacionLineas.validation.paginas_max.decimal",
|
||||
"required" => "TarifaEncuadernacionLineas.validation.paginas_max.required",
|
||||
],
|
||||
"paginas_min" => [
|
||||
"decimal" => "TarifaManipuladoLineas.validation.paginas_min.decimal",
|
||||
"required" => "TarifaManipuladoLineas.validation.paginas_min.required",
|
||||
"decimal" => "TarifaEncuadernacionLineas.validation.paginas_min.decimal",
|
||||
"required" => "TarifaEncuadernacionLineas.validation.paginas_min.required",
|
||||
],
|
||||
"margen" => [
|
||||
"decimal" => "TarifaManipuladoLineas.validation.margen.decimal",
|
||||
"required" => "TarifaManipuladoLineas.validation.margen.required",
|
||||
"decimal" => "TarifaEncuadernacionLineas.validation.margen.decimal",
|
||||
"required" => "TarifaEncuadernacionLineas.validation.margen.required",
|
||||
],
|
||||
];
|
||||
|
||||
@ -93,18 +93,18 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
|
||||
*
|
||||
* @return \CodeIgniter\Database\BaseBuilder
|
||||
*/
|
||||
public function getResource(string $search = "", $tarifa_encuadernacion_id = -1)
|
||||
public function getResource(string $search = "", $tirada_encuadernacion_id = -1)
|
||||
{
|
||||
$builder = $this->db
|
||||
->table($this->table . " t1")
|
||||
->select(
|
||||
"t1.id AS id, t1.tarifa_encuadernacion_id AS tarifa_encuadernacion_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_encuadernacion"
|
||||
"t1.id AS id, t1.tirada_encuadernacion_id AS tirada_encuadernacion_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_encuadernacion"
|
||||
);
|
||||
//JJO
|
||||
$builder->where('tarifa_encuadernacion_id', $tarifa_encuadernacion_id);
|
||||
$builder->where('tirada_encuadernacion_id', $tirada_encuadernacion_id);
|
||||
$builder->where("t1.is_deleted", 0);
|
||||
|
||||
$builder->join("tarifa_encuadernacion t2", "t1.tarifa_encuadernacion_id = t2.id", "left");
|
||||
$builder->join("tarifa_encuadernacion_tiradas t2", "t1.tirada_encuadernacion_id = t2.id", "left");
|
||||
|
||||
|
||||
return empty($search)
|
||||
@ -112,13 +112,13 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
|
||||
: $builder
|
||||
->groupStart()
|
||||
->like("t1.id", $search)
|
||||
->orLike("t1.tarifa_encuadernacion_id", $search)
|
||||
->orLike("t1.tirada_encuadernacion_id", $search)
|
||||
->orLike("t1.paginas_min", $search)
|
||||
->orLike("t1.paginas_max", $search)
|
||||
->orLike("t1.precio_min", $search)
|
||||
->orLike("t1.precio_max", $search)
|
||||
->orLike("t1.id", $search)
|
||||
->orLike("t1.tarifa_encuadernacion_id", $search)
|
||||
->orLike("t1.tirada_encuadernacion_id", $search)
|
||||
->orLike("t1.paginas_min", $search)
|
||||
->orLike("t1.paginas_max", $search)
|
||||
->orLike("t1.precio_min", $search)
|
||||
@ -126,19 +126,19 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
|
||||
->groupEnd();
|
||||
}
|
||||
|
||||
public function checkIntervals($data = [], $id_linea = null, $id_tarifa_encuadernacion = null){
|
||||
public function checkIntervals($data = [], $id_linea = null, $tirada_encuadernacion_id = null){
|
||||
|
||||
helper('general');
|
||||
|
||||
if(floatval($data["paginas_min"])>= floatval($data["paginas_max"])){
|
||||
return lang('TarifaManipuladoLineas.validation.error_paginas_range');
|
||||
return lang('TarifaEncuadernacionLineas.validation.error_paginas_range');
|
||||
}
|
||||
|
||||
$rows = $this->db
|
||||
->table($this->table)
|
||||
->select("id, paginas_min, paginas_max")
|
||||
->where("is_deleted", 0)
|
||||
->where("tarifa_encuadernacion_id", $id_tarifa_encuadernacion)
|
||||
->where("tirada_encuadernacion_id", $tirada_encuadernacion_id)
|
||||
->get()->getResultObject();
|
||||
|
||||
|
||||
@ -150,7 +150,7 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
|
||||
}
|
||||
if(check_overlap(floatval($data["paginas_min"]), floatval($data["paginas_max"]),
|
||||
$row->paginas_min, $row->paginas_max)){
|
||||
return lang('TarifaManipuladoLineas.validation.error_paginas_overlap');
|
||||
return lang('TarifaEncuadernacionLineas.validation.error_paginas_overlap');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user