Rohan Mitchell 422061f137 Merge branch 'master' into products-caching ...

Conflicts:
	app/controllers/shop_controller.rb
	app/models/enterprise_fee.rb
	app/models/order_cycle.rb
	app/models/variant_override.rb
	db/schema.rb
	lib/open_food_network/products_renderer.rb
	spec/lib/open_food_network/products_renderer_spec.rb

2016-03-03 09:42:52 +11:00

..

account_controller.rb

Fixing up enterprise user account page

2015-12-16 19:18:59 +11:00

accounts_and_billing_settings_controller.rb

Redesignating all references to user_invoices as account_invoices

2015-09-17 22:38:28 +10:00

business_model_configuration_controller.rb

Reorganising busines model config settings, moving account invoice tax rate in busines model config settings

2015-12-16 19:18:57 +11:00

cache_settings_controller.rb

Display products cache integrity checker results on cache settings admin page

2016-03-02 11:05:03 +11:00

contents_controller.rb

Make TOS URL configurable

2015-07-31 14:51:17 +10:00

customers_controller.rb

Using clearer json_request? method for customers controller

2015-06-12 01:49:34 +08:00

enterprise_fees_controller.rb

Adding option to 'Inherit From Product' for enterprise_fee tax categories

2016-03-02 11:56:46 +11:00

enterprise_groups_controller.rb

Use ! version of find_by_permalink to recover on missing resource

2015-10-21 15:42:28 +11:00

enterprise_relationships_controller.rb

Render enterprise relationships JSON with AMS instead of rabl

2014-08-25 13:07:31 +10:00

enterprise_roles_controller.rb

Admin can delete enterprise roles

2014-08-15 16:09:06 +10:00

enterprises_controller.rb

OC Coordinators can opt to restrict products in an order cycle to those in their inventory only

2016-03-02 12:10:22 +11:00

inventory_items_controller.rb

WIP: Alerting user to presence of new variant for inventory, new variants can be filtered + limited

2016-03-02 12:10:22 +11:00

order_cycles_controller.rb

OC Coordinators can opt to restrict products in an order cycle to those in their inventory only

2016-03-02 12:10:22 +11:00

producer_properties_controller.rb

Use ! version of find_by_permalink to recover on missing resource

2015-10-21 15:42:28 +11:00

resource_controller.rb

Move admin non-Spree controllers out of Spree namespace

2012-10-25 10:45:39 +11:00

variant_overrides_controller.rb

WIP: Adding infrastructure to show/hide variants + overrides using inventory items

2016-03-02 12:10:22 +11:00