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

trabajando en los errores de calculo de tarifas

Browse Source
This commit is contained in:
Jaime Jiménez
2024-09-18 21:01:13 +02:00
parent 8777ce19c1
commit 5c72771fbe
6 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ci4/app/Models/Compras/ProveedorModel.php
View File

@ -209,6 +209,7 @@ class ProveedorModel extends \App\Models\BaseModel
->select( ->select(
"t1.id AS value, t1.nombre AS label, t1.propiedades AS options") "t1.id AS value, t1.nombre AS label, t1.propiedades AS options")
->where("tipo_id", $tipoId) ->where("tipo_id", $tipoId)
->where("is_deleted", 0)
->orderBy('t1.nombre', 'asc'); ->orderBy('t1.nombre', 'asc');
return $builder->get()->getResultObject(); return $builder->get()->getResultObject();

7
ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php
View File

@ -283,6 +283,13 @@ class PresupuestoAcabadosModel extends \App\Models\BaseModel
$total = $precio_unidad * $tirada; $total = $precio_unidad * $tirada;
$margen = floatval($tarifa->margen); $margen = floatval($tarifa->margen);
if($tarifa->tarifa_precio_min > $total){
$total = $total-($total * $margen/100.0);
$margen = round(100.0 * (floatval($tarifa->tarifa_precio_min) - $total) / floatval($tarifa->tarifa_precio_min), 0);
$total = floatval($tarifa->tarifa_precio_min);
$precio_unidad = round(floatval($total / $tirada), 2);
}
if (!$is_POD){ if (!$is_POD){
$total += floatval($tarifa->tarifa_importe_fijo); $total += floatval($tarifa->tarifa_importe_fijo);
} }

6
ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php
View File

@ -78,6 +78,12 @@ class PresupuestoPreimpresionesModel extends \App\Models\BaseModel
$precio = $precio * (1+ floatval($tarifa->margen)/100.0); $precio = $precio * (1+ floatval($tarifa->margen)/100.0);
$margen = $tarifa->margen; $margen = $tarifa->margen;
if($tarifa->tarifa_precio_min > $precio){
$precio = $precio-($precio * $margen/100.0);
$margen = round(100.0 * (floatval($tarifa->tarifa_precio_min) - $precio) / floatval($tarifa->tarifa_precio_min), 0);
$precio = floatval($tarifa->tarifa_precio_min);
}
return [$precio, $margen]; return [$precio, $margen];
} }

6
ci4/app/Models/Presupuestos/PresupuestoServiciosExtraModel.php
View File

@ -78,6 +78,12 @@ class PresupuestoServiciosExtraModel extends \App\Models\BaseModel
$precio = $precio * (1+ floatval($tarifa->margen)/100.0); $precio = $precio * (1+ floatval($tarifa->margen)/100.0);
$margen = $tarifa->margen; $margen = $tarifa->margen;
if($tarifa->tarifa_precio_min > $precio){
$precio = $precio-($precio * $margen/100.0);
$margen = round(100.0 * (floatval($tarifa->tarifa_precio_min) - $precio) / floatval($tarifa->tarifa_precio_min), 0);
$precio = floatval($tarifa->tarifa_precio_min);
}
return [$precio, $margen]; return [$precio, $margen];
} }

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

@ -101,7 +101,8 @@ class TarifaextraModel extends \App\Models\BaseModel
$builder = $this->db $builder = $this->db
->table($this->table . " t1") ->table($this->table . " t1")
->select( ->select(
"t1.id AS tarifa_extra_id, t1.nombre AS tarifa_extra_nombre, t1.precio AS precio, t1.margen AS margen" "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"
) )
->where("t1.is_deleted", 0); ->where("t1.is_deleted", 0);
//->where("t1.mostrar_en_presupuesto", 1) //->where("t1.mostrar_en_presupuesto", 1)

3
ci4/app/Models/Tarifas/TarifapreimpresionModel.php
View File

@ -101,7 +101,8 @@ class TarifapreimpresionModel extends \App\Models\BaseModel
$builder = $this->db $builder = $this->db
->table($this->table . " t1") ->table($this->table . " t1")
->select( ->select(
"t1.id AS tarifa_preimpresion_id, t1.nombre AS tarifa_preimpresion_nombre, t1.precio AS precio, t1.margen AS margen" "t1.id AS tarifa_preimpresion_id, t1.nombre AS tarifa_preimpresion_nombre, t1.precio AS precio, t1.margen AS margen,
t1.precio_min AS tarifa_precio_min, t1.importe_fijo AS importe_fijo"
) )
->where("t1.is_deleted", 0); ->where("t1.is_deleted", 0);
//->where("t1.mostrar_en_presupuesto", 1) //->where("t1.mostrar_en_presupuesto", 1)