Commit graph

199 commits

Author SHA1 Message Date
benji 5b922ceab5 Add way to see changes in quickpay 2015-10-28 16:57:11 +01:00
benji e8e4fc6855 Old tab in footer 2015-10-27 23:00:01 +01:00
benji 3299f46ed7 Rewrite flash messages 2015-10-27 22:54:06 +01:00
benji 6b3e57ab45 Add barcodes index and destroy 2015-10-27 22:09:01 +01:00
benji aec212e754 Really fix it 2015-10-27 17:11:12 +01:00
benji 8099de435b Fix 69 2015-10-26 18:57:59 +01:00
benji 4c1a630415 Some view changes to make stuff more obvious 2015-10-07 14:52:44 +02:00
benji e6264fd6c8 Move some stuff to barcodecontroller where it belongs + refactoring 2015-09-28 21:51:40 +02:00
benji bd27ac3cca Add styling to stockentry 2015-09-26 12:13:43 +02:00
benji 19dec68c59 add workflow for adding products/stock through barcodes 2015-09-25 14:24:32 +02:00
benji 0885359d71 users controller test 2015-09-22 20:06:50 +02:00
benji 046b2c382c Merge branch 'master' into barcode 2015-09-21 19:07:03 +02:00
benji 5a538a924b oops 2015-09-21 13:00:22 +02:00
benji ec2174171d format balance 2015-09-21 12:48:30 +02:00
benji 571fce83fd Add warning for testfase 2015-09-21 12:25:27 +02:00
benji 6403835872 Use barcode to create new order 2015-09-20 21:21:18 +02:00
benji ec2b516727 Refactor views 2015-09-19 11:05:43 +02:00
benji 17a54723ec Remove index and destroy on userscontroller 2015-09-18 21:05:32 +02:00
benji 442c694122 Fix some small bugs 2015-09-17 15:32:39 +02:00
benji ef75909298 Change erb to haml 2015-09-17 14:05:33 +02:00
benji b55ba47209 Refactor 2015-09-14 20:26:16 +02:00
benji de1436f5c7 Allow destroying of orders 2015-09-14 17:52:25 +02:00
benji 251d3b69b7 Move tab api to seperate job 2015-09-14 17:29:00 +02:00
benji 891e596fda replace tab api key to secrets 2015-09-12 11:47:00 +02:00
benji 5ba36e431f Merge branch 'rspec' 2015-09-12 11:30:59 +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 0f5bfa0432 Annnd another substitute 2015-09-08 13:35:56 +02:00
Tom Naessens 8ac363911e s/tab/tap/g 2015-09-08 13:30:18 +02:00
Tom Naessens d9cc0ee30e Merge branch 'master' of github.com:ZeusWPI/Tap 2015-09-02 14:58:30 +02:00
Tom Naessens 90f4baa546 Fix order/new button group wrapping (closes #65) 2015-09-02 14:58:23 +02:00
benji c0fe8833fa Remove unpermitted parameters and javascript error in orders 2015-09-02 14:35:29 +02:00
benji 4e88be6562 Clean up the validation code of stock 2015-09-02 12:57:41 +02:00
benji 0862b275fc Create actionmodel stock/stockentry and change form 2015-09-01 23:13:20 +02:00
benji b7c292275b Remove schulden for admins as this has been moved to a seperate application 2015-09-01 18:15:27 +02:00
benji 7b345f28a8 Do some styling 2015-09-01 17:40:18 +02:00
benji 43190104ec Add user avatar to user#show 2015-09-01 16:51:21 +02:00
benji 10d52c806d Use actual value for products count instead of fix number 2015-09-01 16:21:43 +02:00
benji 7014201510 Change some styling 2015-09-01 14:52:20 +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
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