168 Commits

Author	SHA1	Message	Date
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	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
Rohan Mitchell	b8147474e8	Add label tags around order cycle admin checkboxes and labels	2014-03-28 15:34:26 +11:00
Rohan Mitchell	3104d285ca	Order cycle admin JS uses exchanges.incoming instead of role	2014-03-27 09:30:53 +11:00
Rohan Mitchell	c563057809	Merge branch 'new-enterprises-form'	2014-03-20 15:34:09 +11:00
Rohan Mitchell	51fdf86329	Polish the new enterprise form	2014-03-20 15:18:21 +11:00
Rohan Mitchell	811b0cb36a	Admin can remove a master variant from an order cycle when further variants have been added	2014-03-20 10:27:55 +11:00
Rohan Mitchell	fd81b143b5	Sort suppliers and distributors by name on order cycle edit page	2014-03-20 10:27:55 +11:00
Maikel Linke	f3789469b2	Feedback from Kerstin. Resolved issue comments removed. Pickup details removed.	2014-03-19 20:42:21 +11:00
Maikel Linke	9181f0243a	added old input fields, enterprises test passing	2014-03-19 20:42:21 +11:00
Maikel Linke	cc2ae2f464	moved fullwidth form css	2014-03-19 20:42:21 +11:00
Maikel Linke	aa7211dc7f	more tooltips	2014-03-19 20:42:21 +11:00
Maikel Linke	6689b0d93f	more tooltips	2014-03-19 20:42:21 +11:00
Maikel Linke	052782678e	working design. TODOs are optional now	2014-03-19 20:42:21 +11:00
Maikel Linke	e9506d1571	complete form with columns. two things to ask Kerstin.	2014-03-19 20:42:21 +11:00
Maikel Linke	4c0885277d	started to redesign form with css	2014-03-19 20:42:21 +11:00
Maikel Linke	6f1d41e020	new selection of input fields for enterprises form, not all datafields working yet	2014-03-19 20:42:21 +11:00
Maikel Linke	510333288c	first steps of new design	2014-03-19 20:42:21 +11:00
Rohan Mitchell	adf4c0e387	Sort enterprises by name on enterprise fees admin page	2014-02-26 15:38:41 +11:00
Will Marshall	aec5894c70	Adding a promo image to enterprises	2014-01-21 16:32:55 +11:00
Will Marshall	0ddef9626e	First working image upload for enterprise logos	2014-01-16 15:47:38 +11:00
Will Marshall	dec33ebda4	Fixing the HTML in the admin section	2013-11-28 16:13:13 +11:00
Rohan Mitchell	94c33e5f45	Colour order cycle rows based on their status	2013-11-22 11:31:04 +11:00
Rohan Mitchell	f75879bec1	Put order cycle variants in a tooltip	2013-11-22 10:03:49 +11:00
Rohan Mitchell	8980284390	Reorder OC admin index table columns	2013-11-15 12:09:26 +11:00