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 'bug/consultas_comparador' into 'main'

Browse Source 
resuelto pero no se por que (¿el fichero de MaquinasTarifasImpresionModel no estaba bien?)

See merge request jjimenez/safekat!171
This commit is contained in:
Jaime Jimenez Ortega
2024-02-26 21:47:13 +00:00
parent 35ef4072b6 eed89d082b
commit f9bce5f419
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ci4/app/Controllers/Presupuestos/Cosidotapablanda.php
View File

@ -791,8 +791,9 @@ class Cosidotapablanda extends \App\Controllers\GoBaseResourceController
} }
$tarifamodel = new MaquinasTarifasImpresionModel(); $tarifamodel = new MaquinasTarifasImpresionModel();
[$tarifaId, $tarifa, $tarifa_margen] = $tarifamodel->getTarifa($maquina->maquina_id, ($uso=='guardas')?'interior':$uso, $tipo); [$tarifaId, $tarifa, $tarifa_margen] = $tarifamodel->getTarifa($maquina->maquina_id, ($uso=='guardas')?'interior':$uso, $tipo);
// Generates a message like: User 123 logged into the system from 127.0.0.1
if(!is_float($tarifa)){ if(!is_float($tarifa)){
continue; continue;

1
ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php
View File

@ -137,6 +137,7 @@ class MaquinasTarifasImpresionModel extends \App\Models\GoBaseModel
$tarifas = $builder->get()->getResultArray(); $tarifas = $builder->get()->getResultArray();
if (count($tarifas)>0){ if (count($tarifas)>0){
return [$tarifas[0]['id'], floatval($tarifas[0]['precio']), floatval($tarifas[0]['margen'])]; return [$tarifas[0]['id'], floatval($tarifas[0]['precio']), floatval($tarifas[0]['margen'])];
} }
return $tarifas; return $tarifas;