Commit graph

58 commits

Author SHA1 Message Date
benji 0bca2c8c23 gitignore 2015-03-03 16:40:06 +01:00
benji b8b89aa779 Add order button on user profile page 2015-03-02 16:10:54 +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 78a0ae15bf re-add pictures 2015-02-17 15:35:15 +01:00
benji b37573a4be Several small fixes 2015-02-12 14:39:58 +01:00
benji f745de8153 remove pictures required 2015-02-10 13:04:35 +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 ca3045fbbf Add undo button for quickpay/dagschotel 2015-02-04 19:03:50 +01:00
benji 4b05623a96 fix price bug for products 2015-02-04 17:05:02 +01:00
benji 8e386f413f Product dependency is fixed 2015-02-04 16:49:19 +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 db23fd2181 Add koelkast to users 2015-01-06 20:18:01 +01:00
Benjamin Cousaert 26f66f8bff Add cancancan to admins 2014-12-15 19:43:02 +01:00
Tom Naessens e76a139205 Add the migrations, add the category to the form 2014-12-10 21:25:21 +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
Benjamin Cousaert f6a37a80cf Fix balance and order paying 2014-12-10 10:00:00 +01:00
Benjamin Cousaert 11097ccfb9 fix some shit 2014-12-10 09:20:12 +01:00
Tom Naessens 4ecfac5070 Add avatar to users 2014-12-09 22:32:54 +01:00
Benjamin Cousaert 0d94b3e383 Merge 2014-12-09 20:29:37 +01:00
Benjamin Cousaert 9fe6bf7530 Add dagschotel to users 2014-12-09 20:28:50 +01:00
Tom Naessens bdf4b6771f Add cancan, fix header, add admins 2014-12-09 19:44:58 +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 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 1a50fb5cf2 Make things a lot more beautiful 2014-12-09 14:39:27 +01:00
Benjamin Cousaert a52f74d1a1 Remove admins 2014-12-09 13:10:15 +01:00
Benjamin Cousaert ee5ebd7ba4 Add payment after order create for users 2014-12-09 10:57:38 +01:00
Benjamin Cousaert 12b3a68972 Add total price to order form 2014-12-09 09:43:21 +01:00
Benjamin Cousaert 3e7658df9f Add devise for admins 2014-12-09 07:05:30 +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 5efef27454 remove some sql queries 2014-12-06 17:51:41 +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 552f811fea Add paperclip to gems and avatar to products 2014-12-04 20:32:31 +01:00
Benjamin Cousaert 182932abf5 Add Annotate Gem and some more validations 2014-12-04 19:50:02 +01:00
Benjamin Cousaert 95aaca802f Fix view of orders/new 2014-12-04 17:02:08 +01:00
Benjamin Cousaert 3553901b7c Add counter for number of each product in order 2014-11-29 11:06:22 +01:00
Benjamin Cousaert 64113790cf belongs_to a single instance of model 2014-11-25 21:34:29 +01:00
Benjamin Cousaert 60bf8030e5 Add many to many relation between orders and products 2014-11-25 14:27:27 +01:00
Benjamin Cousaert b423a9d0e8 Add some validations to User and errors to form 2014-11-25 11:30:55 +01:00
ohsab 73e24e2b55 shit werkt met vuile hacks 2014-11-25 02:01:57 +01:00
ohsab cd78e5719d order form almost done 2014-11-24 21:45:32 +01:00
ohsab 4318f5b56a 't moet af, orders werken 2014-11-23 21:12:31 +01:00