spree_api 6.0.0.rc1 → 6.0.0.rc3

data/app/serializers/spree/api/v3/admin/file_upload_serializer.rb

@@ -0,0 +1,11 @@
+module Spree
+  module Api
+    module V3
+      module Admin
+        class FileUploadSerializer < V3::FileUploadSerializer
+          one :upload_target, key: :upload, resource: proc { Spree.api.admin_file_upload_target_serializer }
+        end
+      end
+    end
+  end
+end

data/app/serializers/spree/api/v3/admin/file_upload_target_serializer.rb

@@ -0,0 +1,10 @@
+module Spree
+  module Api
+    module V3
+      module Admin
+        class FileUploadTargetSerializer < V3::FileUploadTargetSerializer
+        end
+      end
+    end
+  end
+end

data/app/serializers/spree/api/v3/admin/fulfillment_serializer.rb

@@ -3,25 +3,27 @@ module Spree
     module V3
       module Admin
         class FulfillmentSerializer < V3::FulfillmentSerializer
+          without_formatted_money
+
           # The Admin API has no guest gating — money fields inherited from the
           # store serializer are always present, so override their nullability.
-          typelize cost: [:string, nullable: false], display_cost: [:string, nullable: false],
-                   total: [:string, nullable: false], display_total: [:string, nullable: false],
-                   discount_total: [:string, nullable: false], display_discount_total: [:string, nullable: false],
-                   additional_tax_total: [:string, nullable: false], display_additional_tax_total: [:string, nullable: false],
-                   included_tax_total: [:string, nullable: false], display_included_tax_total: [:string, nullable: false],
-                   tax_total: [:string, nullable: false], display_tax_total: [:string, nullable: false]
+          typelize cost: [:string, nullable: false],
+                   total: [:string, nullable: false],
+                   discount_total: [:string, nullable: false],
+                   additional_tax_total: [:string, nullable: false],
+                   included_tax_total: [:string, nullable: false],
+                   tax_total: [:string, nullable: false]
 
           typelize metadata: 'Record<string, unknown>',
                    documents: "Array<{ kind: string; url: string }>",
                    provider_generates_labels: :boolean,
                    order_id: [:string, nullable: true],
-                   stock_location_id: [:string, nullable: true],
-                   adjustment_total: :string,
-                   pre_tax_amount: :string
+                   stock_location_id: [:string, nullable: true]
+
+          attributes :metadata, created_at: :iso8601, updated_at: :iso8601
 
-          attributes :metadata, :adjustment_total, :pre_tax_amount,
-                     created_at: :iso8601, updated_at: :iso8601
+          money_attributes :adjustment_total, :pre_tax_amount
+          typelize adjustment_total: [:string, nullable: false], pre_tax_amount: [:string, nullable: false]
 
           prefixed_id_attributes :order, :stock_location
 

data/app/serializers/spree/api/v3/admin/gift_card_serializer.rb

@@ -6,12 +6,12 @@ module Spree
         # context the admin UI needs: who the card was issued to (customer),
         # who issued it (admin), and the orders that consumed it.
         class GiftCardSerializer < V3::GiftCardSerializer
+          without_formatted_money
+
           # The Admin API has no guest gating — money fields inherited from the
           # store serializer are always present, so override their nullability.
           typelize amount: [:string, nullable: false], amount_used: [:string, nullable: false],
-                   amount_authorized: [:string, nullable: false], amount_remaining: [:string, nullable: false],
-                   display_amount: [:string, nullable: false], display_amount_used: [:string, nullable: false],
-                   display_amount_remaining: [:string, nullable: false]
+                   amount_authorized: [:string, nullable: false], amount_remaining: [:string, nullable: false]
 
           typelize customer_id: [:string, nullable: true],
                    created_by_id: [:string, nullable: true]

data/app/serializers/spree/api/v3/admin/import_serializer.rb

@@ -9,7 +9,7 @@ module Spree
                    completed_rows_count: :number,
                    failed_rows_count: :number,
                    processing_errors: [:string, nullable: true],
-                   preferred_delimiter: :string,
+                   delimiter: :string,
                    schema_fields: 'Array<{ name: string; label: string; required: boolean }>',
                    csv_headers: [:string, multi: true],
                    sample_row: 'Record<string, string | null>',
