Merge branch 'main' into 'dev/views'

# Conflicts:
#   ci4/.env
#   ci4/app/Controllers/Test.php
This commit is contained in:
Ignacio Martinez Navajas
2023-06-20 13:30:37 +00:00
17 changed files with 1220 additions and 357 deletions

View File

@ -0,0 +1,132 @@
<?php
namespace App\Models\Tarifas;
class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
{
protected $table = "tarifa_manipulado_lineas";
/**
* Whether primary key uses auto increment.
*
* @var bool
*/
protected $useAutoIncrement = true;
const SORTABLE = [
0 => "t1.tirada_min",
1 => "t1.tirada_max",
2 => "t1.precio_min",
3 => "t1.precio_max",
4 => "t1.precio_unidad",
];
protected $allowedFields = [
"tarifa_manipulado_id",
"tirada_min",
"tirada_max",
"precio_min",
"precio_max",
"precio_unidad",
"user_created_id",
"is_deleted",
];
protected $returnType = "App\Entities\Tarifas\TarifaManipuladoLinea";
protected $useTimestamps = true;
protected $useSoftDeletes = false;
protected $createdField = "created_at";
protected $updatedField = "updated_at";
public static $labelField = "tarifa_manipulado_id";
protected $validationRules = [
"precio_max" => [
"label" => "TarifaManipuladoLineas.precioMax",
"rules" => "required|decimal",
],
"precio_min" => [
"label" => "TarifaManipuladoLineas.precioMin",
"rules" => "required|decimal",
],
"precio_unidad" => [
"label" => "TarifaManipuladoLineas.precioUnidad",
"rules" => "required|decimal",
],
"tirada_max" => [
"label" => "TarifaManipuladoLineas.tiradaMax",
"rules" => "required|decimal",
],
"tirada_min" => [
"label" => "TarifaManipuladoLineas.tiradaMin",
"rules" => "required|decimal",
],
];
protected $validationMessages = [
"precio_max" => [
"decimal" => "TarifaManipuladoLineas.validation.precio_max.decimal",
"required" => "TarifaManipuladoLineas.validation.precio_max.required",
],
"precio_min" => [
"decimal" => "TarifaManipuladoLineas.validation.precio_min.decimal",
"required" => "TarifaManipuladoLineas.validation.precio_min.required",
],
"precio_unidad" => [
"decimal" => "TarifaManipuladoLineas.validation.precio_unidad.decimal",
"required" => "TarifaManipuladoLineas.validation.precio_unidad.required",
],
"tirada_max" => [
"decimal" => "TarifaManipuladoLineas.validation.tirada_max.decimal",
"required" => "TarifaManipuladoLineas.validation.tirada_max.required",
],
"tirada_min" => [
"decimal" => "TarifaManipuladoLineas.validation.tirada_min.decimal",
"required" => "TarifaManipuladoLineas.validation.tirada_min.required",
],
];
/**
* Get resource data.
*
* @param string $search
*
* @return \CodeIgniter\Database\BaseBuilder
*/
public function getResource(string $search = "", $tarifa_manipulado_id = -1)
{
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS id, t1.tarifa_manipulado_id AS tarifa_manipulado_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.precio_unidad AS precio_unidad, t2.id AS tarifa_manipulado"
);
//JJO
$builder->where('tarifa_manipulado_id', $tarifa_manipulado_id);
$builder->where("t1.is_deleted", 0);
$builder->join("lg_tarifa_manipulado t2", "t1.tarifa_manipulado_id = t2.id", "left");
return empty($search)
? $builder
: $builder
->groupStart()
->like("t1.id", $search)
->orLike("t1.tarifa_manipulado_id", $search)
->orLike("t1.tirada_min", $search)
->orLike("t1.tirada_max", $search)
->orLike("t1.precio_min", $search)
->orLike("t1.precio_max", $search)
->orLike("t1.precio_unidad", $search)
->orLike("t1.id", $search)
->orLike("t1.tarifa_manipulado_id", $search)
->orLike("t1.tirada_min", $search)
->orLike("t1.tirada_max", $search)
->orLike("t1.precio_min", $search)
->orLike("t1.precio_max", $search)
->orLike("t1.precio_unidad", $search)
->groupEnd();
}
}

