3807 Commits

Author	SHA1	Message	Date
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	9650692699	Calculate total tax on enterprise fees for an order	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	5da9bdc614	Merge branch 'victornava-legacy-login-fix'	2015-03-25 10:37:14 +11:00
Rohan Mitchell	ab9bc7b1dc	Output debugging information to help investigate bogus changes to the sells field through the enterprises bulk edit action	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	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	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
Rob Harrington	dd8c769ea9	Hiding fee breakdown on cart page for now	2015-03-13 16:50:57 +11:00
summerscope	864c9ec1da	This changes the user menu labels to show Account next to user email. ... Small tweak to user account page to make it less awful.	2015-03-13 16:49:26 +11:00
Rob Harrington	b0cfa6a17c	Shipping method prices displayed next to options in checkout	2015-03-13 16:18:49 +11:00
Rob Harrington	51258b242c	Merge remote-tracking branch 'origin/order-confirmation' into order-confirmation	2015-03-13 16:07:17 +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
Rohan Mitchell	efbf2c7ffa	Display extended variant name in quick cart	2015-03-13 12:58:53 +11:00
Rohan Mitchell	6365434a94	Merge branch 'lin-d-hop-ordercyclemanagementreports2'	2015-03-13 10:53:03 +11:00
Rohan Mitchell	008b43b1fc	Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2	2015-03-13 10:47:49 +11:00
Rohan Mitchell	5609354136	Fix bug: When there are variant overrides not owned by the current user, user is unable to make any changes to VOs	2015-03-13 10:45:38 +11:00
Lynne Davis	d9e8ce2f0e	Fix bug in report that selecting multiple payment methods didn't work. Added spec as well	2015-03-12 17:16:51 +11:00
Rob Harrington	cce65aa462	Merge remote-tracking branch 'origin/master' into order-confirmation	2015-03-12 16:20:21 +11:00
Rob Harrington	44511b8b61	Only display shipping description if it exists	2015-03-12 16:18:30 +11:00
Rob Harrington	6cd6b751c8	Merge branch 'master' into order-confirmation	2015-03-12 15:34:49 +11:00
Rohan Mitchell	36fa4896ed	Syntax	2015-03-12 12:28:35 +11:00
Rohan Mitchell	7c723c04b6	Show yes/no instead of true/false	2015-03-12 12:23:02 +11:00
Rohan Mitchell	1a97df1d21	Fix whitespace issues	2015-03-12 12:17:15 +11:00
Rohan Mitchell	a5716cf2c2	Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2	2015-03-12 12:15:22 +11:00
Rohan Mitchell	eccd97fc28	Merge branch 'master' into reduce-supplier-list-in-order-cycles	2015-03-12 11:55:14 +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
summerscope	ea96759306	Take styling out of template into SASS	2015-03-10 14:59:46 +11:00