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

Browse Source 
Añadida descripcion en el select de las impresoras

See merge request jjimenez/safekat!818
This commit is contained in:
Ignacio Martinez Navajas
2025-05-21 07:05:13 +00:00
parent edbca8fc6e 242029714d
commit 306ae02a10
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ci4/app/Controllers/Logistica/EtiquetasTitulosController.php
View File

@ -163,10 +163,10 @@ class EtiquetasTitulosController extends BaseController
$modelImpresora = model('App\Models\Configuracion\ImpresoraEtiquetaModel');
$impresoras = $modelImpresora->select('id, name')
$impresoras = $modelImpresora->select('id, name, description')
->where('deleted_at', null)
->where('tipo', 1)
->orderBy('name', 'desc')
->orderBy('name', 'asc')
->findAll();
$etiquetaEntity->impresoras = $impresoras;
@ -440,7 +440,7 @@ class EtiquetasTitulosController extends BaseController
$impresora_id = $this->request->getPost('impresora_id') ?? null;
$modelImpresora = model('App\Models\Configuracion\ImpresoraEtiquetaModel');
$impresora = $modelImpresora->select('id, name, ip, port, user, pass')
$impresora = $modelImpresora->select('id, name, description, ip, port, user, pass')
->where('deleted_at', null)
->where('id', $impresora_id)
->orderBy('name', 'asc')

6
ci4/app/Controllers/Logistica/LogisticaController.php
View File

@ -225,7 +225,7 @@ class LogisticaController extends BaseController
}
$modelImpresora = model('App\Models\Configuracion\ImpresoraEtiquetaModel');
$impresora = $modelImpresora->select('id, name, ip, port, user, pass')
$impresora = $modelImpresora->select('id, name, description, ip, port, user, pass')
->where('deleted_at', null)
->where('id', $printer_id)
->orderBy('name', 'asc')
@ -346,10 +346,10 @@ class LogisticaController extends BaseController
}
$modelImpresora = model('App\Models\Configuracion\ImpresoraEtiquetaModel');
$impresoras = $modelImpresora->select('id, name')
$impresoras = $modelImpresora->select('id, name, description')
->where('deleted_at', null)
->where('tipo', 1)
->orderBy('name', 'desc')
->orderBy('name', 'asc')
->findAll();
$envioEntity->impresoras = $impresoras;

2
ci4/app/Controllers/Produccion/Ordentrabajo.php
View File

@ -951,7 +951,7 @@ class Ordentrabajo extends BaseController
}
$modelImpresora = model('App\Models\Configuracion\ImpresoraEtiquetaModel');
$impresora = $modelImpresora->select('id, name, ip, port, user, pass')
$impresora = $modelImpresora->select('id, name, description, ip, port, user, pass')
->where('deleted_at', null)
->where('id', $impresora_id)
->orderBy('name', 'asc')

4
ci4/app/Views/themes/vuexy/form/logistica/viewEnvioEditForm.php
View File

@ -240,7 +240,7 @@
</button>
</div>
<div class="col-sm-2 px-3 d-flex flex-column justify-content-end">
<div class="col-sm-3 px-3 d-flex flex-column justify-content-end">
<div class="d-flex flex-column justify-content-end h-100">
<label for="impresoraEtiquetas" class="form-label">
<?= lang("Logistica.impresoraEtiquetas") ?>
@ -250,7 +250,7 @@
style="width: 100%;">
<?php foreach ($envioEntity->impresoras as $impresora): ?>
<option value="<?= $impresora->id ?>">
<?= $impresora->name ?>
<?= $impresora->description ? "$impresora->name [$impresora->description]" : $impresora->name ?>
</option>
<?php endforeach; ?>
</select>

4
ci4/app/Views/themes/vuexy/form/logistica/viewEtiquetasTitulosEdit.php
View File

@ -158,7 +158,7 @@
</button>
</div>
<div class="col-sm-2 px-3 d-flex flex-column justify-content-end">
<div class="col-sm-3 px-3 d-flex flex-column justify-content-end">
<div class="d-flex flex-column justify-content-end h-100">
<label for="impresoraEtiquetas" class="form-label">
<?= lang("Logistica.impresoraEtiquetas") ?>
@ -167,7 +167,7 @@
maxlength="50" class="form-control select2bs2" style="width: 100%;">
<?php foreach ($etiquetaEntity->impresoras as $impresora): ?>
<option value="<?= $impresora->id ?>">
<?= $impresora->name ?>
<?= $impresora->description ? "$impresora->name [$impresora->description]" : $impresora->name ?>
</option>
<?php endforeach; ?>
</select>