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

..

admin

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

address_serializer.rb

Moving to state_name

2014-07-31 15:38:26 +10:00

country_serializer.rb

Adding countries and states to registration

2014-09-11 17:07:05 +10:00

currency_config_serializer.rb

add currency spec file and update some class names

2014-09-10 18:22:33 +10:00

current_order_serializer.rb

Fixing cart total in checkout

2014-08-06 13:59:47 +10:00

enterprise_serializer.rb

Not using Paperclip's to avoid HTTP calls to S3

2015-12-04 10:37:55 +11:00

id_name_serializer.rb

Adding product property filter to shop page

2015-03-06 11:22:52 +11:00

id_serializer.rb

WIP: Angularise payment methods on enterprise edit page

2014-07-24 10:16:54 +10:00

image_serializer.rb

Starting to restructure data injection

2014-07-18 11:21:51 +10:00

line_item_serializer.rb

Preserve max quantity when reloading shopfront

2016-01-07 16:35:54 +11:00

payment_method_serializer.rb

add payment description to checkout

2014-09-17 14:56:29 +10:00

product_serializer.rb

Do not serialize product count_on_hand - reduce coupling between variant create and products JSON

2016-03-03 09:33:32 +11:00

property_serializer.rb

Spiking out products serializers and caching

2014-07-10 12:46:25 +10:00

shipping_method_serializer.rb

All the new serializers and some specs

2014-07-17 14:23:09 +10:00

state_serializer.rb

Make state abbreviations upper case

2014-10-17 12:29:51 +11:00

taxon_image_serializer.rb

Spiking out products serializers and caching

2014-07-10 12:46:25 +10:00

taxon_serializer.rb

Temporary/demonstration caching behaviour, INCOMPLETE

2014-07-04 14:38:27 +10:00

variant_serializer.rb

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00