@@ -18,7 +18,7 @@ module Spree
                    original_file_url: [:string, nullable: true],
                    price_list_id: [:string, nullable: true]
 
-          attributes :processing_errors, :preferred_delimiter
+          attributes :processing_errors, :delimiter
 
           # The list a price-list import writes into; nil for every other type.
           attribute :price_list_id do |import|

data/app/serializers/spree/api/v3/admin/integration_serializer.rb

@@ -9,8 +9,7 @@ module Spree
                    name: :string,
                    group: [:string, nullable: true],
                    active: :boolean,
-                   preferences: 'Record<string, unknown>',
-                   preference_schema: "Array<{ key: string; type: string; default: unknown; choices?: string[] }>"
+                   preferences: 'Record<string, unknown>'
 
           attributes :name, :active,
                      created_at: :iso8601, updated_at: :iso8601
@@ -24,7 +23,6 @@ module Spree
           end
 
           attribute :preferences, &:serialized_preferences
-          attribute :preference_schema, &:serialized_preference_schema
         end
       end
     end

data/app/serializers/spree/api/v3/admin/line_item_serializer.rb

@@ -5,16 +5,18 @@ module Spree
         # Admin API Line Item Serializer
         # Extends the store serializer with metadata visibility
         class LineItemSerializer < V3::LineItemSerializer
+          without_formatted_money
+
           # The Admin API has no guest gating — money fields inherited from the
           # store serializer are always present, so override their nullability.
-          typelize price: [:string, nullable: false], display_price: [:string, nullable: false],
-                   total: [:string, nullable: false], display_total: [:string, nullable: false],
-                   adjustment_total: [:string, nullable: false], display_adjustment_total: [:string, nullable: false],
-                   additional_tax_total: [:string, nullable: false], display_additional_tax_total: [:string, nullable: false],
-                   included_tax_total: [:string, nullable: false], display_included_tax_total: [:string, nullable: false],
-                   discount_total: [:string, nullable: false], display_discount_total: [:string, nullable: false],
-                   pre_tax_amount: [:string, nullable: false], display_pre_tax_amount: [:string, nullable: false],
-                   discounted_amount: [:string, nullable: false], display_discounted_amount: [:string, nullable: false]
+          typelize price: [:string, nullable: false],
+                   total: [:string, nullable: false],
+                   adjustment_total: [:string, nullable: false],
+                   additional_tax_total: [:string, nullable: false],
+                   included_tax_total: [:string, nullable: false],
+                   discount_total: [:string, nullable: false],
+                   pre_tax_amount: [:string, nullable: false],
+                   discounted_amount: [:string, nullable: false]
 
           typelize metadata: 'Record<string, unknown>',
                    cost_price: [:string, nullable: true],
@@ -34,7 +36,7 @@ module Spree
           # Base price, not resolved: resolving would call the pricing provider
           # once per line on a read path that must stay provider-free.
           attribute :catalog_price do |line_item|
-            line_item.variant&.amount_in(line_item.currency)&.to_s
+            Spree::Money::Rounding.format(line_item.variant&.amount_in(line_item.currency), line_item.currency, unit_price: true)
           end
 
           # Which agreement priced this line. The list id is stamped on the
@@ -58,9 +60,7 @@ module Spree
             line_item.price_list&.catalog&.name
           end
 
-          attribute :cost_price do |line_item|
-            line_item.cost_price&.to_s
-          end
+          money_attributes :cost_price, unit_price: true
 
           prefixed_id_attributes :tax_category
 

data/app/serializers/spree/api/v3/admin/locale_serializer.rb

@@ -0,0 +1,13 @@
+module Spree
+  module Api
+    module V3
+      module Admin
+        # The dashboard names locales with Intl.DisplayNames in the admin's
+        # own language, so the Admin API sends the code alone.
+        class LocaleSerializer < V3::LocaleSerializer
+          _attributes.delete(:name)
+        end
+      end
+    end
+  end
+end

data/app/serializers/spree/api/v3/admin/market_serializer.rb

@@ -3,6 +3,9 @@ module Spree
     module V3
       module Admin
         class MarketSerializer < V3::MarketSerializer
