448 Commits

Author	SHA1	Message	Date
Rohan Mitchell	9b15c213d1	When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges	2014-05-23 11:28:00 +10:00
Will Marshall	272cb0469f	Setting up after_login redirects	2014-05-22 12:40:46 +10:00
Rohan Mitchell	c2f762d570	Enterprise user can only see relationships involving their enterprises	2014-05-22 11:27:19 +10:00
Rohan Mitchell	06955a024f	Enterprise user can only create relationships with their own enterprises as parent	2014-05-22 11:02:03 +10:00
Rohan Mitchell	5d0680234d	Admin can delete enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	b9a9937541	Attempting to create a relationship with invalid data shows an error message	2014-05-21 11:29:11 +10:00
Rohan Mitchell	9b2a80c6b5	Admin can create enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	5f4e4ebeb0	Admin can list enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	aa53d82386	Add stub page for managing enterprise relationships	2014-05-21 11:29:11 +10:00
Will Marshall	391b1da04c	adding session token to order test	2014-05-21 10:46:03 +10:00
Will Marshall	ef91f8d17f	Redirecting if cart is empty and activating the empty cart link	2014-05-20 16:05:28 +10:00
Will Marshall	36aba8049f	Starting to rework login behaviour when hitting /admin	2014-05-20 16:05:28 +10:00
Will Marshall	da69167b4c	Putting error messages on checkout into error flash for easier debugging	2014-05-20 16:05:28 +10:00
Will Marshall	61cf35a5b9	Adding attr_accessors and paperclip file uploads	2014-05-20 12:18:28 +10:00
Will Marshall	0958602418	Starting on migrations and admin forms	2014-05-20 12:18:27 +10:00
Will Marshall	eab9c28d2e	Adding groups to this branch, also tidying up the shop stuff for Laura	2014-05-16 14:00:33 +10:00
Rob H	93dedb690d	Change overview controller to class_eval	2014-05-16 10:03:35 +10:00
Rob H	fd6f4d04df	Merge branch 'master' into ent-makeover	2014-05-15 17:05:05 +10:00
Rob H	7cdfb4bab2	Add methods and fees to sidebar on enterprise edit page	2014-05-15 14:52:19 +10:00
Will Marshall	5f712a8984	Removing code	2014-05-14 15:16:29 +10:00
Will Marshall	151702d685	Catching order cycle expiry and redirecting	2014-05-14 11:51:25 +10:00
Rob H	c98d2e71d8	Add scroll pane to admin dashboard	2014-05-09 17:20:53 +10:00
Will Marshall	573d479e08	Fixing test regressions	2014-05-09 16:43:57 +10:00
Rohan Mitchell	04379101e1	Change to new production hostname: openfoodnetwork.org.au	2014-05-09 16:39:39 +10:00
Rob H	05e01d02c4	Merge branch 'master' into ent-makeover	2014-05-09 15:58:17 +10:00
Rob H	01c5822fcc	Add basic dashboard to admin section	2014-05-09 15:48:58 +10:00
Rohan Mitchell	87179669a6	Change to new production hostname: openfoodnetwork.org.au	2014-05-09 11:34:52 +10:00
Will Marshall	0df2eabf95	Moving useless assets	2014-05-09 10:32:39 +10:00
Will Marshall	d9f462ba81	Moving useless assets	2014-05-09 10:12:40 +10:00
Rob H	fe5d015778	Merging in master	2014-05-07 13:07:11 +10:00
Will Marshall	23fa1c7b7b	Patching a couple more issues	2014-05-02 15:17:44 +10:00
Will Marshall	b907616749	Renaming our partials	2014-05-02 14:47:12 +10:00
Rob H	ceada3596b	Merge master into cleanup	2014-05-02 14:43:06 +10:00
Will Marshall	9bd76df116	That wasn't actually a bug! Sorry	2014-05-02 12:52:51 +10:00
Will Marshall	34f170d4f7	Bugged thing in the shop spec	2014-05-02 10:18:57 +10:00
Will Marshall	2d536e01e7	Patching some deadlocks	2014-05-01 17:21:46 +10:00
Will Marshall	6ad30d901d	Tidying down shop/checkout test	2014-05-01 16:22:11 +10:00
Will Marshall	2ff2d3dcbd	Starting to work on test format	2014-05-01 15:51:40 +10:00
Will Marshall	8a5b93ace9	Adding a couple of basic feature tests for the sake of demonstration	2014-04-30 16:10:02 +10:00
Will Marshall	0f6bd7049c	Starting to build out producers Angular page	2014-04-30 12:52:47 +10:00
Will Marshall	e7d6e7e564	Removing the sidebar before filter stuff, since we're not using it anymore	2014-04-30 12:15:57 +10:00
Will Marshall	4ca148ee93	Starting on the producers controller	2014-04-30 12:05:53 +10:00
Will Marshall	c33fa03736	Merging into master	2014-04-29 10:35:05 +10:00
Will Marshall	f9b7b602da	Moving from darkswarm to home	2014-04-24 16:53:00 +10:00
Rob H	566704a968	Alter enterprise index order	2014-04-24 16:09:52 +10:00
Rohan Mitchell	b649d6ef69	Authorise access to OrderCycles API	2014-04-24 13:20:16 +10:00
Rohan Mitchell	7931a2e8da	Test managed products API access for all user types	2014-04-24 13:20:16 +10:00
Rohan Mitchell	6c86254a90	Extract sign_in_as_user method, test managed orders API access for normal user and enterprise user	2014-04-24 13:20:16 +10:00
Rohan Mitchell	e6d988ff34	Nest variant soft delete route under product resource	2014-04-24 13:20:16 +10:00
Rohan Mitchell	e28a450875	Add API call to soft-delete a variant	2014-04-24 13:20:16 +10:00