spree_api 6.0.0.beta4 → 6.0.0.rc2

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

@@ -5,6 +5,11 @@ module Spree
     module V3
       module Admin
         class ExchangeSerializer < V3::ExchangeSerializer
+          without_formatted_money
+
+          # No guest price gating here, so the inherited money fields are always present.
+          typelize price_difference: [:string, nullable: false]
+
           typelize memo: [:string, nullable: true],
                    metadata: 'Record<string, unknown>',
                    stock_location_id: [:string, nullable: true],
@@ -13,9 +18,7 @@ module Spree
 
           attributes :memo, :metadata, created_at: :iso8601, updated_at: :iso8601
 
-          attribute :stock_location_id do |exchange|
-            exchange.stock_location&.prefixed_id
-          end
+          prefixed_id_attributes :stock_location
 
           actor_attributes :created_by
 

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

@@ -23,13 +23,7 @@ module Spree
           # it — whose it is. A null `seller_id` means the operator's own.
           # The name rides along so the list can show who without a second
           # request per row.
-          attribute :store_id do |export|
-            export.store&.prefixed_id
-          end
-
-          attribute :seller_id do |export|
-            export.seller&.prefixed_id
-          end
+          prefixed_id_attributes :store, :seller
 
           attribute :seller_name do |export|
             export.seller&.name

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

@@ -3,7 +3,9 @@ module Spree
     module V3
       module Admin
         class FeeSerializer < V3::FeeSerializer
-          typelize amount: [:string, nullable: false], display_amount: [:string, nullable: false],
+          without_formatted_money
+
+          typelize amount: [:string, nullable: false],
                    metadata: ['Record<string, unknown>', nullable: true]
 
           attributes :metadata, created_at: :iso8601, updated_at: :iso8601

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_item_serializer.rb

@@ -17,13 +17,7 @@ module Spree
 
           attributes :quantity, :status
 
-          attribute :variant_id do |item|
-            item.variant&.prefixed_id
-          end
-
-          attribute :line_item_id do |item|
-            item.line_item&.prefixed_id
-          end
+          prefixed_id_attributes :variant, :line_item
 
           attribute :name do |item|
             item.variant&.product&.name

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

@@ -3,33 +3,29 @@ 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, :adjustment_total, :pre_tax_amount,
-                     created_at: :iso8601, updated_at: :iso8601
+          attributes :metadata, created_at: :iso8601, updated_at: :iso8601
 
-          attribute :order_id do |fulfillment|
-            fulfillment.order&.prefixed_id
-          end
+          money_attributes :adjustment_total, :pre_tax_amount
+          typelize adjustment_total: [:string, nullable: false], pre_tax_amount: [:string, nullable: false]
 
-          attribute :stock_location_id do |fulfillment|
-            fulfillment.stock_location&.prefixed_id
-          end
+          prefixed_id_attributes :order, :stock_location
 
           # Customs forms and other paperwork the provider produced beside the
           # label; the labels themselves are listed under +labels+.

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]
@@ -24,13 +24,7 @@ module Spree
             params[:gift_card_codes] ? gift_card.display_code : gift_card.masked_code
           end
 
-          attribute :customer_id do |gift_card|
-            gift_card.customer&.prefixed_id
-          end
-
-          attribute :created_by_id do |gift_card|
-            gift_card.created_by&.prefixed_id
-          end
+          prefixed_id_attributes :customer, :created_by
 
           # Customer the card was issued to. Gated behind `expand?` to keep
           # the list payload thin — the SPA's list view passes

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
@@ -44,9 +46,7 @@ module Spree
           # Empty on a shop-price or hand-negotiated line. Names ride along
           # beside the ids so a page of lines does not cost a request each to
           # label, as `company_name` already does.
-          attribute :price_list_id do |line_item|
-            line_item.price_list&.prefixed_id
-          end
+          prefixed_id_attributes :price_list
 
           attribute :price_list_name do |line_item|
             line_item.price_list&.name
@@ -60,13 +60,9 @@ 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
 
-          attribute :tax_category_id do |line_item|
-            line_item.tax_category&.prefixed_id
-          end
+          prefixed_id_attributes :tax_category
 
           # Override inherited associations to use admin serializers
           many :option_values, resource: proc { Spree.api.admin_option_value_serializer }

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,11 +3,16 @@ module Spree
     module V3
       module Admin
         class MarketSerializer < V3::MarketSerializer
-          typelize tax_provider: [:string, nullable: true]
+          # 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
 
           # Which tax engine computes for this market. Nil means the store-wide
           # default; the selectable values come from /admin/tax_providers.
-          attributes :tax_provider, created_at: :iso8601, updated_at: :iso8601
+          api_type_attributes :tax_provider
 
           many :countries,
                resource: proc { Spree.api.admin_country_serializer },

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

