Merge branch 'caching' into new_cart

Conflicts:
	app/serializers/api/variant_serializer.rb
This commit is contained in:
Will Marshall
2014-07-18 11:23:25 +10:00
7 changed files with 70 additions and 5 deletions

View File

@@ -1,7 +1,8 @@
class Api::VariantSerializer < ActiveModel::Serializer
attributes :id, :is_master, :count_on_hand, :name_to_display, :on_demand,
:price
attributes :id, :is_master, :count_on_hand, :name_to_display, :unit_to_display, :on_demand
attributes :price
has_many :images, serializer: Api::ImageSerializer
def price