From b7de8353bcf0d921278e248c37541e83e684f2b7 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Mon, 6 Apr 2015 09:47:37 +1000 Subject: [PATCH] Renaming existing enterprise fee serializer as basic... --- app/serializers/api/admin/basic_enterprise_fee_serializer.rb | 3 +++ app/serializers/api/admin/enterprise_fee_serializer.rb | 3 --- app/serializers/api/admin/exchange_serializer.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 app/serializers/api/admin/basic_enterprise_fee_serializer.rb delete mode 100644 app/serializers/api/admin/enterprise_fee_serializer.rb diff --git a/app/serializers/api/admin/basic_enterprise_fee_serializer.rb b/app/serializers/api/admin/basic_enterprise_fee_serializer.rb new file mode 100644 index 0000000000..07bcaffc0c --- /dev/null +++ b/app/serializers/api/admin/basic_enterprise_fee_serializer.rb @@ -0,0 +1,3 @@ +class Api::Admin::BasicEnterpriseFeeSerializer < ActiveModel::Serializer + attributes :id, :enterprise_id +end diff --git a/app/serializers/api/admin/enterprise_fee_serializer.rb b/app/serializers/api/admin/enterprise_fee_serializer.rb deleted file mode 100644 index 5f5755507e..0000000000 --- a/app/serializers/api/admin/enterprise_fee_serializer.rb +++ /dev/null @@ -1,3 +0,0 @@ -class Api::Admin::EnterpriseFeeSerializer < ActiveModel::Serializer - attributes :id, :enterprise_id -end diff --git a/app/serializers/api/admin/exchange_serializer.rb b/app/serializers/api/admin/exchange_serializer.rb index 4fa7760de5..518d865003 100644 --- a/app/serializers/api/admin/exchange_serializer.rb +++ b/app/serializers/api/admin/exchange_serializer.rb @@ -1,7 +1,7 @@ class Api::Admin::ExchangeSerializer < ActiveModel::Serializer attributes :id, :sender_id, :receiver_id, :incoming, :variants, :pickup_time, :pickup_instructions - has_many :enterprise_fees, serializer: Api::Admin::EnterpriseFeeSerializer + has_many :enterprise_fees, serializer: Api::Admin::BasicEnterpriseFeeSerializer def variants permitted = Spree::Variant.where("1=0")