Commit graph

404 commits

Author SHA1 Message Date
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
ebf2275c94 Remove purchase_price from products and rename sale_price 2014-12-08 17:03:54 +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
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
182932abf5 Add Annotate Gem and some more validations 2014-12-04 19:50:02 +01:00
Benjamin Cousaert
9e598c5751 Fix controller orders create action 2014-12-04 19:28:21 +01:00
Benjamin Cousaert
95aaca802f Fix view of orders/new 2014-12-04 17:02:08 +01:00
Benjamin Cousaert
cb17fdc1a7 Merge branch 'master' of github.com:ZeusWPI/Tab 2014-11-29 11:06:34 +01:00
Benjamin Cousaert
3553901b7c Add counter for number of each product in order 2014-11-29 11:06:22 +01:00
ohsab
a52c50531e clean up 2014-11-26 12:01:22 +01:00
ohsab
b2b9a7a188 clean up 2014-11-26 11:58:51 +01:00
Benjamin Cousaert
64113790cf belongs_to a single instance of model 2014-11-25 21:34:29 +01:00
ohsab
1c0a313fdb header 2014-11-25 16:42:07 +01:00
ohsab
fd05ea2d64 header 2014-11-25 16:40:22 +01:00
Benjamin Cousaert
c986683273 fix routes 2014-11-25 16:38:08 +01:00
ohsab
e2e9582211 HEADER IS GEFIXED SILOX STOP ME HATEN 2014-11-25 16:25:00 +01:00
ohsab
9309ae60dc user show 2014-11-25 16:18:11 +01:00
ohsab
7d082a64a7 Merge branch 'master' of https://github.com/ZeusWPI/Tab 2014-11-25 16:16:21 +01:00
ohsab
45d10ca9f7 routes overview fix 2014-11-25 16:13:04 +01:00
ohsab
5c07c0b2cc routes fixed, orders need to be nested 2014-11-25 15:27:12 +01:00
Benjamin Cousaert
60bf8030e5 Add many to many relation between orders and products 2014-11-25 14:27:27 +01:00
ohsab
2575133ce2 product edit fixed 2014-11-25 13:41:22 +01:00
ohsab
95ea927ba2 Merge branch 'master' of https://github.com/ZeusWPI/Tab 2014-11-25 13:12:51 +01:00
ohsab
69dc9ce05a admin interface 2014-11-25 13:09:55 +01:00
Benjamin Cousaert
b423a9d0e8 Add some validations to User and errors to form 2014-11-25 11:30:55 +01:00
Tom Naessens
b6cba92124 Don't specify ruby version in gemfile 2014-11-25 10:16:07 +01:00
Tom Naessens
52eea26c8a Add linked files 2014-11-25 10:10:47 +01:00
Tom Naessens
96fbe2c4b8 Random dots? 2014-11-25 10:05:00 +01:00
Tom Naessens
9a97cc94e1 Added capistrano 2014-11-25 10:00: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
Basho
df24bcd58e gefaalde orders 2014-11-10 22:57:37 +01:00
ohsab
6b9e67ba2d kben naar huis 2014-11-10 17:50:11 +01:00
ohsab
d47e9af80c product edits 2014-11-10 17:06:50 +01:00
ohsab
c62b064128 producten 2014-11-10 15:52:54 +01:00
Basho
3dd5873a55 orders create 2014-11-10 02:30:42 +01:00
Basho
d3cdb9fcd7 order model 2014-11-09 22:53:39 +01:00
ohsab
c54e13978a user acces dingen, toverpoort 2014-11-06 22:53:11 +01:00
ohsab
44805c3a5a þ 2014-11-06 21:31:21 +01:00
MatsMyncke
a508f56642 ik kom naar de kelder 2014-11-06 20:07:18 +01:00
MatsMyncke
af6f2668e6 logout 2014-11-06 18:56:00 +01:00
MatsMyncke
ec6ca60887 orderslink 2014-11-06 18:31:47 +01:00