mirror of
https://git.imnavajas.es/jjimenez/safekat.git
synced 2025-07-25 22:52:08 +00:00
cambios realizados
This commit is contained in:
@ -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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user