View File

@ -1,7 +1,7 @@
<?php
namespace App\Models\Tarifas;
class TarifamanipuladoModel extends \App\Models\GoBaseModel
class TarifaManipuladoModel extends \App\Models\GoBaseModel
{
protected $table = "lg_tarifa_manipulado";
@ -12,97 +12,62 @@ class TarifamanipuladoModel extends \App\Models\GoBaseModel
*/
protected $useAutoIncrement = true;
const SORTABLE = [
0 => "t1.nombre",
];
protected $allowedFields = [
"nombre",
"tirada_min",
"precio_min",
"tirada_max",
"precio_max",
"ajuste",
"ajuste_total_pedido",
"formula_price",
"deleted_at",
"is_deleted",
"user_created_id",
"user_update_id",
"user_update_id"
];
protected $returnType = "App\Entities\Tarifas\TarifamanipuladoEntity";
protected $returnType = "App\Entities\Tarifas\TarifaManipuladoEntity";
protected $useTimestamps = true;
protected $useSoftDeletes = false;
protected $createdField = "created_at";
protected $updatedField = "updated_at";
protected $deletedField = 'deleted_at';
public static $labelField = "nombre";
protected $validationRules = [
"ajuste" => [
"label" => "Manipuladoes.ajuste",
"rules" => "required|decimal",
],
"ajuste_total_pedido" => [
"label" => "Manipuladoes.ajusteTotalPedido",
"rules" => "required|decimal",
],
"formula_price" => [
"label" => "Manipuladoes.formulaPrice",
"rules" => "trim|required|max_length[1073241]",
],
"nombre" => [
"label" => "Manipuladoes.nombre",
"label" => "Tarifamanipulado.nombre",
"rules" => "trim|required|max_length[255]",
],
"precio_max" => [
"label" => "Manipuladoes.precioMax",
"rules" => "required|decimal",
],
"precio_min" => [
"label" => "Manipuladoes.precioMin",
"rules" => "required|decimal",
],
"tirada_max" => [
"label" => "Manipuladoes.tiradaMax",
"rules" => "required|integer",
],
"tirada_min" => [
"label" => "Manipuladoes.tiradaMin",
"rules" => "required|integer",
],
];
protected $validationMessages = [
"ajuste" => [
"decimal" => "Manipuladoes.validation.ajuste.decimal",
"required" => "Manipuladoes.validation.ajuste.required",
],
"ajuste_total_pedido" => [
"decimal" => "Manipuladoes.validation.ajuste_total_pedido.decimal",
"required" => "Manipuladoes.validation.ajuste_total_pedido.required",
],
"formula_price" => [
"max_length" => "Manipuladoes.validation.formula_price.max_length",
"required" => "Manipuladoes.validation.formula_price.required",
],
"nombre" => [
"max_length" => "Manipuladoes.validation.nombre.max_length",
"required" => "Manipuladoes.validation.nombre.required",
"max_length" => "Tarifamanipulado.validation.nombre.max_length",
"required" => "Tarifamanipulado.validation.nombre.required",
],
"precio_max" => [
"decimal" => "Manipuladoes.validation.precio_max.decimal",
"required" => "Manipuladoes.validation.precio_max.required",
],
"precio_min" => [
"decimal" => "Manipuladoes.validation.precio_min.decimal",
"required" => "Manipuladoes.validation.precio_min.required",
],
"tirada_max" => [
"integer" => "Manipuladoes.validation.tirada_max.integer",
"required" => "Manipuladoes.validation.tirada_max.required",
],
"tirada_min" => [
"integer" => "Manipuladoes.validation.tirada_min.integer",
"required" => "Manipuladoes.validation.tirada_min.required",
]
];
/**
* Get resource data.
*
* @param string $search
*
* @return \CodeIgniter\Database\BaseBuilder
*/
public function getResource(string $search = "")
{
$builder = $this->db->table($this->table . " t1")->select("t1.id AS id, t1.nombre AS nombre");
//JJO
$builder->where("t1.is_deleted", 0);
return empty($search)
? $builder
: $builder
->groupStart()
->like("t1.nombre", $search)
->orLike("t1.nombre", $search)
->groupEnd();
}
}