Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Include automatically money methods in Platform serializers

Damian Legawiecb4da4a522bce
diff --git a/api/app/serializers/concerns/spree/api/v2/resource_serializer_concern.rb b/api/app/serializers/concerns/spree/api/v2/resource_serializer_concern.rb
index 49d40229f0..df66b0552b 100644
--- a/api/app/serializers/concerns/spree/api/v2/resource_serializer_concern.rb
+++ b/api/app/serializers/concerns/spree/api/v2/resource_serializer_concern.rb
@@ -8,7 +8,12 @@ module Spree
model_klazz = "Spree::#{base.to_s.demodulize.gsub(/Serializer/, '')}".constantize
base.set_type model_klazz.json_api_type
+ # include standard attributes
base.attributes(*model_klazz.json_api_columns)
+ # include money attributes
+ base.attributes(*model_klazz.new.methods.find_all do |m|
+ m.to_s.match(/display_/) && !([Spree::Product, Spree::Variant].include?(model_klazz) && m == :display_amount)
+ end)
end
end
end
diff --git a/api/app/serializers/spree/api/v2/platform/address_serializer.rb b/api/app/serializers/spree/api/v2/platform/address_serializer.rb
index 3593c92f88..febe61bb6a 100644
--- a/api/app/serializers/spree/api/v2/platform/address_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/address_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class AddressSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
belongs_to :country
belongs_to :state
diff --git a/api/app/serializers/spree/api/v2/platform/classification_serializer.rb b/api/app/serializers/spree/api/v2/platform/classification_serializer.rb
index ec94c6f75e..0c0c5995da 100644
--- a/api/app/serializers/spree/api/v2/platform/classification_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/classification_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class ClassificationSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
belongs_to :product
belongs_to :taxon
diff --git a/api/app/serializers/spree/api/v2/platform/cms_page_serializer.rb b/api/app/serializers/spree/api/v2/platform/cms_page_serializer.rb
index 6e2b89483f..2a5a57cc44 100644
--- a/api/app/serializers/spree/api/v2/platform/cms_page_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/cms_page_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class CmsPageSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
has_many :cms_sections, serializer: :cms_section
end
diff --git a/api/app/serializers/spree/api/v2/platform/cms_section_serializer.rb b/api/app/serializers/spree/api/v2/platform/cms_section_serializer.rb
index 10675aa12f..4a69956176 100644
--- a/api/app/serializers/spree/api/v2/platform/cms_section_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/cms_section_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class CmsSectionSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
belongs_to :cms_page, serializer: :cms_page
belongs_to :linked_resource, polymorphic: {
diff --git a/api/app/serializers/spree/api/v2/platform/country_serializer.rb b/api/app/serializers/spree/api/v2/platform/country_serializer.rb
index e6f29f6071..c960ccd0d9 100644
--- a/api/app/serializers/spree/api/v2/platform/country_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/country_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class CountrySerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
has_many :states
end
diff --git a/api/app/serializers/spree/api/v2/platform/menu_item_serializer.rb b/api/app/serializers/spree/api/v2/platform/menu_item_serializer.rb
index 9f2d01b229..889290d671 100644
--- a/api/app/serializers/spree/api/v2/platform/menu_item_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/menu_item_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class MenuItemSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
attributes :link
diff --git a/api/app/serializers/spree/api/v2/platform/menu_serializer.rb b/api/app/serializers/spree/api/v2/platform/menu_serializer.rb
index 2ec221508b..69ec4c8f56 100644
--- a/api/app/serializers/spree/api/v2/platform/menu_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/menu_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class MenuSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
has_many :menu_items
end
diff --git a/api/app/serializers/spree/api/v2/platform/option_type_serializer.rb b/api/app/serializers/spree/api/v2/platform/option_type_serializer.rb
index f320529a03..35907a059d 100644
--- a/api/app/serializers/spree/api/v2/platform/option_type_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/option_type_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class OptionTypeSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
has_many :option_values
end
diff --git a/api/app/serializers/spree/api/v2/platform/option_value_serializer.rb b/api/app/serializers/spree/api/v2/platform/option_value_serializer.rb
index 40700094e1..f50f60f133 100644
--- a/api/app/serializers/spree/api/v2/platform/option_value_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/option_value_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class OptionValueSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
belongs_to :option_type
end
diff --git a/api/app/serializers/spree/api/v2/platform/product_property_serializer.rb b/api/app/serializers/spree/api/v2/platform/product_property_serializer.rb
index 9f60c1b6ac..1216e3ee5e 100644
--- a/api/app/serializers/spree/api/v2/platform/product_property_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/product_property_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class ProductPropertySerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
end
end
end
diff --git a/api/app/serializers/spree/api/v2/platform/product_serializer.rb b/api/app/serializers/spree/api/v2/platform/product_serializer.rb
index edc746321a..0f319af5d0 100644
--- a/api/app/serializers/spree/api/v2/platform/product_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/product_serializer.rb
@@ -3,8 +3,8 @@ module Spree
module V2
module Platform
class ProductSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
- include ::Spree::Api::V2::DisplayMoneyHelper
+ include ResourceSerializerConcern
+ include DisplayMoneyHelper
attribute :purchasable do |product|
product.purchasable?
diff --git a/api/app/serializers/spree/api/v2/platform/state_serializer.rb b/api/app/serializers/spree/api/v2/platform/state_serializer.rb
index 8146aa4f6e..6d4c756774 100644
--- a/api/app/serializers/spree/api/v2/platform/state_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/state_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class StateSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
belongs_to :country
end
diff --git a/api/app/serializers/spree/api/v2/platform/stock_item_serializer.rb b/api/app/serializers/spree/api/v2/platform/stock_item_serializer.rb
index 1de41fb9d6..ff7fb00d1c 100644
--- a/api/app/serializers/spree/api/v2/platform/stock_item_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/stock_item_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class StockItemSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
set_type :stock_item
diff --git a/api/app/serializers/spree/api/v2/platform/stock_location_serializer.rb b/api/app/serializers/spree/api/v2/platform/stock_location_serializer.rb
index abd5f7c90e..ea07116570 100644
--- a/api/app/serializers/spree/api/v2/platform/stock_location_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/stock_location_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class StockLocationSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
attributes :name
diff --git a/api/app/serializers/spree/api/v2/platform/store_serializer.rb b/api/app/serializers/spree/api/v2/platform/store_serializer.rb
index de6b7338fa..bdf5e52a32 100644
--- a/api/app/serializers/spree/api/v2/platform/store_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/store_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class StoreSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
has_many :menus
has_one :default_country, serializer: :country, record_type: :country, id_method_name: :default_country_id
diff --git a/api/app/serializers/spree/api/v2/platform/tax_category_serializer.rb b/api/app/serializers/spree/api/v2/platform/tax_category_serializer.rb
index d8ee5d582c..81c28e2e2f 100644
--- a/api/app/serializers/spree/api/v2/platform/tax_category_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/tax_category_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class TaxCategorySerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
# TODO: add tax_rates
end
diff --git a/api/app/serializers/spree/api/v2/platform/taxon_serializer.rb b/api/app/serializers/spree/api/v2/platform/taxon_serializer.rb
index 0c5b9be37a..4b25e3c785 100644
--- a/api/app/serializers/spree/api/v2/platform/taxon_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/taxon_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class TaxonSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
attributes :pretty_name, :seo_title
diff --git a/api/app/serializers/spree/api/v2/platform/taxonomy_serializer.rb b/api/app/serializers/spree/api/v2/platform/taxonomy_serializer.rb
index 16261ef10e..5cc7365b0f 100644
--- a/api/app/serializers/spree/api/v2/platform/taxonomy_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/taxonomy_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class TaxonomySerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
has_many :taxons
has_one :root, serializer: :taxon
diff --git a/api/app/serializers/spree/api/v2/platform/variant_serializer.rb b/api/app/serializers/spree/api/v2/platform/variant_serializer.rb
index 29f922e35f..a0fb346093 100644
--- a/api/app/serializers/spree/api/v2/platform/variant_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/variant_serializer.rb
@@ -3,8 +3,8 @@ module Spree
module V2
module Platform
class VariantSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
- include ::Spree::Api::V2::DisplayMoneyHelper
+ include ResourceSerializerConcern
+ include DisplayMoneyHelper
attributes :name, :options_text, :total_on_hand
diff --git a/api/app/serializers/spree/api/v2/platform/wished_item_serializer.rb b/api/app/serializers/spree/api/v2/platform/wished_item_serializer.rb
index d3b8f8c6b5..3546e13be1 100644
--- a/api/app/serializers/spree/api/v2/platform/wished_item_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/wished_item_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class WishedItemSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
attribute :price do |wished_item, params|
wished_item.price(currency: params[:currency])
diff --git a/api/app/serializers/spree/api/v2/platform/wishlist_serializer.rb b/api/app/serializers/spree/api/v2/platform/wishlist_serializer.rb
index 61365fe3d2..ed7120db71 100644
--- a/api/app/serializers/spree/api/v2/platform/wishlist_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/wishlist_serializer.rb
@@ -3,7 +3,7 @@ module Spree
module V2
module Platform
class WishlistSerializer < BaseSerializer
- include ::Spree::Api::V2::ResourceSerializerConcern
+ include ResourceSerializerConcern
attributes :token