+          # The Store API keeps this deprecated name until 6.1.
+          _attributes.delete(:country_isos)
+
           typelize tax_provider: [:string, nullable: true, comment: 'Tax provider; null uses the store default. Built-in: internal. Provider gems register more.']
 
           attributes created_at: :iso8601, updated_at: :iso8601

data/app/serializers/spree/api/v3/admin/media_serializer.rb

@@ -52,9 +52,10 @@ module Spree
           # (a category image, a store logo) accepts on write. Handing it over
           # lets those fields adopt a library file, sharing the blob instead of
           # uploading a second copy — the same economics as placing media on a
-          # product, through endpoints that need no change.
+          # product, through endpoints that need no change. Minted fresh, with
+          # the same expiry as an upload, on every read.
           attribute :signed_id do |asset|
-            asset.attachment_blob&.signed_id
+            Spree::Uploads.signed_id_for(asset.attachment_blob) if asset.attachment_blob
           end
 
           prefixed_id_attributes :viewable

data/app/serializers/spree/api/v3/admin/order_group_serializer.rb

@@ -9,6 +9,8 @@ module Spree
         # place and this adds only what an operator needs on top: the payment
         # shares, and the timestamps every admin surface carries.
         class OrderGroupSerializer < V3::OrderGroupSerializer
+          without_formatted_money
+
           typelize customer_id: 'string | null',
                    cart_id: 'string | null',
                    seller_count: :number,

data/app/serializers/spree/api/v3/admin/order_routing_rule_serializer.rb

@@ -12,8 +12,7 @@ module Spree
                    channel_id: :string,
                    position: :number,
                    active: :boolean,
-                   preferences: 'Record<string, unknown>',
-                   preference_schema: "Array<{ key: string; type: string; default: unknown; choices?: string[] }>"
+                   preferences: 'Record<string, unknown>'
 
           attributes :position, :active
           attributes created_at: :iso8601, updated_at: :iso8601
@@ -25,7 +24,6 @@ module Spree
           prefixed_id_attributes :channel
 
           attribute :preferences, &:serialized_preferences
-          attribute :preference_schema, &:serialized_preference_schema
 
         end
       end

data/app/serializers/spree/api/v3/admin/order_serializer.rb

@@ -5,6 +5,8 @@ module Spree
         # Admin API Order Serializer
         # Full order data including admin-only fields
         class OrderSerializer < V3::OrderSerializer
+          without_formatted_money
+
           include Concerns::ExternalReferencesAttribute
 
 
@@ -16,37 +18,23 @@ module Spree
 
           # The Admin API has no guest gating — money fields inherited from the
           # store serializer are always present, so override their nullability.
-          typelize item_total: [:string, nullable: false], display_item_total: [:string, nullable: false],
-                   delivery_total: [:string, nullable: false], display_delivery_total: [:string, nullable: false],
-                   adjustment_total: [:string, nullable: false], display_adjustment_total: [:string, nullable: false],
-                   discount_total: [:string, nullable: false], display_discount_total: [:string, nullable: false],
-                   tax_total: [:string, nullable: false], display_tax_total: [:string, nullable: false],
-                   included_tax_total: [:string, nullable: false], display_included_tax_total: [:string, nullable: false],
-                   additional_tax_total: [:string, nullable: false], display_additional_tax_total: [:string, nullable: false],
-                   store_credit_total: [:string, nullable: false], display_store_credit_total: [:string, nullable: false],
-                   gift_card_total: [:string, nullable: false], display_gift_card_total: [:string, nullable: false],
-                   fee_total: [:string, nullable: false], display_fee_total: [:string, nullable: false],
-                   total: [:string, nullable: false], display_total: [:string, nullable: false],
-                   amount_due: [:string, nullable: false], display_amount_due: [:string, nullable: false]
-
-          # Back-office only: what the marketplace earned on this sale — the fee,
-          # the tax charged on it, and the two together. Never on the store
-          # serializer: a commission settles between the platform and the
-          # seller, and the shopper does not pay it.
-          #
-          # The tax stands on its own because it is separately reportable —
-          # the platform files it as output tax on a B2B supply to the seller.
-          typelize commission_amount_total: [:string, nullable: false],
-                   display_commission_amount_total: [:string, nullable: false],
-                   commission_tax_total: [:string, nullable: false],
-                   display_commission_tax_total: [:string, nullable: false],
-                   commission_total: [:string, nullable: false],
-                   display_commission_total: [:string, nullable: false]
+          typelize item_total: [:string, nullable: false],
+                   delivery_total: [:string, nullable: false],
+                   adjustment_total: [:string, nullable: false],
+                   discount_total: [:string, nullable: false],
+                   tax_total: [:string, nullable: false],
+                   included_tax_total: [:string, nullable: false],
+                   additional_tax_total: [:string, nullable: false],
+                   store_credit_total: [:string, nullable: false],
+                   gift_card_total: [:string, nullable: false],
+                   fee_total: [:string, nullable: false],
+                   total: [:string, nullable: false],
+                   amount_due: [:string, nullable: false]
 
           typelize status: [:string, enum: Spree::Order::STATUSES],
                    last_ip_address: [:string, nullable: true],
                    considered_risky: :boolean, confirmation_delivered: :boolean,
