From f0fa719d9f4da20f816aae43ce9b2afea815162c Mon Sep 17 00:00:00 2001 From: Florian Streibelt Date: Thu, 13 Oct 2011 23:58:47 +0200 Subject: [PATCH] now displays deposit corectly --- client-barcode/freitagskasse.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/client-barcode/freitagskasse.py b/client-barcode/freitagskasse.py index 1062f2e..d7774eb 100644 --- a/client-barcode/freitagskasse.py +++ b/client-barcode/freitagskasse.py @@ -161,7 +161,18 @@ class Status: show_bar() if isinstance(command, BuyCommand): - print_display('\x0b%-15s %4.2f' % (command.commodity_label()[:15],abs(command.difference()))); + muff = 0; + if (command.includes_commodity()): + muff+=1; + if (command.includes_deposit()): + muff+=2; + if (muff==1): + mylabel=command.item_name() + if (muff==2): + mylabel="Pfand "+command.commodity_label()[:9] + if (muff==3): + mylabel=("%-13s" % (command.commodity_label()[:13]))+"+P" + print_display('\x0b%-15s %4.2f' % (mylabel[:15],abs(command.difference()))); print_display('\x0b\nSUMME: {%02i} %8.2f' % ((i-1),initial_balance - self.balance)); else: print_display('\x0b%-15s %4.2f' % (command.label()[:15],abs(command.difference())));