mirror of
https://bitbucket.org/presik/presik_pos.git
synced 2023-12-14 06:03:00 +01:00
Minor fix
This commit is contained in:
Oscar Alvarez
parent
4951d659d8
commit
8a3e99bde2
2 changed files with 24 additions and 26 deletions
|
|
@ -196,6 +196,7 @@ class FieldInput(QLineEdit):
|
|||
def __init__(self, obj, key, value, amount=None, digits=2):
|
||||
super(FieldInput, self).__init__()
|
||||
setattr(obj, 'field_' + key, self)
|
||||
self.parent = obj
|
||||
set_object_name(self, 'field_', value)
|
||||
self.setAlignment(Qt.AlignRight | Qt.AlignVCenter)
|
||||
self.digits = 0
|
||||
|
|
@ -224,7 +225,6 @@ class FieldInput(QLineEdit):
|
|||
text = ''
|
||||
else:
|
||||
text = self.format_text(amount)
|
||||
print('cambiando texto...', amount)
|
||||
super(FieldInput, self).setText(str(text))
|
||||
|
||||
def zero(self):
|
||||
|
|
@ -232,7 +232,12 @@ class FieldInput(QLineEdit):
|
|||
|
||||
def value_edited(self, amount):
|
||||
self.value_changed = True
|
||||
print('aquiiiiiii', amount)
|
||||
|
||||
def focusInEvent(self, event):
|
||||
self.setFocus()
|
||||
|
||||
def focusOutEvent(self, event):
|
||||
amount = self.text()
|
||||
self.method_on_change(self.field, amount)
|
||||
|
||||
def show(self):
|
||||
|
|
|
|||
|
|
@ -287,7 +287,7 @@ class MainWindow(FrontWindow):
|
|||
|
||||
# LEFT INVOICE COMPONENTS
|
||||
self.label_input = QLabel()
|
||||
self.label_input.setFocus()
|
||||
# self.label_input.setFocus()
|
||||
self.label_input.setObjectName('label_input')
|
||||
size_input = 100
|
||||
if self.screen_size == 'large':
|
||||
|
|
@ -374,21 +374,6 @@ class MainWindow(FrontWindow):
|
|||
})
|
||||
]
|
||||
|
||||
if self.enviroment == 'restaurant':
|
||||
# extra_amounts = QGridLayout()
|
||||
# label_tip_amount = QLabel('VR PROPINA')
|
||||
# extra_amounts.addWidget(label_tip_amount, 0, 1)
|
||||
# self.field_tip_amount = QLineEdit('')
|
||||
# self.field_tip_amount.setObjectName('tip_amount')
|
||||
# extra_amounts.addWidget(label_tip_amount, 0, 2)
|
||||
#
|
||||
# label_delivery_amount = QLabel('VR DOMIC.')
|
||||
# extra_amounts.addWidget(label_delivery_amount, 1, 1)
|
||||
# self.field_delivery_amount = QLineEdit('')
|
||||
# self.field_delivery_amount.setObjectName('delivery_amount')
|
||||
# extra_amounts.addWidget(label_tip_amount, 1, 2)
|
||||
pass
|
||||
|
||||
if self._web_channel:
|
||||
self.channels = self.Channel.find([])
|
||||
|
||||
|
|
@ -530,7 +515,7 @@ class MainWindow(FrontWindow):
|
|||
'font_size': 'big',
|
||||
}),
|
||||
('net_amount', {
|
||||
'name': self.tr('NET TOTAL'),
|
||||
'name': self.tr('NETO TOTAL'),
|
||||
'readonly': True,
|
||||
'type': 'money',
|
||||
'size': self.screen_size,
|
||||
|
|
@ -1098,7 +1083,7 @@ class MainWindow(FrontWindow):
|
|||
}
|
||||
res = self.Sale.write([self._sale['id']], data)
|
||||
print('Res Util???', res)
|
||||
self.set_amounts()
|
||||
self.update_net_amount(res)
|
||||
|
||||
def action_delivery_charge_selection_changed(self, index):
|
||||
val = self.field_delivery_charge.get_id()
|
||||
|
|
@ -1561,6 +1546,10 @@ class MainWindow(FrontWindow):
|
|||
def update_total_amount(self):
|
||||
self.set_amounts()
|
||||
|
||||
def update_net_amount(self, res=None):
|
||||
net_amount = res['total_amount'] + res.get('tip_amount', 0) + res.get('delivery_amount', 0)
|
||||
self.field_net_amount.setText(net_amount)
|
||||
|
||||
def set_amounts(self, res=None):
|
||||
if not res:
|
||||
res = self.Sale.get_amounts({'sale_id': self._sale['id']})
|
||||
|
|
@ -1573,9 +1562,10 @@ class MainWindow(FrontWindow):
|
|||
self.field_untaxed_amount.setText(res['untaxed_amount'])
|
||||
self.field_taxes_amount.setText(res['tax_amount'])
|
||||
self.field_total_amount.setText(res['total_amount'])
|
||||
net_amount = res['total_amount'] + res.get('tip_amount', 0) + res.get('delivery_amount', 0)
|
||||
self.field_net_amount.setText(net_amount)
|
||||
# net_amount = res['total_amount'] + res.get('tip_amount', 0) + res.get('delivery_amount', 0)
|
||||
# self.field_net_amount.setText(net_amount)
|
||||
self.set_discount_amount()
|
||||
self.update_net_amount(res)
|
||||
|
||||
def _get_products_by_category(self, cat_id):
|
||||
records = self.Product.find([
|
||||
|
|
@ -1789,7 +1779,7 @@ class MainWindow(FrontWindow):
|
|||
self.dialog_search_parties.set_from_values(parties)
|
||||
|
||||
def clear_data(self):
|
||||
self._sale = {'total_amount': 0}
|
||||
self._sale = {'total_amount': 0, 'tip_amount': 0, 'delivery_amount': 0}
|
||||
self.party_name = None
|
||||
self._sale_line = {'id': None}
|
||||
self._total_amount = {}
|
||||
|
|
@ -1838,6 +1828,8 @@ class MainWindow(FrontWindow):
|
|||
if self.is_clear_right_panel:
|
||||
return
|
||||
self.field_invoice.setText('')
|
||||
self.field_tip_amount.setText('')
|
||||
self.field_delivery_amount.setText('')
|
||||
self.field_untaxed_amount.zero()
|
||||
self.field_taxes_amount.zero()
|
||||
self.field_total_amount.zero()
|
||||
|
|
@ -1903,7 +1895,6 @@ class MainWindow(FrontWindow):
|
|||
if hasattr(self, 'field_kind'):
|
||||
if not kind:
|
||||
kind = ''
|
||||
print('Yesss ', kind)
|
||||
self.field_kind.set_from_id(kind)
|
||||
if hasattr(self, 'field_delivery_men'):
|
||||
self.field_delivery_men.setText('')
|
||||
|
|
@ -2397,8 +2388,10 @@ class MainWindow(FrontWindow):
|
|||
|
||||
def key_pressed(self, text):
|
||||
if not self._sign and self._state != 'cash':
|
||||
if self._re.match(self._input_text + text):
|
||||
self.input_text_changed(text)
|
||||
# FIXME
|
||||
# if self._re.match(self._input_text + text):
|
||||
# self.input_text_changed(text)
|
||||
pass
|
||||
else:
|
||||
if RE_SIGN['quantity'].match(self._amount_text + text):
|
||||
self.amount_text_changed(text)
|
||||
|
|
|
|||
Loading…
Reference in a new issue