-                   store_owner_notification_delivered: :boolean,
+                   store_owner_notification_delivered: [:boolean, nullable: true],
                    internal_note: [:string, nullable: true], internal_note_html: [:string, nullable: true],
                    approver_id: [:string, nullable: true],
                    approver_type: [:string, nullable: true, enum: Spree::Actor::BUILT_IN_KINDS, enum_type_name: 'ActorKind'],
@@ -59,21 +47,33 @@ module Spree
                    cancel_reason_id: [:string, nullable: true],
                    cancel_reason_name: [:string, nullable: true],
                    cancel_note: [:string, nullable: true],
-                   payment_total: :string, display_payment_total: :string,
                    tags: [:string, multi: true],
                    metadata: 'Record<string, unknown>'
 
           # Admin-only attributes
           attributes :status, :last_ip_address, :considered_risky,
                      :confirmation_delivered, :store_owner_notification_delivered,
-                     :payment_total, :display_payment_total, :metadata,
-                     :cancel_note,
-                     :commission_amount_total, :display_commission_amount_total,
-                     :commission_tax_total, :display_commission_tax_total,
-                     :commission_total, :display_commission_total,
+                     :metadata, :cancel_note,
                      canceled_at: :iso8601, approved_at: :iso8601,
                      created_at: :iso8601, updated_at: :iso8601
 
+          money_attributes :payment_total
+          typelize payment_total: [:string, nullable: false]
+
+          # Back-office only: what the marketplace earned on this sale — the fee,
+          # the tax charged on it, and the two together. Never on the store
+          # serializer: a commission settles between the platform and the
+          # seller, and the shopper does not pay it.
+          #
+          # The tax stands on its own because it is separately reportable —
+          # the platform files it as output tax on a B2B supply to the seller.
+          money_attributes :commission_amount_total,
+                           :commission_tax_total,
+                           :commission_total
+          typelize commission_amount_total: [:string, nullable: false],
+                   commission_tax_total: [:string, nullable: false],
+                   commission_total: [:string, nullable: false]
+
           prefixed_id_attributes :preferred_stock_location
 
           # Our own endpoint rather than a pre-signed storage URL: the

data/app/serializers/spree/api/v3/admin/payment_method_serializer.rb

@@ -4,14 +4,12 @@ module Spree
       module Admin
         class PaymentMethodSerializer < V3::PaymentMethodSerializer
           typelize active: :boolean,
-                   auto_capture: [:boolean, nullable: true],
                    capture_method: "'checkout' | 'on_dispatch' | 'manual' | null",
                    resolved_capture_method: "'checkout' | 'on_dispatch' | 'manual'",
                    storefront_visible: :boolean,
                    position: :number,
                    metadata: 'Record<string, unknown>',
                    preferences: 'Record<string, unknown>',
-                   preference_schema: "Array<{ key: string; type: string; default: unknown; choices?: string[] }>",
                    logo_url: [:string, nullable: true],
                    docs_url: [:string, nullable: true],
                    third_party: :boolean
