diff --git a/source/app/models/main.py b/source/app/models/main.py index 673018e..0be55aa 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -10678,10 +10678,10 @@ def authenticate(args): def get_cp(cp): con = sqlite3.connect(PATH_CP) cursor = con.cursor() - sql = """ - SELECT colonia, municipio, estado, municipios.id_municipio - FROM colonias, municipios, estados - WHERE colonias.id_municipio=municipios.id + sql = """SELECT estado, municipio, clave, colonia, key_estado + FROM codigos, colonias, municipios, estados + WHERE colonias.id_cp=codigos.id + AND codigos.id_municipio=municipios.id AND municipios.id_estado=estados.id AND cp=? ORDER BY colonia""" @@ -10693,14 +10693,18 @@ def get_cp(cp): data = {} if rows: data = { - 'estado': rows[0][2], + 'estado': rows[0][0], 'municipio': rows[0][1], - 'key_municipio': str(rows[0][3]).zfill(3), + 'key_municipio': rows[0][2], + 'key_estado': rows[0][4], } if len(rows) == 1: - data['colonia'] = rows[0][0] + data['colonia'] = rows[0][3] else: - data['colonia'] = [r[0] for r in rows] + data['colonia'] = [r[3] for r in rows] + + print('DATA', data) + return data diff --git a/source/db/cp.db b/source/db/cp.db index 2f632fa..882b8b5 100644 Binary files a/source/db/cp.db and b/source/db/cp.db differ diff --git a/source/static/js/controller/invoices.js b/source/static/js/controller/invoices.js index 6005efc..24eab91 100644 --- a/source/static/js/controller/invoices.js +++ b/source/static/js/controller/invoices.js @@ -1236,11 +1236,9 @@ function grid_carta_ubicaciones_before_edit_stop(state, editor){ msg = 'No se encontrĂ³ el C.P., asegurate de que sea correcto' msg_error(msg) } else { - row['Estado'] = opt_carta_estados.find(x => x.value === values.estado).id + //~ row['Estado'] = opt_carta_estados.find(x => x.value === values.estado).id + row['Estado'] = values.key_estado row['Municipio'] = values.key_municipio - //~ $$('colonia').define('suggest', []) - //~ $$('colonia').define('suggest', values.colonia) - //~ $$('colonia').refresh() g.refresh() msg_ok('Municipio:\n' + values.municipio) } diff --git a/source/static/js/controller/nomina.js b/source/static/js/controller/nomina.js index 9a7292c..fee1238 100644 --- a/source/static/js/controller/nomina.js +++ b/source/static/js/controller/nomina.js @@ -255,10 +255,10 @@ function up_employees_upload_complete(response){ function delete_empleado(id){ webix.ajax().del('/employees', {id: id}, function(text, xml, xhr){ var msg = 'Empleado eliminado correctamente' - if (xhr.status == 200){ + if(xhr.status == 200){ $$('grid_employees').remove(id); msg_ok(msg) - } else { + }else{ msg = 'El Empleado tiene recibos timbrados' msg_error(msg) }