Commit graph

63 commits

Author SHA1 Message Date
benji
046b2c382c Merge branch 'master' into barcode 2015-09-21 19:07:03 +02:00
benji
5a538a924b oops 2015-09-21 13:00:22 +02:00
benji
571fce83fd Add warning for testfase 2015-09-21 12:25:27 +02:00
benji
6403835872 Use barcode to create new order 2015-09-20 21:21:18 +02:00
benji
ec2b516727 Refactor views 2015-09-19 11:05:43 +02:00
benji
ef75909298 Change erb to haml 2015-09-17 14:05:33 +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
Tom Naessens
d9cc0ee30e Merge branch 'master' of github.com:ZeusWPI/Tap 2015-09-02 14:58:30 +02:00
Tom Naessens
90f4baa546 Fix order/new button group wrapping (closes #65) 2015-09-02 14:58:23 +02:00
benji
c0fe8833fa Remove unpermitted parameters and javascript error in orders 2015-09-02 14:35:29 +02:00
benji
f4cc8a9a27 Fix #43 2015-04-03 21:27:03 +02:00
benji
bbf6adef38 remove text field for search 2015-03-19 18:46:41 +01:00
benji
6ec27acaf8 Refactor dagschotel and make test succeed again 2015-03-19 16:22:55 +01:00
benji
0c06c4bedb Change some css and refactor some controller actions 2015-03-12 13:25:11 +01:00
benji
01c777baa1 Do some extra shit 2015-03-10 11:37:48 +01:00
benji
cec6a43ca1 Extra css on start page 2015-02-20 13:34:48 +01:00
benji
82be0ceca4 Add more users on overview screen 2015-02-20 09:21:18 +01:00
benji
d8cf9e443e Clarify schuld in orders/new 2015-02-19 18:12:57 +01:00
Caroline De Brouwer
52b397e250 Stijltjes op producten en al een beetje op profiles 2015-02-12 16:14:11 +01:00
benji
cf8ec8da6e Some clean up 2015-02-09 17:06:24 +01:00
benji
3676068fd9 Add papertrail and paginate orders on user page 2015-02-09 13:23:38 +01:00
benji
b260d90328 Add formatted form builder 2015-02-09 11:58:43 +01:00
benji
9e72274629 add stock to products and some clean up 2015-01-15 00:39:34 +01:00
benji
aa97b51ca6 Small changes to user show page, remove lots of sql queries 2015-01-09 19:15:48 +01:00
benji
f595b0dba9 Add controller action to define root based on user role 2015-01-06 20:33:11 +01:00
Benjamin Cousaert
b7cd3a7060 Add info about order 2014-12-15 18:56:13 +01:00
Benjamin Cousaert
cfd7f6fc0f Add quickpay link and controller action 2014-12-10 13:21:06 +01:00
ohsab
addf41999a layout users monopoly stijl 2014-12-10 05:13:17 +01:00
Tom Naessens
0b80a17940 Merge index and overview 2014-12-10 01:03:22 +01:00
Tom Naessens
9b026c7f25 Yuy, even nicer forms 2014-12-10 00:45:49 +01:00
Tom Naessens
3eeaaf3835 Clean javascript is clean <3 2014-12-10 00:38:48 +01:00
Tom Naessens
dc50fdec88 Fix some styles 2014-12-09 23:19:03 +01:00
ohsab
6c51972248 footer layout 2014-12-09 22:36:24 +01:00
ohsab
5d2859ae61 Merge branch 'master' of https://github.com/ZeusWPI/Tab
Conflicts:
	app/assets/stylesheets/application.css.scss
2014-12-09 21:26:19 +01:00
ohsab
3ddead7943 layout 2014-12-09 21:25:34 +01:00
Tom Naessens
62a47b3bf4 Fix login flashes on the overview 2014-12-09 21:15:24 +01:00
ohsab
c2fe9de0ff filles added 2014-12-09 20:33:11 +01:00
ohsab
f247e6c5ff dagschotel button added 2014-12-09 20:26:18 +01:00
ohsab
00dcd98a93 overview view mooi gemaakt 2014-12-09 19:44:48 +01:00
ohsab
db37c694aa color btn 2014-12-09 13:10:36 +01:00
ohsab
b064cb21ef knopjes 2014-12-09 12:08:49 +01:00
ohsab
98b4759758 new overview 2014-12-09 12:01:25 +01:00
ohsab
26cb04dd33 overview button 2014-12-09 11:38:10 +01:00
Benjamin Cousaert
12b3a68972 Add total price to order form 2014-12-09 09:43:21 +01:00
Benjamin Cousaert
b30b527650 Small commit, for iasoon <3 2014-12-08 17:56:48 +01:00
Benjamin Cousaert
b9e42b8bc1 Move logic to model 2014-12-08 11:41:38 +01:00
Benjamin Cousaert
c06c8cacd2 Add index action and view for orders 2014-12-06 12:03:08 +01:00
Benjamin Cousaert
c3729a5964 new order with decent rails 2014-12-05 16:15:07 +01:00