@@ -19,12 +17,11 @@ module Spree
           # Null capture_method means the method inherits from its store;
           # resolved_capture_method is what actually applies, so the dashboard
           # can show the inherited value.
-          attributes :metadata, :active, :auto_capture, :capture_method, :resolved_capture_method,
+          attributes :metadata, :active, :capture_method, :resolved_capture_method,
                      :storefront_visible, :position,
                      created_at: :iso8601, updated_at: :iso8601
 
           attribute :preferences, &:serialized_preferences
-          attribute :preference_schema, &:serialized_preference_schema
           attribute(:logo_url) { |payment_method| payment_method.class.logo_url }
           attribute(:docs_url) { |payment_method| payment_method.class.docs_url }
           attribute(:third_party) { |payment_method| payment_method.class.third_party? }

data/app/serializers/spree/api/v3/admin/payment_serializer.rb

@@ -3,12 +3,13 @@ module Spree
     module V3
       module Admin
         class PaymentSerializer < V3::PaymentSerializer
+          without_formatted_money
+
           # The Admin API has no guest gating — money fields inherited from the
           # store serializer are always present, so override their nullability.
-          typelize amount: [:string, nullable: false], display_amount: [:string, nullable: false]
+          typelize amount: [:string, nullable: false]
 
           typelize metadata: 'Record<string, unknown>',
-                   captured_amount: :string,
                    order_id: [:string, nullable: true],
                    avs_response: [:string, nullable: true],
                    cvv_response_code: [:string, nullable: true],
@@ -17,7 +18,9 @@ module Spree
           attributes :metadata, :avs_response, :cvv_response_code, :cvv_response_message,
                      created_at: :iso8601, updated_at: :iso8601
 
-          attributes captured_amount: :string
+          money_attributes :captured_amount
+          typelize captured_amount: [:string, nullable: false]
+
           prefixed_id_attributes :order
 
           # Override inherited associations to use admin serializers

data/app/serializers/spree/api/v3/admin/payment_split_serializer.rb

@@ -11,23 +11,22 @@ module Spree
           AMOUNTS = %i[authorized_amount captured_amount refunded_amount claimed_amount
                        net_captured_amount refundable_amount].freeze
 
-          typelize currency: :string,
+          typelize currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    payment_id: :string,
                    payment_number: 'string | null',
                    order_id: :string,
                    order_number: 'string | null',
-                   authorized_amount: :string, display_authorized_amount: :string,
-                   captured_amount: :string, display_captured_amount: :string,
-                   refunded_amount: :string, display_refunded_amount: :string,
-                   claimed_amount: :string, display_claimed_amount: :string,
-                   net_captured_amount: :string, display_net_captured_amount: :string,
-                   refundable_amount: :string, display_refundable_amount: :string
+                   authorized_amount: :string,
+                   captured_amount: :string,
+                   refunded_amount: :string,
+                   claimed_amount: :string,
+                   net_captured_amount: :string,
+                   refundable_amount: :string
 
           attributes :currency, created_at: :iso8601, updated_at: :iso8601
 
           AMOUNTS.each do |amount|
-            attribute(amount) { |split| split.public_send(amount).to_s }
-            attribute(:"display_#{amount}") { |split| split.public_send(:"display_#{amount}").to_s }
+            attribute(amount) { |split| Spree::Money::Rounding.format(split.public_send(amount), split.currency) }
           end
 
           attribute(:payment_id) { |split| split.payment&.prefixed_id }

data/app/serializers/spree/api/v3/admin/price_adjustment_tier_serializer.rb

@@ -6,15 +6,12 @@ module Spree
         # the list itself — the storefront sees resolved prices, never the
         # arithmetic behind them.
         class PriceAdjustmentTierSerializer < V3::BaseSerializer
-          typelize min_quantity: :number, percentage: :string
+          typelize min_quantity: :number
 
           attributes :min_quantity
 
-          # A decimal as a string, like every other money-shaped value on the
-          # wire — a float would round the merchant's own figure.
-          attribute :percentage do |tier|
-            tier.percentage&.to_s
-          end
+          rate_attributes :percentage
+          typelize percentage: [:string, nullable: false]
         end
       end
     end

data/app/serializers/spree/api/v3/admin/price_history_serializer.rb

