fix info consumer for invoice and command
This commit is contained in:
parent
4f64c01b99
commit
8fabce1d6a
12
app/main.py
12
app/main.py
|
@ -1827,6 +1827,16 @@ class AppWindow(FrontWindow):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def get_header_sale(self, sale):
|
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 = {
|
order = {
|
||||||
'id': self.sale_id,
|
'id': self.sale_id,
|
||||||
'sale_number': sale['number'],
|
'sale_number': sale['number'],
|
||||||
|
@ -1842,7 +1852,7 @@ class AppWindow(FrontWindow):
|
||||||
'delivery_charge': sale.get('delivery_charge'),
|
'delivery_charge': sale.get('delivery_charge'),
|
||||||
'total_amount': sale['total_amount'],
|
'total_amount': sale['total_amount'],
|
||||||
'shop': self.shop['name'],
|
'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 ''
|
'table_assigned': sale['table_assigned']['name'] if sale.get('table_assigned') else ''
|
||||||
}
|
}
|
||||||
return order
|
return order
|
||||||
|
|
|
@ -606,9 +606,9 @@ class Receipt(object):
|
||||||
consumer = sale.get('consumer', None)
|
consumer = sale.get('consumer', None)
|
||||||
if consumer:
|
if consumer:
|
||||||
payment_method = sale.get('payment_method', None)
|
payment_method = sale.get('payment_method', None)
|
||||||
consumer_name = consumer.get('name', None)
|
consumer_name = consumer.get('consumer_name', None)
|
||||||
consumer_address = consumer.get('address', '')
|
consumer_address = consumer.get('consumer_address', '')
|
||||||
consumer_phone = consumer.get('phone', '')
|
consumer_phone = consumer.get('consumer_phone', '')
|
||||||
self.print_horinzontal_line()
|
self.print_horinzontal_line()
|
||||||
self.print_enter()
|
self.print_enter()
|
||||||
self._printer.set(align='center')
|
self._printer.set(align='center')
|
||||||
|
|
Loading…
Reference in New Issue