From: John Hodge <tpg@ucc.asn.au>
Date: Mon, 20 Feb 2017 13:17:32 +0000 (+0800)
Subject: VendServer - Set username state on MIFARE auth, clear MIFARE id on logout
X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=commitdiff_plain;h=50ed02d24589bb4340802826f11125f5e5c9038a;hp=6838aa5069d4078fef452e626076dde15c596c03

VendServer - Set username state on MIFARE auth, clear MIFARE id on logout
---

diff --git a/VendServer/VendServer.py b/VendServer/VendServer.py
index 6c52933..f7bc992 100755
--- a/VendServer/VendServer.py
+++ b/VendServer/VendServer.py
@@ -370,7 +370,7 @@ class VendServer():
 				self.vstatus.cur_pin = ''
 				self.vstatus.cur_user = ''
 				self.vstatus.cur_selection = ''
-				_last_card_id = -1
+				self._last_card_id = -1
 				self.vstatus.mk.set_messages([(self.center('BYE!'), False, 1.5)])
 				self.reset_idler(2)
 				return
@@ -405,6 +405,7 @@ class VendServer():
 	Triggered when the user has entered the id of something they would like to purchase.
 	"""
 	def make_selection(self):
+		logging.debug('Dispense item "%s"' % (self.vstatus.cur_selection,))
 		# should use sudo here
 		if self.vstatus.cur_selection == '55':
 			self.vstatus.mk.set_message('OPENSESAME')
@@ -803,6 +804,8 @@ class VendServer():
 			self.reset_idler(2)
 			return
 		else:
+			self.vstatus.cur_user = '----'
+			self.vstatus.username = self.dispense.getUsername()
 			self.vstatus.cur_selection = ''
 			self.vstatus.change_state(STATE_GET_SELECTION)
 			self.scroll_options(self.vstatus.username, self.vstatus.mk, True)