Commit graph

  • 80899f21aa double barcodes benji 2015-10-27 20:57:43 +0100
  • 91061f053f Put back 5minute limit for api call benji 2015-10-27 17:40:08 +0100
  • aec212e754 Really fix it benji 2015-10-27 17:11:12 +0100
  • 9c9511b95e Add error when barcode not found benji 2015-10-27 16:52:06 +0100
  • 62075f9cb1 Remove redirect loop for koelkast benji 2015-10-27 16:31:10 +0100
  • ffda2a4b26 Merge pull request #75 from ZeusWPI/feature/69/add-undo-button benji 2015-10-26 19:08:00 +0100
  • 8099de435b Fix 69 benji 2015-10-26 18:57:59 +0100
  • 344f259efd Use try so it doesn't crash benji 2015-10-07 16:49:29 +0200
  • 3d9afce424 load barcode benji 2015-10-07 16:42:05 +0200
  • cf4cb74087 authorization benji 2015-10-07 16:39:06 +0200
  • 3fc7f9f884 Remove delayedjob info from log benji 2015-10-07 16:20:58 +0200
  • d575de04eb Relative url benji 2015-10-07 16:04:09 +0200
  • 5b22c54c0f shallow benji 2015-10-07 15:55:47 +0200
  • f0032448d5 Ability benji 2015-10-07 15:52:05 +0200
  • c8b21ed1d1 Load barcode through product benji 2015-10-07 15:34:22 +0200
  • 0baa857458 urgh benji 2015-10-07 15:10:14 +0200
  • 328f806d39 Change token login to get benji 2015-10-07 15:06:01 +0200
  • 88096fc46a Merge pull request #72 from ZeusWPI/barcode benji 2015-10-07 14:55:11 +0200
  • 4c1a630415 Some view changes to make stuff more obvious benji 2015-10-07 14:52:44 +0200
  • e6264fd6c8 Move some stuff to barcodecontroller where it belongs + refactoring benji 2015-09-28 21:51:40 +0200
  • f35f8bec41 Fix tests benji 2015-09-26 16:26:58 +0200
  • bd27ac3cca Add styling to stockentry benji 2015-09-26 12:13:43 +0200
  • efa85e7758 Add some useful flash messages benji 2015-09-26 11:57:41 +0200
  • 1848edea8b Use radix for javascript parseInt benji 2015-09-25 17:11:26 +0200
  • 19dec68c59 add workflow for adding products/stock through barcodes benji 2015-09-25 14:24:32 +0200
  • bfe86ae481 Change barcode to a has_many relation benji 2015-09-23 11:09:24 +0200
  • 0885359d71 users controller test benji 2015-09-22 20:06:50 +0200
  • e8f4fe6849 Products controller test benji 2015-09-22 07:43:31 +0200
  • 71659e246d Change koelkast login to login with token benji 2015-09-22 07:13:35 +0200
  • 046b2c382c Merge branch 'master' into barcode benji 2015-09-21 19:07:03 +0200
  • e9aa52736a Fix calculate_price when order_item without product is provided benji 2015-09-21 17:38:22 +0200
  • 0581a7238d order test benji 2015-09-21 16:35:54 +0200
  • b608d2b5c1 user test benji 2015-09-21 15:54:56 +0200
  • 5a538a924b oops benji 2015-09-21 13:00:22 +0200
  • ec2174171d format balance benji 2015-09-21 12:48:30 +0200
  • f05c25e405 tab callback for user balance benji 2015-09-21 12:46:39 +0200
  • 571fce83fd Add warning for testfase benji 2015-09-21 12:25:27 +0200
  • 4f24651b84 Annotate benji 2015-09-21 08:54:50 +0200
  • 2287cbeddd Edit order_item test benji 2015-09-21 08:50:21 +0200
  • e9d89c1e95 Edit product test benji 2015-09-21 08:40:15 +0200
  • a28c89469e Edit abiltiy test benji 2015-09-21 08:23:43 +0200
  • 6403835872 Use barcode to create new order benji 2015-09-20 21:21:18 +0200
  • ec2b516727 Refactor views benji 2015-09-19 11:05:43 +0200
  • 7cc16748bf remove unnecessary fields from devise benji 2015-09-18 21:11:45 +0200
  • 17a54723ec Remove index and destroy on userscontroller benji 2015-09-18 21:05:32 +0200
  • 4fcc598193 fix tests benji 2015-09-18 21:00:58 +0200
  • ce044e8818 Revert "Fix tests" benji 2015-09-18 20:59:06 +0200
  • a9b331b193 Fix tests benji 2015-09-18 20:49:12 +0200
  • c36fe9453a Change call_api_after back benji 2015-09-18 17:16:41 +0200
  • c11ee57425 Fix tests benji 2015-09-18 16:49:41 +0200
  • b81a615408 @user benji 2015-09-18 15:53:45 +0200
  • 397dd169a6 place extra ability benji 2015-09-18 15:46:11 +0200
  • d3f32a89aa change uid to name in devise initializers benji 2015-09-18 14:21:13 +0200
  • 76f8332e97 Remove some gems benji 2015-09-18 13:20:57 +0200
  • 442c694122 Fix some small bugs benji 2015-09-17 15:32:39 +0200
  • ef75909298 Change erb to haml benji 2015-09-17 14:05:33 +0200
  • 5e666d8cb8 Fix failing tests benji 2015-09-14 20:55:49 +0200
  • b55ba47209 Refactor benji 2015-09-14 20:26:16 +0200
  • de1436f5c7 Allow destroying of orders benji 2015-09-14 17:52:25 +0200
  • 251d3b69b7 Move tab api to seperate job benji 2015-09-14 17:29:00 +0200
  • 02b27233cd Save transaction id benji 2015-09-14 11:20:52 +0200
  • 891e596fda replace tab api key to secrets benji 2015-09-12 11:47:00 +0200
  • 052989e819 Remove bin from linked dirs benji 2015-09-12 11:33:54 +0200
  • 5ba36e431f Merge branch 'rspec' benji 2015-09-12 11:30:59 +0200
  • 48aaaa354d Merge branch 'master' into rspec benji 2015-09-12 11:30:09 +0200
  • c24d7ad956 Implement tab api cancelled benji 2015-09-12 11:28:50 +0200
  • fc5fa70980 Add capistrano support for delayed job benji 2015-09-12 11:27:33 +0200
  • 825dee8e02 Add delayed job to post requests to tab benji 2015-09-12 11:17:58 +0200
  • 4b297496c3 Add URL in readme Tom Naessens 2015-09-09 14:27:09 +0200
  • f027735015 Use new travis infrastructure Tom Naessens 2015-09-09 14:18:17 +0200
  • f1bbf77f1b Merge branch 'master' of github.com:ZeusWPI/Tap Tom Naessens 2015-09-09 14:18:01 +0200
  • f5185cfe69 Use the .ruby-version for travis tests Tom Naessens 2015-09-09 14:13:54 +0200
  • d74b1510a8 Update README.md Tom Naessens 2015-09-09 14:09:25 +0200
  • 0f5bfa0432 Annnd another substitute Tom Naessens 2015-09-08 13:35:56 +0200
  • 957fc54d1a Forgot a sub Tom Naessens 2015-09-08 13:34:36 +0200
  • 81691282f8 Merge branch 'master' of github.com:ZeusWPI/Tap Tom Naessens 2015-09-08 13:30:24 +0200
  • 8ac363911e s/tab/tap/g Tom Naessens 2015-09-08 13:30:18 +0200
  • 28774b3175 Add tests for user controller benji 2015-09-07 21:15:16 +0200
  • fee873126a fix (?) bug on travis benji 2015-09-07 14:39:45 +0200
  • 084e542dd5 Add tests for products_controller benji 2015-09-07 14:26:07 +0200
  • d9166b8280 Update README.md Donvittorio 2015-09-07 13:36:10 +0200
  • 003e0bc88b Add tests for ability benji 2015-09-04 18:13:58 +0200
  • c6ce9886de Fix typo and change travis config and ruby version benji 2015-09-04 17:28:15 +0200
  • ebbc8ce471 Finish tests for models benji 2015-09-04 17:17:33 +0200
  • b1dbe76746 Add order price test benji 2015-09-04 16:47:49 +0200
  • 3c4ada0704 Remove slack support from Tap benji 2015-09-04 14:14:49 +0200
  • 43fd368bc7 Add tests for order_items benji 2015-09-04 13:23:51 +0200
  • 168b723dce Add tests for product validations benji 2015-09-03 23:12:20 +0200
  • bb76b36d86 Add tests for cancelling orders benji 2015-09-03 10:08:17 +0200
  • ae28317b07 Remove minitest and add rspec with factories benji 2015-09-02 20:33:35 +0200
  • d9cc0ee30e Merge branch 'master' of github.com:ZeusWPI/Tap Tom Naessens 2015-09-02 14:58:30 +0200
  • 90f4baa546 Fix order/new button group wrapping (closes #65) Tom Naessens 2015-09-02 14:58:23 +0200
  • 3f43dd8cd5 Merge branch 'master' of https://github.com/ZeusWPI/Tap benji 2015-09-02 14:35:36 +0200
  • c0fe8833fa Remove unpermitted parameters and javascript error in orders benji 2015-09-02 14:35:29 +0200
  • 060d4b6a0c Fix asset pipeline stuff Tom Naessens 2015-09-02 14:05:25 +0200
  • 4e88be6562 Clean up the validation code of stock benji 2015-09-02 12:57:41 +0200
  • ea360dc028 Merge pull request #63 from ZeusWPI/active_model_for_stock_form benji 2015-09-01 23:39:48 +0200
  • 9850a63781 Remove fixtures for activemodel benji 2015-09-01 23:22:28 +0200
  • 0862b275fc Create actionmodel stock/stockentry and change form benji 2015-09-01 23:13:20 +0200
  • b7c292275b Remove schulden for admins as this has been moved to a seperate application benji 2015-09-01 18:15:27 +0200