140 Commits

Author	SHA1	Message	Date
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
Rohan Mitchell	6e0dfbd88b	Make order cycle admin open and close time columns wider	2013-11-01 16:50:48 +11:00
Rohan Mitchell	2533e52189	After saving, maintain filter on enterprise fees by enterprise	2013-10-30 17:36:54 +11:00
Rohan Mitchell	5386fa72cc	Enterprise fees admin page for a specific enterprise auto-selects that enterprise for new fees and only allows selection of managed enterprises	2013-10-30 17:00:05 +11:00
Rohan Mitchell	647e1d196c	Position enterprise groups	2013-10-30 14:46:49 +11:00
Rohan Mitchell	2d80490d41	Update group membership for enterprise	2013-10-30 11:27:39 +11:00
Rohan Mitchell	49b36d0670	Delete enterprise group	2013-10-30 10:42:32 +11:00
Rohan Mitchell	b8457b2b0f	Edit enterprise group	2013-10-30 10:42:32 +11:00
Rohan Mitchell	be7e76920d	Create new enterprise group	2013-10-30 10:42:32 +11:00
Rohan Mitchell	a6fa73ec13	List enterprise groups	2013-10-30 10:42:32 +11:00
Rohan Mitchell	0d1dd361d6	Do not display links to enterprise payment methods and shipping methods when enterprise is a supplier only	2013-10-24 10:46:03 +11:00
Rohan Mitchell	12061fd485	Order cycle admin does not allow save until page is loaded	2013-10-23 14:59:50 +11:00
Rohan Mitchell	b8320a9bb6	Rename some directives and internal login details	2013-10-19 09:45:38 +11:00
Rohan Mitchell	bd112c64b0	Fix edit enterprise link to point to edit page, fix spec breakages	2013-10-18 15:39:58 +11:00
Rohan Mitchell	ea17e475a6	When viewing enterprise fees, only show those for the enterprise I select	2013-10-18 14:44:01 +11:00
Rohan Mitchell	91f14dcd4c	Enterprise manager can create/edit enterprise fees	2013-10-18 13:56:22 +11:00
Rohan Mitchell	3b5e6f5742	When viewing shipping methods, only show those for the distributor I select	2013-10-18 10:01:11 +11:00
Rohan Mitchell	c07c52085a	Enterprise user can view and create shipping methods	2013-10-18 09:35:53 +11:00
Rohan Mitchell	e6041aaf2f	Enterprise user can view, create and edit payment methods	2013-10-18 09:09:53 +11:00
Rohan Mitchell	631bc631fb	Do not show order cycle debug info in production	2013-10-16 10:39:32 +11:00
Rohan Mitchell	a6877c6981	Only render calculator HTML in enterprise fee JSON if explicitly requested. Improves load time of order cycles page.	2013-10-16 10:37:09 +11:00
Rohan Mitchell	1d4198d402	Removing a supplier exchange removes variants from distribution	2013-09-30 09:46:39 +10:00
Rohan Mitchell	19349c805f	Destroy supplied products when a supplier is destroyed	2013-09-23 14:58:26 +10:00
Rohan Mitchell	d100d12ebe	When a variant is removed from supply to an order cycle, remove it from distribution also	2013-09-20 11:11:59 +10:00
Rohan Mitchell	00fe10e847	Reposition order cycle admin debug info	2013-09-20 09:29:26 +10:00
Rohan Mitchell	2e1de9a6d3	Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210), fix nil state error	2013-08-23 14:00:31 +10:00
Rohan Mitchell	8a092697ee	Enterprise manager can clone an order cycle	2013-08-22 17:11:53 +10:00
Rohan Mitchell	f1fa90d7c3	Clone order cycles	2013-08-22 16:53:11 +10:00
Andrew Spinks	82726d032c	Add enterprise roles for order cycles.	2013-08-16 11:34:07 +10:00