spree_api 6.0.0.beta4 → 6.0.0.rc2

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

@@ -37,26 +37,22 @@ module Spree
           # response.
           _attributes.delete(:policies)
 
+          # Stored without a currency, so it is shown as stored rather than
+          # rounded to the store's: a rounded figure would be saved back.
           attribute :minimum_payout_amount do |seller|
-            seller.minimum_payout_amount&.to_s
+            Spree::Money::Rounding.format(seller.minimum_payout_amount, (current_store || Spree::Current.store)&.default_currency, unit_price: true)
           end
 
           # Approved but away still cannot sell, and the list has to say so
           # without the dashboard re-deriving the rule.
-          attribute :on_holiday do |seller|
-            seller.on_holiday?
-          end
+          attribute :on_holiday, &:on_holiday?
 
-          attribute :sellable do |seller|
-            seller.sellable?
-          end
+          attribute :sellable, &:sellable?
 
           # Saves the dashboard a request per row for the two counts its list
           # and header show. Read off the seller, which memoizes the SQL count
           # so the minimum-products requirement asks the same question free.
-          attribute :products_count do |seller|
-            seller.products_count
-          end
+          attributes :products_count
 
           attribute :users_count do |seller|
             seller.users.size
@@ -67,13 +63,9 @@ module Spree
           # requirements themselves, with their submissions, stay on the
           # heavier `onboarding` action; a list of sellers needs the number,
           # not the rows behind it.
-          attribute :onboarding_progress do |seller|
-            seller.onboarding_progress
-          end
+          attributes :onboarding_progress
 
-          attribute :onboarding_complete do |seller|
-            seller.onboarding_complete?
-          end
+          attribute :onboarding_complete, &:onboarding_complete?
 
           attribute :legal_name, &:legal_name
           attribute :registration_number, &:registration_number

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

@@ -16,25 +16,24 @@ module Spree
                    order_number: 'string | null',
                    kind: [:string, enum: Spree::SellerTransfer::KINDS],
                    status: [:string, enum: Spree::SellerTransfer.statuses, enum_type_name: 'SellerTransferStatus'],
-                   provider: [:string, comment: 'Payout provider class name. Built-in: Spree::PayoutProvider::System. Provider gems register more.'],
+                   provider: [:string, comment: 'Payout provider. Built-in: system. Provider gems register more (e.g. stripe).'],
                    amount: :string,
