5094 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Harrington	aa170ef5f6	Order cycle simple create controller uses 'new' method on OC service to initialise	2015-03-27 16:16:12 +11:00
Rob Harrington	4d14acb64d	Don't send non-attributes of js order_cycle object to server	2015-03-27 16:16:12 +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	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	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	540ac845da	Fixing broken js spec	2015-03-27 16:16:11 +11:00
Rob Harrington	5e015f0611	Rename visibleVariants filter to visibleProductVariants	2015-03-27 16:16:11 +11:00
Rob Harrington	681dada5df	Simple OC form loads coordinator into JS	2015-03-27 16:16:11 +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	63e345f819	Exchange serializer cuts down list of variants visible to the current user, based on permissions	2015-03-27 16:16:11 +11:00
Rob Harrington	524645aff4	Replacing visible_variants_for(exchange) with more general methods for determining visbility based on the enterprises involced and the current order cyclegs	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	b747f61eb1	P-OC permissions don't apply when determining which enterprises are loaded for order cycle interface	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	a1aa9512a8	Fixing angular order_cycle controller spec	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	d8c4e292c8	Adding method for determining variant override hubs	2015-03-27 16:09:45 +11:00
Rob Harrington	81765de7a7	Building a permission method to determine which enterprises are visible to the user for a given OC	2015-03-27 16:07:38 +11:00
Rob Harrington	4dff3fe79c	Removing unused distributable action from products api	2015-03-27 16:07:38 +11:00
Rob Harrington	1927bc55d0	Load actual variants in the exchange, wrong behaviour was implemented in previous two commits	2015-03-27 16:07:38 +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	00821a60cc	More specific references to enterprise id in permissions querying methods	2015-03-27 16:07:37 +11:00
Rob Harrington	252ddf9beb	Adding method to permissions library for scoping the list of visible variants in a given exchange to a particular user	2015-03-27 16:07:37 +11:00
Rob Harrington	22161bfd6e	rewriting permissions query functions in permissions library, to make scoping easier	2015-03-27 16:07:37 +11:00
Rob Harrington	6c4db7fc22	Adding permission to view outgoing exchanges to producers who have granted P-OC to the relevant outgoing hub	2015-03-27 16:07:37 +11:00
Rob Harrington	df4437ecfe	Altering permissions for exchanges, so the exchange is visible to managers of at least one of the enterprises invloved	2015-03-27 16:07:37 +11:00
Rob Harrington	2310a6a7db	Splitting out order cycle abilities from general order management abilities	2015-03-27 16:07:37 +11:00
Rob Harrington	85e4b3970c	Adding an 'involved' scope to exchanges	2015-03-27 15:56:07 +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	f8a9652333	Moving SASS comments to thier own lines	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
Rob Harrington	a9c7e4b716	Order cycles index shows all OrderCycles I am involved in	2015-03-27 15:56:06 +11:00
Rob Harrington	0b082c964b	Restricting which enterprises can coordinate an order cycle	2015-03-27 15:51:27 +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	d471368412	Spacing	2015-03-27 13:09:25 +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	d8656a36c6	Consistency in tax calculations, remove some unneeded local vars	2015-03-25 16:31:15 +11:00
Rohan Mitchell	89d4a59e9d	Extract order total tax calculations to model	2015-03-25 16:27:29 +11:00
Rohan Mitchell	84f3097217	Calculate total tax from the tax included in all the adjustments on the order	2015-03-25 16:27:29 +11:00
Rohan Mitchell	333a4ecf2f	Include enterprise fee tax on sales tax report	2015-03-25 16:27:29 +11:00
Rohan Mitchell	40b4edeca1	Replace zoned_order factory with zone_with_member. In practice, former had issues with circular dependencies.	2015-03-25 16:27:29 +11:00
Rohan Mitchell	9650692699	Calculate total tax on enterprise fees for an order	2015-03-25 16:27:29 +11:00
Rohan Mitchell	69dc92dec1	Create factories zoned_order and taxed_product	2015-03-25 16:27:29 +11:00
Rohan Mitchell	d489e06009	Retrieve line item sales tax from included_tax rather than tax amount	2015-03-25 16:27:29 +11:00
Rohan Mitchell	daa30ed518	Retrieve the shipping tax on the order instead of calculating it from scratch	2015-03-25 16:27:29 +11:00