77 Commits

Author	SHA1	Message	Date
Rohan Mitchell	7486daa2a3	Merge branch 'master' into require_standard_variant ... Conflicts: spec/controllers/spree/admin/variants_controller_spec.rb spec/lib/open_food_network/permissions_spec.rb spec/lib/open_food_network/products_and_inventory_report_spec.rb spec/models/enterprise_spec.rb	2015-05-28 15:08:13 +10:00
Rohan Mitchell	97e49c2bdb	Replace 'array.sort.should == expected.sort' pattern with match_array	2015-05-28 10:46:08 +10:00
Rob Harrington	b9f19d5777	Fixing broken specs	2015-04-17 13:00:20 +10:00
Rob Harrington	f6e635466b	Rearranging elements on the order cycle form a little bit	2015-04-08 14:31:18 +10:00
Rob Harrington	a4b80b1f33	Implement editable scope for variants on order cycles page	2015-04-06 09:15:14 +10:00
Rob Harrington	009b25a491	Adding an editable variants scope for incoming exchanges	2015-04-05 13:59:00 +10:00
Rob Harrington	bf87394a76	Fixing order cycle feature spec	2015-04-05 10:58:06 +10:00
Rob Harrington	2d5118290b	Fixing broken order cycle feature specs	2015-03-27 16:19:52 +11:00
Rohan Mitchell	95c09315f5	Change class delete-product -> delete-order-cycle	2015-03-16 12:42:05 +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
Victor Nava	f90f7565fb	Allow admins to delete Order Cycles	2015-03-11 18:08:09 +11:00
Victor Nava	3fe1fc3f67	Use dates way into the future so that test that depend on OrderSycles#recently_closed don't break.	2015-03-05 17:32:55 +11:00
Liv Galendez	7ba366e2a6	Added select for coordinator since there are 2 now	2015-03-03 20:46:25 +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	e240933b29	Using simple_order_cycle in spec ... Before: 4 minutes 6.9 seconds After: 3 minutes 27.4 seconds	2014-11-28 14:45:35 +11:00
Rohan Mitchell	0d05c7163d	Use factory shortcut for creating shipping and payment methods	2014-10-31 16:26:13 +11:00
Rohan Mitchell	94d50f220f	Display an error message to admin when there are hubs in order cycles that are not ready for checkout	2014-10-31 12:22:02 +11:00
Rohan Mitchell	1d9a3f33e0	Order cycle distributors must have shipping and payment methods	2014-10-31 12:22:02 +11:00
Rohan Mitchell	bf61d12bfa	Merge branch 'simple-order-cycles' ... Conflicts: app/views/admin/order_cycles/_row.html.haml	2014-10-23 12:11:34 +11:00
Rohan Mitchell	ab76c66b68	Admin can update order cycles with simple interface	2014-10-23 11:38:15 +11:00
Rohan Mitchell	f7c1340f99	Admin can view an order cycle in the simple edit form	2014-10-23 11:08:27 +11:00
Rohan Mitchell	3e61aa7267	Simple interface remove coordinator fee	2014-10-22 17:26:22 +11:00
Rohan Mitchell	8fb95769bf	Fix tested values in spec	2014-10-22 17:07:45 +11:00
Rafael Schouten	b71a40ae6d	show all permitted enterprises in order cycle summery	2014-10-18 03:26:57 +11:00
Rohan Mitchell	deedafde9a	WIP: Simple order cycle form loads and displays correct info	2014-10-17 16:55:55 +11:00
Rohan Mitchell	694dd0c329	Enterprise user selling own produce only sees simple order cycle listing	2014-10-17 10:52:36 +11:00
Rohan Mitchell	57af658e7c	For OC, fetch all enterprises we have access to, including those via E2E relationships	2014-09-05 15:10:13 +10:00
Rohan Mitchell	913c167fdf	Revert 5ede8d1, reinstating a4be0ff..7b89e6a	2014-09-05 15:10:12 +10:00
Rob H	5ede8d169f	Revert a4be0ff..7b89e6a for deployment	2014-08-28 14:32:57 +10:00
Rohan Mitchell	a5debc19dc	Permit edits to exchanges involving enterprises permitted via E2E relationships	2014-08-28 10:09:50 +10:00
Rohan Mitchell	628d87b69a	Add to OC permission allows adding distributors to order cycle	2014-08-28 10:09:50 +10:00
Rohan Mitchell	5ef13d3c5a	Change 'add products to OC' permission into the more general 'add enterprise to OC'	2014-08-28 10:09:50 +10:00
Rohan Mitchell	099a5b0b7b	Show E2E related enterprise exchanges in OC	2014-08-28 10:09:50 +10:00
Rohan Mitchell	34602244ca	Show permitted suppliers in order cycle add supplier select box	2014-08-28 10:09:50 +10:00
Rohan Mitchell	a7689973be	Semantically name enterprises in spec	2014-08-28 10:09:50 +10:00
Rohan Mitchell	5e8bdce67d	Refactor spec	2014-08-28 10:09:50 +10:00
Rohan Mitchell	9b15c213d1	When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges	2014-05-23 11:28:00 +10:00
Rohan Mitchell	a2205d3f93	Make order cycles spec consistent	2014-05-14 15:50:25 +10:00
Rob H	169d5669f1	Amend specs	2014-05-07 13:34:47 +10:00
Rohan Mitchell	930bc2b7ce	Set increased Capybara.default_wait_time globally	2014-05-02 14:25:32 +10:00
Rohan Mitchell	126ddd0a75	Add explicit wait before inconsistently failing lookup	2014-04-25 18:59:33 +10:00
Rohan Mitchell	c8f50216ab	Increase default_wait_time on order_cycles_spec in an attempt to prevent inconsistent failures in CI	2014-04-25 18:06:09 +10:00
Rohan Mitchell	85db8859bb	On admin order cycle edit page, do not show exchanges for enterprises the user doesn't manage	2014-04-24 15:51:39 +10:00
Rohan Mitchell	d0585b4d05	Admin order cycle listing does not show order cycles that enterprise users don't have access to	2014-04-24 14:43:33 +10:00
Rohan Mitchell	6452ebf67d	Make spec more robust	2014-04-11 19:08:55 +10:00
Rohan Mitchell	e792107d7b	Make order cycle specs more robust	2014-04-09 15:02:40 +10:00
Rohan Mitchell	3104d285ca	Order cycle admin JS uses exchanges.incoming instead of role	2014-03-27 09:30:53 +11:00
Rohan Mitchell	af88d0f91b	Fix regression: Invisible checkbox causing ambiguity for capybara	2014-03-20 11:07:13 +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	acbf1ed680	Refactor fragile spec to use has_field? and has_select? in an attempt to make it more reliable in CI	2014-02-19 13:12:52 +11:00