386 Commits

Author	SHA1	Message	Date
Rob Harrington	3aa5f6e023	Adding properties tab to admin enterprise edit form	2015-04-02 11:30:32 +11:00
Rob Harrington	5b235f356e	Replace free text with with select dropdown for property names when not super admin	2015-04-02 08:56:36 +11:00
Rob Harrington	8d95ba2c69	Display full name of variant on order cycle edit form	2015-04-01 15:46:19 +11:00
Rob Harrington	6e77a5eebc	Using the correct method name duh	2015-03-27 16:47:12 +11:00
Rob Harrington	887579ecb8	Use managed_by scope on Enterprise instead of user.enterprises	2015-03-27 16:16:12 +11:00
Rob Harrington	9430999540	Filtering exchange variants, for outgoing exchange variant count	2015-03-27 16:16:12 +11:00
Rob Harrington	99bd6244ed	Filtering the list of variants visible within each exchange based on permissions	2015-03-27 16:16:11 +11:00
Rob Harrington	d115ef5f7e	Scoping old generalised order cycle helper methods to a specific order cycle	2015-03-27 16:16:10 +11:00
Rob Harrington	7e24e6743e	enterprises_for is now order_cycle_enterprises_for, and can be passed an order_cycle or a coordinator (for new order_cycles)	2015-03-27 16:16:09 +11:00
Rob Harrington	c9f343f680	Swapping over scoping method for displayed enterprises in OC index page from order_cycle_enterprises to enterprises_for(order_cycle)	2015-03-27 16:15:28 +11:00
Rob Harrington	e9f2e743ce	Replacing old representative template for OCs with active model serializers	2015-03-27 16:07:38 +11:00
Rob Harrington	1c09b8b76f	Limiting variants loaded into representative template to those a visible to the current user	2015-03-27 16:07:38 +11:00
Rob Harrington	75a37e16e3	Remove elements of order cycle form that coordinators cannot edit	2015-03-27 15:56:07 +11:00
Rob Harrington	75ed259554	Conditionally show input for coordinator ... Conflicts: app/views/admin/order_cycles/_form.html.haml	2015-03-27 15:56:07 +11:00
Rohan Mitchell	5da9bdc614	Merge branch 'victornava-legacy-login-fix'	2015-03-25 10:37:14 +11:00
Rohan Mitchell	ab9bc7b1dc	Output debugging information to help investigate bogus changes to the sells field through the enterprises bulk edit action	2015-03-18 12:50:25 +11:00
Rohan Mitchell	7af17242f9	EnterpriseFee admin interface allows selecting no fee	2015-03-16 14:05:04 +11:00
Rohan Mitchell	95c09315f5	Change class delete-product -> delete-order-cycle	2015-03-16 12:42:05 +11:00
Rohan Mitchell	e125bcf451	Add column header for extra action column	2015-03-16 12:15:43 +11:00
Rohan Mitchell	4491d3cc73	Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix ... Conflicts: app/views/admin/order_cycles/_row.html.haml spec/features/admin/order_cycles_spec.rb	2015-03-16 12:14:54 +11:00
Rohan Mitchell	eccd97fc28	Merge branch 'master' into reduce-supplier-list-in-order-cycles	2015-03-12 11:55:14 +11:00
Rohan Mitchell	c4d4d10873	Reuse supplier/distributor list	2015-03-12 11:53:13 +11:00
Victor Nava	f90f7565fb	Allow admins to delete Order Cycles	2015-03-11 18:08:09 +11:00
Victor Nava	208fa02ec0	Create a 'Show More' button at the top of the page, next to New Order on on admin order cycles index page	2015-03-11 13:14:45 +11:00
Victor Nava	2c89573441	Shave off a few seconds when showing order_cycles#index by loading order_cycle_enterprises only once.	2015-03-11 11:59:25 +11:00
Liv Galendez	266d6ef834	Fixed handling of distributors field	2015-03-06 11:55:35 +11:00
Victor Nava	3e2142c3cf	Remove the hover / pop-up over the # variants on admin order cycles index page	2015-03-06 11:33:03 +11:00
Victor Nava	a21bfc909a	Remove the suppliers column on admin order cycles index page	2015-03-05 16:12:31 +11:00
Rohan Mitchell	53fa71d1f3	Admin can set enterprise fee's tax category	2015-03-05 10:44:25 +11:00
Liv Galendez	c940a34ec9	Created order_cycle_permitted_in helper	2015-03-03 21:03:01 +11:00
Liv Galendez	fc63d8719c	Used order_cycle_permitted_enterprises helper in order cycles row	2015-03-03 20:53:39 +11:00
Rob Harrington	31054c7bf4	Split order_cycle_simple_view logic into index and form scopings	2015-02-27 17:24:36 +11:00
Rob Harrington	8de6f983a2	User must set the coordinator first when creating an order cycle	2015-02-27 17:24:36 +11:00
Rob Harrington	53594b3a0f	Cannot add unconfirmed enterprises to order cycles	2015-02-27 17:24:36 +11:00
Maikel Linke	60c246f104	fixing side menu ng-show of items	2015-02-27 15:21:23 +11:00
Maikel Linke	1f7aec0c1d	group owner select box in own tab	2015-02-26 13:09:46 +11:00
Maikel Linke	f8153c07b1	moving email from "web" to "contact" on group edit page	2015-02-22 16:20:11 +11:00
Rohan Mitchell	f58219eb3d	Split inputs into separate partials for each fieldset	2015-02-20 11:36:30 +11:00
Rohan Mitchell	176db78e64	Extract data fetching from views	2015-02-20 11:17:01 +11:00
Maikel Linke	d5c2abdd7e	stripping "undefined" in after_find and after_save callbacks instead of overriding getters	2015-02-19 16:33:43 +11:00
Maikel Linke	a0f0b3c93b	display only activated enterprises to add to groups	2015-02-19 11:14:25 +11:00
Maikel Linke	718a5911a3	code style and cleanup	2015-02-19 10:48:39 +11:00
Maikel Linke	bbac5aa803	Using pure css for styling odd and even menu items	2015-02-19 10:22:37 +11:00
Maikel Linke	346a4e71d0	side menu partial does not require showItem defined	2015-02-19 10:17:58 +11:00
Maikel Linke	903bd21577	Merge remote-tracking branch 'origin/master' into group-pages-merge ... Conflicts: README.markdown db/schema.rb	2015-02-13 15:42:36 +11:00
Maikel Linke	6b5a1255f8	fixing a bunch of tests	2015-02-12 16:36:18 +11:00
Rob Harrington	5c09ebf138	Adding manager managment to enterprise edit form	2015-02-12 11:34:58 +11:00
Rob Harrington	ee5ab22501	Moving interface for changing owner to new 'Users' tab	2015-02-12 11:34:58 +11:00
Maikel Linke	a7c2a73fa8	make groups editable by group owners	2015-02-05 12:05:39 +11:00
Maikel Linke	91b35d068c	Adding owner to groups ... Groups have owners and users own groups. The owners are displayed and changable on the group's page by admin users.	2015-02-02 15:58:34 +11:00