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 'fix/servicios_defecto_deleted_at' into 'main'

Browse Source 
Fix/servicios defecto deleted at

See merge request jjimenez/safekat!407
This commit is contained in:
Jaime Jimenez Ortega
2024-11-28 09:39:54 +00:00
parent ac40c95d5b 54092fb29b
commit 524eb68b1c
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ci4/app/Models/Presupuestos/TipoPresupuestoServiciosDefectoModel.php
View File

@ -79,6 +79,7 @@ class TipoPresupuestoServiciosDefectoModel extends \App\Models\BaseModel
$where = "(t1.solapas IS NULL OR t1.solapas='" . $solapas . "')";
$builder->where($where);
$builder->where("t1.is_deleted", 0);
$builder->where("t2.is_deleted", 0);
$builder->select("t1.tarifa_id AS tarifa_id, t2.nombre AS tarifa_nombre");

2
ci4/app/Views/themes/vuexy/form/presupuestos/admin/_datosServiciosItems.js
View File

@ -777,7 +777,7 @@ function convertirTiempo(horas){
// se convierte a formato hh:mm:ss
const h = Math.floor(seconds / 3600);
const minutos = Math.floor((seconds % 3600) / 60);
const segundos = round(seconds % 60, 0);
const segundos = Math.round(seconds % 60, 0);
return h + ':' + minutos + ':' + segundos;
}
else{