diff --git a/app/serializers/api/product_serializer.rb b/app/serializers/api/product_serializer.rb index e25fdaf04a..1a34ece6b2 100644 --- a/app/serializers/api/product_serializer.rb +++ b/app/serializers/api/product_serializer.rb @@ -10,7 +10,6 @@ class Api::ProductSerializer < ActiveModel::Serializer has_many :variants, serializer: Api::VariantSerializer has_one :image, serializer: Api::ImageSerializer - has_one :supplier, serializer: Api::IdSerializer # return an unformatted descripton def description diff --git a/app/serializers/api/variant_serializer.rb b/app/serializers/api/variant_serializer.rb index 1d58eda967..660d45467f 100644 --- a/app/serializers/api/variant_serializer.rb +++ b/app/serializers/api/variant_serializer.rb @@ -9,6 +9,8 @@ class Api::VariantSerializer < ActiveModel::Serializer :tag_list, :thumb_url, :unit_price_price, :unit_price_unit + has_one :supplier, serializer: Api::IdSerializer + delegate :price, to: :object def fees diff --git a/app/serializers/invoice/product_serializer.rb b/app/serializers/invoice/product_serializer.rb index 61f5ecadd0..d5900200c6 100644 --- a/app/serializers/invoice/product_serializer.rb +++ b/app/serializers/invoice/product_serializer.rb @@ -3,6 +3,5 @@ class Invoice class ProductSerializer < ActiveModel::Serializer attributes :name - has_one :supplier, serializer: Invoice::EnterpriseSerializer end end diff --git a/app/serializers/invoice/variant_serializer.rb b/app/serializers/invoice/variant_serializer.rb index 3f0a547b96..ef00becdf4 100644 --- a/app/serializers/invoice/variant_serializer.rb +++ b/app/serializers/invoice/variant_serializer.rb @@ -4,5 +4,6 @@ class Invoice class VariantSerializer < ActiveModel::Serializer attributes :id, :display_name, :options_text has_one :product, serializer: Invoice::ProductSerializer + has_one :supplier, serializer: Invoice::EnterpriseSerializer end end