Commit graph

20 commits

Author SHA1 Message Date
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 c0fe8833fa Remove unpermitted parameters and javascript error in orders 2015-09-02 14:35:29 +02:00
benji 5d39abafd5 Merge pull request #53 from VandorpeDavid/calories
Calories
2015-08-24 16:16:27 +02:00
benji 652c598722 Merge pull request #55 from VandorpeDavid/out_of_order
Red border when product is sold out
2015-08-24 16:02:29 +02:00
David Vandorpe ee86411d58 Using helper to generate kcal tag
As suggested by Benji
2015-07-08 17:38:51 +02:00
David Vandorpe d397ae7d34 Use of .zero? instead of == 0 2015-07-08 17:06:02 +02:00
David Vandorpe 24f9531192 Senpai Silox Styling Suggestions 2015-07-08 13:37:19 +02:00
David Vandorpe 91945b6983 Senpai Silox Styling Suggestions 2015-07-08 13:31:32 +02:00
David Vandorpe 7831520c6f Red border when product is sold out 2015-07-07 22:36:04 +02:00
David Vandorpe 33b797b5d9 Enforce stock max en 0 min for amount of products in orders
Fixes #48
2015-07-07 21:47:20 +02:00
David Vandorpe a8055d6f09 Adding calories to several views 2015-07-07 20:20:34 +02:00
benji dc73128508 Fix #49 2015-07-01 16:56:09 +02:00
benji 90e270a03e Avoid long product names of fucking up entire layout 2015-07-01 16:19:36 +02:00
benji 01c777baa1 Do some extra shit 2015-03-10 11:37:48 +01:00
Tleilaxu b9e5c63a9a Merge branch 'master' of github.com:ZeusWPI/Tab into 21/buttons
Conflicts:
	app/assets/stylesheets/orders.css.scss
2015-02-19 18:13:35 +01:00
Tleilaxu 0b35bb1f06 Fixed css 2015-02-19 18:08:50 +01:00
benji 7c1dee80ee fix some css 2015-02-19 18:07:34 +01:00
Tleilaxu df87f5f4e6 Used bootstrap button size classes 2015-02-19 15:30:13 +01:00
benji cf8ec8da6e Some clean up 2015-02-09 17:06:24 +01:00