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

modificacion hecha

Browse Source
This commit is contained in:
Jaime Jiménez
2024-01-07 20:19:54 +01:00
parent 2f5c205902
commit 55f26c85b8
21 changed files with 537 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,7 +144,7 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel
}
public function getInitData($isRotativa = 0, $tarifas = [], $maquina_id = -1)
public function getInitData($isRotativa = 0, $isInkjet=0, $tarifas = [], $maquina_id = -1)
{
$builder = $this->db
->table($this->table . " t1")
@ -158,6 +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("t1.active", 1);
$isFirst = true;
@ -195,7 +196,7 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel
// Funcion para obtener todas las máquinas seleccionadas para un papel
public function getInitSelectedMachines($papel_impresion_id= -1, $isRotativa)
public function getInitSelectedMachines($papel_impresion_id= -1, $isRotativa=false, $isInkjet=false)
{
$builder = $this->db
->table($this->table . " t1")
@ -210,6 +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);
return $builder;
}