Skip to content

Commit

Permalink
Fix customize tickets not updating, Resolves #209
Browse files Browse the repository at this point in the history
  • Loading branch information
mrf345 committed Aug 31, 2020
1 parent 37cb7c7 commit 5da9e56
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
6 changes: 5 additions & 1 deletion app/views/customize.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ def ticket():
if form.kind.data == 1: # Rigestered
printer.value = form.value.data
printer.active = False
touch_screen_settings = data.Touch_store.get() # NOTE: sessions's lost
touch_screen_settings.n = True
else: # Printed
printer_id = form.printers.data
Expand Down Expand Up @@ -76,6 +77,7 @@ def ticket():
printer.langu = form.langu.data
printer.value = form.value.data
printer.scale = form.scale.data
touch_screen_settings = data.Touch_store.get() # NOTE: sessions's lost
touch_screen_settings.n = False

db.session.commit()
Expand All @@ -92,7 +94,9 @@ def ticket():
form.printers.data = printer.name or ''
else:
form.printers.data = f'{printer.vendor}_{printer.product}'
form.printers.data += f'_{printer.in_ep}_{printer.out_ep}'

if printer.in_ep and printer.out_ep:
form.printers.data += f'_{printer.in_ep}_{printer.out_ep}'

return render_template('ticket.html', navbar='#snb2',
page_title='Tickets',
Expand Down
6 changes: 6 additions & 0 deletions tests/customize.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ def test_ticket_printed(c, monkeypatch):
'printers': printers,
'scale': scale
}, follow_redirects=True)
page_content = response.data.decode('utf-8')

assert response.status == '200 OK'
assert Touch_store.get().n is False
Expand All @@ -80,6 +81,7 @@ def test_ticket_printed(c, monkeypatch):
assert Printer.get().out_ep == out_ep
assert Printer.get().vendor == vendor
assert Printer.get().product == product
assert f'value={printers}' in page_content
assert mock_usb_find.call_count == 2


Expand Down Expand Up @@ -110,6 +112,7 @@ def test_ticket_printed_windows(c, monkeypatch):
'printers': name,
'scale': scale
}, follow_redirects=True)
page_content = response.data.decode('utf-8')

assert response.status == '200 OK'
assert Touch_store.get().n is False
Expand All @@ -118,6 +121,7 @@ def test_ticket_printed_windows(c, monkeypatch):
assert Printer.get().langu == lang
assert Printer.get().scale == scale
assert Printer.get().name == name
assert f'value={name}' in page_content
assert mock_execute.call_count == 2
mock_execute.assert_called_with('wmic printer get sharename',
parser='\n',
Expand Down Expand Up @@ -152,6 +156,7 @@ def test_ticket_printed_lp(c, monkeypatch):
'printers': secondName,
'scale': scale
}, follow_redirects=True)
page_content = response.data.decode('utf-8')

assert response.status == '200 OK'
assert Touch_store.get().n is False
Expand All @@ -160,6 +165,7 @@ def test_ticket_printed_lp(c, monkeypatch):
assert Printer.get().langu == lang
assert Printer.get().scale == scale
assert Printer.get().name == secondName
assert f'value={secondName}' in page_content
assert mock_execute.call_count == 2
mock_execute.assert_called_with('lpstat -a', parser='\n')

Expand Down

0 comments on commit 5da9e56

Please sign in to comment.