diff --git a/source/app/models/main.py b/source/app/models/main.py index 014a84e..22ddf52 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -3475,7 +3475,9 @@ class Sucursales(BaseModel): Sucursales.nombre.alias('name'), Sucursales.serie_facturas.alias('serie_invoice'), Sucursales.serie_tickets, + Almacenes.name.alias('warehouse'), ) + .join(Almacenes).switch(Sucursales) .dicts() ) return tuple(rows) @@ -3489,6 +3491,7 @@ class Sucursales(BaseModel): def _create(cls, args): try: values = utils.loads(args) + print(values) Sucursales.create(**values) result = {'ok': True} except Exception as e: diff --git a/source/static/js/controller/admin.js b/source/static/js/controller/admin.js index e27c523..978fc25 100644 --- a/source/static/js/controller/admin.js +++ b/source/static/js/controller/admin.js @@ -2834,6 +2834,7 @@ function cmd_add_sucursal_click(){ sucursal_name = values.sucursal_add_name.trim() sucursal_invoice = values.sucursal_add_invoice sucursal_ticket = values.sucursal_add_ticket.trim() + sucursal_warehouse = values.sucursal_warehouse if(!sucursal_name){ msg = 'El campo Nombre de la sucursal no puede estar vacío' @@ -2866,15 +2867,22 @@ function cmd_add_sucursal_click(){ nombre: sucursal_name, serie_facturas: sucursal_invoice, serie_tickets: sucursal_ticket, + //~ warehouse: sucursal_warehouse, } + if(sucursal_warehouse){ + values['warehouse'] = sucursal_warehouse + } + var data = { opt: 'create', values: values, } + var clean = { txt_sucursal_add_name: '', lst_sucursal_add_invoice: '', txt_sucursal_add_ticket: '', + lst_sucursal_warehouse: '', } msg = 'Datos correctos.

¿Estás seguro de agregar la nueva sucursal?' diff --git a/source/static/js/ui/admin.js b/source/static/js/ui/admin.js index f9c8da2..20e7286 100644 --- a/source/static/js/ui/admin.js +++ b/source/static/js/ui/admin.js @@ -878,8 +878,8 @@ var controls_add_sucursal = [{cols: [ label: 'Serie Facturas: ', labelPosition: 'top', required: true, options: []}, {view: 'text', id: 'txt_sucursal_add_ticket', name: 'sucursal_add_ticket', required: true, label: 'Serie Tickets: ', labelPosition: 'top'}, - {view: 'richselect', id: 'lst_sucursal_warehouse', label: 'Almacen: ', - labelPosition: 'top', required: false, options: [], hidden: true}, + {view: 'richselect', id: 'lst_sucursal_warehouse', name: 'sucursal_warehouse', + label: 'Almacen: ', labelPosition: 'top', required: false, options: [], hidden: true}, {view: 'button', id: 'cmd_add_sucursal', label: 'Agregar', autowidth: true, type: 'iconButton', icon: 'plus'}, {maxWidth: 20},