1616 Commits

Author	SHA1	Message	Date
Maikel Linke	e6e063670c	Allow managers to remove line items from order ... Managers of an order cycle and the distributor of an order are allowed to remove a line item from the order.	2015-05-01 14:49:34 +10:00
Rohan Mitchell	153604dd64	Merge branch 'single-order-patches'	2015-05-01 14:39:17 +10:00
Rohan Mitchell	a6cecdcc25	Display header for Xero invoices report	2015-05-01 11:59:52 +10:00
Maikel Linke	5efc0a5110	quick fix: update fees after updating order	2015-04-30 16:29:51 +10:00
Rob Harrington	992fb2347d	Merging master branch into require_standard_variant	2015-04-29 14:30:49 +10:00
Maikel Linke	f6d87eee87	Merge remote-tracking branch 'origin/master' into single-order-patches	2015-04-29 13:20:44 +10:00
Maikel Linke	f94a5a975a	Edit Order: resend button uses new pretty template.	2015-04-24 15:31:45 +10:00
Maikel Linke	a937fd3c61	Using variant overrides in variant seach on order edit page	2015-04-23 11:37:10 +10:00
Rob Harrington	5d6f265c0a	Moving spree namespaced serializers into admin	2015-04-22 21:02:06 +10:00
Rob Harrington	a75a76840d	Merging master into require_standard_variant	2015-04-17 21:18:24 +10:00
Rob Harrington	c43eb9ef72	Merge branch 'email_user' into properties	2015-04-17 15:17:37 +10:00
Rob Harrington	b9f19d5777	Fixing broken specs	2015-04-17 13:00:20 +10:00
Rob Harrington	5940ff2b2c	Don't override devise's after_sign_in_path_for, use specific before filters for user sessions and registrations controllers instead	2015-04-16 16:56:27 +10:00
Rohan Mitchell	7f973604e5	Add columns to customer totals report: order cycle, payment method, customer code, tags, billing address	2015-04-16 10:59:15 +10:00
Rob Harrington	8ed6653dc4	Ignoring any new product properties submitted by a non-admin user	2015-04-02 08:55:20 +11:00
Rob Harrington	588e036c1d	Adding SKU to customer totals report	2015-04-01 14:45:23 +11:00
Rob Harrington	aa7ddbcba4	Renaming Dist. column to Admin & Handling	2015-04-01 14:38:15 +11:00
Rob Harrington	4dff3fe79c	Removing unused distributable action from products api	2015-03-27 16:07:38 +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	cc7d6cde1d	Shorter syntax	2015-03-05 10:43:54 +11:00
Matt-Yorkley	d194e74eda	Rohan's suggested changes	2015-03-05 10:43:51 +11:00
Matt-Yorkley	be55f461d0	Report: sales tax on orders	2015-03-05 10:43:50 +11:00
Lynne Davis	87b1ab9a1a	LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report	2015-03-03 16:01:42 +11:00
Rob Harrington	ad1f837c44	Admin users can access all users through known_users	2015-02-12 11:34:58 +11:00
Rob Harrington	dcb24cf06c	Controller method to allow enterprise users to search for other users which share management of their enterprises	2015-02-12 11:34:58 +11:00
Rohan Mitchell	22f6ece83f	When fetching products for variant overrides admin, fetch all overridable products	2015-02-04 10:16:34 +11:00
Rob Harrington	713999c1d8	Merge branch 'master' into shop-url	2015-01-28 10:53:42 +11:00
Lynne Davis	3c4ad4121f	LD adding whitespace to get my master version back in line with origin	2015-01-22 14:00:48 +00:00
Lynne Davis	8e8f38e484	app/controllers/spree/admin/reports_controller_decorator.rb	2015-01-22 12:01:20 +00:00
Rob Harrington	9286c82b43	Removing obsolete methods	2015-01-22 10:19:42 +11:00
Rohan Mitchell	6a42f62eb2	Fix filename on order cycle management report csv, add timestamp to it and also users and enterprises report	2015-01-09 11:49:59 +11:00
Rohan Mitchell	8db09d9590	Merge branch 'report_download_namechange' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-report_download_namechange ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb	2015-01-09 11:48:23 +11:00
Rohan Mitchell	51b0d7e0eb	Move private method to helper	2015-01-08 10:48:02 +11:00
Rohan Mitchell	ab26902e4e	Move money decorator to lib dir, as it's a decorator for a lib class, not a model	2015-01-08 10:39:14 +11:00
Rohan Mitchell	4839c00d62	Retrieve currency_symbol via private method rather than before_filter + instance var - cleaner syntax	2015-01-08 10:12:32 +11:00
Rohan Mitchell	a438216189	Merge branch 'reports_2' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-reports_2 ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb	2015-01-08 10:08:12 +11:00
Rohan Mitchell	72118f4e2e	Fix syntax error, spec for removed column	2014-12-19 10:01:46 +11:00
Rohan Mitchell	e9f04c3c15	Clean up whitespace	2014-12-19 10:01:21 +11:00
Rohan Mitchell	4a30f27b3d	Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb spec/models/spree/order_spec.rb	2014-12-19 09:38:02 +11:00
Rohan Mitchell	531b35bbc6	WIP: Extract variant overrides to own controller - route, controller, views	2014-12-12 13:33:14 +11:00
Rohan Mitchell	51d2805de9	WIP: Rename override_variants to variant_overrides	2014-12-12 13:33:13 +11:00
Rohan Mitchell	efae9265c1	Inject variant overrides	2014-12-12 13:33:12 +11:00
Rohan Mitchell	5b82fcaca7	Inject hub permissions - which producers each hub can add to order cycle	2014-12-12 13:33:12 +11:00
Rob Harrington	3a9c4e0826	Adding a price without fees column to the order cycle customer report	2014-12-12 12:00:15 +11:00
Rob Harrington	dfb9e5bde5	Order reports now present the price of line items with adjustments included	2014-12-11 15:48:29 +11:00
Rob Harrington	3be437485a	Redirecting any spree checkout_state redirects to our checkout controller	2014-12-11 14:53:11 +11:00
Matt-Yorkley	e4d1ae7548	Refactored currency symbol display	2014-11-24 18:20:10 +00:00
Matt-Yorkley	4f153714a8	Reports pages improvements and i18n	2014-11-23 17:26:26 +00:00
Rohan Mitchell	0b030a85ff	Incrementally load products	2014-11-21 13:49:09 +11:00
Rohan Mitchell	58fdc48b9f	Display products in table	2014-11-21 13:49:09 +11:00