Fix customize tickets not updating, Resolves #209

mrf345 · Aug 31, 2020 · 30431d7 · 30431d7
1 parent 37cb7c7
commit 30431d7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/app/views/customize.py b/app/views/customize.py
@@ -80,18 +80,18 @@ def ticket():
 
         db.session.commit()
         flash('Notice: settings have been updated .', 'info')
-        return redirect(url_for('cust_app.ticket'))
 
-    if not form.errors:
-        form.kind.data = 1 if touch_screen_settings.n else 2
-        form.langu.data = printer.langu
-        form.value.data = printer.value
-        form.scale.data = printer.scale
+    form.kind.data = 1 if touch_screen_settings.n else 2
+    form.langu.data = printer.langu
+    form.value.data = printer.value
+    form.scale.data = printer.scale
 
-        if windows or settings.lp_printing:
-            form.printers.data = printer.name or ''
-        else:
-            form.printers.data = f'{printer.vendor}_{printer.product}'
+    if windows or settings.lp_printing:
+        form.printers.data = printer.name or ''
+    else:
+        form.printers.data = f'{printer.vendor}_{printer.product}'
+
+        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',

diff --git a/tests/customize.py b/tests/customize.py
@@ -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
@@ -80,7 +81,8 @@ def test_ticket_printed(c, monkeypatch):
     assert Printer.get().out_ep == out_ep
     assert Printer.get().vendor == vendor
     assert Printer.get().product == product
-    assert mock_usb_find.call_count == 2
+    assert f'value="{printers}"' in page_content
+    assert mock_usb_find.call_count == 1
 
 
 @pytest.mark.usefixtures('c')
@@ -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
@@ -118,7 +121,8 @@ def test_ticket_printed_windows(c, monkeypatch):
     assert Printer.get().langu == lang
     assert Printer.get().scale == scale
     assert Printer.get().name == name
-    assert mock_execute.call_count == 2
+    assert f'value="{name}"' in page_content
+    assert mock_execute.call_count == 1
     mock_execute.assert_called_with('wmic printer get sharename',
                                     parser='\n',
                                     encoding='utf-16')
@@ -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
@@ -160,7 +165,8 @@ def test_ticket_printed_lp(c, monkeypatch):
     assert Printer.get().langu == lang
     assert Printer.get().scale == scale
     assert Printer.get().name == secondName
-    assert mock_execute.call_count == 2
+    assert f'value="{secondName}"' in page_content
+    assert mock_execute.call_count == 1
     mock_execute.assert_called_with('lpstat -a', parser='\n')