From eed89d082b69168c25a125be1585d03c80fb6b02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Jim=C3=A9nez=20Ortega?= Date: Mon, 26 Feb 2024 22:45:58 +0100 Subject: [PATCH] =?UTF-8?q?resuelto=20pero=20no=20se=20por=20que=20(=C2=BF?= =?UTF-8?q?el=20fichero=20de=20MaquinasTarifasImpresionModel=20no=20estaba?= =?UTF-8?q?=20bien=3F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci4/app/Controllers/Presupuestos/Cosidotapablanda.php | 3 ++- ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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;