191 Commits

Author	SHA1	Message	Date
Rohan Mitchell	d52c1fa5da	Revert "Do not show deleted products in order cycle admin" ... This reverts commit 4e45a682fd.	2014-06-03 12:18:27 +10:00
Rohan Mitchell	4e45a682fd	Do not show deleted products in order cycle admin	2014-06-03 11:29:54 +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
Will Marshall	9db602f031	Patching the visible flag in admin	2014-05-05 16:26:03 +10:00
Rob H	ceada3596b	Merge master into cleanup	2014-05-02 14:43:06 +10:00
Will Marshall	e65924c50f	Removing a dud reference to active'	2014-05-01 15:52:27 +10:00
Will Marshall	f68a637609	Renaming Enterprise.active to Enterprise.visible	2014-04-30 12:09:22 +10:00
Will Marshall	c33fa03736	Merging into master	2014-04-29 10:35:05 +10:00
Will Marshall	22b87cc236	Adding active flag to enterprises	2014-04-25 16:17:37 +10:00
Rob H	07ace99adc	Add informational warnings to admin enterprises index page	2014-04-24 16:10:40 +10:00
Rohan Mitchell	85db8859bb	On admin order cycle edit page, do not show exchanges for enterprises the user doesn't manage	2014-04-24 15:51:39 +10:00
Rob H	29cf40a5bf	Add visual indication that no payment/shipping/fees exist to enterprise index	2014-04-24 15:35:59 +10:00
Rohan Mitchell	2603256a17	Extract admin order cycle index row into partial	2014-04-24 14:53:32 +10:00
Rohan Mitchell	d0585b4d05	Admin order cycle listing does not show order cycles that enterprise users don't have access to	2014-04-24 14:43:33 +10:00
Rob H	c86586fc16	Remove collection date from admin enterprises index	2014-04-24 13:57:56 +10:00
Will Marshall	35d590c926	Fixing a bug uploading promo images	2014-04-09 15:53:39 +10:00
Rohan Mitchell	e792107d7b	Make order cycle specs more robust	2014-04-09 15:02:40 +10:00
Rohan Mitchell	9e74a72985	Fix silent fail when order cycle coordinator not filled out	2014-04-02 10:35:16 +11:00
Rohan Mitchell	466b10e797	Select all distributed products on order cycle admin page	2014-03-28 15:34:26 +11:00
Rohan Mitchell	fddfdf8050	Select all supplied products on order cycle admin page	2014-03-28 15:34:26 +11:00