675 Commits

Author	SHA1	Message	Date
Rohan Mitchell	53fa71d1f3	Admin can set enterprise fee's tax category	2015-03-05 10:44:25 +11:00
Rohan Mitchell	cc7d6cde1d	Shorter syntax	2015-03-05 10:43:54 +11:00
Matt-Yorkley	d194e74eda	Rohan's suggested changes	2015-03-05 10:43:51 +11:00
Matt-Yorkley	be55f461d0	Report: sales tax on orders	2015-03-05 10:43:50 +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	9fa5a9e766	Fix before_filter load order for enterprises#shop	2015-02-12 11:34:58 +11:00
Rob Harrington	a62f48441d	Restrict ability to change managers of enterprises using update action	2015-02-12 11:34:58 +11:00
Rob Harrington	ad1f837c44	Admin users can access all users through known_users	2015-02-12 11:34:58 +11:00
Rob Harrington	dcb24cf06c	Controller method to allow enterprise users to search for other users which share management of their enterprises	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
Rohan Mitchell	22f6ece83f	When fetching products for variant overrides admin, fetch all overridable products	2015-02-04 10:16:34 +11:00
Rob Harrington	713999c1d8	Merge branch 'master' into shop-url	2015-01-28 10:53:42 +11:00
Lynne Davis	3c4ad4121f	LD adding whitespace to get my master version back in line with origin	2015-01-22 14:00:48 +00:00
Lynne Davis	8e8f38e484	app/controllers/spree/admin/reports_controller_decorator.rb	2015-01-22 12:01:20 +00: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	6991e5e6b1	Finally got all callbacks available to all action that need them	2015-01-22 10:19:46 +11:00
Rob Harrington	4d26b3d648	Make unused cart_controller happy	2015-01-22 10:19:45 +11:00
Rob Harrington	4baa205cf9	before_filters for enterprise controller are run in the correct order, and put inside the shop action	2015-01-22 10:19:45 +11:00
Rob Harrington	60313f7a6a	Replace delete with parameterize	2015-01-22 10:19:45 +11:00
Rob Harrington	ff624e83eb	Require distributor in enterprise controller, so that everything actually works	2015-01-22 10:19:44 +11:00
Rob Harrington	7ad9fdf0be	Cleaning permalink before checking	2015-01-22 10:19:43 +11:00
Rob Harrington	4088bdc236	Clean up permalink checker	2015-01-22 10:19:43 +11:00
Rob Harrington	9b78963d5a	Adding a javascript interface for checking permalinks and user input on enterprise console	2015-01-22 10:19:43 +11:00
Rob Harrington	39889390ef	Altering shop page routing so that shop url is copy-and-pastable	2015-01-22 10:19:42 +11:00
Rob Harrington	c3659612ed	enterprise routes use permalink	2015-01-22 10:19:42 +11:00
Rob Harrington	9286c82b43	Removing obsolete methods	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
Rohan Mitchell	0431e0048c	Merge branch 'master' into variant-overrides-frontend ... Conflicts: app/controllers/shop_controller.rb app/views/shop/products/_form.html.haml spec/controllers/shop_controller_spec.rb	2015-01-12 16:48:51 +11:00
Rohan Mitchell	6a42f62eb2	Fix filename on order cycle management report csv, add timestamp to it and also users and enterprises report	2015-01-09 11:49:59 +11:00
Rohan Mitchell	8db09d9590	Merge branch 'report_download_namechange' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-report_download_namechange ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb	2015-01-09 11:48:23 +11:00
Rohan Mitchell	51b0d7e0eb	Move private method to helper	2015-01-08 10:48:02 +11:00
Rohan Mitchell	ab26902e4e	Move money decorator to lib dir, as it's a decorator for a lib class, not a model	2015-01-08 10:39:14 +11:00
Rohan Mitchell	4839c00d62	Retrieve currency_symbol via private method rather than before_filter + instance var - cleaner syntax	2015-01-08 10:12:32 +11:00
Rohan Mitchell	a438216189	Merge branch 'reports_2' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-reports_2 ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb	2015-01-08 10:08:12 +11:00
Maikel Linke	9310bc902a	first draft of group page, a lot of TODOs	2015-01-06 22:39:15 +11:00