seba
/
k4ever
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
238 Commits 3 Branches 0 Tags 2.5 MiB
Commit Graph

238 Commits

Author SHA1 Message Date
Sebastian Lohff 5f0c0c14fc Cleanup of VirtualTransaction 2011-10-25 19:03:51 +02:00
Sebastian Lohff ccd9e327c7 Merge branch 'master' of git.someserver.de:k4ever 2011-10-25 15:48:10 +02:00
Sebastian Lohff c3100ad09a Implemented first part for VirtualTransactions. 
See Ticket #4
 2011-10-25 15:47:10 +02:00
Sebastian Pipping 04f9741de7 client-barcode: Implement and integrate bulkbuy 2011-10-24 19:08:09 +02:00
Sebastian Lohff 4e93c66b64 Fixed API urls, allowed to use bulkbuy without / 2011-10-24 17:28:11 +02:00
Sebastian Lohff 1e7820b80b completed er for virtual transactions 2011-10-24 14:45:50 +02:00
TKroenert 1e26d28122 Merge branch 'master' of someserver.de:k4ever 2011-10-22 22:58:36 +02:00
TKroenert 38e1bb44dc ER-diagram: add VirtualTransaction 2011-10-22 00:33:03 +02:00
Florian Streibelt 0a26f74872 display escape codes replaced by api calls 2011-10-21 20:52:34 +02:00
Sebastian Lohff fd46332e65 Fixed transaction checking. 
Now the default value for the form is set to the value
given in TransactionType.needsCheck
 2011-10-21 18:41:27 +02:00
Sebastian Lohff eaf1551fa1 Added password changing for non-ldap user 2011-10-21 03:05:07 +02:00
Sebastian Lohff b458cfaead Fixed #5 - Wrong API-Doc for Api /buy/ 2011-10-21 01:25:52 +02:00
Konrad Mohrfeldt bc18ed6661 fix: javascript-enabled click&buy didnt recognize deposit or item+deposit buttons 2011-10-21 00:03:55 +02:00
Sebastian Pipping f2ad3bb89b client-barcode: Replace 10 Euro by 5 Euro on howto sheet 2011-10-19 23:44:39 +02:00
tkroenert 0ee86a1228 Merge branch 'master' of git.someserver.de:k4ever 2011-10-19 23:36:41 +02:00
tkroenert 447224b0fe transactions: add filter against 0.00 transactions 2011-10-19 23:34:49 +02:00
Sebastian Pipping 53368e49ac client-barcode: Commit 6 deposits of 1.00 Euro as one deposit of 6.00 Euro (bug #203) 2011-10-19 20:32:17 +02:00
Sebastian Pipping 7046890acf client-barcode: Show sum of commodity and deposit on item info page, too (bug #202) 2011-10-19 19:44:21 +02:00
Sebastian Pipping eff542bc99 client-barcode: Increase presentation time of item info page (bug #202) 2011-10-19 19:30:26 +02:00
Sebastian Pipping 5ba9cf97d6 Revert "client-barcode: Turn off console echo (experiment for now, idea by Andy Gunschl)" 
This reverts commit 9880b1ebc1.
 2011-10-19 19:17:28 +02:00
Florian Streibelt 10962d479f sleep entfernt, etc 2011-10-19 12:45:28 +02:00
Sebastian Pipping a0f1acffc1 client-barcode: Reduce presentation time of item info page 2011-10-19 05:56:20 +02:00
Sebastian Pipping 9880b1ebc1 client-barcode: Turn off console echo (experiment for now, idea by Andy Gunschl) 2011-10-19 05:55:36 +02:00
Sebastian Pipping 2e83f6fbb3 RFID: License under "GPL v3 or later" (with acknoledgement from Andy) 2011-10-19 04:50:05 +02:00
Andy b526525cfa RFID: Add finishing <return> keypress for xdotool 2011-10-19 04:49:10 +02:00
Andy 7c8a072f4f RFID: Add current Keypresser Code 2011-10-19 04:48:57 +02:00
Florian Streibelt f5d40285a1 fixed typos and increased display time for price info 2011-10-19 01:56:37 +02:00
Florian Streibelt fb80a1a70d now starts without display too 2011-10-19 01:45:57 +02:00
Florian Streibelt 8fd3a73d0a Merge branch 'display-threading' 2011-10-19 01:23:58 +02:00
Florian Streibelt e7c73198f5 Merge remote-tracking branch 'origin/display-florian-backup' into display-threading 
Conflicts:
	client-barcode/freitagskasse.py
 2011-10-19 01:08:05 +02:00
Florian Streibelt 67ebf64ffe finally usuable(?) again! 2011-10-19 00:27:02 +02:00
Florian Streibelt 4af7594490 gnah.. i don't know yet if I hate or like that language 2011-10-19 00:22:14 +02:00
Florian Streibelt dd49d650fb almost usable. threads are not all temrinating yet 2011-10-19 00:12:49 +02:00
Florian Streibelt 65255fb53a the first time information is somehow displayed again 2011-10-18 23:59:18 +02:00
Florian Streibelt a9d82b9b85 its scrolling, yay. 2011-10-18 23:56:37 +02:00
Florian Streibelt 2858b1e71a yea, now screensaver almost works... or sth like that. lets convert the helper funcs 2011-10-18 23:10:35 +02:00
Florian Streibelt f575423506 started to push the screensaver over 2011-10-18 22:30:25 +02:00
Sebastian Pipping d468585069 client-barcode: Allow showing product info without log-in (bug #202) 
Log-in is tried first so if someone's code matches a product he can still log in
 2011-10-18 21:10:39 +02:00
Florian Streibelt 0aad574f60 commands converted from C-program to python, now replacing all calls accordingly 2011-10-18 19:23:14 +02:00
Florian Streibelt 5c9d45b725 first steps for pulling display functionality out of the client 2011-10-18 18:59:14 +02:00
seba 939159a1c9 Fixed bug in bulkBuy when not buying deposit 2011-10-18 02:56:29 +02:00
Sebastian Pipping d3b0a8fa4c client-barcode: Turn stdin reading to nonblocking, add autologout after 3 Minutes 2011-10-17 23:19:54 +02:00
Sebastian Pipping c532fdb551 client-barcode: No longer print empty barcode on LCD display 2011-10-17 23:19:54 +02:00
Sebastian Pipping 0a86d9391c client-barcode: Extra method Status.logout() 2011-10-17 23:19:54 +02:00
Sebastian Pipping bb880e494b Allow asciify to deal with instances of unicode 2011-10-17 21:46:31 +02:00
Sebastian Pipping bb468f25bf Hopefully fix crash on sending "Schöfferhofer" to LCD display 2011-10-17 21:23:17 +02:00
seba 16a0686b03 Fixed wrong function, now wrapping content_type 2011-10-17 20:06:20 +02:00
Sebastian Pipping 028d03456f Merge branch 'master' into display-threading 
Conflicts:
	client-barcode/freitagslib/network.py
 2011-10-17 20:01:43 +02:00
Sebastian Pipping dd27a1e5ab client-barcode: Handle long labels better 2011-10-17 19:59:16 +02:00
seba 2d11431e63 Fixed pistons content-type issue. 
Pistons utils.Mimer.loader_for_type now get wrapped to remove
everything behind a ; (including the ;).
 2011-10-17 19:44:41 +02:00