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

Browse Source 
arreglado bug que solo mostraba inkjet en los papeles

See merge request jjimenez/safekat!118
This commit is contained in:
Jaime Jimenez Ortega
2024-01-09 09:07:01 +00:00
parent 28e6d21dfc d7e86ec7d0
commit a2f9874278
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci4/app/Models/Configuracion/MaquinaModel.php
View File

@ -261,7 +261,7 @@ class MaquinaModel extends \App\Models\GoBaseModel
"'" . $papel_impresion_id . "'" . " as papel_impresion_id, t1.id AS maquina_id, '0' as active"
);
$builder->where("t1.is_rotativa", $rotativa);
$builder->where("t1.is_inkjet", $inkjet);
//$builder->where("t1.is_inkjet", $inkjet);
return $builder;
}

4
ci4/app/Models/Configuracion/MaquinasPapelesImpresionModel.php
View File

@ -158,7 +158,7 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel
$builder->where("t2.is_deleted", 0);
$builder->where("t2.isActivo", 1);
$builder->where("t2.rotativa", $isRotativa);
$builder->where("t2.inkjet", $isInkjet);
//$builder->where("t2.inkjet", $isInkjet);
$builder->where("t1.active", 1);
$isFirst = true;
@ -211,7 +211,7 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel
// Se aplican las condiciones que tienen que cumplir
$builder->where("t2.is_rotativa", $isRotativa);
$builder->where("t2.is_inkjet", $isInkjet);
//$builder->where("t2.is_inkjet", $isInkjet);
return $builder;
}