650 Commits

Author	SHA1	Message	Date
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	9245af6a8f	Producer properties routes use enterprise permalink	2015-01-22 10:19:47 +11:00
Rob Harrington	6991e5e6b1	Finally got all callbacks available to all action that need them	2015-01-22 10:19:46 +11:00
Rob Harrington	4d26b3d648	Make unused cart_controller happy	2015-01-22 10:19:45 +11:00
Rob Harrington	4baa205cf9	before_filters for enterprise controller are run in the correct order, and put inside the shop action	2015-01-22 10:19:45 +11:00
Rob Harrington	60313f7a6a	Replace delete with parameterize	2015-01-22 10:19:45 +11:00
Rob Harrington	ff624e83eb	Require distributor in enterprise controller, so that everything actually works	2015-01-22 10:19:44 +11:00
Rob Harrington	7ad9fdf0be	Cleaning permalink before checking	2015-01-22 10:19:43 +11:00
Rob Harrington	4088bdc236	Clean up permalink checker	2015-01-22 10:19:43 +11:00
Rob Harrington	9b78963d5a	Adding a javascript interface for checking permalinks and user input on enterprise console	2015-01-22 10:19:43 +11:00
Rob Harrington	39889390ef	Altering shop page routing so that shop url is copy-and-pastable	2015-01-22 10:19:42 +11:00
Rob Harrington	c3659612ed	enterprise routes use permalink	2015-01-22 10:19:42 +11:00
Rob Harrington	9286c82b43	Removing obsolete methods	2015-01-22 10:19:42 +11:00
Rob Harrington	c330e49a7f	Moving permalink check action to enterprise controller	2015-01-22 10:19:42 +11:00
Rob Harrington	e2268e53bb	Adding action to check uniquness of enterprise permalink against existing routes	2015-01-22 10:19:41 +11:00
Rohan Mitchell	f6e9c9494c	Enterprise user can edit profiles it has permission to	2015-01-15 13:43:39 +11:00
Rohan Mitchell	0431e0048c	Merge branch 'master' into variant-overrides-frontend ... Conflicts: app/controllers/shop_controller.rb app/views/shop/products/_form.html.haml spec/controllers/shop_controller_spec.rb	2015-01-12 16:48:51 +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	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
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