diff --git a/CHANGELOG.md b/CHANGELOG.md index c8e1e04..8cda8e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +v 1.4.0 [01-ene-2017] +--------------------- + - ImpresiĆ³n de tickets + v 1.3.0 [27-Dic-2017] --------------------- - Punto de venta diff --git a/source/app/controllers/helper.py b/source/app/controllers/helper.py index 0cd1c36..98bdc8b 100644 --- a/source/app/controllers/helper.py +++ b/source/app/controllers/helper.py @@ -14,7 +14,10 @@ from email import encoders from email.utils import formatdate import requests -from escpos import printer +try: + from escpos import printer +except ImportError: + printer = None from reportlab.platypus import BaseDocTemplate, Frame, PageTemplate, Image from reportlab.lib import colors diff --git a/source/static/js/controller/tickets.js b/source/static/js/controller/tickets.js index 59033a8..7bf62ea 100644 --- a/source/static/js/controller/tickets.js +++ b/source/static/js/controller/tickets.js @@ -7,7 +7,8 @@ var tickets_controllers = { init: function(){ $$('cmd_nuevo_ticket').attachEvent('onItemClick', cmd_nuevo_ticket_click) $$('cmd_ticket_to_invoice').attachEvent('onItemClick', cmd_ticket_to_invoice_click) - $$('cmd_ticket_report').attachEvent('onItemClick', cmd_ticket_report_click) + $$('cmd_ticket_report_pdf').attachEvent('onItemClick', cmd_ticket_report_pdf_click) + $$('cmd_ticket_report_xls').attachEvent('onItemClick', cmd_ticket_report_xls_click) $$('cmd_generar_ticket').attachEvent('onItemClick', cmd_generar_ticket_click) $$('cmd_cerrar_ticket').attachEvent('onItemClick', cmd_cerrar_ticket_click) $$('cmd_new_invoice_from_ticket').attachEvent('onItemClick', cmd_new_invoice_from_ticket_click) @@ -704,7 +705,7 @@ function grid_tickets_click(id, e, node){ } -function cmd_ticket_report_click(){ +function cmd_ticket_report_pdf_click(){ webix.toPDF($$('grid_tickets'), { ignore: {'pdf': true, 'print': true}, filename: 'Reporte_Tickets', @@ -717,4 +718,9 @@ function cmd_ticket_report_click(){ total: {css: 'right'}, } }) +} + + +function cmd_ticket_report_xls_click(){ + } \ No newline at end of file diff --git a/source/static/js/ui/tickets.js b/source/static/js/ui/tickets.js index 553898c..336d800 100644 --- a/source/static/js/ui/tickets.js +++ b/source/static/js/ui/tickets.js @@ -6,7 +6,9 @@ var toolbar_tickets = [ {view: 'button', id: 'cmd_ticket_to_invoice', label: 'Facturar', type: 'iconButton', autowidth: true, icon: 'file-code-o'}, {}, - {view: 'button', id: 'cmd_ticket_report', label: 'Reporte', + {view: 'button', id: 'cmd_ticket_report_pdf', label: 'Reporte [PDF]', + type: 'iconButton', autowidth: true, icon: 'bars'}, + {view: 'button', id: 'cmd_ticket_report_xls', label: 'Reporte [XLS]', type: 'iconButton', autowidth: true, icon: 'bars'}, {}, {view: 'button', id: 'cmd_cancelar_ticket', label: 'Cancelar',