diff --git a/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php b/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php index 3fa40d28..549317ad 100755 --- a/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php +++ b/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php @@ -791,8 +791,9 @@ class Cosidotapablanda extends \App\Controllers\GoBaseResourceController } $tarifamodel = new MaquinasTarifasImpresionModel(); + [$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)){ continue; diff --git a/ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php b/ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php index a5b8859b..4d349f86 100755 --- a/ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php +++ b/ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php @@ -137,6 +137,7 @@ class MaquinasTarifasImpresionModel extends \App\Models\GoBaseModel $tarifas = $builder->get()->getResultArray(); if (count($tarifas)>0){ + return [$tarifas[0]['id'], floatval($tarifas[0]['precio']), floatval($tarifas[0]['margen'])]; } return $tarifas;