X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=VendServer%2FVendServer.py;fp=VendServer%2FVendServer.py;h=3ac2b81cb710486eb52750ccada0ccb7cc951155;hp=6dfbfe15ea31372ccf1f69a9c01d7bd4e913404d;hb=2a07cd688d615b7996be7420b2e9e38696c210cd;hpb=8861a669b4611e2dbf7aa5354f0248aafba3ef91 diff --git a/VendServer/VendServer.py b/VendServer/VendServer.py index 6dfbfe1..3ac2b81 100755 --- a/VendServer/VendServer.py +++ b/VendServer/VendServer.py @@ -140,6 +140,7 @@ class VendServer(): # If the user has just logged in, show them their balance if welcome: balance = self.dispense.getBalance() + balance = balance[:-4] + '.' + balance[-4] + balance[-2:] # Work around display bug msg = [(self.center('WELCOME'), False, TEXT_SPEED), (self.center(self.dispense.getUsername()), False, TEXT_SPEED), @@ -391,7 +392,11 @@ class VendServer(): self.vstatus.last_timeout_refresh = None else: # Price check mode. - self.dispense.getItemInfo(self.vstatus.cur_selection) + (name,price) = self.dispense.getItemInfo(self.vstatus.cur_selection) + dollarprice = "$%.2f" % ( price / 100.0 ) + dollarprice = dollarprice[:-4] + '.' + dollarprice[-4] + dollarprice[-2:] # Work around display bug + self.v.display( self.vstatus.cur_selection+' - %s'%dollarprice) + self.vstatus.cur_selection = '' self.vstatus.time_to_autologout = None self.vstatus.last_timeout_refresh = None