Commit graph

137 commits

Author SHA1 Message Date
Felix Van der Jeugt
6dc80bbaeb Merge branch 'master' into fix/side-bar-layout 2016-02-05 19:52:37 +01:00
Felix Van der Jeugt
e72e76e9a3 fix form errors and notice when nothing changed 2016-02-05 09:16:02 +01:00
Felix Van der Jeugt
670b17622d show error flash on failed file stuffs 2016-02-04 23:47:34 +01:00
benji
71fc48cd71 Find correct user on users#show 2016-02-04 21:03:03 +01:00
benji
6aec736c52 Little bug with user order 2016-02-02 15:20:04 +01:00
benji
e91e3213d7 Prepare some things for production phase 2015-12-31 17:30:57 +01:00
benji
49898d484f Add guest account 2015-11-30 18:29:18 +01:00
benji
f109f5eb18 Remove format html from quickpay 2015-10-29 11:54:02 +01:00
benji
839151405b Remove hack for nested models 2015-10-28 22:07:48 +01:00
benji
539b65b75f barcode model test 2015-10-28 21:54:55 +01:00
benji
8906ca7e39 Add flash messages on quickpay 2015-10-28 20:48:49 +01:00
benji
5b922ceab5 Add way to see changes in quickpay 2015-10-28 16:57:11 +01:00
benji
6b3e57ab45 Add barcodes index and destroy 2015-10-27 22:09:01 +01:00
benji
62075f9cb1 Remove redirect loop for koelkast 2015-10-27 16:31:10 +01:00
benji
8099de435b Fix 69 2015-10-26 18:57:59 +01:00
benji
344f259efd Use try so it doesn't crash 2015-10-07 16:49:29 +02:00
benji
3d9afce424 load barcode 2015-10-07 16:42:05 +02:00
benji
cf4cb74087 authorization 2015-10-07 16:39:06 +02:00
benji
5b22c54c0f shallow 2015-10-07 15:55:47 +02:00
benji
c8b21ed1d1 Load barcode through product 2015-10-07 15:34:22 +02:00
benji
0baa857458 urgh 2015-10-07 15:10:14 +02:00
benji
328f806d39 Change token login to get 2015-10-07 15:06:01 +02:00
benji
4c1a630415 Some view changes to make stuff more obvious 2015-10-07 14:52:44 +02:00
benji
e6264fd6c8 Move some stuff to barcodecontroller where it belongs + refactoring 2015-09-28 21:51:40 +02:00
benji
efa85e7758 Add some useful flash messages 2015-09-26 11:57:41 +02:00
benji
19dec68c59 add workflow for adding products/stock through barcodes 2015-09-25 14:24:32 +02:00
benji
bfe86ae481 Change barcode to a has_many relation 2015-09-23 11:09:24 +02:00
benji
0885359d71 users controller test 2015-09-22 20:06:50 +02:00
benji
71659e246d Change koelkast login to login with token 2015-09-22 07:13:35 +02:00
benji
6403835872 Use barcode to create new order 2015-09-20 21:21:18 +02:00
benji
17a54723ec Remove index and destroy on userscontroller 2015-09-18 21:05:32 +02:00
benji
b81a615408 @user 2015-09-18 15:53:45 +02:00
benji
b55ba47209 Refactor 2015-09-14 20:26:16 +02:00
benji
de1436f5c7 Allow destroying of orders 2015-09-14 17:52:25 +02:00
benji
251d3b69b7 Move tab api to seperate job 2015-09-14 17:29:00 +02:00
benji
28774b3175 Add tests for user controller 2015-09-07 21:15:16 +02:00
benji
bb76b36d86 Add tests for cancelling orders 2015-09-03 10:08:17 +02:00
benji
0862b275fc Create actionmodel stock/stockentry and change form 2015-09-01 23:13:20 +02:00
benji
b7c292275b Remove schulden for admins as this has been moved to a seperate application 2015-09-01 18:15:27 +02:00
benji
7b345f28a8 Do some styling 2015-09-01 17:40:18 +02:00
benji
c668cc1ab9 cancancan fix 2015-08-31 15:35:59 +02:00
benji
da278491b1 Fix authorization for orders using cancancan 2015-08-31 15:10:13 +02:00
benji
b5017bff9a Remove debt from tab and refactor some code 2015-08-31 14:33:15 +02:00
benji
cc9e4ed6b3 Merge master 2015-08-25 16:05:13 +02:00
benji
b7f40f8832 Add possibility to remove products from the offer without breaking stuff 2015-08-25 15:53:27 +02:00
David Vandorpe
849d9ce04b Product calories: DB migration + Model update + attribute permit 2015-07-07 20:11:37 +02:00
benji
5a5fbdf1c9 Fix #38 2015-07-01 23:51:26 +02:00
benji
2f71e95a81 Add private option to users 2015-06-30 22:30:34 +02:00
benji
be9c967db2 Add slack notification 2015-04-04 01:44:28 +02:00
benji
99c49db848 change products to table view 2015-04-03 23:56:13 +02:00