3832 Commits

Author	SHA1	Message	Date
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
Maikel Linke	9310bc902a	first draft of group page, a lot of TODOs	2015-01-06 22:39:15 +11:00
Paul Mackay	67b17de695	#275: Add receival time and instructions to order cycle for incoming exchanges. Fix issues from feedback.	2014-12-30 11:33:13 +00:00
Rohan Mitchell	85882a73ff	Merge branch 'lin-d-hop-266reportsbranch'	2014-12-19 16:51:38 +11:00
Rob Harrington	21e4f40616	Implementing primary taxon ordering on the shopfront	2014-12-19 14:05:23 +11:00
Rob Harrington	f145a7ed65	Moving taxons into its own module, adding preferred shopfront taxon order to enterprise	2014-12-19 14:04:02 +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	1d3800696e	Variant overrides can override stock levels	2014-12-18 10:46:47 +11:00
Rohan Mitchell	84b607433c	Creating and then updating the new override updates the same override instead of creating a duplicate	2014-12-12 13:33:14 +11:00
Rohan Mitchell	c38686c820	Create new variant overrides	2014-12-12 13:33:14 +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
Paul Mackay	8d5a0aea9f	Setup daemon and delayed job table.	2014-11-24 21:25:58 +00: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
Rohan Mitchell	912c60f720	Do not show producers in hubs list	2014-11-21 13:49:09 +11:00
Rohan Mitchell	2c74a94e31	Show list of hubs to select for managing variant overrides	2014-11-21 13:49:09 +11:00
Lynne Davis	03b59eae75	266: Updating with rohans suggestions to tidy up and 'rubify' the code. Thanks for the tips Rohan!	2014-11-14 15:56:07 +00:00
Rob Harrington	79a83ee206	Adding users and enterprises report, controller action and template	2014-11-14 16:36:22 +11:00
Rob Harrington	65a5960fcc	WIP: Add route for User and Enterprise report	2014-11-14 16:36:22 +11:00
Lynne Davis	cc3959467d	285: Report downlaod naming - Updating to the cleaner suggestions of Rohan. Note to self, don't be lazy :-)	2014-11-13 10:30:00 +00:00
Rohan Mitchell	43bac4079f	Show hubs that are not ready for checkout so that we can view SEFH - Sample :/	2014-11-13 15:21:02 +11:00
Lynne Davis	9a5ee81431	Changing report download titles in include download date	2014-11-11 17:49:08 +00:00
Paul Mackay	05437e2a56	#275: start on producer email.	2014-11-09 11:17:46 +00:00
Rob Harrington	898af0a55e	Enterprise confirmation emails can be resent, and sensible things happen if confirmation link is clicked twice	2014-11-06 21:19:21 +11:00
Rob Harrington	51e768e722	Refactor EnterpriseSet to accept a collection as an argument	2014-11-06 16:29:09 +11:00
Rob Harrington	93e3d87fcb	Errors on bulk update for enterprise index do not allow user to list all enterprises	2014-11-06 11:01:44 +11:00
Rohan Mitchell	fdbb274667	Allow browsing products (but not cart/checkout) for hubs that are not ready for checkout	2014-11-05 14:29:36 +11:00
Lynne Davis	6f6ae309c6	266 UK: Adding first UK report - Payment Methods Report - to find balances per ordercycle for multiple payment method options. Working, but not complete to spec yet	2014-11-02 11:26:39 +00:00
Rohan Mitchell	15b05de7f2	Fix specs: Distributors require shipping and payment method	2014-11-01 10:42:38 +11:00
Rohan Mitchell	8488b8e469	When user has selected a hub that is not ready for checkout, unselect it	2014-10-31 15:02:58 +11:00
Rohan Mitchell	94d50f220f	Display an error message to admin when there are hubs in order cycles that are not ready for checkout	2014-10-31 12:22:02 +11:00
Rohan Mitchell	f0d3b987d4	Show hubs as unavailable when they do not have available payment and shipping methods	2014-10-31 12:22:02 +11:00
Rob Harrington	65d13e0490	Show error messages on enterprise index page	2014-10-30 13:02:16 +11:00
Rob Harrington	6155600cb2	Set environment for payment methods unless admin	2014-10-24 18:15:48 +11:00
Rob Harrington	8385bff55e	Make admins get multi enterprise dashboard	2014-10-24 17:59:58 +11:00
Rob Harrington	cc0e205f50	Merge master into onbaording	2014-10-24 15:36:59 +11:00
Rob Harrington	8b819539e7	Fixing specs	2014-10-24 14:52:59 +11:00
Rob Harrington	96516a8ff3	User can switch between trialling a shopfront and not trialling a shopfront	2014-10-24 14:12:47 +11:00