From 8fabce1d6a8b52bf2180db3cd44f40461e931a98 Mon Sep 17 00:00:00 2001 From: Wilson Gomez Date: Wed, 25 Oct 2023 18:14:58 -0500 Subject: [PATCH] fix info consumer for invoice and command --- app/main.py | 12 +++++++++++- app/reporting.py | 6 +++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/main.py b/app/main.py index e5218a3..087c576 100644 --- a/app/main.py +++ b/app/main.py @@ -1827,6 +1827,16 @@ class AppWindow(FrontWindow): return True def get_header_sale(self, sale): + # TODO: for remove pass consumer to reporting + def _get_info_consumer(consumer_): + consumer = {} + if consumer_: + consumer['consumer_name'] = consumer.get('name', None) + consumer['consumer_phone'] = consumer.get('phone', '') + consumer['consumer_address'] = consumer.get('address', '') + consumer['consumer_notes'] = consumer.get('notes', '') + return consumer + order = { 'id': self.sale_id, 'sale_number': sale['number'], @@ -1842,7 +1852,7 @@ class AppWindow(FrontWindow): 'delivery_charge': sale.get('delivery_charge'), 'total_amount': sale['total_amount'], 'shop': self.shop['name'], - 'consumer': sale.get('consumer'), + 'consumer': _get_info_consumer(sale.get('consumer')), 'table_assigned': sale['table_assigned']['name'] if sale.get('table_assigned') else '' } return order diff --git a/app/reporting.py b/app/reporting.py index 659313d..ec5bd37 100755 --- a/app/reporting.py +++ b/app/reporting.py @@ -606,9 +606,9 @@ class Receipt(object): consumer = sale.get('consumer', None) if consumer: payment_method = sale.get('payment_method', None) - consumer_name = consumer.get('name', None) - consumer_address = consumer.get('address', '') - consumer_phone = consumer.get('phone', '') + consumer_name = consumer.get('consumer_name', None) + consumer_address = consumer.get('consumer_address', '') + consumer_phone = consumer.get('consumer_phone', '') self.print_horinzontal_line() self.print_enter() self._printer.set(align='center')