315 Commits

Author	SHA1	Message	Date
Rohan Mitchell	97e49c2bdb	Replace 'array.sort.should == expected.sort' pattern with match_array	2015-05-28 10:46:08 +10:00
Rob Harrington	903ed7e507	Merge branch 'master' into variable_weights ... Conflicts: app/assets/javascripts/admin/bulk_order_management.js.coffee app/views/spree/admin/orders/bulk_management.html.haml app/views/spree/api/line_items/bulk_show.v1.rabl spec/features/admin/bulk_order_management_spec.rb	2015-05-21 17:31:33 +10:00
Rob Harrington	0b28771364	Removing unrequired specs for variant/product 'units_show'	2015-05-20 21:06:20 +10:00
Rob Harrington	0ad2978926	Removing old managed route from api orders controller and switching BOM over to use new controller action	2015-05-20 11:48:48 +10:00
Rob Harrington	fc55a000b8	Adding managed controller action which uses new order serializer to render json	2015-05-20 11:48:13 +10:00
Lynne	90dd1ea4a2	Merge pull request #1 from openfoodfoundation/variable_weights ... Merging	2015-05-09 19:25:30 +01:00
Lynne Davis	4d025ee7a9	Updating the spec based on @Robs suggestions, hoping for his insights. Still doesn't work.	2015-05-09 19:10:55 +01:00
Lynne Davis	2f463474fb	Adding specs for variable weight adjustment via builk order management	2015-05-09 19:10:55 +01:00
Rob Harrington	0d5ce5ff57	Fixing issues with reports controller spec	2015-05-07 12:50:57 +10:00
Rob Harrington	9ab16d8cec	Allowing calls to Api::OrderCyclesController#accessible to specify :as => 'distributor' or 'producer'	2015-05-07 12:50:54 +10:00
Maikel Linke	af78859db6	Merge remote-tracking branch 'origin/master' into single-order-patches	2015-04-30 17:18:02 +10:00
Maikel Linke	5efc0a5110	quick fix: update fees after updating order	2015-04-30 16:29:51 +10:00
Rob Harrington	a253b88525	Fixing line item controller spec	2015-04-29 10:42:38 +10:00
Lynne Davis	d344c3dec8	Updating the spec based on @Robs suggestions, hoping for his insights. Still doesn't work.	2015-04-24 16:22:17 +01:00
Maikel Linke	a937fd3c61	Using variant overrides in variant seach on order edit page	2015-04-23 11:37:10 +10:00
Rohan Mitchell	7b8938b5f6	Run password reset job for spec that requires it	2015-04-22 07:32:22 +10:00
Rohan Mitchell	0d4dbd23fd	Remove redundant spec line, test that sells is not changed	2015-04-17 15:42:42 +10:00
Rob Harrington	c43eb9ef72	Merge branch 'email_user' into properties	2015-04-17 15:17:37 +10:00
Rob Harrington	b44f2bcdf5	Fixing trial expiry test	2015-04-17 13:30:36 +10:00
Rob Harrington	456a6f94f5	On enterprise confirmation: create a new user based on enterprise contact email if one does not already exist, and add it as a manager	2015-04-17 10:24:37 +10:00
Rob Harrington	afe77925ba	Allow request to specify a return value when calling user_passwords#edit	2015-04-17 10:21:25 +10:00
Rob Harrington	5940ff2b2c	Don't override devise's after_sign_in_path_for, use specific before filters for user sessions and registrations controllers instead	2015-04-16 16:56:27 +10:00
Rohan Mitchell	a384f5e3d4	Merge branch 'buildkite' into customer-totals-report-and-perms-fix	2015-04-16 14:08:39 +10:00
Rohan Mitchell	318957551f	Freeze time to make spec repeatable	2015-04-16 14:07:38 +10:00
Rohan Mitchell	2e021941d1	Fix bug where new enterprises should be created as hubs, but aren't	2015-04-16 10:59:15 +10:00
Rob Harrington	e3138c3cd2	Renaming order_cycle_enterprises_for as visible_enterprises	2015-04-11 22:25:23 +10:00
Rob Harrington	26d55baa35	Moving order cycle permissions to their own permissions class	2015-04-11 21:11:10 +10:00
Rob Harrington	72403fd021	Fixing broken enterprise controller spec	2015-04-10 13:16:21 +10:00
Rob Harrington	60a3d8e0d1	Restrict bulk updating order cycles at controller level	2015-04-09 12:27:43 +10:00
Rob Harrington	adc1b639bc	Merge remote-tracking branch 'origin/master' into complex_oc	2015-04-08 14:38:27 +10:00
Rob Harrington	61a9e2f7cc	Add a referer for all admin enterprise controller specs	2015-04-08 14:36:56 +10:00
Rob Harrington	104a8ddecf	Refactor order_cycle_enterpises_for permission method, now requires an order cycle	2015-04-08 13:00:17 +10:00
Lynne Davis	ffd850c761	Adding specs for variable weight adjustment via builk order management	2015-04-04 19:20:41 +01:00
Rob Harrington	8ed6653dc4	Ignoring any new product properties submitted by a non-admin user	2015-04-02 08:55:20 +11:00
Rob Harrington	ca1a5b5f8d	Ignoring any new producer properties submitted by the user	2015-04-02 08:54:35 +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
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	0ed1eeffd6	When registering a new enterprise, if user is signed in, owns a hub and is not making a producer, the new enterprise becomes a hub	2015-03-27 14:05:58 +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	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	1a44e74a9d	When enterprise user creates an enterprise, make it a hub if they have other hubs	2015-03-13 16:06:42 +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	a62f48441d	Restrict ability to change managers of enterprises using update action	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
Rob Harrington	b0a29801b6	Making spec controller product request spec a little bit more robust	2015-01-22 10:20:03 +11:00
Rob Harrington	c3659612ed	enterprise routes use permalink	2015-01-22 10:19:42 +11:00
Rob Harrington	7a6cd98646	Fixing failing spec, missing 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