465 Commits

Author	SHA1	Message	Date
Rohan Mitchell	a207f50aeb	Merge branch 'master' into delay-devise-emails ... Conflicts: script/run_tests.sh	2015-04-30 12:29:06 +10:00
Rob Harrington	7b83438b5e	Pulling property values into the shopfront	2015-04-23 13:51:49 +10:00
Rob Harrington	0251d8962d	Adding sku to BPE	2015-04-22 21:02:07 +10:00
Rob Harrington	e546388784	Rename properties_h to properties_including_inherited	2015-04-22 21:02:07 +10:00
Rob Harrington	976c24cf4c	properties_h uses inherit_properties flag, and returns property id rather than presentation	2015-04-22 21:02:07 +10:00
Rob Harrington	f610a709e1	Adding inherits_properties to BPE	2015-04-22 21:02:06 +10:00
Rob Harrington	a4a41ae26a	Refactor properties_h	2015-04-22 21:02:06 +10:00
Rohan Mitchell	9d225142c8	Send password reset instructions asynchronously	2015-04-21 16:10:40 +10:00
Rohan Mitchell	81324f3cc4	Do not charge tax on shipments when distributor does not charge sales tax	2015-04-17 13:41:38 +10:00
Rohan Mitchell	0b8a619274	When the order does not have a hub, all tax rates apply	2015-04-17 13:41:38 +10:00
Rohan Mitchell	3e8801b12b	Do not charge sales tax on items or on enterprise fees when the distributor of the order does not charge sales tax	2015-04-17 13:41:38 +10:00
Rohan Mitchell	e9fbd74e88	Send emails via jobs instead of synchronously	2015-04-16 16:54:43 +10:00
Rohan Mitchell	7f6c02ca29	Add User#customer_of to look up customers	2015-04-16 10:59:15 +10:00
Rohan Mitchell	34d1841d22	Make Variant#full_name resilient to regex chars	2015-04-16 10:59:15 +10:00
Rob Harrington	7448d41b27	Adding abilities for new for_order_cycle action	2015-04-06 10:23:39 +10:00
Rob Harrington	94a88278a9	Ignore the unit_to_display when it is wholly contained within display_name or vice versa	2015-04-01 15:46:11 +11:00
Rob Harrington	54af6886c2	Line items with a quantity of zero return price_with_adjustments of 0.0	2015-04-01 12:34:22 +11:00
Rob Harrington	d49dd62124	Replace unused bugsnag notification with one to test for line items with a quantity of zero	2015-04-01 11:38:06 +11:00
Rob Harrington	d8c4e292c8	Adding method for determining variant override hubs	2015-03-27 16:09:45 +11:00
Rob Harrington	2310a6a7db	Splitting out order cycle abilities from general order management abilities	2015-03-27 16:07:37 +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	e38772ada0	Enterprise user can delete unreferenced order cycles	2015-03-16 12:41:06 +11:00
Rohan Mitchell	8d3f25bb39	Fix intermittent 500 error when updating the cart	2015-03-13 17:50:01 +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
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
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	b5ce056d06	Fix tax calculations for determining tax included in an amount	2015-03-05 13:03:53 +11:00
Rohan Mitchell	dfb855bd14	Record the tax included in shipping.	2015-03-05 10:44:27 +11:00
Rohan Mitchell	9395f6c808	Record the tax included in adjustments. TaxRate adjustments consist of 100% tax.	2015-03-05 10:44:26 +11:00
Rohan Mitchell	ec22f4c09f	Sales tax report pulls sales tax from adjustments instead of recalculating it at report-time	2015-03-05 10:43:57 +11:00
Matt-Yorkley	0f3723a923	Added currency symbols to sales tax report	2015-03-05 10:43:51 +11:00
Matt-Yorkley	623882a2a1	Config option for tax rate on shipping	2015-03-05 10:43:50 +11:00
Matt-Yorkley	be55f461d0	Report: sales tax on orders	2015-03-05 10:43:50 +11:00
Lynne Davis	cfa281478a	Adding ability to edit ShippingCategory.temperature_controlled from admin interface	2015-03-04 12:02:07 +11:00
Maikel Linke	903bd21577	Merge remote-tracking branch 'origin/master' into group-pages-merge ... Conflicts: README.markdown db/schema.rb	2015-02-13 15:42:36 +11:00
Rob Harrington	12dc0b93aa	Scoping users correctly for realz this time	2015-02-12 16:20:46 +11:00
Rob Harrington	5503760ce3	Scoping users correctly	2015-02-12 13:45:25 +11:00
Rob Harrington	ee5ab22501	Moving interface for changing owner to new 'Users' tab	2015-02-12 11:34:58 +11:00
Rob Harrington	ad1f837c44	Admin users can access all users through known_users	2015-02-12 11:34:58 +11:00
Rob Harrington	b73619d168	Adding known_users method to Spree::User	2015-02-12 11:34:58 +11:00
Rob Harrington	dde1a27d3a	Adding ability to search for known users	2015-02-12 11:34:57 +11:00
Maikel Linke	a7c2a73fa8	make groups editable by group owners	2015-02-05 12:05:39 +11:00
Rohan Mitchell	7ca9670073	Admin can access variant override only when it can add hub to order cycle and it can create variant overrides for the producer of the variant	2015-02-04 11:09:48 +11:00
Maikel Linke	91b35d068c	Adding owner to groups ... Groups have owners and users own groups. The owners are displayed and changable on the group's page by admin users.	2015-02-02 15:58:34 +11:00
Rohan Mitchell	d5437e1508	edit_profile permission no longer shows links to manage shipping methods, payment methods and enterprise fees for an enterprise	2015-01-15 13:43:39 +11:00
Rohan Mitchell	90ad2e2b7d	Allow enterprises with 'edit profile' permission to edit enterprises	2015-01-15 13:43:39 +11:00
Rob Harrington	06cf914119	Hopefully resolving order populator strangeness related to concurrency by ensuring a fresh list of line items	2015-01-15 12:10:05 +11:00