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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Changed string attributes to an Alba type and restored written-out expandable associations
Claudebd1094235eb9
diff --git a/spree/api/app/serializers/spree/api/v3/admin/catalog_order_minimum_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/catalog_order_minimum_serializer.rbindex 178959e062..9f97281746 100644--- a/spree/api/app/serializers/spree/api/v3/admin/catalog_order_minimum_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/catalog_order_minimum_serializer.rb@@ -9,7 +9,7 @@ module Spreeattributes :currency, created_at: :iso8601, updated_at: :iso8601- string_attributes :amount, :display_amount+ attributes amount: :string, display_amount: :stringendendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/catalog_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/catalog_serializer.rbindex 06c979384e..8d2f63ff22 100644--- a/spree/api/app/serializers/spree/api/v3/admin/catalog_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/catalog_serializer.rb@@ -25,12 +25,16 @@ module Spree# Minimums are few (one per currency) and the card renders them# inline, so they ride along rather than costing a second request.- expandable :many, :order_minimums, :admin_catalog_order_minimum_serializer+ many :order_minimums,+ resource: proc { Spree.api.admin_catalog_order_minimum_serializer },+ if: proc { expand?('order_minimums') }# The owned list rides along so the agreement editor can render its# pricing without a second request — the catalog page is where an# owned list is edited (docs/plans/6.0-catalog-agreement-rework.md).- expandable :one, :price_list, :admin_price_list_serializer+ one :price_list,+ resource: proc { Spree.api.admin_price_list_serializer },+ if: proc { expand?('price_list') }many :catalog_assignments, key: :assignments,resource: proc { Spree.api.admin_catalog_assignment_serializer },diff --git a/spree/api/app/serializers/spree/api/v3/admin/category_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/category_serializer.rbindex 7f75261d18..53ab756406 100644--- a/spree/api/app/serializers/spree/api/v3/admin/category_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/category_serializer.rb@@ -16,13 +16,21 @@ module Spreecreated_at: :iso8601, updated_at: :iso8601# Override inherited associations to use admin serializers- expandable :one, :parent, :admin_category_serializer+ one :parent,+ resource: proc { Spree.api.admin_category_serializer },+ if: proc { expand?('parent') }- expandable :many, :children, :admin_category_serializer+ many :children,+ resource: proc { Spree.api.admin_category_serializer },+ if: proc { expand?('children') }- expandable :many, :ancestors, :admin_category_serializer+ many :ancestors,+ resource: proc { Spree.api.admin_category_serializer },+ if: proc { expand?('ancestors') }- expandable :many, :custom_fields, :admin_custom_field_serializer+ many :custom_fields,+ resource: proc { Spree.api.admin_custom_field_serializer },+ if: proc { expand?('custom_fields') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/claim_line_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/claim_line_item_serializer.rbindex 4d643cc542..1142282443 100644--- a/spree/api/app/serializers/spree/api/v3/admin/claim_line_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/claim_line_item_serializer.rb@@ -7,8 +7,8 @@ module Spreeclass ClaimLineItemSerializer < V3::ClaimLineItemSerializerattributes created_at: :iso8601, updated_at: :iso8601- expandable :one, :variant, :admin_variant_serializer- expandable :one, :replacement_variant, :admin_variant_serializer+ one :variant, resource: proc { Spree.api.admin_variant_serializer }, if: proc { expand?('variant') }+ one :replacement_variant, resource: proc { Spree.api.admin_variant_serializer }, if: proc { expand?('replacement_variant') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/claim_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/claim_serializer.rbindex 9f524d96a2..661bb563c6 100644--- a/spree/api/app/serializers/spree/api/v3/admin/claim_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/claim_serializer.rb@@ -14,11 +14,13 @@ module Spreeactor_attributes :created_by- expandable :many, :claim_line_items, :admin_claim_line_item_serializer+ many :claim_line_items,+ resource: proc { Spree.api.admin_claim_line_item_serializer },+ if: proc { expand?('claim_line_items') }- expandable :one, :reason, :admin_claim_reason_serializer- expandable :one, :order, :admin_order_serializer- expandable :many, :refunds, :admin_refund_serializer+ one :reason, resource: proc { Spree.api.admin_claim_reason_serializer }, if: proc { expand?('reason') }+ one :order, resource: proc { Spree.api.admin_order_serializer }, if: proc { expand?('order') }+ many :refunds, resource: proc { Spree.api.admin_refund_serializer }, if: proc { expand?('refunds') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/collection_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/collection_serializer.rbindex 5bc15cda53..e9f2e4a962 100644--- a/spree/api/app/serializers/spree/api/v3/admin/collection_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/collection_serializer.rb@@ -14,10 +14,14 @@ module Spreeattributes :automatic, :rules_match_policy, :metadata,created_at: :iso8601, updated_at: :iso8601- expandable :many, :rules, :admin_collection_rule_serializer+ many :rules,+ resource: proc { Spree.api.admin_collection_rule_serializer },+ if: proc { expand?('rules') }# Override inherited custom_fields to use the admin serializer.- expandable :many, :custom_fields, :admin_custom_field_serializer+ many :custom_fields,+ resource: proc { Spree.api.admin_custom_field_serializer },+ if: proc { expand?('custom_fields') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/commission_line_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/commission_line_serializer.rbindex ac4b4284f0..4d77454ab4 100644--- a/spree/api/app/serializers/spree/api/v3/admin/commission_line_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/commission_line_serializer.rb@@ -57,7 +57,9 @@ module Spreeline.seller&.nameend- expandable :one, :commission_rate, :admin_commission_rate_serializer+ one :commission_rate,+ resource: proc { Spree.api.admin_commission_rate_serializer },+ if: proc { expand?('commission_rate') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/company_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/company_serializer.rbindex 31dbcd048e..f87e017461 100644--- a/spree/api/app/serializers/spree/api/v3/admin/company_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/company_serializer.rb@@ -19,11 +19,17 @@ module Spree# The member count covers the node's whole subtreeattributes :members_count- expandable :many, :children, :admin_company_serializer+ many :children,+ resource: proc { Spree.api.admin_company_serializer },+ if: proc { expand?('children') }- expandable :many, :addresses, :admin_address_serializer+ many :addresses,+ resource: proc { Spree.api.admin_address_serializer },+ if: proc { expand?('addresses') }- expandable :many, :memberships, :admin_company_membership_serializer+ many :memberships,+ resource: proc { Spree.api.admin_company_membership_serializer },+ if: proc { expand?('memberships') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/customer_group_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/customer_group_serializer.rbindex edf6824d43..00dccbb960 100644--- a/spree/api/app/serializers/spree/api/v3/admin/customer_group_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/customer_group_serializer.rb@@ -16,7 +16,9 @@ module Spree# because a group can hold tens of thousands of users — embedding the# whole list on every group fetch would explode the index payload.# Pass `expand=customers` when you need them inline (single-record reads only).- expandable :many, :customers, :admin_customer_serializer+ many :customers,+ resource: proc { Spree.api.admin_customer_serializer },+ if: proc { expand?('customers') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/customer_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/customer_serializer.rbindex decdb30a8e..19defb49ad 100644--- a/spree/api/app/serializers/spree/api/v3/admin/customer_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/customer_serializer.rb@@ -68,7 +68,7 @@ module Spreeend# Override inherited associations to use admin serializers- expandable :many, :addresses, :admin_address_serializer+ many :addresses, resource: proc { Spree.api.admin_address_serializer }, if: proc { expand?('addresses') }one :bill_address, key: :default_billing_address, resource: proc { Spree.api.admin_address_serializer }, if: proc { expand?('default_billing_address') }one :ship_address, key: :default_shipping_address, resource: proc { Spree.api.admin_address_serializer }, if: proc { expand?('default_shipping_address') }@@ -82,19 +82,27 @@ module Spreeuser.newsletter_subscriber(store)end- expandable :many, :orders, :admin_order_serializer+ many :orders,+ resource: proc { Spree.api.admin_order_serializer },+ if: proc { expand?('orders') }- expandable :many, :store_credits, :admin_store_credit_serializer+ many :store_credits,+ resource: proc { Spree.api.admin_store_credit_serializer },+ if: proc { expand?('store_credits') }attribute :customer_group_ids do |user|user.customer_groups.map(&:prefixed_id)end- expandable :many, :customer_groups, :admin_customer_group_serializer+ many :customer_groups,+ resource: proc { Spree.api.admin_customer_group_serializer },+ if: proc { expand?('customer_groups') }# Membership rows only — standing over a parent is a question for the# standing filter, not a claim of membership.- expandable :many, :companies, :admin_company_serializer+ many :companies,+ resource: proc { Spree.api.admin_company_serializer },+ if: proc { expand?('companies') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/data_request_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/data_request_serializer.rbindex 38b6708fab..036ab82e01 100644--- a/spree/api/app/serializers/spree/api/v3/admin/data_request_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/data_request_serializer.rb@@ -24,7 +24,7 @@ module Spree# Null when the subject asked for it themselves.prefixed_id_attributes :requested_by- expandable :one, :customer, :admin_customer_serializer+ one :customer, resource: proc { Spree.api.admin_customer_serializer }, if: proc { expand?('customer') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/delivery_rate_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/delivery_rate_serializer.rbindex 2f8db9e02c..3575c31da3 100644--- a/spree/api/app/serializers/spree/api/v3/admin/delivery_rate_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/delivery_rate_serializer.rb@@ -10,7 +10,7 @@ module Spreeattributes :metadataattributes created_at: :iso8601, updated_at: :iso8601- expandable :one, :delivery_method, :admin_delivery_method_serializer+ one :delivery_method, resource: proc { Spree.api.admin_delivery_method_serializer }, if: proc { expand?('delivery_method') }# An admin twin, so this package carries its own type rather# than importing the store one.diff --git a/spree/api/app/serializers/spree/api/v3/admin/delivery_zone_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/delivery_zone_serializer.rbindex 0329990221..1b40cf9dbe 100644--- a/spree/api/app/serializers/spree/api/v3/admin/delivery_zone_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/delivery_zone_serializer.rb@@ -15,7 +15,7 @@ module Spreerecord.delivery_methods.map(&:prefixed_id)end- expandable :many, :members, :admin_delivery_zone_member_serializer+ many :members, resource: proc { Spree.api.admin_delivery_zone_member_serializer }, if: proc { expand?('members') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/exchange_line_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/exchange_line_item_serializer.rbindex 73c325e1f7..20295621de 100644--- a/spree/api/app/serializers/spree/api/v3/admin/exchange_line_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/exchange_line_item_serializer.rb@@ -7,8 +7,8 @@ module Spreeclass ExchangeLineItemSerializer < V3::ExchangeLineItemSerializerattributes created_at: :iso8601, updated_at: :iso8601- expandable :one, :original_variant, :admin_variant_serializer- expandable :one, :new_variant, :admin_variant_serializer+ one :original_variant, resource: proc { Spree.api.admin_variant_serializer }, if: proc { expand?('original_variant') }+ one :new_variant, resource: proc { Spree.api.admin_variant_serializer }, if: proc { expand?('new_variant') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/exchange_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/exchange_serializer.rbindex 80c2fa5167..19ea087a55 100644--- a/spree/api/app/serializers/spree/api/v3/admin/exchange_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/exchange_serializer.rb@@ -17,12 +17,14 @@ module Spreeactor_attributes :created_by- expandable :many, :exchange_line_items, :admin_exchange_line_item_serializer+ many :exchange_line_items,+ resource: proc { Spree.api.admin_exchange_line_item_serializer },+ if: proc { expand?('exchange_line_items') }- expandable :one, :reason, :admin_return_reason_serializer- expandable :one, :order, :admin_order_serializer- expandable :one, :stock_location, :admin_stock_location_serializer- expandable :many, :refunds, :admin_refund_serializer+ one :reason, resource: proc { Spree.api.admin_return_reason_serializer }, if: proc { expand?('reason') }+ one :order, resource: proc { Spree.api.admin_order_serializer }, if: proc { expand?('order') }+ one :stock_location, resource: proc { Spree.api.admin_stock_location_serializer }, if: proc { expand?('stock_location') }+ many :refunds, resource: proc { Spree.api.admin_refund_serializer }, if: proc { expand?('refunds') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/fulfillment_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/fulfillment_serializer.rbindex a3d5afd5d1..8f9b5ed84b 100644--- a/spree/api/app/serializers/spree/api/v3/admin/fulfillment_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/fulfillment_serializer.rb@@ -42,16 +42,20 @@ module Spree# Override inherited associations to use admin serializersmany :deliveries, resource: proc { Spree.api.admin_delivery_serializer }- expandable :one, :delivery_method, :admin_delivery_method_serializer- expandable :one, :stock_location, :admin_stock_location_serializer- expandable :many, :delivery_rates, :admin_delivery_rate_serializer- expandable :many, :tax_lines, :admin_tax_line_serializer+ one :delivery_method, resource: proc { Spree.api.admin_delivery_method_serializer }, if: proc { expand?('delivery_method') }+ one :stock_location, resource: proc { Spree.api.admin_stock_location_serializer }, if: proc { expand?('stock_location') }+ many :delivery_rates, resource: proc { Spree.api.admin_delivery_rate_serializer }, if: proc { expand?('delivery_rates') }+ many :tax_lines, resource: proc { Spree.api.admin_tax_line_serializer }, if: proc { expand?('tax_lines') }# The units in this fulfillment — the dashboard needs them to offer# what can actually be returned or exchanged.- expandable :many, :fulfillment_items, :admin_fulfillment_item_serializer+ many :fulfillment_items,+ resource: proc { Spree.api.admin_fulfillment_item_serializer },+ if: proc { expand?('fulfillment_items') }- expandable :one, :order, :admin_order_serializer+ one :order,+ resource: proc { Spree.api.admin_order_serializer },+ if: proc { expand?('order') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/gift_card_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/gift_card_serializer.rbindex a508f433b0..6895bb859a 100644--- a/spree/api/app/serializers/spree/api/v3/admin/gift_card_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/gift_card_serializer.rb@@ -29,10 +29,14 @@ module Spree# Customer the card was issued to. Gated behind `expand?` to keep# the list payload thin — the SPA's list view passes# `expand=customer,created_by` to populate the row chips.- expandable :one, :customer, :admin_customer_serializer+ one :customer,+ resource: proc { Spree.api.admin_customer_serializer },+ if: proc { expand?('customer') }# Admin who issued the card.- expandable :one, :created_by, :admin_admin_user_serializer+ one :created_by,+ resource: proc { Spree.api.admin_admin_user_serializer },+ if: proc { expand?('created_by') }# Batch the card was issued as part of (bulk-issue flow). The# `Spree::GiftCard#batch` association is keyed off@@ -44,7 +48,9 @@ module Spreeif: proc { expand?('gift_card_batch') }# Orders that consumed the card. Detail-only — pass `expand=orders`.- expandable :many, :orders, :admin_order_serializer+ many :orders,+ resource: proc { Spree.api.admin_order_serializer },+ if: proc { expand?('orders') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/line_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/line_item_serializer.rbindex e422bea600..6e7cf86180 100644--- a/spree/api/app/serializers/spree/api/v3/admin/line_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/line_item_serializer.rb@@ -67,15 +67,21 @@ module Spree# Override inherited associations to use admin serializersmany :option_values, resource: proc { Spree.api.admin_option_value_serializer }many :digital_links, resource: proc { Spree.api.admin_digital_link_serializer }- expandable :many, :tax_lines, :admin_tax_line_serializer+ many :tax_lines, resource: proc { Spree.api.admin_tax_line_serializer }, if: proc { expand?('tax_lines') }# `seller_id` comes from the store serializer; the expand resolves# to the operator's view of the seller rather than the public one.- expandable :one, :seller, :admin_seller_serializer+ one :seller,+ resource: proc { Spree.api.admin_seller_serializer },+ if: proc { expand?('seller') }- expandable :one, :variant, :admin_variant_serializer+ one :variant,+ resource: proc { Spree.api.admin_variant_serializer },+ if: proc { expand?('variant') }- expandable :one, :tax_category, :admin_tax_category_serializer+ one :tax_category,+ resource: proc { Spree.api.admin_tax_category_serializer },+ if: proc { expand?('tax_category') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/option_type_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/option_type_serializer.rbindex 0fdb93d47b..ee0b252051 100644--- a/spree/api/app/serializers/spree/api/v3/admin/option_type_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/option_type_serializer.rb@@ -10,7 +10,9 @@ module Spreeattributes :metadata, :filterable,created_at: :iso8601, updated_at: :iso8601- expandable :many, :option_values, :admin_option_value_serializer+ many :option_values,+ resource: proc { Spree.api.admin_option_value_serializer },+ if: proc { expand?('option_values') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/option_value_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/option_value_serializer.rbindex 09b7a3f125..e7c76d8ef0 100644--- a/spree/api/app/serializers/spree/api/v3/admin/option_value_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/option_value_serializer.rb@@ -8,7 +8,9 @@ module Spreeattributes :metadata,created_at: :iso8601, updated_at: :iso8601- expandable :one, :option_type, :admin_option_type_serializer+ one :option_type,+ resource: proc { Spree.api.admin_option_type_serializer },+ if: proc { expand?('option_type') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/order_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/order_serializer.rbindex 801a83abaa..352f9ac153 100644--- a/spree/api/app/serializers/spree/api/v3/admin/order_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/order_serializer.rb@@ -98,7 +98,9 @@ module Spree# profile is `?expand=seller`.prefixed_id_attributes :seller- expandable :one, :seller, :admin_seller_serializer+ one :seller,+ resource: proc { Spree.api.admin_seller_serializer },+ if: proc { expand?('seller') }# The checkout this order was placed in, when it was placed alongside# others.@@ -151,32 +153,44 @@ module Spree_attributes.delete(:fees)many :order_promotions, key: :applied_promotions, resource: proc { Spree.api.admin_applied_promotion_serializer }, if: proc { expand?('applied_promotions') }many :line_items, key: :items, resource: proc { Spree.api.admin_line_item_serializer }, if: proc { expand?('items') }- expandable :many, :fulfillments, :admin_fulfillment_serializer- expandable :many, :payments, :admin_payment_serializer+ many :fulfillments, resource: proc { Spree.api.admin_fulfillment_serializer }, if: proc { expand?('fulfillments') }+ many :payments, resource: proc { Spree.api.admin_payment_serializer }, if: proc { expand?('payments') }# An order from a split checkout has no payments of its own; what it# has is a share of each payment made against its group.- expandable :many, :payment_splits, :admin_payment_split_serializer+ many :payment_splits, resource: proc { Spree.api.admin_payment_split_serializer }, if: proc { expand?('payment_splits') }- expandable :one, :billing_address, :admin_address_serializer- expandable :one, :shipping_address, :admin_address_serializer+ one :billing_address, resource: proc { Spree.api.admin_address_serializer }, if: proc { expand?('billing_address') }+ one :shipping_address, resource: proc { Spree.api.admin_address_serializer }, if: proc { expand?('shipping_address') }one :gift_card, resource: proc { Spree.api.admin_gift_card_serializer }- expandable :one, :cart, :admin_cart_serializer+ one :cart, resource: proc { Spree.api.admin_cart_serializer }, if: proc { expand?('cart') }one :market, resource: proc { Spree.api.admin_market_serializer }- expandable :one, :channel, :admin_channel_serializer- expandable :one, :preferred_stock_location, :admin_stock_location_serializer+ one :channel, resource: proc { Spree.api.admin_channel_serializer }, if: proc { expand?('channel') }+ one :preferred_stock_location,+ resource: proc { Spree.api.admin_stock_location_serializer },+ if: proc { expand?('preferred_stock_location') }- expandable :many, :payment_methods, :admin_payment_method_serializer+ many :payment_methods, resource: proc { Spree.api.admin_payment_method_serializer }, if: proc { expand?('payment_methods') }- expandable :one, :customer, :admin_customer_serializer+ one :customer,+ resource: proc { Spree.api.admin_customer_serializer },+ if: proc { expand?('customer') }- expandable :one, :cancel_reason, :admin_order_cancellation_reason_serializer+ one :cancel_reason,+ resource: proc { Spree.api.admin_order_cancellation_reason_serializer },+ if: proc { expand?('cancel_reason') }- expandable :many, :returns, :admin_return_serializer+ many :returns,+ resource: proc { Spree.api.admin_return_serializer },+ if: proc { expand?('returns') }- expandable :many, :exchanges, :admin_exchange_serializer+ many :exchanges,+ resource: proc { Spree.api.admin_exchange_serializer },+ if: proc { expand?('exchanges') }- expandable :many, :claims, :admin_claim_serializer+ many :claims,+ resource: proc { Spree.api.admin_claim_serializer },+ if: proc { expand?('claims') }# What the forwarder quoted against, frozen onto the rates this# order shipped under. Back-office only: a buyer is told what theirdiff --git a/spree/api/app/serializers/spree/api/v3/admin/payment_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/payment_serializer.rbindex d330ff6e0e..bd5dfa1c15 100644--- a/spree/api/app/serializers/spree/api/v3/admin/payment_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/payment_serializer.rb@@ -17,12 +17,11 @@ module Spreeattributes :metadata, :avs_response, :cvv_response_code, :cvv_response_message,created_at: :iso8601, updated_at: :iso8601- string_attributes :captured_amount-+ attributes captured_amount: :stringprefixed_id_attributes :order# Override inherited associations to use admin serializers- expandable :one, :payment_method, :admin_payment_method_serializer+ one :payment_method, resource: proc { Spree.api.admin_payment_method_serializer }, if: proc { expand?('payment_method') }attribute :source do |payment|next nil if payment.source.blank?@@ -39,13 +38,19 @@ module Spreeserializer.new(payment.source).to_hend- expandable :one, :order, :admin_order_serializer+ one :order,+ resource: proc { Spree.api.admin_order_serializer },+ if: proc { expand?('order') }- expandable :many, :refunds, :admin_refund_serializer+ many :refunds,+ resource: proc { Spree.api.admin_refund_serializer },+ if: proc { expand?('refunds') }# How a payment made against an order group is shared between the# orders in it; empty on a payment made against a single order.- expandable :many, :payment_splits, :admin_payment_split_serializer+ many :payment_splits,+ resource: proc { Spree.api.admin_payment_split_serializer },+ if: proc { expand?('payment_splits') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/price_list_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/price_list_serializer.rbindex 947a8e32c9..734c873a8e 100644--- a/spree/api/app/serializers/spree/api/v3/admin/price_list_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/price_list_serializer.rb@@ -53,7 +53,9 @@ module Spreemany :price_adjustment_tiers,resource: proc { Spree.api.admin_price_adjustment_tier_serializer }- expandable :many, :price_rules, :admin_price_rule_serializer+ many :price_rules,+ resource: proc { Spree.api.admin_price_rule_serializer },+ if: proc { expand?('price_rules') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/price_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/price_serializer.rbindex 2eea5be234..5b6410de88 100644--- a/spree/api/app/serializers/spree/api/v3/admin/price_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/price_serializer.rb@@ -18,7 +18,9 @@ module Spreeattributes created_at: :iso8601, updated_at: :iso8601- expandable :one, :variant, :admin_variant_serializer+ one :variant,+ resource: proc { Spree.api.admin_variant_serializer },+ if: proc { expand?('variant') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/product_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/product_serializer.rbindex 4910e22517..91a1acd52e 100644--- a/spree/api/app/serializers/spree/api/v3/admin/product_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/product_serializer.rb@@ -41,7 +41,9 @@ module Spreeproduct.seller&.nameend- expandable :one, :seller, :admin_seller_serializer+ one :seller,+ resource: proc { Spree.api.admin_seller_serializer },+ if: proc { expand?('seller') }prefixed_id_attributes :product_type, :tax_category@@ -61,11 +63,17 @@ module Spreeend# Admin uses admin variant serializer- expandable :many, :variants, :admin_variant_serializer+ many :variants,+ resource: proc { Spree.api.admin_variant_serializer },+ if: proc { expand?('variants') }- expandable :one, :default_variant, :admin_variant_serializer+ one :default_variant,+ resource: proc { Spree.api.admin_variant_serializer },+ if: proc { expand?('default_variant') }- expandable :one, :primary_media, :admin_media_serializer+ one :primary_media,+ resource: proc { Spree.api.admin_media_serializer },+ if: proc { expand?('primary_media') }many :gallery_media,key: :media,@@ -74,11 +82,17 @@ module Spree# Read/write symmetry: the product accepts inline `digital_assets` on# create, so it exposes them (opt-in via ?expand=digital_assets).- expandable :many, :digital_assets, :admin_digital_asset_serializer+ many :digital_assets,+ resource: proc { Spree.api.admin_digital_asset_serializer },+ if: proc { expand?('digital_assets') }- expandable :many, :option_types, :admin_option_type_serializer+ many :option_types,+ resource: proc { Spree.api.admin_option_type_serializer },+ if: proc { expand?('option_types') }- expandable :many, :option_values, :admin_option_value_serializer+ many :option_values,+ resource: proc { Spree.api.admin_option_value_serializer },+ if: proc { expand?('option_values') }many :categories,proc { |categories, params|@@ -88,15 +102,25 @@ module Spreeresource: proc { Spree.api.admin_category_serializer },if: proc { expand?('categories') }- expandable :many, :collections, :admin_collection_serializer+ many :collections,+ resource: proc { Spree.api.admin_collection_serializer },+ if: proc { expand?('collections') }- expandable :many, :custom_fields, :admin_custom_field_serializer+ many :custom_fields,+ resource: proc { Spree.api.admin_custom_field_serializer },+ if: proc { expand?('custom_fields') }- expandable :many, :product_publications, :admin_product_publication_serializer+ many :product_publications,+ resource: proc { Spree.api.admin_product_publication_serializer },+ if: proc { expand?('product_publications') }- expandable :many, :channels, :admin_channel_serializer+ many :channels,+ resource: proc { Spree.api.admin_channel_serializer },+ if: proc { expand?('channels') }- expandable :one, :product_type, :admin_product_type_serializer+ one :product_type,+ resource: proc { Spree.api.admin_product_type_serializer },+ if: proc { expand?('product_type') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/purchase_order_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/purchase_order_item_serializer.rbindex c3931675b5..8297564313 100644--- a/spree/api/app/serializers/spree/api/v3/admin/purchase_order_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/purchase_order_item_serializer.rb@@ -32,8 +32,7 @@ module Spreeitem.unit_cost&.to_send- string_attributes :total_cost, :display_unit_cost, :display_total_cost-+ attributes total_cost: :string, display_unit_cost: :string, display_total_cost: :stringattribute :purchase_order_id do |item|Spree::PurchaseOrder.prefixed_id_for(item.purchase_order_id)enddiff --git a/spree/api/app/serializers/spree/api/v3/admin/purchase_order_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/purchase_order_serializer.rbindex 7f49c2a662..ba3f649c1e 100644--- a/spree/api/app/serializers/spree/api/v3/admin/purchase_order_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/purchase_order_serializer.rb@@ -56,17 +56,24 @@ module Spreeattribute :editable, &:editable?- string_attributes :subtotal, :display_subtotal-+ attributes subtotal: :string, display_subtotal: :stringprefixed_id_attributes :supplier, :destination_location- expandable :many, :items, :admin_purchase_order_item_serializer+ many :items,+ resource: proc { Spree.api.admin_purchase_order_item_serializer },+ if: proc { expand?('items') }- expandable :many, :stock_receipts, :admin_stock_receipt_serializer+ many :stock_receipts,+ resource: proc { Spree.api.admin_stock_receipt_serializer },+ if: proc { expand?('stock_receipts') }- expandable :one, :supplier, :admin_supplier_serializer+ one :supplier,+ resource: proc { Spree.api.admin_supplier_serializer },+ if: proc { expand?('supplier') }- expandable :one, :destination_location, :admin_stock_location_serializer+ one :destination_location,+ resource: proc { Spree.api.admin_stock_location_serializer },+ if: proc { expand?('destination_location') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/refund_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/refund_serializer.rbindex d028e33070..623cd74fad 100644--- a/spree/api/app/serializers/spree/api/v3/admin/refund_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/refund_serializer.rb@@ -14,13 +14,14 @@ module Spreecreated_at: :iso8601, updated_at: :iso8601# The tax inside the amount, when what was refunded carried tax.- string_attributes :tax_amount-+ attributes tax_amount: :string# Who issued it — an admin user, or the API key an integration# refunded through.actor_attributes :refunder- expandable :one, :payment, :admin_payment_serializer+ one :payment,+ resource: proc { Spree.api.admin_payment_serializer },+ if: proc { expand?('payment') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/return_line_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/return_line_item_serializer.rbindex 55b65b1bdb..479661b7c1 100644--- a/spree/api/app/serializers/spree/api/v3/admin/return_line_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/return_line_item_serializer.rb@@ -7,9 +7,9 @@ module Spreeclass ReturnLineItemSerializer < V3::ReturnLineItemSerializerattributes created_at: :iso8601, updated_at: :iso8601- expandable :one, :variant, :admin_variant_serializer- expandable :one, :line_item, :admin_line_item_serializer- expandable :many, :tax_lines, :admin_tax_line_serializer+ one :variant, resource: proc { Spree.api.admin_variant_serializer }, if: proc { expand?('variant') }+ one :line_item, resource: proc { Spree.api.admin_line_item_serializer }, if: proc { expand?('line_item') }+ many :tax_lines, resource: proc { Spree.api.admin_tax_line_serializer }, if: proc { expand?('tax_lines') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/return_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/return_serializer.rbindex 997a0f50d7..aa57d92b1b 100644--- a/spree/api/app/serializers/spree/api/v3/admin/return_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/return_serializer.rb@@ -21,14 +21,15 @@ module Spreeactor_attributes :created_by- string_attributes :refunded_total, :display_refunded_total, :refundable_total-- expandable :many, :return_line_items, :admin_return_line_item_serializer-- expandable :one, :reason, :admin_return_reason_serializer- expandable :one, :order, :admin_order_serializer- expandable :one, :stock_location, :admin_stock_location_serializer- expandable :many, :refunds, :admin_refund_serializer+ attributes refunded_total: :string, display_refunded_total: :string, refundable_total: :string+ many :return_line_items,+ resource: proc { Spree.api.admin_return_line_item_serializer },+ if: proc { expand?('return_line_items') }++ one :reason, resource: proc { Spree.api.admin_return_reason_serializer }, if: proc { expand?('reason') }+ one :order, resource: proc { Spree.api.admin_order_serializer }, if: proc { expand?('order') }+ one :stock_location, resource: proc { Spree.api.admin_stock_location_serializer }, if: proc { expand?('stock_location') }+ many :refunds, resource: proc { Spree.api.admin_refund_serializer }, if: proc { expand?('refunds') }# Paperwork the provider produced beside the label: a cross-border# return is declared like any other export.diff --git a/spree/api/app/serializers/spree/api/v3/admin/shipping_label_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/shipping_label_serializer.rbindex 148b2ee531..8b3bf2129e 100644--- a/spree/api/app/serializers/spree/api/v3/admin/shipping_label_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/shipping_label_serializer.rb@@ -34,8 +34,7 @@ module Spreeshipping_label.owner_type == 'Spree::Return' ? 'return' : 'fulfillment'end- string_attributes :cost, :display_cost-+ attributes cost: :string, display_cost: :stringprefixed_id_attributes :integration# Whether the file is still being fetched from the carrier; thediff --git a/spree/api/app/serializers/spree/api/v3/admin/stock_level_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/stock_level_serializer.rbindex 0629015b98..afe776942f 100644--- a/spree/api/app/serializers/spree/api/v3/admin/stock_level_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/stock_level_serializer.rb@@ -49,9 +49,13 @@ module Spreestock_level.available_count.to_iend- expandable :one, :stock_location, :admin_stock_location_serializer+ one :stock_location,+ resource: proc { Spree.api.admin_stock_location_serializer },+ if: proc { expand?('stock_location') }- expandable :one, :variant, :admin_variant_serializer+ one :variant,+ resource: proc { Spree.api.admin_variant_serializer },+ if: proc { expand?('variant') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/stock_location_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/stock_location_serializer.rbindex e01557a842..ba686af783 100644--- a/spree/api/app/serializers/spree/api/v3/admin/stock_location_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/stock_location_serializer.rb@@ -28,7 +28,9 @@ module Spreestock_location.seller&.nameend- expandable :one, :seller, :admin_seller_serializer+ one :seller,+ resource: proc { Spree.api.admin_seller_serializer },+ if: proc { expand?('seller') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/stock_receipt_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/stock_receipt_serializer.rbindex 9b24d805ca..ace0aa5c73 100644--- a/spree/api/app/serializers/spree/api/v3/admin/stock_receipt_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/stock_receipt_serializer.rb@@ -36,7 +36,9 @@ module Spreereceipt.items.sizeend- expandable :many, :items, :admin_stock_receipt_item_serializer+ many :items,+ resource: proc { Spree.api.admin_stock_receipt_item_serializer },+ if: proc { expand?('items') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/stock_transfer_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/stock_transfer_serializer.rbindex 88f9f856dd..1f38ef6f9b 100644--- a/spree/api/app/serializers/spree/api/v3/admin/stock_transfer_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/stock_transfer_serializer.rb@@ -35,13 +35,21 @@ module Spreeattribute :editable, &:editable?- expandable :many, :items, :admin_stock_transfer_item_serializer+ many :items,+ resource: proc { Spree.api.admin_stock_transfer_item_serializer },+ if: proc { expand?('items') }- expandable :many, :stock_receipts, :admin_stock_receipt_serializer+ many :stock_receipts,+ resource: proc { Spree.api.admin_stock_receipt_serializer },+ if: proc { expand?('stock_receipts') }- expandable :one, :source_location, :admin_stock_location_serializer+ one :source_location,+ resource: proc { Spree.api.admin_stock_location_serializer },+ if: proc { expand?('source_location') }- expandable :one, :destination_location, :admin_stock_location_serializer+ one :destination_location,+ resource: proc { Spree.api.admin_stock_location_serializer },+ if: proc { expand?('destination_location') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/store_credit_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/store_credit_serializer.rbindex 4765359593..6a0f8a34c6 100644--- a/spree/api/app/serializers/spree/api/v3/admin/store_credit_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/store_credit_serializer.rb@@ -16,14 +16,12 @@ module Spreeattributes :memo, :metadata,created_at: :iso8601, updated_at: :iso8601- string_attributes :amount_authorized-+ attributes amount_authorized: :string# Answers the same question as the `outstanding` filter, so the row# and the filter cannot disagree.attribute :outstanding, &:outstanding?- string_attributes :display_amount_authorized-+ attributes display_amount_authorized: :stringprefixed_id_attributes :customer, :created_by# Why the credit exists: the return, exchange, claim or gift card@@ -44,9 +42,13 @@ module SpreeSpree::Base.polymorphic_prefixed_id(store_credit.originator_type, store_credit.originator_id)end- expandable :one, :customer, :admin_customer_serializer+ one :customer,+ resource: proc { Spree.api.admin_customer_serializer },+ if: proc { expand?('customer') }- expandable :one, :created_by, :admin_admin_user_serializer+ one :created_by,+ resource: proc { Spree.api.admin_admin_user_serializer },+ if: proc { expand?('created_by') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/variant_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/variant_serializer.rbindex 63dfcc36b5..5fd3c81fec 100644--- a/spree/api/app/serializers/spree/api/v3/admin/variant_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/variant_serializer.rb@@ -87,7 +87,9 @@ module Spreeend# Override inherited associations to use admin serializers- expandable :one, :primary_media, :admin_media_serializer+ one :primary_media,+ resource: proc { Spree.api.admin_media_serializer },+ if: proc { expand?('primary_media') }many :gallery_media,key: :media,@@ -97,11 +99,17 @@ module Spreemany :option_values, resource: proc { Spree.api.admin_option_value_serializer }# All prices for this variant (for admin management)- expandable :many, :prices, :admin_price_serializer+ many :prices,+ resource: proc { Spree.api.admin_price_serializer },+ if: proc { expand?('prices') }- expandable :many, :custom_fields, :admin_custom_field_serializer+ many :custom_fields,+ resource: proc { Spree.api.admin_custom_field_serializer },+ if: proc { expand?('custom_fields') }- expandable :many, :stock_levels, :admin_stock_level_serializer+ many :stock_levels,+ resource: proc { Spree.api.admin_stock_level_serializer },+ if: proc { expand?('stock_levels') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/base_serializer.rb b/spree/api/app/serializers/spree/api/v3/base_serializer.rbindex 054c308cb0..b85fc20416 100644--- a/spree/api/app/serializers/spree/api/v3/base_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/base_serializer.rb@@ -39,21 +39,6 @@ module Spreeendend- # Declares attributes rendered as strings, so decimals and money keep- # their exact form instead of becoming JSON numbers.- def self.string_attributes(*names)- names.each do |name|- attribute(name) { |object| object.public_send(name).to_s }- end- end-- # Declares an association rendered only when the request expands it- # (`?expand=customer`). `serializer` names the `Spree.api` setting- # resolving the serializer class, so host apps can swap it.- def self.expandable(kind, name, serializer)- public_send(kind, name, resource: proc { Spree.api.public_send(serializer) }, if: proc { expand?(name.to_s) })- end-# Declares the wire form of an `acted_by` association: the actor's# prefixed id, the kind of actor it is, and the expansion. Both# halves read off the columns, so naming an actor costs no query anddiff --git a/spree/api/app/serializers/spree/api/v3/category_serializer.rb b/spree/api/app/serializers/spree/api/v3/category_serializer.rbindex 631a3a0ee5..ec7f653cc0 100644--- a/spree/api/app/serializers/spree/api/v3/category_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/category_serializer.rb@@ -38,11 +38,17 @@ module Spree# Conditional associations# Note: We pass empty expand to nested categories to prevent infinite recursion# (e.g., ancestors trying to load their own ancestors)- expandable :one, :parent, :category_serializer+ one :parent,+ resource: proc { Spree.api.category_serializer },+ if: proc { expand?('parent') }- expandable :many, :children, :category_serializer+ many :children,+ resource: proc { Spree.api.category_serializer },+ if: proc { expand?('children') }- expandable :many, :ancestors, :category_serializer+ many :ancestors,+ resource: proc { Spree.api.category_serializer },+ if: proc { expand?('ancestors') }many :storefront_custom_fields,key: :custom_fields,diff --git a/spree/api/app/serializers/spree/api/v3/claim_line_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/claim_line_item_serializer.rbindex caeb99b05c..1af3954c09 100644--- a/spree/api/app/serializers/spree/api/v3/claim_line_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/claim_line_item_serializer.rb@@ -20,17 +20,15 @@ module Spreeattributes :quantity, :send_replacement, :description- string_attributes :refund_amount-+ attributes refund_amount: :string# What the customer actually paid for these units, tax included — the# ceiling the resolve workflow enforces, and what the dashboard offers# when the claim carries no explicit amount.- string_attributes :paid_amount, :pre_tax_amount, :included_tax_total, :additional_tax_total, :tax_total,- :display_refund_amount-+ attributes paid_amount: :string, pre_tax_amount: :string, included_tax_total: :string,+ additional_tax_total: :string, tax_total: :string, display_refund_amount: :stringprefixed_id_attributes :variant, :replacement_variant, :line_item- expandable :one, :variant, :variant_serializer+ one :variant, resource: proc { Spree.api.variant_serializer }, if: proc { expand?('variant') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/claim_serializer.rb b/spree/api/app/serializers/spree/api/v3/claim_serializer.rbindex b22cfa0047..c918db6d12 100644--- a/spree/api/app/serializers/spree/api/v3/claim_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/claim_serializer.rb@@ -21,8 +21,7 @@ module Spreeprefixed_id_attributes :order, :reason- string_attributes :refund_total, :display_refund_total-+ attributes refund_total: :string, display_refund_total: :stringattribute :approved_at do |claim|claim.approved_at&.iso8601end@@ -39,9 +38,11 @@ module Spreeclaim.canceled_at&.iso8601end- expandable :one, :reason, :claim_reason_serializer+ one :reason, resource: proc { Spree.api.claim_reason_serializer }, if: proc { expand?('reason') }- expandable :many, :claim_line_items, :claim_line_item_serializer+ many :claim_line_items,+ resource: proc { Spree.api.claim_line_item_serializer },+ if: proc { expand?('claim_line_items') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/delivery_rate_serializer.rb b/spree/api/app/serializers/spree/api/v3/delivery_rate_serializer.rbindex aa223af288..d8c3438a5c 100644--- a/spree/api/app/serializers/spree/api/v3/delivery_rate_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/delivery_rate_serializer.rb@@ -33,9 +33,8 @@ module Spree# froze it here when it quoted.one :freight_summary, resource: proc { Spree.api.freight_summary_serializer }- string_attributes :display_cost, :display_total, :display_additional_tax_total, :display_included_tax_total,- :display_tax_total-+ attributes display_cost: :string, display_total: :string, display_additional_tax_total: :string,+ display_included_tax_total: :string, display_tax_total: :stringone :delivery_method, resource: proc { Spree.api.delivery_method_serializer }endenddiff --git a/spree/api/app/serializers/spree/api/v3/delivery_zone_serializer.rb b/spree/api/app/serializers/spree/api/v3/delivery_zone_serializer.rbindex c3fd355ead..9e01e75fb2 100644--- a/spree/api/app/serializers/spree/api/v3/delivery_zone_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/delivery_zone_serializer.rb@@ -6,7 +6,7 @@ module Spreeattributes :name, :description- expandable :many, :members, :delivery_zone_member_serializer+ many :members, resource: proc { Spree.api.delivery_zone_member_serializer }, if: proc { expand?('members') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/exchange_line_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/exchange_line_item_serializer.rbindex f5436a297d..3306b31d4d 100644--- a/spree/api/app/serializers/spree/api/v3/exchange_line_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/exchange_line_item_serializer.rb@@ -21,15 +21,14 @@ module Spree# What the customer paid for the units coming back, after discounts# and with their tax.- string_attributes :original_price-+ attributes original_price: :string# The replacement at the same discount, with its own tax.- string_attributes :new_variant_price, :price_difference, :original_tax_total, :new_tax_total-+ attributes new_variant_price: :string, price_difference: :string, original_tax_total: :string,+ new_tax_total: :stringprefixed_id_attributes :original_variant, :new_variant, :line_item, :fulfillment_item- expandable :one, :original_variant, :variant_serializer- expandable :one, :new_variant, :variant_serializer+ one :original_variant, resource: proc { Spree.api.variant_serializer }, if: proc { expand?('original_variant') }+ one :new_variant, resource: proc { Spree.api.variant_serializer }, if: proc { expand?('new_variant') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/exchange_serializer.rb b/spree/api/app/serializers/spree/api/v3/exchange_serializer.rbindex 6a73c7345b..1244863b7e 100644--- a/spree/api/app/serializers/spree/api/v3/exchange_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/exchange_serializer.rb@@ -20,8 +20,7 @@ module Spreeprefixed_id_attributes :order, :reason- string_attributes :price_difference, :display_price_difference-+ attributes price_difference: :string, display_price_difference: :stringattribute :approved_at do |exchange|exchange.approved_at&.iso8601end@@ -38,9 +37,11 @@ module Spreeexchange.canceled_at&.iso8601end- expandable :one, :reason, :return_reason_serializer+ one :reason, resource: proc { Spree.api.return_reason_serializer }, if: proc { expand?('reason') }- expandable :many, :exchange_line_items, :exchange_line_item_serializer+ many :exchange_line_items,+ resource: proc { Spree.api.exchange_line_item_serializer },+ if: proc { expand?('exchange_line_items') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/fulfillment_serializer.rb b/spree/api/app/serializers/spree/api/v3/fulfillment_serializer.rbindex 9c238bc9e2..798f6a09e2 100644--- a/spree/api/app/serializers/spree/api/v3/fulfillment_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/fulfillment_serializer.rb@@ -58,7 +58,7 @@ module Spreeone :delivery_method, resource: proc { Spree.api.delivery_method_serializer }one :stock_location, resource: proc { Spree.api.stock_location_serializer }many :delivery_rates, resource: proc { Spree.api.delivery_rate_serializer }- expandable :many, :tax_lines, :tax_line_serializer+ many :tax_lines, resource: proc { Spree.api.tax_line_serializer }, if: proc { expand?('tax_lines') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/import_serializer.rb b/spree/api/app/serializers/spree/api/v3/import_serializer.rbindex 95674e2596..34cde0f552 100644--- a/spree/api/app/serializers/spree/api/v3/import_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/import_serializer.rb@@ -21,8 +21,7 @@ module SpreeSpree::Import.api_type_for(import.type)end- string_attributes :status-+ attributes status: :string# Which marketplace this import belongs to, and — when a seller ran it —# whose it is. A null `seller_id` means the operator's own.prefixed_id_attributes :store, :sellerdiff --git a/spree/api/app/serializers/spree/api/v3/invitation_serializer.rb b/spree/api/app/serializers/spree/api/v3/invitation_serializer.rbindex ad75910bed..12d71d3654 100644--- a/spree/api/app/serializers/spree/api/v3/invitation_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/invitation_serializer.rb@@ -14,8 +14,7 @@ module Spreeattributes :email,created_at: :iso8601, updated_at: :iso8601- string_attributes :status-+ attributes status: :string# `"store"` / `"admin_user"`, not the polymorphic class names.attribute :resource_type do |invitation|Spree::Base.polymorphic_api_type(invitation.resource_type)diff --git a/spree/api/app/serializers/spree/api/v3/line_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/line_item_serializer.rbindex c402bfbef1..dec753b2ae 100644--- a/spree/api/app/serializers/spree/api/v3/line_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/line_item_serializer.rb@@ -52,7 +52,9 @@ module Spreeimage_url_for(line_item.thumbnail)end- expandable :one, :seller, :seller_serializer+ one :seller,+ resource: proc { Spree.api.seller_serializer },+ if: proc { expand?('seller') }many :option_values, resource: proc { Spree.api.option_value_serializer }# Download links carry a bearer token; only the buyer gets them.@@ -60,7 +62,7 @@ module Spree# Tax hangs off its adjustable, never off the cart or order: the# exactly-one-adjustable rule makes the nested view complete, and the# owner already carries the tax totals.- expandable :many, :tax_lines, :tax_line_serializer+ many :tax_lines, resource: proc { Spree.api.tax_line_serializer }, if: proc { expand?('tax_lines') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/order_group_serializer.rb b/spree/api/app/serializers/spree/api/v3/order_group_serializer.rbindex a98317f03f..63baaf3a07 100644--- a/spree/api/app/serializers/spree/api/v3/order_group_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/order_group_serializer.rb@@ -18,8 +18,7 @@ module Spreeattributes :number, :email, :currency- string_attributes :total, :display_total, :item_total, :display_item_total-+ attributes total: :string, display_total: :string, item_total: :string, display_item_total: :string# Rolled up across the children rather than stored, so it can never# disagree with the orders it describes.attributes :fulfillment_status, :payment_statusdiff --git a/spree/api/app/serializers/spree/api/v3/product_serializer.rb b/spree/api/app/serializers/spree/api/v3/product_serializer.rbindex 77956fc31d..899d7692f5 100644--- a/spree/api/app/serializers/spree/api/v3/product_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/product_serializer.rb@@ -100,22 +100,34 @@ module Spreeprefixed_id_attributes :seller# Conditional associations- expandable :one, :seller, :seller_serializer+ one :seller,+ resource: proc { Spree.api.seller_serializer },+ if: proc { expand?('seller') }- expandable :one, :primary_media, :media_serializer+ one :primary_media,+ resource: proc { Spree.api.media_serializer },+ if: proc { expand?('primary_media') }many :gallery_media,key: :media,resource: proc { Spree.api.media_serializer },if: proc { expand?('media') }- expandable :many, :variants, :variant_serializer+ many :variants,+ resource: proc { Spree.api.variant_serializer },+ if: proc { expand?('variants') }- expandable :one, :default_variant, :variant_serializer+ one :default_variant,+ resource: proc { Spree.api.variant_serializer },+ if: proc { expand?('default_variant') }- expandable :many, :option_types, :option_type_serializer+ many :option_types,+ resource: proc { Spree.api.option_type_serializer },+ if: proc { expand?('option_types') }- expandable :many, :option_values, :option_value_serializer+ many :option_values,+ resource: proc { Spree.api.option_value_serializer },+ if: proc { expand?('option_values') }many :categories,proc { |categories, params|diff --git a/spree/api/app/serializers/spree/api/v3/return_line_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/return_line_item_serializer.rbindex 9ee49c9e91..98bf354e2d 100644--- a/spree/api/app/serializers/spree/api/v3/return_line_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/return_line_item_serializer.rb@@ -21,16 +21,14 @@ module Spreeattributes :quantity, :received_quantity, :resellable- string_attributes :pre_tax_amount, :display_pre_tax_amount, :included_tax_total, :additional_tax_total,- :tax_total, :display_tax_total-+ attributes pre_tax_amount: :string, display_pre_tax_amount: :string, included_tax_total: :string,+ additional_tax_total: :string, tax_total: :string, display_tax_total: :string# What the line refunds, tax included — for the units that arrived# once the warehouse has counted.- string_attributes :refund_amount, :display_refund_amount-+ attributes refund_amount: :string, display_refund_amount: :stringprefixed_id_attributes :variant, :line_item, :fulfillment_item- expandable :one, :variant, :variant_serializer+ one :variant, resource: proc { Spree.api.variant_serializer }, if: proc { expand?('variant') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/return_serializer.rb b/spree/api/app/serializers/spree/api/v3/return_serializer.rbindex b729913f60..dc274374c2 100644--- a/spree/api/app/serializers/spree/api/v3/return_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/return_serializer.rb@@ -23,11 +23,9 @@ module Spreeprefixed_id_attributes :order, :reason- string_attributes :refund_total, :display_refund_total-+ attributes refund_total: :string, display_refund_total: :string# The tax inside refund_total.- string_attributes :refund_tax_total, :display_refund_tax_total-+ attributes refund_tax_total: :string, display_refund_tax_total: :stringattribute :approved_at do |return_record|return_record.approved_at&.iso8601end@@ -44,9 +42,11 @@ module Spreereturn_record.canceled_at&.iso8601end- expandable :one, :reason, :return_reason_serializer+ one :reason, resource: proc { Spree.api.return_reason_serializer }, if: proc { expand?('reason') }- expandable :many, :return_line_items, :return_line_item_serializer+ many :return_line_items,+ resource: proc { Spree.api.return_line_item_serializer },+ if: proc { expand?('return_line_items') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/seller/claim_line_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/seller/claim_line_item_serializer.rbindex 7aac7e4b81..67a062ebcd 100644--- a/spree/api/app/serializers/spree/api/v3/seller/claim_line_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/seller/claim_line_item_serializer.rb@@ -13,7 +13,7 @@ module Spreeline.line_item&.name || line.variant&.nameend- expandable :one, :variant, :seller_variant_serializer+ one :variant, resource: proc { Spree.api.seller_variant_serializer }, if: proc { expand?('variant') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/seller/claim_serializer.rb b/spree/api/app/serializers/spree/api/v3/seller/claim_serializer.rbindex 19009fd94d..80df34d85c 100644--- a/spree/api/app/serializers/spree/api/v3/seller/claim_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/seller/claim_serializer.rb@@ -13,9 +13,11 @@ module Spreeattributes :memo- expandable :many, :claim_line_items, :seller_claim_line_item_serializer+ many :claim_line_items,+ resource: proc { Spree.api.seller_claim_line_item_serializer },+ if: proc { expand?('claim_line_items') }- expandable :one, :reason, :seller_reason_serializer+ one :reason, resource: proc { Spree.api.seller_reason_serializer }, if: proc { expand?('reason') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/seller/delivery_rate_serializer.rb b/spree/api/app/serializers/spree/api/v3/seller/delivery_rate_serializer.rbindex 960c6e7840..ec93334600 100644--- a/spree/api/app/serializers/spree/api/v3/seller/delivery_rate_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/seller/delivery_rate_serializer.rb@@ -21,7 +21,7 @@ module Spreeattributes :name, :selected, :cost, :total,:carrier, :service_level, :estimated_delivery_date- string_attributes :display_cost, :display_total+ attributes display_cost: :string, display_total: :stringendendenddiff --git a/spree/api/app/serializers/spree/api/v3/seller/exchange_line_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/seller/exchange_line_item_serializer.rbindex 30d9bb3dd5..5539256b8e 100644--- a/spree/api/app/serializers/spree/api/v3/seller/exchange_line_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/seller/exchange_line_item_serializer.rb@@ -18,8 +18,10 @@ module Spreeline.new_variant&.nameend- expandable :one, :original_variant, :seller_variant_serializer- expandable :one, :new_variant, :seller_variant_serializer+ one :original_variant, resource: proc { Spree.api.seller_variant_serializer },+ if: proc { expand?('original_variant') }+ one :new_variant, resource: proc { Spree.api.seller_variant_serializer },+ if: proc { expand?('new_variant') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/seller/exchange_serializer.rb b/spree/api/app/serializers/spree/api/v3/seller/exchange_serializer.rbindex f4a9161556..a20ffa87e7 100644--- a/spree/api/app/serializers/spree/api/v3/seller/exchange_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/seller/exchange_serializer.rb@@ -16,9 +16,11 @@ module Spreeprefixed_id_attributes :stock_location- expandable :many, :exchange_line_items, :seller_exchange_line_item_serializer+ many :exchange_line_items,+ resource: proc { Spree.api.seller_exchange_line_item_serializer },+ if: proc { expand?('exchange_line_items') }- expandable :one, :reason, :seller_reason_serializer+ one :reason, resource: proc { Spree.api.seller_reason_serializer }, if: proc { expand?('reason') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/seller/invitation_serializer.rb b/spree/api/app/serializers/spree/api/v3/seller/invitation_serializer.rbindex a1b1112b61..e01360dc83 100644--- a/spree/api/app/serializers/spree/api/v3/seller/invitation_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/seller/invitation_serializer.rb@@ -10,7 +10,7 @@ module Spreeattributes :email,created_at: :iso8601, expires_at: :iso8601, accepted_at: :iso8601- string_attributes :status+ attributes status: :stringendendenddiff --git a/spree/api/app/serializers/spree/api/v3/seller/order_serializer.rb b/spree/api/app/serializers/spree/api/v3/seller/order_serializer.rbindex b9d0e5a3ea..15f36834fa 100644--- a/spree/api/app/serializers/spree/api/v3/seller/order_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/seller/order_serializer.rb@@ -86,7 +86,8 @@ module Spree# page reads it, the list never does. Empty on an order that did not# split — a single-seller basket keeps the payment on the order# itself, and that payment stays the marketplace's.- expandable :many, :payment_splits, :seller_payment_split_serializer+ many :payment_splits, resource: proc { Spree.api.seller_payment_split_serializer },+ if: proc { expand?('payment_splits') }many :fulfillments, resource: proc { Spree.api.seller_fulfillment_serializer }one :shipping_address, resource: proc { Spree.api.address_serializer }one :billing_address, resource: proc { Spree.api.address_serializer }diff --git a/spree/api/app/serializers/spree/api/v3/seller/product_serializer.rb b/spree/api/app/serializers/spree/api/v3/seller/product_serializer.rbindex 0848db66b6..f312b72c19 100644--- a/spree/api/app/serializers/spree/api/v3/seller/product_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/seller/product_serializer.rb@@ -22,16 +22,22 @@ module Spreeprefixed_id_attributes :product_type, :delivery_profile- expandable :many, :variants, :seller_variant_serializer+ many :variants,+ resource: proc { Spree.api.seller_variant_serializer },+ if: proc { expand?('variants') }- expandable :one, :default_variant, :seller_variant_serializer+ one :default_variant,+ resource: proc { Spree.api.seller_variant_serializer },+ if: proc { expand?('default_variant') }many :gallery_media,key: :media,resource: proc { Spree.api.seller_media_serializer },if: proc { expand?('media') }- expandable :many, :option_types, :option_type_serializer+ many :option_types,+ resource: proc { Spree.api.option_type_serializer },+ if: proc { expand?('option_types') }# Why the marketplace sent this back, so the panel can show it# against a rejected listing without a second request. Expandeddiff --git a/spree/api/app/serializers/spree/api/v3/seller/profile_serializer.rb b/spree/api/app/serializers/spree/api/v3/seller/profile_serializer.rbindex 1493e9d6fd..24e0f4a2f5 100644--- a/spree/api/app/serializers/spree/api/v3/seller/profile_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/seller/profile_serializer.rb@@ -36,7 +36,9 @@ module Spree# shape of a policy (with `created_at`), which is what the seller# SDK's generated type and this branch's OpenAPI schema promise._attributes.delete(:policies)- expandable :many, :policies, :seller_policy_serializer+ many :policies,+ resource: proc { Spree.api.seller_policy_serializer },+ if: proc { expand?('policies') }attribute :on_holiday, &:on_holiday?diff --git a/spree/api/app/serializers/spree/api/v3/seller/return_line_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/seller/return_line_item_serializer.rbindex dd130d86b0..2a173edb3c 100644--- a/spree/api/app/serializers/spree/api/v3/seller/return_line_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/seller/return_line_item_serializer.rb@@ -16,7 +16,7 @@ module Spreeline.line_item&.name || line.variant&.nameend- expandable :one, :variant, :seller_variant_serializer+ one :variant, resource: proc { Spree.api.seller_variant_serializer }, if: proc { expand?('variant') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/seller/return_serializer.rb b/spree/api/app/serializers/spree/api/v3/seller/return_serializer.rbindex 3126c5f073..f0ef298805 100644--- a/spree/api/app/serializers/spree/api/v3/seller/return_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/seller/return_serializer.rb@@ -23,15 +23,15 @@ module Spreeprefixed_id_attributes :stock_location- string_attributes :refunded_total-+ attributes refunded_total: :string# What the refund dialog opens on — never more than this may be# given back, whatever amount is typed.- string_attributes :refundable_total, :display_refunded_total-- expandable :many, :return_line_items, :seller_return_line_item_serializer+ attributes refundable_total: :string, display_refunded_total: :string+ many :return_line_items,+ resource: proc { Spree.api.seller_return_line_item_serializer },+ if: proc { expand?('return_line_items') }- expandable :one, :reason, :seller_reason_serializer+ one :reason, resource: proc { Spree.api.seller_reason_serializer }, if: proc { expand?('reason') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/seller/stock_level_serializer.rb b/spree/api/app/serializers/spree/api/v3/seller/stock_level_serializer.rbindex 180664cfe0..86bc765f99 100644--- a/spree/api/app/serializers/spree/api/v3/seller/stock_level_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/seller/stock_level_serializer.rb@@ -17,7 +17,9 @@ module Spreestock_level.available_count.to_iend- expandable :one, :stock_location, :seller_stock_location_serializer+ one :stock_location,+ resource: proc { Spree.api.seller_stock_location_serializer },+ if: proc { expand?('stock_location') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/seller/variant_serializer.rb b/spree/api/app/serializers/spree/api/v3/seller/variant_serializer.rbindex 0e34db95d7..6be48ca80b 100644--- a/spree/api/app/serializers/spree/api/v3/seller/variant_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/seller/variant_serializer.rb@@ -48,16 +48,22 @@ module Spreevariant.total_on_hand.to_i if variant.should_track_inventory?end- expandable :one, :primary_media, :seller_media_serializer+ one :primary_media,+ resource: proc { Spree.api.seller_media_serializer },+ if: proc { expand?('primary_media') }many :gallery_media,key: :media,resource: proc { Spree.api.seller_media_serializer },if: proc { expand?('media') }- expandable :many, :prices, :price_serializer+ many :prices,+ resource: proc { Spree.api.price_serializer },+ if: proc { expand?('prices') }- expandable :many, :stock_levels, :seller_stock_level_serializer+ many :stock_levels,+ resource: proc { Spree.api.seller_stock_level_serializer },+ if: proc { expand?('stock_levels') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/seller_serializer.rb b/spree/api/app/serializers/spree/api/v3/seller_serializer.rbindex d19e2faa9b..d723392780 100644--- a/spree/api/app/serializers/spree/api/v3/seller_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/seller_serializer.rb@@ -39,7 +39,9 @@ module Spree# because a policy body is a whole legal document: a marketplace's# seller listing would otherwise carry every seller's full text on# every page. A product page reaches them as `expand=seller.policies`.- expandable :many, :policies, :policy_serializer+ many :policies,+ resource: proc { Spree.api.policy_serializer },+ if: proc { expand?('policies') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/store_credit_event_serializer.rb b/spree/api/app/serializers/spree/api/v3/store_credit_event_serializer.rbindex 50001f42ec..e824f5e292 100644--- a/spree/api/app/serializers/spree/api/v3/store_credit_event_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/store_credit_event_serializer.rb@@ -12,8 +12,7 @@ module Spreeattributes :display_action- string_attributes :amount, :display_amount-+ attributes amount: :string, display_amount: :stringattributes created_at: :iso8601endenddiff --git a/spree/api/app/serializers/spree/api/v3/store_credit_serializer.rb b/spree/api/app/serializers/spree/api/v3/store_credit_serializer.rbindex 5ce832cd24..ff8965f49b 100644--- a/spree/api/app/serializers/spree/api/v3/store_credit_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/store_credit_serializer.rb@@ -6,9 +6,8 @@ module Spreedisplay_amount: :string, display_amount_used: :string, display_amount_remaining: :string,currency: :string- string_attributes :amount, :amount_used, :amount_remaining, :display_amount, :display_amount_used,- :display_amount_remaining-+ attributes amount: :string, amount_used: :string, amount_remaining: :string, display_amount: :string,+ display_amount_used: :string, display_amount_remaining: :stringattributes :currencyendenddiff --git a/spree/api/app/serializers/spree/api/v3/variant_serializer.rb b/spree/api/app/serializers/spree/api/v3/variant_serializer.rbindex 8bc33e256d..200080ddd9 100644--- a/spree/api/app/serializers/spree/api/v3/variant_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/variant_serializer.rb@@ -116,7 +116,9 @@ module Spreeend# Conditional associations- expandable :one, :primary_media, :media_serializer+ one :primary_media,+ resource: proc { Spree.api.media_serializer },+ if: proc { expand?('primary_media') }many :gallery_media,key: :media,diff --git a/spree/api/app/serializers/spree/api/v3/wishlist_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/wishlist_item_serializer.rbindex 9e92b7bdb3..649a164258 100644--- a/spree/api/app/serializers/spree/api/v3/wishlist_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/wishlist_item_serializer.rb@@ -10,7 +10,8 @@ module Spreeattributes :quantityone :variant, resource: proc { Spree.api.variant_serializer }- expandable :one, :product, :product_serializer+ one :product, resource: proc { Spree.api.product_serializer },+ if: proc { expand?('product') }endendenddiff --git a/spree/api/config/initializers/typelizer.rb b/spree/api/config/initializers/typelizer.rbindex 4072be78ed..6eba318561 100644--- a/spree/api/config/initializers/typelizer.rb+++ b/spree/api/config/initializers/typelizer.rb@@ -15,7 +15,8 @@ Rails.application.config.after_initialize doconfig.plugin_configs = {alba: {ts_mapper: Typelizer::SerializerPlugins::Alba::ALBA_TS_MAPPER.merge(- 'iso8601' => { type: :string }+ 'iso8601' => { type: :string },+ 'string' => { type: :string })}}diff --git a/spree/core/config/initializers/alba.rb b/spree/core/config/initializers/alba.rbindex dca159da9f..d9ab9c1163 100644--- a/spree/core/config/initializers/alba.rb+++ b/spree/core/config/initializers/alba.rb@@ -3,3 +3,5 @@ Alba.inflector = :active_support# Custom typesAlba.register_type :iso8601, converter: ->(time) { time&.iso8601(3) }, auto_convert: true+# Decimals and money rendered as their exact string form instead of JSON numbers+Alba.register_type :string, check: ->(value) { value.is_a?(String) }, converter: ->(value) { value.to_s }, auto_convert: true