208 Commits

Author	SHA1	Message	Date
Rob H	0785509bc4	Add plus icon to new order cycles button	2014-06-20 17:00:36 +10:00
Rob H	9f285b1d8c	Add plus icon to new enterprises button	2014-06-20 17:00:07 +10:00
Rob H	a448ccdad4	Remove unused enterprise show page	2014-06-20 16:53:04 +10:00
Rob H	d71966b5c0	Change show link to edit link on admin enterprises index	2014-06-20 16:39:09 +10:00
Rob H	4b437e2ab5	Realign enterprises social media form components	2014-06-20 16:38:10 +10:00
Rob H	d6341b65e5	Add edit button to Order cycles index	2014-06-20 16:22:55 +10:00
Rob H	1f72bade65	Changing promo image explanation text	2014-06-20 13:47:33 +10:00
Rob H	2861191ab7	Merge branch 'sm-desc' into working	2014-06-20 09:43:58 +10:00
Rob H	0527900453	Change text of OC collection details	2014-06-19 18:02:05 +10:00
Rob H	3c24be3c0b	Change text of OC delivery instructions placeholder	2014-06-19 17:57:23 +10:00
Rohan Mitchell	cf4e7b18b4	Redirect to enterprises index page after updating producer properties	2014-06-18 15:43:22 +10:00
Rohan Mitchell	e6674d43fa	Admin can reorder producer properties	2014-06-18 15:28:41 +10:00
Rohan Mitchell	27fa93dbb4	Admin can remove producer properties	2014-06-18 15:28:41 +10:00
Rohan Mitchell	84cd56cfdc	Admin can list and create producer properties	2014-06-18 15:28:41 +10:00
Rob H	65a0e4707a	Add text which explains cropping of promo image	2014-06-18 12:58:32 +10:00
Rob H	3884b0cc1b	Adding a direct link to shopfront to enterprise edit page for distributor enterprises	2014-06-18 12:37:26 +10:00
Rob H	45b16d52dd	Add visible checkbox to enterprises index page to allow bulk editing of visibility	2014-06-18 11:44:47 +10:00
Rob H	2e749ef1f3	Move admin enterprises index to haml	2014-06-18 11:08:00 +10:00
Rohan Mitchell	0061caa8df	Do not show deleted products in order cycle admin	2014-06-12 14:59:27 +10:00
Will Marshall	7abfb2f936	Showing the resizing logo as well	2014-05-30 15:32:47 +10:00
Will Marshall	3ddd7c31e8	Patching which image is rendered	2014-05-30 15:08:16 +10:00
Rohan Mitchell	4c6a7622eb	Convert rep template to rabl	2014-05-29 17:21:52 +10:00
Rohan Mitchell	7d73f7d7f2	Fix reversed checkbox value for select all variants on order cycle admin page	2014-05-29 17:21:52 +10:00
Rohan Mitchell	e951f80070	Merge branch 'new-product-form' ... Conflicts: app/assets/javascripts/admin/admin.js.coffee	2014-05-24 17:14:32 +10:00
Will Marshall	015403c282	Merge branch 'new_shop'	2014-05-22 12:40:48 +10:00
Will Marshall	c69a4a5f1a	Adding social media links	2014-05-22 12:12:10 +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	a049266732	Replace enterprise relationship parent/child concepts with 'X permits Y'	2014-05-21 16:28:27 +10:00
Rohan Mitchell	0c647841a6	Add dynamic filter to enterprise relationships	2014-05-21 16:18:07 +10:00
Rohan Mitchell	92292c853d	Extract partials from enterprise relationships admin page	2014-05-21 15:03:29 +10:00
Rob H	3bf21d42dd	WIP: removing all payment methods from enterprise edit page	2014-05-21 15:02:59 +10:00
Rohan Mitchell	18886c931f	Extract create EnterpriseRelationship to service	2014-05-21 11:29:11 +10:00
Rohan Mitchell	5d0680234d	Admin can delete enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	f1df021091	Show enterprise relationships tab as selected	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	3cb55062cc	Split enterprise_relationships rabl into show and index	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	6414ae2972	Output enterprise relationships as JSON	2014-05-21 11:29:11 +10:00
Rohan Mitchell	f7de504d89	Add stub angular controller for managing 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	61cf35a5b9	Adding attr_accessors and paperclip file uploads	2014-05-20 12:18:28 +10:00
Rob H	2b414d99e1	Revert content_for changes	2014-05-16 15:12:47 +10:00
Rob H	03139cd2de	Use existing sidebar content_for	2014-05-16 11:42:40 +10:00
Rob H	6979644af7	Fiddle with colors and scrolling in admin enterpise sidebar	2014-05-16 11:28:02 +10:00
Rob H	dafa89a2cc	Add placeholder for ACN and ABN	2014-05-16 10:07:30 +10:00
Rob H	d17a316387	remove naughty pry	2014-05-15 22:43:08 +10:00
Rob H	c1c92d62e4	Adjust admin enterprise edit to improve scanning	2014-05-15 17:03:47 +10:00
Rob H	7cdfb4bab2	Add methods and fees to sidebar on enterprise edit page	2014-05-15 14:52:19 +10:00
Rob H	fe5d015778	Merging in master	2014-05-07 13:07:11 +10:00