1306 Commits

Author	SHA1	Message	Date
Rohan Mitchell	e6461ba01e	Fix enterprises spec - primary taxons change	2014-05-24 10:34:22 +10:00
Will Marshall	0a8f5d91ba	Adding primary taxon to admin forms	2014-05-24 09:29:26 +10:00
Will Marshall	17f09d1852	Adding primary taxon field to product	2014-05-24 09:29:19 +10:00
Rohan Mitchell	ad1f852bdd	Revert "Adding primary taxon field to product" ... This reverts commit fd1e7ebaa3.	2014-05-24 09:07:57 +10:00
Rohan Mitchell	79393476b0	Revert "Adding primary taxon to admin forms" ... This reverts commit 110a6f2d14.	2014-05-24 09:07:56 +10:00
Will Marshall	110a6f2d14	Adding primary taxon to admin forms	2014-05-23 15:59:06 +10:00
Will Marshall	fd1e7ebaa3	Adding primary taxon field to product	2014-05-23 15:59:06 +10:00
Rohan Mitchell	9e46108e9a	Enterprise user can only add order cycle exchanges where it manages the participant enterprise	2014-05-23 12:18:22 +10:00
Rohan Mitchell	14dee8d7fe	OrderCycleFormApplicator requires permitted_enterprises to be set explicitly	2014-05-23 12:09:38 +10:00
Rohan Mitchell	095b9bf67a	Enterprise user can only update order cycle exchanges where it manages the participant enterprise	2014-05-23 12:05:46 +10:00
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	015403c282	Merge branch 'new_shop'	2014-05-22 12:40:48 +10:00
Will Marshall	d1b27edefe	Reworking the JS specs	2014-05-22 12:40:46 +10:00
Will Marshall	272cb0469f	Setting up after_login redirects	2014-05-22 12:40:46 +10:00
Will Marshall	c69a4a5f1a	Adding social media links	2014-05-22 12:12:10 +10:00
Will Marshall	70f549e92a	Patching our modified admin login	2014-05-22 11:46:06 +10:00
Rohan Mitchell	a16f726377	Extract have_relationship test	2014-05-22 11:32:37 +10:00
Rohan Mitchell	c2f762d570	Enterprise user can only see relationships involving their enterprises	2014-05-22 11:27:19 +10:00
Rohan Mitchell	d7b4318aff	Find enterprise relationships involving any of a number of enterprises	2014-05-22 11:25:37 +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	fb05ad57e1	Tidy up spec helper, clean database before suite run	2014-05-22 11:00:29 +10:00
Rohan Mitchell	66cd5c937f	Add a helper to make capybara specs fail fast	2014-05-22 10:59:41 +10:00
Rohan Mitchell	f6bc1a82be	Enterprise user can manage enterprise relationships	2014-05-22 10:54:51 +10:00
Will Marshall	12dfcd0de9	Fixing auth workflowsg	2014-05-22 10:43:26 +10:00
Will Marshall	f997026796	Reworking the JS specs	2014-05-22 10:42:44 +10:00
Will Marshall	67e72f4504	Setting up after_login redirects	2014-05-22 10:42:44 +10:00
Rohan Mitchell	48a7b9c3f8	Fix specs from 'X permits Y' table format change	2014-05-22 08:50:52 +10:00
Rohan Mitchell	d8fa30ea6f	Add a sequence to option type position, prevents inconsistent ordering in specs	2014-05-21 16:54:26 +10:00
Rohan Mitchell	76d1754c32	Reorder helper method at bottom	2014-05-21 15:11:14 +10:00
Rohan Mitchell	6026a74c73	Table matcher have_table_row does not wait for full duration on should_not	2014-05-21 14:59:24 +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	ba7e29074f	have_table_row waits	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	61af8204d9	Add spec matcher have_table_row	2014-05-21 11:29:11 +10:00
Rohan Mitchell	6414ae2972	Output enterprise relationships as JSON	2014-05-21 11:29:11 +10:00
Rohan Mitchell	1a854b89ec	Sort enterprise relationships by enterprise name	2014-05-21 11:29:11 +10:00
Rohan Mitchell	4f1b8d06e7	Construct enterprise relationships with a factory	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	685ba3f63a	Fixing my modal and the tests	2014-05-20 12:18: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
Will Marshall	9f169e6ef8	Adding a basic stub of the primary taxon	2014-05-16 10:23:31 +10:00
Rob H	fd6f4d04df	Merge branch 'master' into ent-makeover	2014-05-15 17:05:05 +10:00
Will Marshall	da95df5ab3	patching one dud spec	2014-05-15 15:41:01 +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	eae12da24a	Adding distributors display to producers page	2014-05-15 12:20:17 +10:00