diff --git a/app/reporting.py b/app/reporting.py index 8eb0c01..6004ada 100755 --- a/app/reporting.py +++ b/app/reporting.py @@ -59,7 +59,7 @@ SSH_PORT = 23 def money(value): - if type(value) is int: + if isinstance(value, str): value = int(value) return '{:,.0f}'.format(value) @@ -68,7 +68,7 @@ dev_printers = {} if os.name == 'posix' and os.path.exists('/dev/usb'): for fl in os.listdir('/dev/usb'): if 'lp' in fl: - dev_printers['usb'] = fl + dev_printers['usb'] = '/dev/usb/' + fl class Receipt(object): @@ -133,33 +133,34 @@ class Receipt(object): return self._printer def test_printer(self): + self.set_printer() try: - if self._interface == 'usb': - if OS_NAME == 'posix': - self._printer = printer.File( - self._device, profile=self._profile) - elif OS_NAME == 'nt': - self._printer = printer.Win32Raw(self._device) - self._printer.open() - elif self._interface == 'network': - try: - host, port = self._device.split(":") - except Exception: - host, port = self._device, None - if port: - self._printer = printer.Network(host, port=int(port), timeout=15) - else: - self._printer = printer.Network(host, timeout=15) - elif self._interface == 'ssh': - self._printer = FileSSH(*self._device.split('@')) - self._printer.open() + # if self._interface == 'usb': + # if OS_NAME == 'posix': + # self._printer = printer.File( + # self._device, profile=self._profile) + # elif OS_NAME == 'nt': + # self._printer = printer.Win32Raw(self._device) + # self._printer.open() + # elif self._interface == 'network': + # try: + # host, port = self._device.split(":") + # except Exception: + # host, port = self._device, None + # if port: + # self._printer = printer.Network(host, port=int(port), timeout=15) + # else: + # self._printer = printer.Network(host, timeout=15) + # elif self._interface == 'ssh': + # self._printer = FileSSH(*self._device.split('@')) + # self._printer.open() if not self._printer: - return + return False self.print_enter() try: self._printer.image(image_test_file, center=True) - except Exception as e: - print(e, 'error') + except Exception: + logging.exception('Error impresion imagen') self.print_enter() self.print_header() self._printer.ln(3) @@ -234,7 +235,6 @@ class Receipt(object): if port: self._printer = printer.Network(host, port=int(port), timeout=5) else: - print(host, 'VALIDATE o') self._printer = printer.Network(host, timeout=5) if not self._printer: msg = "Warning: Can not found Printer!"