@@ -52,14 +52,13 @@ 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
 
-          attribute :viewable_id do |asset|
-            asset.viewable&.prefixed_id
-          end
+          prefixed_id_attributes :viewable
 
           # Forces Content-Disposition: attachment so admins downloading from
           # cloud storage (S3) get a save-as instead of an inline view. Mirrors

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

@@ -19,9 +19,7 @@ module Spree
 
           # Lets the dashboard hide destructive controls instead of offering a
           # delete that the model will refuse.
-          attribute :can_be_deleted do |reason|
-            reason.can_be_deleted?
-          end
+          attribute :can_be_deleted, &:can_be_deleted?
         end
       end
     end

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,
@@ -17,9 +19,7 @@ module Spree
                    store_owner_notification_delivered: :boolean,
                    created_at: :string, updated_at: :string
 
-          attribute :customer_id do |group|
-            group.customer&.prefixed_id
-          end
+          prefixed_id_attributes :customer
 
           attribute :cart_id do |group|
             Spree::Cart.prefixed_id_for(group.cart_id)
@@ -28,13 +28,9 @@ module Spree
           # How many sellers this checkout reached — the operator's headline
           # question about a group, and cheaper than counting the orders client
           # side once a group is large.
-          attribute :seller_count do |group|
-            group.seller_count
-          end
+          attributes :seller_count
 
-          attribute :includes_first_party do |group|
-            group.includes_first_party?
-          end
+          attribute :includes_first_party, &:includes_first_party?
 
           # A split checkout is confirmed once, from here — every child order
           # places silently, so their own flags are false and only the group

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
@@ -22,12 +21,9 @@ module Spree
             rule.class.api_type
           end
 
-          attribute :channel_id do |rule|
-            rule.channel&.prefixed_id
-          end
+          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,24 +47,34 @@ 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
 
-          attribute :preferred_stock_location_id do |order|
-            order.preferred_stock_location&.prefixed_id
-          end
+          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
           # controller streams the bytes, so admin auth runs on every download
@@ -90,9 +88,7 @@ module Spree
           # Which company node the order is for, so the dashboard can show and
           # change it. Read back from the column rather than #resolved_company:
           # a placed order must report what it was stamped with.
-          attribute :company_id do |order|
-            order.company&.prefixed_id
-          end
+          prefixed_id_attributes :company
 
           attribute :company_name do |order|
             order.company&.name
@@ -100,9 +96,7 @@ module Spree
 
           # Whose sale this is — nil on the operator's own goods. The full
           # profile is `?expand=seller`.
-          attribute :seller_id do |order|
-            order.seller&.prefixed_id
-          end
+          prefixed_id_attributes :seller
 
           one :seller,
               resource: proc { Spree.api.admin_seller_serializer },
@@ -136,9 +130,7 @@ module Spree
           # secret key names the key.
           actor_attributes :approver, :canceler, :created_by
 
-          attribute :cancel_reason_id do |order|
-            order.cancel_reason&.prefixed_id
-          end
+          prefixed_id_attributes :cancel_reason
 
           # The reason's name alongside its id, so an order list can show why
           # each canceled order was called off without expanding a record per
@@ -147,9 +139,7 @@ module Spree
             order.cancel_reason&.name
           end
 
-          attribute :customer_id do |order|
-            order.customer&.prefixed_id
-          end
+          prefixed_id_attributes :customer
 
           # Override inherited associations to use admin serializers
           # Renamed from the store's `discounts` key: on the admin surface that

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

@@ -39,9 +39,7 @@ module Spree
           # Whose packaging this is: a seller's own, or (null) the
           # marketplace's shared vocabulary
           # (docs/plans/6.0-seller-package-types.md).
-          attribute :seller_id do |package_type|
-            package_type.seller&.prefixed_id
-          end
+          prefixed_id_attributes :seller
 
           attribute :seller_name do |package_type|
             package_type.seller&.name

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

@@ -4,24 +4,27 @@ 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
 
           # 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? }
         end
       end
     end

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,13 +18,10 @@ module Spree
           attributes :metadata, :avs_response, :cvv_response_code, :cvv_response_message,
                      created_at: :iso8601, updated_at: :iso8601
 
-          attribute :captured_amount do |payment|
-            payment.captured_amount.to_s
-          end
+          money_attributes :captured_amount
+          typelize captured_amount: [:string, nullable: false]
 
-          attribute :order_id do |payment|
-            payment.order&.prefixed_id
-          end
+          prefixed_id_attributes :order
 
           # Override inherited associations to use admin serializers
           one :payment_method, resource: proc { Spree.api.admin_payment_method_serializer }, if: proc { expand?('payment_method') }