Commit graph

54 commits

Author SHA1 Message Date
benji
bfe86ae481 Change barcode to a has_many relation 2015-09-23 11:09:24 +02:00
benji
6403835872 Use barcode to create new order 2015-09-20 21:21:18 +02:00
benji
7cc16748bf remove unnecessary fields from devise 2015-09-18 21:11:45 +02:00
benji
76f8332e97 Remove some gems 2015-09-18 13:20:57 +02:00
benji
de1436f5c7 Allow destroying of orders 2015-09-14 17:52:25 +02:00
benji
02b27233cd Save transaction id 2015-09-14 11:20:52 +02:00
benji
48aaaa354d Merge branch 'master' into rspec 2015-09-12 11:30:09 +02:00
benji
825dee8e02 Add delayed job to post requests to tab 2015-09-12 11:17:58 +02:00
Tom Naessens
90f4baa546 Fix order/new button group wrapping (closes #65) 2015-09-02 14:58:23 +02:00
benji
a220397a33 Fix wrong migration 2015-09-01 15:12: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
2f71e95a81 Add private option to users 2015-06-30 22:30:34 +02:00
benji
e4e717084b put back database_authenticatable to users, fix empty avatar form bug 2015-03-25 17:49:37 +01:00
benji
33ffcfdb9b remove database_authenticatable from user and fix paths 2015-03-21 17:58:49 +01:00
benji
6ca2ecebc2 Change devise to handle oauth 2015-03-20 02:21:56 +01:00
benji
a4245c1331 Change users to table, fix seeds and remove name and lastname from users 2015-03-19 17:38:59 +01:00
benji
6ec27acaf8 Refactor dagschotel and make test succeed again 2015-03-19 16:22:55 +01:00
benji
191517bda7 Lot of styles, and some other stuff 2015-03-19 14:59:37 +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
Caroline De Brouwer
52b397e250 Stijltjes op producten en al een beetje op profiles 2015-02-12 16:14:11 +01:00
benji
835f08b60c Fix order bug 2015-02-10 08:33:51 +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
4b05623a96 fix price bug for products 2015-02-04 17:05:02 +01:00
benji
9e72274629 add stock to products and some clean up 2015-01-15 00:39:34 +01:00
benji
db23fd2181 Add koelkast to users 2015-01-06 20:18:01 +01:00
Tom Naessens
e76a139205 Add the migrations, add the category to the form 2014-12-10 21:25:21 +01:00
Tom Naessens
1e0f04ada2 Initially disable the btn-dec 2014-12-10 20:47:56 +01:00
Benjamin Cousaert
744f8090ba Add orders_count and ordering on overview 2014-12-10 10:09:53 +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
ohsab
3ddead7943 layout 2014-12-09 21:25:34 +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
a52f74d1a1 Remove admins 2014-12-09 13:10:15 +01:00
Benjamin Cousaert
3e7658df9f Add devise for admins 2014-12-09 07:05:30 +01:00
Benjamin Cousaert
ebf2275c94 Remove purchase_price from products and rename sale_price 2014-12-08 17:03:54 +01:00
Benjamin Cousaert
552f811fea Add paperclip to gems and avatar to products 2014-12-04 20:32:31 +01:00
Benjamin Cousaert
3553901b7c Add counter for number of each product in order 2014-11-29 11:06:22 +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
cd78e5719d order form almost done 2014-11-24 21:45:32 +01:00