Commit graph

151 commits

Author SHA1 Message Date
nek0
6720907137 change timestamp format to day 2016-03-17 23:59:52 +01:00
nek0
52804ce9ce singles should be able to be zero. 2016-02-05 11:15:57 +01:00
nek0
1cb116ea4f making matemat more friendly 2016-02-03 00:25:06 +01:00
nek0
5b9bcfc641 enable upstocking of zero crates 2016-02-02 20:05:18 +01:00
nek0
6096731f8a Merge branch 'master' of github.com:nek0/yammat 2016-01-30 23:56:38 +01:00
nek0
fd532b592f whoops. wrong function name. 2016-01-30 23:40:37 +01:00
nek0
400775e925 added possibility to restock whole crates at once 2016-01-30 22:57:45 +01:00
nek0
f1806a4dfb sending users to restock menu instead of home after completed actions 2016-01-30 22:56:01 +01:00
nek0
74407b1c75 fixed permissions 2016-01-30 18:29:45 +01:00
Astro
a5b2dca922 we demand extended measures 2016-01-24 01:27:58 +01:00
Astro
18fa53c696 Handler.Buy: transactionize postBuyR runDB 2016-01-24 00:42:58 +01:00
Braden Walters
587a4e499a Use MonadIO 2016-01-21 23:17:35 +01:00
Braden Walters
926a8b5bd8 Fixed warnings in Foundation and Handler.SupplierActions 2016-01-21 22:32:25 +01:00
Braden Walters
625c0cfd9b Resolved warnings in Handler/Common.hs 2016-01-21 22:19:41 +01:00
Braden Walters
0c5a864986 Remove some more warnings 2016-01-21 22:06:14 +01:00
Braden Walters
e0092b300a Removed warnings about unused symbols 2015-12-06 21:14:58 +01:00
Braden Walters
034685e40e Redundant imports 2015-12-06 21:03:30 +01:00
nek0
fa8cc79fa5 fixed bug in issue #77 2015-11-03 23:32:28 +01:00
nek0
fdfe41ac4a made user ident modifyable 2015-10-26 18:33:34 +01:00
nek0
ffd327e077 strange states 2015-10-25 23:30:15 +01:00
nek0
079b357459 introducing: Bootstrap3!!! 2015-10-23 00:08:06 +02:00
nek0
1c2218f887 hardcoded text alignments in deigest table 2015-10-12 17:33:56 +02:00
nek0
8563f8a738 fixed bug in inventory json backup 2015-10-12 17:19:51 +02:00
nek0
34a5b61993 made supplier digest more beautiful 2015-10-12 17:11:56 +02:00
nek0
f42b79d1c8 fixed bug with duplicate bodies in tableLayout 2015-10-12 16:46:31 +02:00
nek0
0b2cd56712 fixed rounding bug in currencyField 2015-10-12 16:34:03 +02:00
nek0
5e1abcbc07 reverted supplier order 2015-10-11 22:19:15 +02:00
nek0
ee72c2eaa9 added feature of total crates 2015-10-11 21:44:46 +02:00
nek0
8375041ad7 fixed bug in supplier digest where crates could become negative 2015-10-11 21:20:18 +02:00
nek0
303c2716f1 fixed missing ident field in supplier modification form 2015-10-11 21:03:25 +02:00
nek0
a2c1aad250 Merge branch 'master' of github.com:nek0/yammat 2015-10-11 20:56:22 +02:00
nek0
165ba6318e added supplier management 2015-10-11 20:11:31 +02:00
nek0
82470c1942 added supplier management 2015-10-11 20:07:12 +02:00
nek0
ab8a869ea8 even grater hash 2015-09-17 16:15:46 +02:00
nek0
4d4e68ff11 greater hash size 2015-09-17 16:06:50 +02:00
nek0
ae567528d5 now base64ing etag hashes for compatibility 2015-09-17 01:53:50 +02:00
nek0
647167dd0d now setting etags 2015-09-16 20:28:30 +02:00
nek0
f7656110ae warning reduction 2015-09-16 18:47:36 +02:00
nek0
b7a994ea08 avatars now never expire and should be loaded from cache 2015-09-16 18:47:13 +02:00
nek0
0689cd76b7 showing beverage avatars in restock menu 2015-09-16 14:40:06 +02:00
nek0
a93cdb937f sending emails to credit transfer recipients 2015-09-16 14:27:37 +02:00
nek0
35ae7833c5 linted 2015-09-15 00:49:13 +02:00
nek0
522da12175 added journal pagination
forgot template file
2015-09-08 15:42:09 +02:00
nek0
dc68d0fd69 added license 2015-08-09 21:16:33 +02:00
nek0
a5d08b1b9f made extra charge for paying cash configurable 2015-07-28 22:56:03 +02:00
nek0
43d587b2ad toying with Avatar caching 2015-07-28 21:48:09 +02:00
nek0
6e93762eee added possibility for cash transfer between users 2015-07-28 21:47:18 +02:00
nek0
74d56b1295 correction for old users 2015-07-22 07:08:59 +02:00
nek0
ddfa7957c4 ruling out seperator string as barcode 2015-07-22 07:01:34 +02:00
nek0
4e3c496845 proper handling of pure whitespace barcodes. 2015-07-21 18:56:24 +02:00
nek0
73c1acd368 cleanup and enabling barcodes for cash payment 2015-07-21 11:37:43 +02:00
nek0
b6ee74b0a5 forgot beverage update 2015-07-21 10:00:19 +02:00
nek0
838ba30a8a shortening user timeout to 30 days 2015-07-21 09:15:09 +02:00
nek0
68213ea8df added barcode reader support 2015-07-21 09:14:38 +02:00
Astro
5d160ab8c5 GET Barcode 2015-07-21 01:42:52 +02:00
Astro
5b444ce17e barcode submission with hidden forms 2015-07-21 01:28:05 +02:00
Astro
fafb1548cb barcode: switch to location with user 2015-07-21 01:17:25 +02:00
nek0
c5f138a36c fixed check of used avatars 2015-06-24 01:48:06 +02:00
nek0
58d7a3c443 now tracking article loss 2015-05-19 05:37:22 +02:00
nek0
207bcbc35d fixed volume display 2015-05-03 18:01:30 +02:00
Jörg Thalheim
8e4602ca53 mails: set List-Id 2015-04-24 16:44:43 +02:00
nek0
f62f76a52b added volume info 2015-04-24 12:28:45 +02:00
rys ostrovid
28e2ac1a3f Merge pull request #47 from vv01f/patch-13
Update Common.hs
2015-04-23 03:47:00 +02:00
nek0
465f51d169 fix in database restoration 2015-04-23 03:32:53 +02:00
nek0
1147ce0e06 beverageAvatar now also stored for display 2015-04-23 03:32:12 +02:00
Wolf
464aecc662 Update Common.hs
bitte gegen #46 testen
2015-04-20 00:24:23 +02:00
nek0
f8e5d0e8a2 handle avatar delete error while avatar is in use 2015-04-18 00:04:13 +02:00
nek0
ccb1278bd1 avatar deletion now possible 2015-04-16 03:14:28 +02:00
nek0
fc83ae87df propagated avatars. works. 2015-04-16 02:51:08 +02:00
nek0
edc307a01f first toying around with avatars. 2015-04-16 02:12:03 +02:00
nek0
df4b740472 prohibited negative recharge 2015-04-13 14:49:14 +02:00
nek0
f410d9e350 propagate crementing 2015-04-13 14:09:47 +02:00
nek0
93f16d92d0 css stuff 2015-04-12 18:01:26 +02:00
nek0
c8a3359dd0 inventory backup 2015-04-11 19:44:13 +02:00
nek0
8a525a1088 Merge branch 'i18n' of https://github.com/astro/yammat into astro-i18n
Conflicts:
	Handler/CashCheck.hs
	Handler/NewUser.hs
	templates/journal.hamlet
	templates/modify.hamlet