@@ -5,9 +5,11 @@ module Spree
     module V3
       module Admin
         class PriceHistorySerializer < V3::PriceHistorySerializer
+          without_formatted_money
+          _attributes.delete(:amount_in_cents)
+
           typelize variant_id: :string,
                    price_id: :string,
-                   compare_at_amount: [:string, nullable: true],
                    created_at: :string
 
           attribute :variant_id do |price_history|
@@ -18,7 +20,9 @@ module Spree
             price_history.price.prefixed_id
           end
 
-          attributes :compare_at_amount, created_at: :iso8601
+          money_attributes :compare_at_amount, unit_price: true
+
+          attributes created_at: :iso8601
         end
       end
     end

data/app/serializers/spree/api/v3/admin/price_list_serializer.rb

@@ -27,11 +27,7 @@ module Spree
                      starts_at: :iso8601, ends_at: :iso8601, deleted_at: :iso8601,
                      created_at: :iso8601, updated_at: :iso8601
 
-          # A decimal as a string, like every other money-shaped value on the
-          # wire — a float would round the merchant's own figure.
-          attribute :price_adjustment_percentage do |price_list|
-            price_list.price_adjustment_percentage&.to_s
-          end
+          rate_attributes :price_adjustment_percentage
 
           attribute :automatic_pricing, &:automatic_pricing?
 

data/app/serializers/spree/api/v3/admin/price_rule_serializer.rb

@@ -8,8 +8,7 @@ module Spree
         class PriceRuleSerializer < V3::BaseSerializer
           typelize type: [:string, comment: 'Rule type. Built-in: channel_rule, customer_group_rule, market_rule, user_rule, volume_rule, zone_rule. Extensions may register more.'],
                    price_list_id: :string,
-                   preferences: 'Record<string, unknown>',
-                   preference_schema: 'Array<{ key: string; type: string; default: unknown }>'
+                   preferences: 'Record<string, unknown>'
 
           attributes created_at: :iso8601, updated_at: :iso8601
 
@@ -20,7 +19,6 @@ module Spree
           prefixed_id_attributes :price_list
 
           attribute :preferences, &:serialized_preferences
-          attribute :preference_schema, &:serialized_preference_schema
 
           # Embeds skip rules that don't carry the association (e.g.
           # VolumeRule has no markets/customers — the keys are omitted).

data/app/serializers/spree/api/v3/admin/price_serializer.rb

@@ -5,6 +5,10 @@ module Spree
         # Admin API Price Serializer
         # Extends Store Price Serializer with admin-only fields
         class PriceSerializer < V3::PriceSerializer
+          without_formatted_money
+          _attributes.delete(:amount_in_cents)
+          _attributes.delete(:compare_at_amount_in_cents)
+
           typelize variant_id: [:string, nullable: true],
                    min_quantity: :number,
                    created_at: :string,

data/app/serializers/spree/api/v3/admin/product_serializer.rb

@@ -6,6 +6,8 @@ module Spree
         # Full product data including admin-only fields
         # Extends the store serializer with additional attributes
         class ProductSerializer < V3::ProductSerializer
+          without_formatted_money
+
           include Concerns::ExternalReferencesAttribute
 
           include Spree::Api::V3::Admin::Translatable

data/app/serializers/spree/api/v3/admin/promotion_action_serializer.rb

@@ -7,13 +7,13 @@ module Spree
         # Serializes Spree::PromotionAction (and its STI subclasses) for the
         # admin promotion editor. The shape is intentionally generic so a
         # single component can render any subclass — `preferences` is the
-        # current value hash, `preference_schema` describes its fields.
+        # current value hash, described by the `schema` its type's entry in
+        # `/promotion_actions/types` carries.
         class PromotionActionSerializer < BaseSerializer
           typelize type: [:string, comment: 'Action type. Built-in: create_adjustment, create_item_adjustments, create_line_items, free_shipping. Extensions may register more.'],
                    promotion_id: :string,
                    preferences: 'Record<string, unknown>',
