5065 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Rohan Mitchell	7fb8370c36	Look up shipping tax on an order	2015-03-25 16:27:29 +11:00
Rohan Mitchell	e2a4b9a898	Fix specs that relied on the old login page which we now redirect to the new page	2015-03-25 12:11:06 +11:00
Rohan Mitchell	2a7a106ad8	Merge branch 'folklabs-currency-config'	2015-03-25 11:54:06 +11:00
Rohan Mitchell	1005a06583	Merge branch 'currency-config' of https://github.com/folklabs/openfoodnetwork into folklabs-currency-config	2015-03-25 11:39:43 +11:00
Rohan Mitchell	c36272ead6	Switch to update_column, which will not run geocoding callback of Enterprise	2015-03-25 11:37:10 +11:00
Rohan Mitchell	c6ddf36856	Make migration reversible	2015-03-25 11:35:59 +11:00
Rohan Mitchell	ebb3688add	Merge branch 'migrations' of https://github.com/folklabs/openfoodnetwork into folklabs-migrations	2015-03-25 11:30:00 +11:00
Rohan Mitchell	5da9bdc614	Merge branch 'victornava-legacy-login-fix'	2015-03-25 10:37:14 +11:00
Paul Mackay	af9a7a2ed4	#443: Support currency configuration. Fix LOCALE variable name.	2015-03-24 15:34:45 +00:00
Paul Mackay	fcfb1aeb87	#440: Try removing validation from update (to prevent geocoding).	2015-03-23 14:24:16 +00:00
Paul Mackay	e39d2eb113	#440: Reset Enterprise columns before querying them.	2015-03-23 13:47:44 +00:00
Rohan Mitchell	ab9bc7b1dc	Output debugging information to help investigate bogus changes to the sells field through the enterprises bulk edit action 0.7.4	2015-03-18 12:50:25 +11:00
Rohan Mitchell	cf4ccc268a	Admin may set no tax category on product unless tax category is required	2015-03-18 10:12:32 +11:00
Rohan Mitchell	7af17242f9	EnterpriseFee admin interface allows selecting no fee	2015-03-16 14:05:04 +11:00
Rohan Mitchell	eb5e411a8e	Update zeus	2015-03-16 14:00:55 +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	95c09315f5	Change class delete-product -> delete-order-cycle	2015-03-16 12:42:05 +11:00
Rohan Mitchell	e38772ada0	Enterprise user can delete unreferenced order cycles	2015-03-16 12:41:06 +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
Rob Harrington	bdeca54377	Reloading stale enterprise object in test	2015-03-14 16:17:16 +11:00
Rob Harrington	20d59cf5a5	Fixing authentication spec to work with altered user factory	2015-03-14 11:40:21 +11:00
Rob Harrington	8b241f058b	Login to consumer section in a way that ensures user is not an admin	2015-03-14 11:02:45 +11:00
Rob Harrington	cb28843af1	Reload manager before ensuring owner is a manager	2015-03-14 10:41:49 +11:00
Rob Harrington	d684a88697	Merge branch 'order-confirmation' into ready-to-merge	2015-03-13 18:11:53 +11:00
summerscope	d0f66a6053	Fixing label for cart popover to make it write name of product variant without page load	2015-03-13 18:10:59 +11:00
summerscope	d2fbf9f14d	Fixing logic for instance where collection instructions are not entered	2015-03-13 18:00:36 +11:00
Rohan Mitchell	8d3f25bb39	Fix intermittent 500 error when updating the cart	2015-03-13 17:50:01 +11:00
Rohan Mitchell	abaaf05631	Merge branch 'user-menu'	2015-03-13 17:00:37 +11:00