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

modificadas tarifas en las que import minimo y precio minimo no tenian sentido. Revision de Presupuestos* para calcular la tarifa

Browse Source
This commit is contained in:
Jaime Jiménez
2024-09-19 08:58:15 +02:00
parent 5c72771fbe
commit 1862d4ccf9
15 changed files with 14 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ci4/app/Models/Tarifas/TarifaextraModel.php
View File

@ -15,8 +15,6 @@ class TarifaextraModel extends \App\Models\BaseModel
protected $allowedFields = [
"nombre",
"precio",
"precio_min",
"importe_fijo",
"margen",
"mostrar_en_presupuesto",
"deleted_at",
@ -39,14 +37,6 @@ class TarifaextraModel extends \App\Models\BaseModel
"label" => "Tarifaextra.nombre",
"rules" => "trim|required|max_length[255]",
],
"precio" => [
"label" => "Tarifaextra.precio",
"rules" => "required|decimal",
],
"precio_min" => [
"label" => "Tarifaextra.precioMin",
"rules" => "required|decimal",
],
"importe_fijo" => [
"label" => "Tarifaextra.importeFijo",
"rules" => "required|decimal",
@ -66,14 +56,6 @@ class TarifaextraModel extends \App\Models\BaseModel
"decimal" => "Tarifaextra.validation.precio.decimal",
"required" => "Tarifaextra.validation.precio.required",
],
"precio_min" => [
"required" => "Tarifaextra.validation.precio_min.required",
"decimal" => "Tarifaextra.validation.precio_min.decimal",
],
"importe_fijo" => [
"required" => "Tarifaextra.validation.importe_fijo.required",
"decimal" => "Tarifaextra.validation.importe_fijo.decimal",
],
"margen" => [
"required" => "Tarifaextra.validation.margen.required",
"decimal" => "Tarifaextra.validation.margen.decimal",
@ -101,8 +83,7 @@ class TarifaextraModel extends \App\Models\BaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS tarifa_extra_id, t1.nombre AS tarifa_extra_nombre, t1.precio AS precio, t1.margen AS margen,
t1.precio_min AS tarifa_precio_min, t1.importe_fijo AS importe_fijo"
"t1.id AS tarifa_extra_id, t1.nombre AS tarifa_extra_nombre, t1.precio AS precio, t1.margen AS margen"
)
->where("t1.is_deleted", 0);
//->where("t1.mostrar_en_presupuesto", 1)