133 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	ca1a5b5f8d	Ignoring any new producer properties submitted by the user	2015-04-02 08:54:35 +11:00
Rob Harrington	f5bacf71b7	Permissions for OrderCycleFormApplicator are determined internally	2015-03-27 16:16:13 +11:00
Rob Harrington	43d2eb4d22	Adding 'new' method to admin order cycle service, for loading data from serializer for new OCs	2015-03-27 16:16:12 +11:00
Rob Harrington	193a061c44	Order cycle form applicator only updates visible variants, should add an 'editable variants' scope to 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	35b27fcfd2	Delegating responsibility for returning an empty scope when no options are passed to order_cycle_enterprises_for	2015-03-27 16:16:10 +11:00
Rob Harrington	45f6042d3d	Enterprises etched by for_order_cycle action now use permissions scoped using an order cycle or coordinator	2015-03-27 16:16:10 +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	d8c4e292c8	Adding method for determining variant override hubs	2015-03-27 16:09:45 +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	a9c7e4b716	Order cycles index shows all OrderCycles I am involved in	2015-03-27 15:56:06 +11:00
Rohan Mitchell	8037811735	Only make new enterprises as hubs when current user *owns*, not just manages a hub.	2015-03-27 14:38:21 +11:00
Rohan Mitchell	09a102bd8b	When an enterprise user with a hub creates a new producer, it does not default to sells any #453	2015-03-27 12:02:20 +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	a6f0d8f69a	Show a nice error message instead of 500 error when deleting a referenced order cycle	2015-03-16 12:42:35 +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	1a44e74a9d	When enterprise user creates an enterprise, make it a hub if they have other hubs	2015-03-13 16:06:42 +11:00
Rohan Mitchell	5609354136	Fix bug: When there are variant overrides not owned by the current user, user is unable to make any changes to VOs	2015-03-13 10:45:38 +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
Victor Nava	1b709a3e03	Do not load Order Cycles that closed more than a month a go	2015-03-05 16:04:36 +11:00
Rohan Mitchell	53fa71d1f3	Admin can set enterprise fee's tax category	2015-03-05 10:44:25 +11:00
Rob Harrington	85b8adb1aa	call to order_cycle_hub_enterprises has no arguments	2015-03-01 15:33:16 +11:00
Rob Harrington	c91699a11e	Using @order_cycle.coordinator instead of @coordinator	2015-02-27 17:24:37 +11:00
Rob Harrington	5563d23beb	Rename set_coordinator method to require_coordinator	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
Maikel Linke	3beff77164	Merge remote-tracking branch 'origin/master' into group-pages	2015-02-26 17:22:13 +11:00
Rohan Mitchell	176db78e64	Extract data fetching from views	2015-02-20 11:17:01 +11:00
Maikel Linke	98063dae60	setting default country by id in groups controller	2015-02-19 16:57:19 +11:00
Maikel Linke	c01d45e3af	Serialize move_up and move_down methods of groups ... There have been race conditions in other projects using the acts_as_list gem which could be solved by serializing.	2015-02-19 16:51:58 +11:00
Maikel Linke	ecd7b16ef5	revert setting default country by name in enterprise controller	2015-02-19 11:09:43 +11:00
Rohan Mitchell	f83ceae5d1	Fix feature: Enterprises list is shortened when error in bulk update	2015-02-18 15:32:56 +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
Rob Harrington	a62f48441d	Restrict ability to change managers of enterprises using update action	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
Rohan Mitchell	fce7714994	Load correct set of variant override producers, use variant_override_enterprises_per_hub, tighten specs	2015-02-04 11:20:08 +11:00
Maikel Linke	d93a8b6428	Enterprise and Group controllers use default country instead of default country id	2015-01-22 16:22:34 +11:00
Rob Harrington	9245af6a8f	Producer properties routes use enterprise permalink	2015-01-22 10:19:47 +11:00
Rob Harrington	c3659612ed	enterprise routes use permalink	2015-01-22 10:19:42 +11:00
Rob Harrington	c330e49a7f	Moving permalink check action to enterprise controller	2015-01-22 10:19:42 +11:00
Rob Harrington	e2268e53bb	Adding action to check uniquness of enterprise permalink against existing routes	2015-01-22 10:19:41 +11:00
Maikel Linke	71de15b3e4	Contact address for enterprise group	2015-01-21 12:32:07 +11:00
Rohan Mitchell	f6e9c9494c	Enterprise user can edit profiles it has permission to	2015-01-15 13:43:39 +11:00
Rob Harrington	f145a7ed65	Moving taxons into its own module, adding preferred shopfront taxon order to enterprise	2014-12-19 14:04:02 +11:00
Rohan Mitchell	84b607433c	Creating and then updating the new override updates the same override instead of creating a duplicate	2014-12-12 13:33:14 +11:00
Rohan Mitchell	c38686c820	Create new variant overrides	2014-12-12 13:33:14 +11:00
Rohan Mitchell	531b35bbc6	WIP: Extract variant overrides to own controller - route, controller, views	2014-12-12 13:33:14 +11:00
Rob Harrington	51e768e722	Refactor EnterpriseSet to accept a collection as an argument	2014-11-06 16:29:09 +11:00