Commit graph

568 commits

Author SHA1 Message Date
benji 41d67556f4 Fix ability test 2015-10-29 14:27:06 +01:00
benji b7ac8c32f7 Simplify ability 2015-10-29 14:09:52 +01:00
benji 7cc2ec6a20 product controller 2015-10-29 13:53:11 +01:00
benji f109f5eb18 Remove format html from quickpay 2015-10-29 11:54:02 +01:00
benji 6248e1211a user controller test 2015-10-29 11:50:16 +01:00
benji b5782b13d8 user test 2015-10-28 23:34:03 +01:00
benji f5e6a6e7bf product test 2015-10-28 22:58:56 +01:00
benji a453a6ada2 order test 2015-10-28 22:48:49 +01:00
benji 839151405b Remove hack for nested models 2015-10-28 22:07:48 +01:00
benji 895c523bb9 annotate 2015-10-28 21:55:59 +01:00
benji 539b65b75f barcode model test 2015-10-28 21:54:55 +01:00
benji 8906ca7e39 Add flash messages on quickpay 2015-10-28 20:48:49 +01:00
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 80899f21aa double barcodes 2015-10-27 20:57:43 +01:00
benji 91061f053f Put back 5minute limit for api call 2015-10-27 17:40:08 +01:00
benji aec212e754 Really fix it 2015-10-27 17:11:12 +01:00
benji 9c9511b95e Add error when barcode not found 2015-10-27 16:52:06 +01:00
benji 62075f9cb1 Remove redirect loop for koelkast 2015-10-27 16:31:10 +01:00
benji ffda2a4b26 Merge pull request #75 from ZeusWPI/feature/69/add-undo-button
Fix #69
2015-10-26 19:08:00 +01:00
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 3fc7f9f884 Remove delayedjob info from log 2015-10-07 16:20:58 +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 88096fc46a Merge pull request #72 from ZeusWPI/barcode
Barcode
2015-10-07 14:55:11 +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 f35f8bec41 Fix tests 2015-09-26 16:26:58 +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 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