5852 Commits

Author	SHA1	Message	Date
Will Marshall	3ed569b24a	Patching a couple of borked specs	2014-04-24 09:52:29 +10:00
Will Marshall	b4da348e36	Patching a json test	2014-04-23 16:58:38 +10:00
Will Marshall	0479a0a55d	Fixing bugs, improving dates	2014-04-23 15:46:14 +10:00
Will Marshall	16251fe5ea	Merging with master	2014-04-23 14:43:39 +10:00
Will Marshall	2981412540	Adding some specs, next order cycle, better CSS	2014-04-23 14:38:41 +10:00
Rob H	b37a701d39	Merge branch 'api_fixes' into bom	2014-04-23 12:03:01 +10:00
Rob H	669ec0eee7	Fix failing API specs	2014-04-23 12:02:27 +10:00
Will Marshall	99d743f7cf	Some very basic specs	2014-04-18 16:35:06 +10:00
Will Marshall	a5a3f9fe43	Fixing up some minor spec bugs	2014-04-17 17:22:30 +10:00
Rob H	2532248e6f	Fix failing javascript tests	2014-04-17 15:27:15 +10:00
Will Marshall	c6395a686a	Adding flash notifications	2014-04-17 15:08:01 +10:00
Rob H	5345e8d339	Add accessible_by scope to enterprises model and accessible action to enterprises API	2014-04-17 12:23:09 +10:00
Rob H	20a5278a75	Merge branch 'master' into bom	2014-04-17 09:23:08 +10:00
Rob H	83e3172901	Add accessible action to order_cycles controller for listing order_cycles by enterprises invloved	2014-04-16 18:27:50 +10:00
Rob H	2eb21a024c	Tiny fixes to API orders controller spec	2014-04-16 18:24:17 +10:00
Will Marshall	171c8c6ed1	Merging in with master	2014-04-16 16:16:15 +10:00
Rob H	c68aeb4c36	Only show orders I am distributing in the API	2014-04-16 14:54:50 +10:00
Rob H	2b283405e7	Only admin and users of distributors can access admin orders	2014-04-13 10:09:17 +10:00
Rohan Mitchell	6452ebf67d	Make spec more robust	2014-04-11 19:08:55 +10:00
Rohan Mitchell	47ac097eb7	Do not show deleted variants on shopfront	2014-04-11 19:08:55 +10:00
Will Marshall	9cb56c61ae	Patching a bug in which carts get emptied	2014-04-11 17:32:39 +10:00
Will Marshall	2e0485c064	Getting the entire order into localStorage: one bug with radio boxes	2014-04-11 17:24:32 +10:00
Will Marshall	c8012e7045	Improving panel workflow, moving back to simple format for Order service	2014-04-11 16:43:21 +10:00
Will Marshall	6e35dc7168	Merging with master	2014-04-11 13:09:22 +10:00
Will Marshall	9f3bf0b8f1	Pending the checkout auth tests, since they're testing a monkeypatch	2014-04-11 12:50:06 +10:00
Will Marshall	2e5425d931	Pulling over some test changes	2014-04-11 12:48:28 +10:00
Rob H	ff531f0e18	Producers can only list line items which contain products they supply	2014-04-11 09:39:01 +10:00
Will Marshall	5f62cb7ddb	Working with ngForm and subcontrollers. Also fixing bulk order specs	2014-04-10 16:32:08 +10:00
Rob H	e114aecfd0	Merge branch 'master' into bom	2014-04-10 16:30:13 +10:00
Rob H	e64bfe8ba3	Fix failing API Orders spec	2014-04-10 16:26:24 +10:00
Rob H	5c7d36ba9b	BOM: interface cleanup and adding 'Clear All' button for filters	2014-04-10 15:29:09 +10:00
Will Marshall	00f5d09d65	Moving our inputs to magical helpers	2014-04-10 14:48:22 +10:00
Will Marshall	621e58f67a	First stab at a DRY implementation	2014-04-10 12:54:18 +10:00
Rob H	645b6d5a8f	BOM: change datetimepickers to datepickers	2014-04-10 10:51:55 +10:00
Rob H	c5d5f5a9e6	BOM: view information about max quantities ordered	2014-04-10 10:33:57 +10:00
Will Marshall	093004a460	Clearing the cart when order cycle is changed	2014-04-09 15:40:41 +10:00
Will Marshall	873de1d118	Able to submit Checkout form via Ajax	2014-04-09 15:31:15 +10:00
Will Marshall	36a4e34dff	Preprocessing order attributes, returning path	2014-04-09 15:04:17 +10:00
Rohan Mitchell	e792107d7b	Make order cycle specs more robust	2014-04-09 15:02:40 +10:00
Rohan Mitchell	19ca8e142a	Do not show deleted products on shopfront	2014-04-09 15:02:40 +10:00
Will Marshall	b5550c048a	Starting on JSON checkout, moving Order properties to Order.order	2014-04-09 14:33:45 +10:00
Will Marshall	87a43fc36e	Fixing the build! Some minor bugs due to mailer changes	2014-04-09 12:19:52 +10:00
Will Marshall	09d22f74ec	Renaming some methods in our experimental	2014-04-09 11:51:12 +10:00
Will Marshall	e641d2a788	Starting to add inline validation and behaviour to checkout	2014-04-08 18:09:03 +10:00
Will Marshall	8495c13063	Patching local storage; authentication actions	2014-04-08 18:09:02 +10:00
Will Marshall	a4cba99de6	Starting to rework checkout Login links	2014-04-08 18:09:02 +10:00
Will Marshall	8084262efe	Patching a test and removing our duped Angular libs	2014-04-08 18:09:02 +10:00
Will Marshall	5ac5b74f01	Setting up a Rake task for Jasmine/Karma	2014-04-08 18:09:02 +10:00
Will Marshall	195f62dba1	Basics in place, about to rework karma config	2014-04-08 18:09:02 +10:00
Will Marshall	b99fe20b7c	Adding some SUPER clever magic and fixing some regression issues	2014-04-08 18:07:55 +10:00