5046 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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	d9f90be38a	Fix indentation	2015-03-13 10:52:44 +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	eb413ccc84	Committing schema changes	2015-03-12 16:18:07 +11:00
Rob Harrington	6cd6b751c8	Merge branch 'master' into order-confirmation	2015-03-12 15:34:49 +11:00
Rohan Mitchell	af95181245	Merge branch 'lin-d-hop-ordercyclemanagementreports2'	2015-03-12 12:30: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	c85d5b86eb	Fix temperature_controlled migration - NOT NULL requires default value	2015-03-12 12:22:51 +11:00