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

Merge branch 'dev/ui_fixing' into 'main'

Browse Source 
Dev/ui fixing

See merge request jjimenez/safekat!29
This commit is contained in:
Ignacio Martinez Navajas
2023-07-12 10:38:54 +00:00
parent a8454a191a 90d63432d6
commit 4e662e04e7
6185 changed files with 6817 additions and 317295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ci4/app/Models/Tarifas/TarifaacabadoModel.php
View File

@ -18,6 +18,8 @@ class TarifaacabadoModel extends \App\Models\GoBaseModel
protected $allowedFields = [
"nombre",
"precio_min",
"importe_fijo",
"deleted_at",
"is_deleted",
"user_created_id",
@ -36,16 +38,33 @@ class TarifaacabadoModel extends \App\Models\GoBaseModel
protected $validationRules = [
"nombre" => [
"label" => "Acabadoes.nombre",
"label" => "TarifaAcabado.nombre",
"rules" => "trim|required|max_length[255]",
],
"precio_min" => [
"label" => "TarifaAcabado.precioMin",
"rules" => "required|decimal",
],
"importe_fijo" => [
"label" => "TarifaAcabado.importeFijo",
"rules" => "required|decimal",
],
];
protected $validationMessages = [
"nombre" => [
"max_length" => "Acabadoes.validation.nombre.max_length",
"required" => "Acabadoes.validation.nombre.required",
"max_length" => "TarifaAcabado.validation.nombre.max_length",
"required" => "TarifaAcabado.validation.nombre.required",
],
"precio_min" => [
"required" => "TarifaAcabado.validation.precio_min.required",
"decimal" => "TarifaAcabado.validation.precio_min.decimal",
],
"importe_fijo" => [
"required" => "TarifaAcabado.validation.importe_fijo.required",
"decimal" => "TarifaAcabado.validation.importe_fijo.decimal",
],
];
/**
@ -57,7 +76,9 @@ class TarifaacabadoModel 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");
$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"
);
//JJO
$builder->where("t1.is_deleted", 0);
@ -68,6 +89,8 @@ class TarifaacabadoModel extends \App\Models\GoBaseModel
->groupStart()
->like("t1.nombre", $search)
->orLike("t1.nombre", $search)
->orLike("t1.precio_min", $search)
->orLike("t1.importe_fijo", $search)
->groupEnd();
}
}