-                   currency: :string,
+                   currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    settled_amount: 'string | null',
-                   settled_currency: 'string | null',
+                   settled_currency: [:string, nullable: true, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    converted: :boolean,
-                   reference: 'string | null',
-                   display_amount: :string
+                   reference: 'string | null'
 
-          attributes :kind, :status, :currency, :provider, :reference, :metadata,
+          attributes :kind, :status, :currency, :reference, :metadata,
                      created_at: :iso8601, updated_at: :iso8601
 
-          # A string, so the figure a seller is paid round-trips exactly.
-          attribute(:amount) { |transfer| transfer.amount&.to_s }
-          attribute(:display_amount) { |transfer| transfer.display_amount.to_s }
+          attribute(:amount) { |transfer| Spree::Money::Rounding.format(transfer.amount, transfer.currency) }
 
           # What the seller's account received, when the provider converted on
           # the way in. Null when it settled in the currency of the sale.
-          attribute(:settled_amount) { |transfer| transfer.settled_amount&.to_s }
+          attribute(:settled_amount) do |transfer|
+            Spree::Money::Rounding.format(transfer.settled_amount, transfer.settled_currency || transfer.currency)
+          end
           attribute(:settled_currency) { |transfer| transfer.settled_currency }
           attribute(:converted) { |transfer| transfer.converted? }
 
@@ -46,6 +45,8 @@ module Spree
           # by row and these are what identify a row to an operator.
           attribute(:seller_name) { |transfer| transfer.seller&.name }
           attribute(:order_number) { |transfer| transfer.order&.number }
+
+          api_type_attributes :provider
         end
       end
     end

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

@@ -7,16 +7,14 @@ module Spree
         # The file is streamed through +download_url+, never linked to storage.
         class ShippingLabelSerializer < V3::BaseSerializer
           typelize owner_id: :string,
-                   owner_type: [:string, enum: Spree::ShippingLabel::OWNER_TYPES],
+                   owner_type: [:string, enum: Spree::ShippingLabel::OWNER_TYPES.map { |type| Spree::Base.polymorphic_api_type(type) }],
                    source: [:string, enum: Spree::ShippingLabel::SOURCES],
                    status: [:string, enum: Spree::ShippingLabel.statuses, enum_type_name: 'ShippingLabelStatus'],
                    carrier: [:string, nullable: true],
                    carrier_name: [:string, nullable: true],
                    service: [:string, nullable: true],
                    tracking_number: [:string, nullable: true],
-                   cost: :string,
-                   currency: [:string, nullable: true],
-                   display_cost: :string,
+                   currency: [:string, nullable: true, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    format: [:string, nullable: true],
                    external_id: [:string, nullable: true],
                    integration_id: [:string, nullable: true],
@@ -28,31 +26,20 @@ module Spree
           attributes :source, :status, :carrier, :carrier_name, :service, :tracking_number, :currency, :format,
                      :external_id, :metadata, refunded_at: :iso8601, created_at: :iso8601, updated_at: :iso8601
 
-          attribute :owner_id do |shipping_label|
-            shipping_label.owner&.prefixed_id
-          end
+          prefixed_id_attributes :owner
 
           attribute :owner_type do |shipping_label|
-            shipping_label.owner_type == 'Spree::Return' ? 'return' : 'fulfillment'
-          end
-
-          attribute :cost do |shipping_label|
-            shipping_label.cost.to_s
+            Spree::Base.polymorphic_api_type(shipping_label.owner_type)
           end
 
-          attribute :display_cost do |shipping_label|
-            shipping_label.display_cost.to_s
-          end
+          money_attributes :cost, currency: ->(label) { label.currency.presence || label.store.default_currency }
+          typelize cost: [:string, nullable: false]
 
-          attribute :integration_id do |shipping_label|
-            shipping_label.integration&.prefixed_id
-          end
+          prefixed_id_attributes :integration
 
           # Whether the file is still being fetched from the carrier; the
           # download proxies the provider's copy meanwhile.
-          attribute :file_pending do |shipping_label|
-            shipping_label.file_pending?
-          end
+          attribute :file_pending, &:file_pending?
 
           # Our own endpoint rather than a storage URL: the controller streams
           # the bytes, so admin auth runs on every print.

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

@@ -27,9 +27,7 @@ module Spree
             stock_level.stock_location&.name
           end
 
-          attribute :product_id do |stock_level|
-            stock_level.product&.prefixed_id
-          end
+          prefixed_id_attributes :product
 
           attribute :options_text do |stock_level|
             stock_level.variant&.options_text.presence

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

@@ -3,6 +3,9 @@ module Spree
     module V3
       module Admin
         class StockLocationSerializer < V3::StockLocationSerializer
+          # The Store API keeps these deprecated names until 6.1.
+          %i[country_iso state_abbr].each { |key| _attributes.delete(key) }
+
           include Concerns::ExternalReferencesAttribute
 
           typelize seller_id: [:string, nullable: true], seller_name: [:string, nullable: true],
@@ -22,9 +25,7 @@ module Spree
                      :pickup_ready_in_minutes, :pickup_instructions,
                      created_at: :iso8601, updated_at: :iso8601
 
-          attribute :seller_id do |stock_location|
-            stock_location.seller&.prefixed_id
-          end
+          prefixed_id_attributes :seller
 
           attribute :seller_name do |stock_location|
             stock_location.seller&.name

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

@@ -13,7 +13,6 @@ module Spree
                    stock_transfer_number: [:string, nullable: true],
                    purchase_order_number: [:string, nullable: true],
                    unit_cost: [:string, nullable: true],
-                   display_unit_cost: [:string, nullable: true],
                    stock_location_id: [:string, nullable: true],
                    stock_location_name: [:string, nullable: true],
                    variant_id: [:string, nullable: true],
@@ -68,9 +67,7 @@ module Spree
             Spree::StockTransfer.prefixed_id_for(movement.stock_transfer_id)
           end
 
-          attribute :stock_receipt_id do |movement|
-            movement.stock_receipt&.prefixed_id
-          end
+          prefixed_id_attributes :stock_receipt
 
           attribute :purchase_order_id do |movement|
             Spree::PurchaseOrder.prefixed_id_for(movement.purchase_order_id)
@@ -103,11 +100,8 @@ module Spree
           # purchase. Null on a transfer or a return — moving stock the
           # merchant already owns is not buying it.
           attribute :unit_cost do |movement|
-            movement.unit_cost&.to_s
-          end
-
-          attribute :display_unit_cost do |movement|
-            movement.display_unit_cost&.to_s
+            currency = movement.purchase_order&.currency || (current_store || Spree::Current.store)&.default_currency
+            Spree::Money::Rounding.format(movement.unit_cost, currency, unit_price: true)
           end
         end
       end

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

@@ -25,13 +25,7 @@ module Spree
             item.line_type.demodulize.underscore
           end
 
-          attribute :line_id do |item|
-            item.line&.prefixed_id
-          end
-
-          attribute :variant_id do |item|
-            item.variant&.prefixed_id
-          end
+          prefixed_id_attributes :line, :variant
 
           # The product the line's variant belongs to, so a delivery's line
           # can link to the screen where that SKU's stock lives.

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

@@ -28,9 +28,7 @@ module Spree
             receipt.receivable_type.demodulize.underscore
           end
 
-          attribute :receivable_id do |receipt|
-            receipt.receivable&.prefixed_id
-          end
+          prefixed_id_attributes :receivable
 
           actor_attributes :received_by
 

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

@@ -34,9 +34,7 @@ module Spree
 
           attributes :quantity, expires_at: :iso8601
 
-          attribute :active do |reservation|
-            reservation.active?
-          end
+          attribute :active, &:active?
 
           attributes created_at: :iso8601, updated_at: :iso8601
         end

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

@@ -25,9 +25,7 @@ module Spree
             Spree::StockTransfer.prefixed_id_for(item.stock_transfer_id)
           end
 
-          attribute :variant_id do |item|
-            item.variant&.prefixed_id
-          end
+          prefixed_id_attributes :variant
 
           # The product the line's variant belongs to, so a line can link
           # straight to the screen where that SKU's stock lives.

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

@@ -5,15 +5,18 @@ module Spree
         # One line of a store credit's ledger: how the balance moved and what
         # moved it. Read-only — events are written by the credit itself.
         class StoreCreditEventSerializer < V3::StoreCreditEventSerializer
+          without_formatted_money
+
+          # No guest price gating here, so the inherited money fields are always present.
+          typelize amount: [:string, nullable: false]
+
           typelize originator_type: [:string, nullable: true],
                    originator_id: [:string, nullable: true],
                    store_credit_id: :string
 
           attributes updated_at: :iso8601
 
-          attribute :store_credit_id do |event|
-            event.store_credit&.prefixed_id
-          end
+          prefixed_id_attributes :store_credit
 
           attribute :originator_type do |event|
             Spree::Base.polymorphic_api_type(event.originator_type)

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

@@ -3,11 +3,14 @@ module Spree
     module V3
       module Admin
         class StoreCreditSerializer < V3::StoreCreditSerializer
+          without_formatted_money
+
           typelize customer_id: [:string, nullable: true],
                    created_by_id: [:string, nullable: true],
                    memo: [:string, nullable: true],
-                   amount_authorized: :string,
-                   display_amount_authorized: :string,
+                   amount: [:string, nullable: false], amount_used: [:string, nullable: false],
+                   amount_remaining: [:string, nullable: false],
+                   amount_authorized: [:string, nullable: false],
                    outstanding: :boolean,
                    originator_type: [:string, nullable: true],
                    originator_id: [:string, nullable: true],
@@ -16,27 +19,15 @@ module Spree
           attributes :memo, :metadata,
                      created_at: :iso8601, updated_at: :iso8601
 
-          attribute :amount_authorized do |store_credit|
-            store_credit.amount_authorized.to_s
-          end
-
+          money_attributes :amount_authorized
           # Answers the same question as the `outstanding` filter, so the row
           # and the filter cannot disagree.
-          attribute :outstanding do |store_credit|
-            store_credit.outstanding?
-          end
+          attribute :outstanding, &:outstanding?
 
-          attribute :display_amount_authorized do |store_credit|
-            store_credit.display_amount_authorized.to_s
-          end
-
-          attribute :customer_id do |store_credit|
-            store_credit.customer&.prefixed_id
-          end
-
-          attribute :created_by_id do |store_credit|
-            store_credit.created_by&.prefixed_id
-          end
+          # money_attributes types its fields nullable for gated guests; the
+          # Admin API never gates prices.
+          typelize amount_authorized: [:string, nullable: false]
+          prefixed_id_attributes :customer, :created_by
 
           # Why the credit exists: the return, exchange, claim or gift card
           # that issued it, or null when an admin issued it by hand. The type

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

@@ -4,110 +4,39 @@ module Spree
       module Admin
         class StoreSerializer < V3::BaseSerializer
           typelize name: :string, url: :string, code: :string, api_url: :string,
-                   preferred_storefront_url: [:string, nullable: true],
-                   default_currency: :string, default_locale: :string,
+                   default_currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'], default_locale: [:string, enum: Spree::Locales::ALL, enum_type_name: 'LocaleCode'],
                    default_country_code: [:string, nullable: true],
-                   supported_currencies: [:string, multi: true],
-                   supported_locales: [:string, multi: true],
-                   available_locales: [:string, multi: true],
+                   supported_currencies: [:string, multi: true, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
+                   supported_locales: [:string, multi: true, enum: Spree::Locales::ALL, enum_type_name: 'LocaleCode'],
+                   available_locales: [:string, multi: true, enum: Spree::Locales::ALL, enum_type_name: 'LocaleCode'],
                    logo_url: [:string, nullable: true],
                    mailer_logo_url: [:string, nullable: true],
                    mail_from_address: [:string, nullable: true],
                    customer_support_email: [:string, nullable: true],
                    new_order_notifications_email: [:string, nullable: true],
-                   preferred_send_consumer_transactional_emails: :boolean,
-                   preferred_admin_locale: [:string, nullable: true],
-                   preferred_timezone: :string,
-                   preferred_weight_unit: [:string, enum: Spree::Variant::WEIGHT_UNITS],
-                   preferred_unit_system: :string,
-                   preferred_storefront_access: :string,
-                   preferred_guest_checkout: :boolean,
-                   preferred_always_include_confirm_step: :boolean,
-                   preferred_company_field_enabled: :boolean,
-                   preferred_address_requires_company: :boolean,
-                   preferred_address_requires_phone: :boolean,
-                   preferred_capture_method: :string,
-                   preferred_track_inventory_levels: :boolean,
-                   preferred_stock_reservations_enabled: :boolean,
-                   preferred_low_stock_threshold: :number,
-                   preferred_tax_using_ship_address: :boolean,
-                   preferred_track_price_history: :boolean,
-                   preferred_show_products_without_price: :boolean,
-                   preferred_disable_sku_validation: :boolean,
-                   preferred_order_routing_strategy: :string,
-                   preferred_pricing_provider: :string,
-                   preferred_inventory_provider: :string,
-                   preferred_pricing_provider_failure_policy: :string,
-                   preferred_inventory_provider_failure_policy: :string,
-                   preferred_payout_provider: 'string | null',
-                   preferred_default_payouts_schedule_interval: :string,
-                   preferred_default_minimum_payout_amount: :number,
-                   preferred_auto_approve_sellers: :boolean,
-                   preferred_auto_approve_seller_products: :boolean,
-                   preferred_send_seller_transactional_emails: :boolean,
-                   preferred_default_commission_tax_rate: :number,
-                   preferred_document_number_format: :string,
-                   preferred_order_number_prefix: :string,
-                   preferred_order_number_suffix: :string,
-                   preferred_order_number_sequence_start: :number,
+                   order_routing_strategy: [:string, comment: 'Order routing strategy. Built-in: rules. Extensions may register more.'],
+                   payout_provider: [:string, nullable: true, comment: 'Payout provider; null uses the installation default. Built-in: system. Provider gems register more (e.g. stripe).'],
                    order_number_sequence_started: :boolean,
-                   preferred_limit_digital_download_count: :boolean,
-                   preferred_digital_asset_authorized_clicks: :number,
-                   preferred_limit_digital_download_days: :boolean,
-                   preferred_digital_asset_authorized_days: :number,
                    metadata: 'Record<string, unknown>'
 
           attributes :metadata,
                      :name,
                      :code,
-                     :preferred_storefront_url,
                      :default_currency,
                      :default_locale,
                      :default_country_code,
                      :mail_from_address,
                      :customer_support_email,
                      :new_order_notifications_email,
-                     :preferred_send_consumer_transactional_emails,
-                     :preferred_admin_locale,
-                     :preferred_timezone,
-                     :preferred_weight_unit,
-                     :preferred_unit_system,
-                     :preferred_storefront_access,
-                     :preferred_guest_checkout,
-                     :preferred_always_include_confirm_step,
-                     :preferred_company_field_enabled,
-                     :preferred_address_requires_company,
-                     :preferred_address_requires_phone,
-                     :preferred_capture_method,
-                     :preferred_track_inventory_levels,
-                     :preferred_stock_reservations_enabled,
-                     :preferred_low_stock_threshold,
-                     :preferred_tax_using_ship_address,
-                     :preferred_track_price_history,
-                     :preferred_show_products_without_price,
-                     :preferred_disable_sku_validation,
-                     :preferred_order_routing_strategy,
-                     :preferred_pricing_provider,
-                     :preferred_inventory_provider,
-                     :preferred_pricing_provider_failure_policy,
-                     :preferred_inventory_provider_failure_policy,
-                     :preferred_payout_provider,
-                     :preferred_default_payouts_schedule_interval,
-                     :preferred_default_minimum_payout_amount,
-                     :preferred_auto_approve_sellers,
-                     :preferred_auto_approve_seller_products,
-                     :preferred_send_seller_transactional_emails,
-                     :preferred_default_commission_tax_rate,
-                     :preferred_document_number_format,
-                     :preferred_order_number_prefix,
-                     :preferred_order_number_suffix,
-                     :preferred_order_number_sequence_start,
-                     :preferred_limit_digital_download_count,
-                     :preferred_digital_asset_authorized_clicks,
-                     :preferred_limit_digital_download_days,
-                     :preferred_digital_asset_authorized_days,
                      created_at: :iso8601, updated_at: :iso8601
 
+          api_type_attributes :order_routing_strategy, :payout_provider
+
+          # The first two read through `api_type_attributes` above; the money
+          # and rate settings are formatted below.
+          preference_attributes Spree::Store, except: %i[order_routing_strategy payout_provider
+                                                         default_minimum_payout_amount default_commission_tax_rate]
+
           # Once the counter has issued a number the starting value no longer
           # applies, so the settings page can say that instead of accepting a
           # value that does nothing.
@@ -115,6 +44,14 @@ module Spree
             Spree::NumberSequence.started?(store: store)
           end
 
+          typelize default_minimum_payout_amount: [:string, nullable: true]
+
+          attribute :default_minimum_payout_amount do |store|
+            Spree::Money::Rounding.format(store.preferred_default_minimum_payout_amount, store.default_currency, unit_price: true)
+          end
+
+          rate_attributes :default_commission_tax_rate
+
           attribute :url, &:storefront_url
 
           # The backend's own public URL — what a headless client sets as its

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

@@ -15,7 +15,7 @@ module Spree
                    city: 'string | null',
                    state_name: 'string | null',
                    state_code: 'string | null',
-                   country_code: 'string | null',
+                   country_code: [:string, nullable: true, enum: Spree::IsoData.country_codes, enum_type_name: 'CountryCode'],
                    postal_code: 'string | null',
                    purchase_orders_count: :number,
                    can_be_deleted: :boolean,
@@ -29,9 +29,7 @@ module Spree
 
           # Lets the dashboard hide the delete control rather than offer one
           # the model will refuse.
-          attribute :can_be_deleted do |supplier|
-            supplier.can_be_deleted?
-          end
+          attribute :can_be_deleted, &:can_be_deleted?
         end
       end
     end

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

@@ -7,8 +7,10 @@ module Spree
         class TaxExemptionCertificateSerializer < V3::BaseSerializer
           typelize certificate_number: :string, reason_code: :string, status: [:string, enum: Spree::TaxExemptionCertificate.statuses, enum_type_name: 'TaxExemptionCertificateStatus'],
                    issuing_authority: [:string, nullable: true],
+                   issued_at: [:string, nullable: true], expires_at: [:string, nullable: true],
+                   verified_at: [:string, nullable: true],
                    company_id: :string,
-                   country_code: [:string, nullable: true], state_code: [:string, nullable: true],
+                   country_code: [:string, nullable: true, enum: Spree::IsoData.country_codes, enum_type_name: 'CountryCode'], state_code: [:string, nullable: true],
                    active: :boolean, lapsed: :boolean, can_be_deleted: :boolean,
                    document_filename: [:string, nullable: true],
                    document_byte_size: ['number | null'],
@@ -19,9 +21,7 @@ module Spree
                      issued_at: :iso8601, expires_at: :iso8601, verified_at: :iso8601,
                      created_at: :iso8601, updated_at: :iso8601
 
-          attribute :company_id do |certificate|
-            certificate.company&.prefixed_id
-          end
+          prefixed_id_attributes :company
 
           # The jurisdiction the certificate holds in, in the same vocabulary the
           # tax lines use.
@@ -33,14 +33,10 @@ module Spree
             certificate.verified? && !certificate.lapsed?
           end
 
-          attribute :lapsed do |certificate|
-            certificate.lapsed?
-          end
+          attribute :lapsed, &:lapsed?
 
           # Lets the dashboard hide a delete the model will refuse.
-          attribute :can_be_deleted do |certificate|
-            certificate.can_be_deleted?
-          end
+          attribute :can_be_deleted, &:can_be_deleted?
 
           attribute :document_filename do |certificate|
             certificate.document.blob&.filename&.to_s if certificate.document.attached?

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

@@ -18,9 +18,7 @@ module Spree
           # Whether this installation can check a number of this kind at all —
           # what tells a nil verdict "not checked yet" apart from "nothing here
           # knows how to ask".
-          attribute :validatable do |tax_identifier|
-            tax_identifier.validatable?
-          end
+          attribute :validatable, &:validatable?
 
           # The owner, reported under the name of what it is, so a client can
           # tell a customer's durable registration from a cart override or an

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

@@ -3,10 +3,13 @@ module Spree
     module V3
       module Admin
         class TaxLineSerializer < V3::TaxLineSerializer
-          typelize amount: [:string, nullable: false], display_amount: [:string, nullable: false],
+          without_formatted_money
+
+          typelize amount: [:string, nullable: false],
                    provider_id: [:string, nullable: true], metadata: ['Record<string, unknown>', nullable: true],
-                   taxability_reason: [:string, nullable: true], country_code: [:string, nullable: true],
-                   state_code: [:string, nullable: true], data: ['Record<string, unknown>', nullable: true]
+                   taxability_reason: [:string, nullable: true], country_code: [:string, nullable: true, enum: Spree::IsoData.country_codes, enum_type_name: 'CountryCode'],
+                   state_code: [:string, nullable: true], data: ['Record<string, unknown>', nullable: true],
+                   original_tax_line_id: [:string, nullable: true]
 
           # The treatment and its jurisdiction stay admin-only: no surveyed
           # platform shows a buyer a machine-readable tax reason, and `label`
@@ -14,6 +17,9 @@ module Spree
           # breakdown, which is what an e-invoicing integration reads.
           attributes :provider_id, :metadata, :taxability_reason, :country_code, :state_code, :data,
                      created_at: :iso8601, updated_at: :iso8601
+
+          # The sale row a credit gives back.
+          prefixed_id_attributes :original_tax_line
         end
       end
     end

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

@@ -6,13 +6,11 @@ module Spree
         # customer-facing. What the customer sees is the label on a tax line.
         class TaxRateSerializer < V3::BaseSerializer
           typelize name: :string,
-                   amount: :string,
-                   amount_percentage: [:number, nullable: true],
                    included_in_price: :boolean,
                    show_rate_in_label: :boolean,
                    tax_category_id: [:string, nullable: true],
                    store_id: [:string, nullable: true],
-                   country_code: [:string, nullable: true],
+                   country_code: [:string, nullable: true, enum: Spree::IsoData.country_codes, enum_type_name: 'CountryCode'],
                    state_code: [:string, nullable: true],
                    metadata: ['Record<string, unknown>', nullable: true],
                    deleted_at: [:string, nullable: true]
@@ -20,23 +18,9 @@ module Spree
           attributes :name, :included_in_price, :show_rate_in_label, :metadata,
                      created_at: :iso8601, updated_at: :iso8601, deleted_at: :iso8601
 
-          attribute :amount do |tax_rate|
-            tax_rate.amount&.to_s
-          end
+          rate_attributes :rate, :rate_percent
 
-          # A real number, unlike the money-style `amount` string — this is a
-          # percentage for display, not an amount to round-trip exactly.
-          attribute :amount_percentage do |tax_rate|
-            tax_rate.amount_percentage&.to_f
-          end
-
-          attribute :tax_category_id do |tax_rate|
-            tax_rate.tax_category&.prefixed_id
-          end
-
-          attribute :store_id do |tax_rate|
-            tax_rate.store&.prefixed_id
-          end
+          prefixed_id_attributes :tax_category, :store
 
           # The jurisdiction the rate taxes, as codes: a null country means every
           # country, and a country with no state means the whole country. Read