From 00988fca52158db64be5456ab8814c8905d7b390 Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Sat, 30 Dec 2017 15:17:12 -0600 Subject: [PATCH] Notas en tickets --- source/app/models/main.py | 3 +- source/static/js/controller/tickets.js | 17 +++++++++ source/static/js/ui/invoices.js | 1 - source/static/js/ui/tickets.js | 49 ++++++++++++++++++++++++-- 4 files changed, 65 insertions(+), 5 deletions(-) diff --git a/source/app/models/main.py b/source/app/models/main.py index d023511..3164799 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -2574,7 +2574,7 @@ class Facturas(BaseModel): options = { 'para': obj.cliente.correo_facturas, 'copia': values['correo_copia'], - 'confirmar': util.get_bool(values['correo_confirmacion']), + 'confirmar': util.get_bool(values.get('correo_confirmacion', '0')), 'asunto': util.make_info_mail(values['correo_asunto'], fields), 'mensaje': util.make_info_mail(values['correo_mensaje'], fields), 'files': files, @@ -3994,7 +3994,6 @@ class Tickets(BaseModel): @classmethod def add(cls, values): productos = util.loads(values.pop('productos')) - values['serie'] = 'T' values['folio'] = cls._get_folio(cls, values['serie']) diff --git a/source/static/js/controller/tickets.js b/source/static/js/controller/tickets.js index 741b5f1..e07ca09 100644 --- a/source/static/js/controller/tickets.js +++ b/source/static/js/controller/tickets.js @@ -13,6 +13,7 @@ var tickets_controllers = { $$('cmd_cancelar_ticket').attachEvent('onItemClick', cmd_cancelar_ticket_click) $$('cmd_move_tickets_right').attachEvent('onItemClick', cmd_move_tickets_right_click) $$('cmd_move_tickets_left').attachEvent('onItemClick', cmd_move_tickets_left_click) + $$('cmd_ticket_notes').attachEvent('onItemClick', cmd_ticket_notes_click) $$('tsearch_product_key').attachEvent('onKeyPress', tsearch_product_key_press) $$('grid_tdetails').attachEvent('onItemClick', grid_ticket_details_click) $$('grid_tdetails').attachEvent('onBeforeEditStop', grid_tickets_details_before_edit_stop) @@ -141,6 +142,7 @@ function configuracion_inicial_nuevo_ticket(){ grid.clearAll() table_pt.clear() table_totals.clear() + $$('form_new_ticket').setValues({notas: ''}) } @@ -189,6 +191,7 @@ function guardar_ticket(values){ data['opt'] = 'add' data['productos'] = rows data['forma_pago'] = values.forma_pago + data['notas'] = values.notas webix.ajax().sync().post('tickets', data, { error:function(text, data, XmlHttpRequest){ @@ -614,4 +617,18 @@ function tsearch_client_key_press(code, e){ function grid_ticket_clients_found_click(obj){ ticket_set_client(obj) +} + + +function cmd_ticket_notes_click(){ + win_ticket_notes.init() + var values = $$('form_new_ticket').getValues() + $$('ticket_notes').setValue(values.notas) + $$('win_ticket_notes').show() +} + + +function ticket_notes_key_up(){ + var value = this.getValue() + $$('form_new_ticket').setValues({notas: value}, true) } \ No newline at end of file diff --git a/source/static/js/ui/invoices.js b/source/static/js/ui/invoices.js index 5b86340..17565ce 100644 --- a/source/static/js/ui/invoices.js +++ b/source/static/js/ui/invoices.js @@ -166,7 +166,6 @@ var win_invoice_notes = { body: body_cfdi_notes, }) $$('cfdi_notes').attachEvent('onTimedKeyPress', cfdi_notes_key_up); - //~ $$('cmd_cfdi_save_notes').attachEvent('onItemClick', cmd_cfdi_save_notes_click) }} diff --git a/source/static/js/ui/tickets.js b/source/static/js/ui/tickets.js index a791f6f..f3a8b67 100644 --- a/source/static/js/ui/tickets.js +++ b/source/static/js/ui/tickets.js @@ -165,7 +165,16 @@ var body_ticket_informacion = {rows: [ ],} -var controls_generate_ticket = [ +var toolbar_new_ticket = { + view: 'toolbar', elements: [{}, + {view: 'button', id: 'cmd_ticket_notes', label: 'Notas', + autowidth: true, type: 'iconButton', icon: 'commenting-o'}, +{}]} + + +var cells_new_ticket = [ + {minHeight: 10, maxHeight: 10}, + toolbar_new_ticket, {minHeight: 10, maxHeight: 10}, {cols: [{rows: [ {view: 'fieldset', label: 'Buscar Producto', body: tbody_buscar_producto}, @@ -202,6 +211,12 @@ var toolbar_ticket_invoice = {view: 'toolbar', elements: [{}, ]} +//~ var toolbar_new_ticket = {view: 'toolbar', elements: [{}, + //~ {view: 'button', id: 'cmd_ticket_notes', label: 'Notas', + //~ type: 'iconButton', autowidth: true, icon: 'commenting-o'}, +//~ {}]} + + var ticket_suggest_partners = { view: 'gridsuggest', id: 'grid_ticket_clients_found', @@ -359,7 +374,7 @@ var controls_new_ticket = [ id: 'tv_new_ticket', animate: true, cells: [ - {id: 'Generar', rows: controls_generate_ticket}, + {id: 'Generar', rows: cells_new_ticket}, ] }, ] @@ -423,3 +438,33 @@ var app_tickets = { multi_tickets ], } + + +var body_ticket_notes = {rows: [ + {minHeight: 5, maxHeight: 5}, + {view: 'textarea', id: 'ticket_notes', name: 'ticket_notes', height: 300, + placeholder: 'Captura las notas, se autoguarda al escribir.'}, + {minHeight: 5, maxHeight: 5}, +]} + + +var win_ticket_notes = { + init: function(){ + webix.ui({ + view: 'window', + id: 'win_ticket_notes', + height: 350, + width: 500, + modal: true, + position: 'center', + head: {view: 'toolbar', + elements: [ + {view: 'label', label: 'Notas'}, + {view: 'icon', icon: 'times-circle', hotkey: 'esc', + click: '$$("win_ticket_notes").close()'}, + ] + }, + body: body_ticket_notes, + }) + $$('ticket_notes').attachEvent('onTimedKeyPress', ticket_notes_key_up); +}} \ No newline at end of file