Commit graph

71 commits

Author SHA1 Message Date
benji b8b89aa779 Add order button on user profile page 2015-03-02 16:10:54 +01:00
benji 82be0ceca4 Add more users on overview screen 2015-02-20 09:21:18 +01:00
Caroline De Brouwer f9e2c7e104 Styling on profile pages 2015-02-19 15:41:12 +01:00
benji 3b1a571b0b Euro helper fix negative numbers, and reverse orders of orders on user#show 2015-02-12 15:31:32 +01:00
benji b37573a4be Several small fixes 2015-02-12 14:39:58 +01:00
benji f37bc6acb0 rails 4.2 2015-02-10 09:00:29 +01:00
benji 835f08b60c Fix order bug 2015-02-10 08:33:51 +01:00
benji 7642e35d5d Add db/seeds and fix two minor bugs 2015-02-10 07:15:25 +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 39e96305b6 Add stock form 2015-02-08 10:11:23 +01:00
benji ca3045fbbf Add undo button for quickpay/dagschotel 2015-02-04 19:03:50 +01:00
benji 9e4563fbd1 fix minor bug 2015-02-04 17:09:42 +01:00
benji 6b05067dc6 tis kapot 2015-02-04 16:10:47 +01:00
benji 9e72274629 add stock to products and some clean up 2015-01-15 00:39:34 +01:00
benji 49dc9201b6 Some changes to user profile page and other fixes 2015-01-13 13:06:42 +01:00
benji aa97b51ca6 Small changes to user show page, remove lots of sql queries 2015-01-09 19:15:48 +01:00
benji 7684f54120 Remove redirects for root and put logic in routes 2015-01-09 12:31:14 +01:00
benji f595b0dba9 Add controller action to define root based on user role 2015-01-06 20:33:11 +01:00
benji db23fd2181 Add koelkast to users 2015-01-06 20:18:01 +01:00
Benjamin Cousaert b0fec45150 cancancan permissions 2014-12-17 07:31:51 +01:00
Benjamin Cousaert 26f66f8bff Add cancancan to admins 2014-12-15 19:43:02 +01:00
Benjamin Cousaert b7cd3a7060 Add info about order 2014-12-15 18:56:13 +01:00
Tom Naessens 0b0d780e91 Tabs <3 2014-12-10 22:06:36 +01:00
Tom Naessens e76a139205 Add the migrations, add the category to the form 2014-12-10 21:25:21 +01:00
Benjamin Cousaert cb94f2dbb8 Add schulden csv voor iepoev 2014-12-10 16:17:55 +01:00
Benjamin Cousaert bbc8901353 Let use choose his dagschotel 2014-12-10 14:18:56 +01:00
Benjamin Cousaert cfd7f6fc0f Add quickpay link and controller action 2014-12-10 13:21:06 +01:00
Benjamin Cousaert 744f8090ba Add orders_count and ordering on overview 2014-12-10 10:09:53 +01:00
Tom Naessens 0b80a17940 Merge index and overview 2014-12-10 01:03:22 +01:00
Tom Naessens 4ecfac5070 Add avatar to users 2014-12-09 22:32:54 +01:00
Benjamin Cousaert da12b71938 Remove email from Devise users and use nickname as primary key 2014-12-09 18:56:56 +01:00
Benjamin Cousaert bb234d7463 Fix routes for devise 2014-12-09 17:28:24 +01:00
Benjamin Cousaert da22af605f Add devise to users 2014-12-09 17:17:11 +01:00
Benjamin Cousaert 20d968a7ef merge conflict 2014-12-09 14:45:18 +01:00
Tom Naessens 6cbe661a6d Added flashes to products 2014-12-09 14:42:50 +01:00
Tom Naessens 1a50fb5cf2 Make things a lot more beautiful 2014-12-09 14:39:27 +01:00
ohsab db37c694aa color btn 2014-12-09 13:10:36 +01:00
ohsab 6c50375aba Merge branch 'master' of https://github.com/ZeusWPI/Tab 2014-12-09 11:38:19 +01:00
ohsab 26cb04dd33 overview button 2014-12-09 11:38:10 +01:00
Benjamin Cousaert c06982e643 Fix controller permitted parameters 2014-12-09 11:18:54 +01:00
Benjamin Cousaert 6305d3327a install cancan 2014-12-09 11:18:18 +01:00
Benjamin Cousaert ee5ebd7ba4 Add payment after order create for users 2014-12-09 10:57: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
Benjamin Cousaert 7ddd1d5775 Fix bug with count for products in orders 2014-12-05 07:55:28 +01:00
Benjamin Cousaert 4e4f0c32a2 Add avatar to product edit form and use recources in routes 2014-12-05 07:24:27 +01:00
Benjamin Cousaert 552f811fea Add paperclip to gems and avatar to products 2014-12-04 20:32:31 +01:00
Benjamin Cousaert 9e598c5751 Fix controller orders create action 2014-12-04 19:28:21 +01:00