Commit graph

380 commits

Author SHA1 Message Date
benji efa85e7758 Add some useful flash messages 2015-09-26 11:57:41 +02:00
benji 1848edea8b Use radix for javascript parseInt 2015-09-25 17:11:26 +02:00
benji 19dec68c59 add workflow for adding products/stock through barcodes 2015-09-25 14:24:32 +02:00
benji bfe86ae481 Change barcode to a has_many relation 2015-09-23 11:09:24 +02:00
benji 0885359d71 users controller test 2015-09-22 20:06:50 +02:00
benji e8f4fe6849 Products controller test 2015-09-22 07:43:31 +02:00
benji 71659e246d Change koelkast login to login with token 2015-09-22 07:13:35 +02:00
benji 046b2c382c Merge branch 'master' into barcode 2015-09-21 19:07:03 +02:00
benji e9aa52736a Fix calculate_price when order_item without product is provided 2015-09-21 17:38:22 +02:00
benji 0581a7238d order test 2015-09-21 16:35:54 +02:00
benji b608d2b5c1 user test 2015-09-21 15:54:56 +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 f05c25e405 tab callback for user balance 2015-09-21 12:46:39 +02:00
benji 571fce83fd Add warning for testfase 2015-09-21 12:25:27 +02:00
benji 4f24651b84 Annotate 2015-09-21 08:54:50 +02:00
benji 2287cbeddd Edit order_item test 2015-09-21 08:50:21 +02:00
benji e9d89c1e95 Edit product test 2015-09-21 08:40:15 +02:00
benji a28c89469e Edit abiltiy test 2015-09-21 08:23:43 +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 7cc16748bf remove unnecessary fields from devise 2015-09-18 21:11:45 +02:00
benji 17a54723ec Remove index and destroy on userscontroller 2015-09-18 21:05:32 +02:00
benji 4fcc598193 fix tests 2015-09-18 21:00:58 +02:00
benji ce044e8818 Revert "Fix tests"
This reverts commit a9b331b193.
2015-09-18 20:59:06 +02:00
benji a9b331b193 Fix tests 2015-09-18 20:49:12 +02:00
benji c36fe9453a Change call_api_after back 2015-09-18 17:16:41 +02:00
benji c11ee57425 Fix tests 2015-09-18 16:49:41 +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 d3f32a89aa change uid to name in devise initializers 2015-09-18 14:21:13 +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 052989e819 Remove bin from linked dirs 2015-09-12 11:33:54 +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 fc5fa70980 Add capistrano support for delayed job 2015-09-12 11:27:33 +02:00
benji 825dee8e02 Add delayed job to post requests to tab 2015-09-12 11:17:58 +02:00
Tom Naessens 4b297496c3 Add URL in readme 2015-09-09 14:27:09 +02:00
Tom Naessens f027735015 Use new travis infrastructure 2015-09-09 14:18:17 +02:00
Tom Naessens f1bbf77f1b Merge branch 'master' of github.com:ZeusWPI/Tap 2015-09-09 14:18:01 +02:00
Tom Naessens f5185cfe69 Use the .ruby-version for travis tests 2015-09-09 14:13:54 +02:00