2015-04-10 18:46:59 +02:00
nek0
0242b31e22 cashiers should know, when they were created 2015-04-10 18:19:48 +02:00
nek0
6e2fef78f8 better journal summary 2015-04-10 17:00:50 +02:00
nek0
1d19538a83 reduced data overhead with notifications 2015-04-10 17:00:19 +02:00
nek0
9642e5a745 Merge branch 'master' of github.com:nek0/yammat 2015-04-10 14:51:36 +02:00
nek0
3e6701b12e resolved cashCheck issue 2015-04-10 14:50:44 +02:00
Astro
0d0bbbacc5 summary.json 2015-04-10 02:54:11 +02:00
Astro
0077e0b98a i18n support 2015-04-10 01:30:25 +02:00
nek0
1cc845215a fixed bug in metanotifications 2015-04-09 23:18:47 +02:00
nek0
c173c6005a notification on notification settings change 2015-04-09 23:03:49 +02:00
nek0
848f00cfdf now added cash checks 2015-04-09 21:39:39 +02:00
nek0
d4609d1cbe forgot files 2015-04-09 17:45:52 +02:00
nek0
c625d65c41 now capable of holding more than one cashier 2015-04-09 17:28:08 +02:00
nek0
388f2d0f34 better article ordering in restock 2015-04-09 13:47:27 +02:00
nek0
588b868841 better article ordering 2015-04-09 13:10:23 +02:00
nek0
e552c398df better float formatting 2015-04-09 12:35:34 +02:00
nek0
83485074b0 removed active users from list of inactive users 2015-04-08 18:02:33 +02:00
nek0
1f3e59e643 now user notification on buy 2015-04-07 22:03:21 +02:00
nek0
64881460b5 more currency formating 2015-04-07 16:34:01 +02:00
nek0
4506d48b50 nice float formatting 2015-04-07 16:30:06 +02:00
nek0
4c6d16238a wrong terminology 2015-04-05 11:06:17 +02:00
nek0
b1e108d257 articel amounts can no longer be negative 2015-04-05 11:05:35 +02:00
nek0
8f6303750c forgot currency in buy cash message 2015-04-05 01:49:15 +02:00
nek0
623b19a440 more currency 2015-04-04 08:25:10 +02:00
nek0
8e8691d357 more cleanup 2015-04-04 08:19:00 +02:00
nek0
2ab5f9b4c1 added currency 2015-04-04 08:18:15 +02:00