From 9460d923c9321933d0b21aa544c066762ccc0946 Mon Sep 17 00:00:00 2001 From: Andreas Mieke Date: Sun, 21 Apr 2024 21:27:36 -0400 Subject: [PATCH] fix(label): Call print_label for everry label --- inventree_phomemo/phomemo_label.py | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/inventree_phomemo/phomemo_label.py b/inventree_phomemo/phomemo_label.py index 3c11d22..c5ee53e 100644 --- a/inventree_phomemo/phomemo_label.py +++ b/inventree_phomemo/phomemo_label.py @@ -82,7 +82,7 @@ class PhomemoLabelPlugin(LabelPrintingMixin, BarcodeMixin, SettingsMixin, InvenT # Get label content for every label for item in items: label.object_to_print = item - outputs.append(self.get_fields(label, request, **kwargs)) + outputs.append(self.print_label(label, request, **kwargs)) # Read settings ip_address = self.get_setting('IP_ADDRESS') @@ -106,26 +106,9 @@ class PhomemoLabelPlugin(LabelPrintingMixin, BarcodeMixin, SettingsMixin, InvenT 'message': f'{len(items)} labels printed', }) - def print_label(self, **kwargs): - # Read settings - ip_address = self.get_setting('IP_ADDRESS') - port = int(self.get_setting('PORT')) - - # Get label content - fields = self.get_fields(self, kwargs) - - # Dump to json - data = json.dumps(fields) - - # Send the label to the printer - try: - print_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - print_socket.settimeout(5) - print_socket.connect((ip_address, port)) - print_socket.sendall(bytes(data,encoding="utf-8")) - print_socket.close() - except Exception as error: - raise ConnectionError('Error connecting to printer server: ' + str(error)) + def print_label(self, label: LabelTemplate, request, **kwargs): + self.render_to_html(label, request, **kwargs) + return self.get_fields(**kwargs) @staticmethod