Merge branch 'main' into feat/update-ot-flow

This commit is contained in:
amazuecos
2025-05-22 18:34:08 +02:00
21 changed files with 1036 additions and 259 deletions

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')