midgard
/
tap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
602 Commits 1 Branch 0 Tags 1.5 MiB
Commit Graph

392 Commits

Author SHA1 Message Date
benji 8099de435b Fix 69 2015-10-26 18:57:59 +01:00
benji 344f259efd Use try so it doesn't crash 2015-10-07 16:49:29 +02:00
benji 3d9afce424 load barcode 2015-10-07 16:42:05 +02:00
benji cf4cb74087 authorization 2015-10-07 16:39:06 +02:00
benji d575de04eb Relative url 2015-10-07 16:04:09 +02:00
benji 5b22c54c0f shallow 2015-10-07 15:55:47 +02:00
benji f0032448d5 Ability 2015-10-07 15:52:05 +02:00
benji c8b21ed1d1 Load barcode through product 2015-10-07 15:34:22 +02:00
benji 0baa857458 urgh 2015-10-07 15:10:14 +02:00
benji 328f806d39 Change token login to get 2015-10-07 15:06:01 +02: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 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 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 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 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 17a54723ec Remove index and destroy on userscontroller 2015-09-18 21:05:32 +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
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
David Vandorpe 849d9ce04b Product calories: DB migration + Model update + attribute permit 2015-07-07 20:11:37 +02:00
benji 5a5fbdf1c9 Fix #38 2015-07-01 23:51:26 +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 bf52027229 Add image_tag of avatar on user edit page 2015-07-01 11:16:08 +02:00
benji f5c970af53 Fix css on order_items 2015-06-30 23:33:11 +02:00
benji 2f71e95a81 Add private option to users 2015-06-30 22:30:34 +02:00
benji 97fdd2e24c Change orderitems from text inputs to number fields 2015-04-04 04:13:30 +02:00
benji ec36ac619f use english locale 2015-04-04 03:38:29 +02:00
benji eda0d86e74 Fix #47 2015-04-04 03:26:25 +02:00
benji 8e5ccfed7a urgh 2015-04-04 02:50:26 +02:00
benji d8f77442ab comma and empty token in development 2015-04-04 01:51:11 +02:00
benji 0105c30a36 secrets 2015-04-04 01:47:02 +02:00
benji be9c967db2 Add slack notification 2015-04-04 01:44:28 +02:00
benji 9ec9f043ed Merge pull request #46 from ZeusWPI/products_list 
Products list
 2015-04-03 23:56:48 +02:00
benji 99c49db848 change products to table view 2015-04-03 23:56:13 +02:00
benji bd67675472 add #42 2015-04-03 22:19:47 +02:00
benji 9f898fa832 fix #45 2015-04-03 22:01:20 +02:00
benji f4cc8a9a27 Fix #43 2015-04-03 21:27:03 +02:00
benji 0bcbc20702 change index of products in table view 2015-03-28 14:36:07 +01:00
benji 4e651882e9 Add seeds for don 2015-03-26 12:45:45 +01:00
benji e4e717084b put back database_authenticatable to users, fix empty avatar form bug 2015-03-25 17:49:37 +01:00
benji efd4dcbb2c Replace multistep registration by default avatar from identicon 2015-03-23 11:54:15 +01:00
benji 33ffcfdb9b remove database_authenticatable from user and fix paths 2015-03-21 17:58:49 +01:00
benji a97a64b6db Fix user_avatar url 2015-03-21 13:00:24 +01:00
benji 6cbf3df70e No root path when session present 2015-03-20 04:54:44 +01:00
benji 67285d8107 Add logout button for sessions 2015-03-20 04:20:39 +01:00
benji 3ecb2b53d8 Add user avatar after user creation 2015-03-20 03:57:00 +01:00
benji 7a5b1f20dd tests and travis succeeding 2015-03-20 02:33:37 +01:00
benji 6ca2ecebc2 Change devise to handle oauth 2015-03-20 02:21:56 +01:00
benji eaa076b508 Add oauth 2015-03-19 22:37:16 +01:00
benji bbf6adef38 remove text field for search 2015-03-19 18:46:41 +01:00
benji 46fd14a0a5 tests working 2015-03-19 18:04:58 +01:00
benji a4245c1331 Change users to table, fix seeds and remove name and lastname from users 2015-03-19 17:38:59 +01:00
benji 6ec27acaf8 Refactor dagschotel and make test succeed again 2015-03-19 16:22:55 +01:00
benji 191517bda7 Lot of styles, and some other stuff 2015-03-19 14:59:37 +01:00
benji 0c06c4bedb Change some css and refactor some controller actions 2015-03-12 13:25:11 +01:00
benji 3a11861bb0 Fix html validator on numberfield 2015-03-10 12:14:54 +01:00
benji 01c777baa1 Do some extra shit 2015-03-10 11:37:48 +01:00
benji 35fc8ecc77 Add test for placing order 2015-03-09 13:17:41 +01:00
benji ec597ff1aa Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-03-05 10:17:04 +01:00
benji c99fc4e492 Remove complexity from formbuilder 2015-03-05 10:16:58 +01:00
benji bb36147721 Merge pull request #27 from ZeusWPI/test_coverage 
Test coverage
 2015-03-04 20:17:08 +01:00
benji ea93a4c456 Remove ugly constraint 2015-03-03 20:11:50 +01:00
Tleilaxu 72cfaadfe3 Fixed pixel 2015-03-03 19:45:13 +01:00
benji 0bca2c8c23 gitignore 2015-03-03 16:40:06 +01:00
benji 7d367a154d Only show button on own user page 2015-03-02 16:11:44 +01:00
benji b8b89aa779 Add order button on user profile page 2015-03-02 16:10:54 +01:00
benji 35876715f6 Add contextmenu for keyboard 2015-02-20 15:05:11 +01:00
benji cec6a43ca1 Extra css on start page 2015-02-20 13:34:48 +01:00
benji 1c6be64e5c Merge branch 'master' of https://github.com/ZeusWPI/Tab 2015-02-20 09:21:24 +01:00
benji 82be0ceca4 Add more users on overview screen 2015-02-20 09:21:18 +01:00
benji c2d5db70df Merge pull request #25 from ZeusWPI/21/buttons 
21/buttons
 2015-02-19 18:14:35 +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
benji d8cf9e443e Clarify schuld in orders/new 2015-02-19 18:12:57 +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
benji c642bf69c9 Remove footer for koelkast 2015-02-19 17:25:55 +01:00
Tleilaxu b455d17231 Merge branch 'master' of github.com:ZeusWPI/Tab into 21/buttons 2015-02-19 17:13:46 +01:00
Tleilaxu b6283e8c32 Fixed pixel, added style to logo 2015-02-19 17:04:01 +01:00
benji 66a8dc4f68 Merge pull request #23 from ZeusWPI/profile_page_style 
Styling on profile pages
 2015-02-19 15:44:49 +01:00
Caroline De Brouwer f9e2c7e104 Styling on profile pages 2015-02-19 15:41:12 +01:00
Tleilaxu df87f5f4e6 Used bootstrap button size classes 2015-02-19 15:30:13 +01:00
Tleilaxu 08c37fd80b Bigger order buttons on mobile devices 2015-02-18 21:16:27 +01:00
benji 78a0ae15bf re-add pictures 2015-02-17 15:35:15 +01:00
Caroline De Brouwer 5b5c454e0e Merge conflict 2015-02-12 16:19:41 +01:00
Caroline De Brouwer 52b397e250 Stijltjes op producten en al een beetje op profiles 2015-02-12 16:14:11 +01:00
benji 3b1a571b0b Euro helper fix negative numbers, and reverse orders of orders on user#show 2015-02-12 15:31:32 +01:00