-                   preference_schema: "Array<{ key: string; type: string; default: unknown; choices?: string[] }>",
-                   calculator: "{ type: string; preferences: Record<string, unknown>; preference_schema: Array<{ key: string; type: string; default: unknown }> } | null",
+                   calculator: 'TypedPromotionCalculator | null',
                    line_items: 'Array<{ variant_id: string; quantity: number }> | null'
 
           attributes created_at: :iso8601, updated_at: :iso8601
@@ -25,7 +25,6 @@ module Spree
           prefixed_id_attributes :promotion
 
           attribute :preferences, &:serialized_preferences
-          attribute :preference_schema, &:serialized_preference_schema
 
           # Calculator is exposed as a nested object so the SPA can render
           # the calculator picker + its own preference fields. Null for
@@ -38,8 +37,7 @@ module Spree
             calc = action.calculator
             {
               type: calc.class.api_type,
-              preferences: calc.serialized_preferences,
-              preference_schema: calc.serialized_preference_schema
+              preferences: calc.serialized_preferences
             }
           end
 

data/app/serializers/spree/api/v3/admin/promotion_rule_serializer.rb

@@ -11,7 +11,6 @@ module Spree
           typelize type: [:string, comment: 'Rule type. Built-in: currency, country, channel, market, item_total, product, customer, customer_group, first_order, customer_logged_in, one_use_per_user, category, option_value. Extensions may register more.'],
                    promotion_id: :string,
                    preferences: 'Record<string, unknown>',
-                   preference_schema: "Array<{ key: string; type: string; default: unknown; choices?: string[] }>",
                    product_ids: 'Array<string> | null',
                    category_ids: 'Array<string> | null',
                    customer_ids: 'Array<string> | null',
@@ -26,7 +25,6 @@ module Spree
           prefixed_id_attributes :promotion
 
           attribute :preferences, &:serialized_preferences
-          attribute :preference_schema, &:serialized_preference_schema
 
           # Association IDs for rules that wire products/taxons/users through
           # join tables. Returned as prefixed IDs to match the rest of the

data/app/serializers/spree/api/v3/admin/purchase_order_item_serializer.rb

@@ -9,11 +9,7 @@ module Spree
                    quantity_rejected: :number,
                    quantity_over: :number,
                    outstanding: :number,
-                   unit_cost: :string,
-                   display_unit_cost: :string,
-                   total_cost: :string,
-                   display_total_cost: :string,
-                   currency: 'string | null',
+                   currency: [:string, nullable: true, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    purchase_order_id: 'string | null',
                    thumbnail_url: 'string | null',
                    product_id: 'string | null',
@@ -26,13 +22,11 @@ module Spree
                      :outstanding, :currency,
                      created_at: :iso8601, updated_at: :iso8601
 
-          # Money on the wire is a decimal string: a float would round the
-          # merchant's own figure.
-          attribute :unit_cost do |item|
-            item.unit_cost&.to_s
-          end
+          money_attributes :unit_cost, unit_price: true
+          money_attributes :total_cost
+          typelize unit_cost: [:string, nullable: false],
+                   total_cost: [:string, nullable: false]
 
-          attributes total_cost: :string, display_unit_cost: :string, display_total_cost: :string
           attribute :purchase_order_id do |item|
             Spree::PurchaseOrder.prefixed_id_for(item.purchase_order_id)
           end

data/app/serializers/spree/api/v3/admin/purchase_order_serializer.rb

@@ -7,7 +7,7 @@ module Spree
         class PurchaseOrderSerializer < V3::BaseSerializer
           typelize number: :string,
                    status: :string,
-                   currency: :string,
+                   currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    reference: 'string | null',
                    notes: 'string | null',
                    supplier_id: 'string | null',
@@ -21,8 +21,6 @@ module Spree
                    quantity_rejected_total: :number,
                    quantity_ordered_total: :number,
                    quantity_received_total: :number,
-                   subtotal: :string,
-                   display_subtotal: :string,
                    editable: :boolean,
                    ordered_at: 'string | null',
                    received_at: 'string | null',
@@ -56,7 +54,9 @@ module Spree
 
           attribute :editable, &:editable?
 
-          attributes subtotal: :string, display_subtotal: :string
+          money_attributes :subtotal
+          typelize subtotal: [:string, nullable: false]
+
           prefixed_id_attributes :supplier, :destination_location
 
           many :items,