239 Commits

Author	SHA1	Message	Date
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	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	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
Paul Mackay	ca665dc6bc	Merge master into producer-emails.	2015-03-04 19:09:43 +00: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
Rob Harrington	76acbb6159	Empty arrays are no longer considered falsy by angular.js parser (see bdfc9c02d0)	2015-01-22 10:19:47 +11:00
Rob Harrington	d7ea81e821	Prevent default form action from submitting ordercycle forms	2015-01-22 10:19:47 +11:00
Paul Mackay	67b17de695	#275: Add receival time and instructions to order cycle for incoming exchanges. Fix issues from feedback.	2014-12-30 11:33:13 +00:00
Paul Mackay	05437e2a56	#275: start on producer email.	2014-11-09 11:17:46 +00:00
Rohan Mitchell	1d9a3f33e0	Order cycle distributors must have shipping and payment methods	2014-10-31 12:22:02 +11:00
Rohan Mitchell	433806aca8	Remove unused helpers and standardise naming	2014-10-31 12:22:02 +11:00
Rohan Mitchell	7faf6e12ea	Clean up simple order cycle interface	2014-10-23 15:53:16 +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	f7c1340f99	Admin can view an order cycle in the simple edit form	2014-10-23 11:08:27 +11:00
Rohan Mitchell	d47db903fb	Add basic styling to simple order cycle interface	2014-10-22 19:12:51 +11:00
Rafael Schouten	b71a40ae6d	show all permitted enterprises in order cycle summery	2014-10-18 03:26:57 +11:00
Rafael Schouten	577cb06371	make navCallback actually versatile	2014-10-18 01:42:29 +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	d8b648d531	Extract name and timing form from order cycles	2014-10-17 16:51:03 +11:00
Rohan Mitchell	f060da9c8d	Rename angular app order_cycle -> admin.order_cycles	2014-10-17 14:13:27 +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	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	8548a1a67e	Determine producer options on order cycle screen through OpenFoodNetwork::Permissions class	2014-08-28 10:09:50 +10:00