benji
|
571fce83fd
|
Add warning for testfase
|
2015-09-21 12:25:27 +02:00 |
|
|
benji
|
b81a615408
|
@user
|
2015-09-18 15:53:45 +02:00 |
|
|
benji
|
397dd169a6
|
place extra ability
|
2015-09-18 15:46:11 +02:00 |
|
|
benji
|
76f8332e97
|
Remove some gems
|
2015-09-18 13:20:57 +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
|
5e666d8cb8
|
Fix failing tests
|
2015-09-14 20:55:49 +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
|
02b27233cd
|
Save transaction id
|
2015-09-14 11:20:52 +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
|
c24d7ad956
|
Implement tab api cancelled
|
2015-09-12 11:28:50 +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
|
81691282f8
|
Merge branch 'master' of github.com:ZeusWPI/Tap
|
2015-09-08 13:30:24 +02:00 |
|
|
Tom Naessens
|
8ac363911e
|
s/tab/tap/g
|
2015-09-08 13:30:18 +02:00 |
|
|
benji
|
28774b3175
|
Add tests for user controller
|
2015-09-07 21:15:16 +02:00 |
|
|
benji
|
084e542dd5
|
Add tests for products_controller
|
2015-09-07 14:26:07 +02:00 |
|
|
benji
|
b1dbe76746
|
Add order price test
|
2015-09-04 16:47:49 +02:00 |
|
|
benji
|
3c4ada0704
|
Remove slack support from Tap
|
2015-09-04 14:14:49 +02:00 |
|
|
benji
|
43fd368bc7
|
Add tests for order_items
|
2015-09-04 13:23:51 +02:00 |
|
|
benji
|
168b723dce
|
Add tests for product validations
|
2015-09-03 23:12:20 +02:00 |
|
|
benji
|
bb76b36d86
|
Add tests for cancelling orders
|
2015-09-03 10:08:17 +02:00 |
|
|
benji
|
ae28317b07
|
Remove minitest and add rspec with factories
|
2015-09-02 20:33:35 +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
|
c668cc1ab9
|
cancancan fix
|
2015-08-31 15:35:59 +02:00 |
|
|
benji
|
da278491b1
|
Fix authorization for orders using cancancan
|
2015-08-31 15:10: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 |
|
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
|
595d8ed282
|
Forgot to commit helper
|
2015-07-08 17:43:20 +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 |
|