spree_api 6.0.0.rc1 → 6.0.0.rc3

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

@@ -3,18 +3,22 @@ module Spree
     module V3
       module Admin
         class RefundSerializer < V3::RefundSerializer
+          # The Store API keeps this deprecated name until 6.1.
+          _attributes.delete(:reimbursement_id)
+
           typelize payment_id: [:string, nullable: true],
                    refund_reason_id: [:string, nullable: true],
                    refunder_id: [:string, nullable: true],
                    refunder_type: [:string, nullable: true, enum: Spree::Actor::BUILT_IN_KINDS, enum_type_name: 'ActorKind'],
-                   metadata: 'Record<string, unknown>',
-                   tax_amount: :string
+                   metadata: 'Record<string, unknown>'
 
           attributes :metadata,
                      created_at: :iso8601, updated_at: :iso8601
 
           # The tax inside the amount, when what was refunded carried tax.
-          attributes tax_amount: :string
+          money_attributes :tax_amount
+          typelize tax_amount: [:string, nullable: false]
+
           # Who issued it — an admin user, or the API key an integration
           # refunded through.
           actor_attributes :refunder

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

@@ -2,8 +2,9 @@ module Spree
   module Api
     module V3
       module Admin
-        # Decorates a Spree::Reporting::Result for the wire: money display
-        # strings, ISO ranges, and dimension hydration (raw group keys become
+        # Decorates a Spree::Reporting::Result for the wire: money as decimal
+        # strings in the result's currency, ratios and growth as plain decimal
+        # strings, counts as integers, money display strings, ISO ranges, and dimension hydration (raw group keys become
         # { id, label, meta } display payloads — see Spree::Reporting::Hydration).
         class ReportingResultSerializer
           attr_reader :result, :store, :params
@@ -39,7 +40,13 @@ module Spree
           end
 
           def metric_payload(name, payload)
+            metric = Spree.reporting.metrics[name]
             output = payload.dup
+            if metric
+              output[:value] = metric.format_value(payload[:value], result.meta[:currency])
+              output[:previous] = metric.format_value(payload[:previous], result.meta[:currency]) if payload.key?(:previous)
+            end
+            output[:growth] = Spree::Money::Rounding.format_decimal(payload[:growth]) if payload.key?(:growth)
             output[:display] = money(payload[:value]) if money_metrics.include?(name)
             output
           end

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

@@ -5,6 +5,14 @@ module Spree
     module V3
       module Admin
         class ReturnLineItemSerializer < V3::ReturnLineItemSerializer
+          without_formatted_money
+
+          # No guest price gating here, so the inherited money fields are always present.
+          typelize pre_tax_amount: [:string, nullable: false],
+                   included_tax_total: [:string, nullable: false], additional_tax_total: [:string, nullable: false],
+                   tax_total: [:string, nullable: false],
+                   refund_amount: [:string, nullable: false]
+
           attributes created_at: :iso8601, updated_at: :iso8601
 
           one :variant, resource: proc { Spree.api.admin_variant_serializer }, if: proc { expand?('variant') }

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

@@ -5,15 +5,16 @@ module Spree
     module V3
       module Admin
         class ReturnSerializer < V3::ReturnSerializer
+          without_formatted_money
+
           typelize memo: [:string, nullable: true],
                    metadata: 'Record<string, unknown>',
                    documents: "Array<{ kind: string; url: string }>",
                    stock_location_id: [:string, nullable: true],
                    created_by_id: [:string, nullable: true],
                    created_by_type: [:string, nullable: true, enum: Spree::Actor::BUILT_IN_KINDS, enum_type_name: 'ActorKind'],
-                   refunded_total: :string,
-                   display_refunded_total: :string,
-                   refundable_total: :string
+                   refund_total: [:string, nullable: false],
+                   refund_tax_total: [:string, nullable: false]
 
           attributes :memo, :metadata, created_at: :iso8601, updated_at: :iso8601
 
@@ -21,7 +22,10 @@ module Spree
 
           actor_attributes :created_by
 
-          attributes refunded_total: :string, display_refunded_total: :string, refundable_total: :string
+          money_attributes :refunded_total, :refundable_total
+          typelize refunded_total: [:string, nullable: false],
+                   refundable_total: [:string, nullable: false]
+
           many :return_line_items,
                resource: proc { Spree.api.admin_return_line_item_serializer },
                if: proc { expand?('return_line_items') }

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

@@ -6,14 +6,14 @@ module Spree
         # operator. A computed value rather than a record, so it carries no id.
         class SellerBalanceSerializer < V3::BaseSerializer
           typelize seller_id: :string,
-                   currency: :string,
-                   settlement_currency: :string,
+                   currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
+                   settlement_currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    converted: :boolean,
-                   earned: :string, display_earned: :string,
-                   payable: :string, display_payable: :string,
-                   paid: :string, display_paid: :string,
-                   balance: :string, display_balance: :string,
-                   pending: :string, display_pending: :string
+                   earned: :string,
+                   payable: :string,
+                   paid: :string,
+                   balance: :string,
+                   pending: :string
 
           _attributes.delete(:id)
 
@@ -26,9 +26,14 @@ module Spree
 
           attribute(:seller_id) { |balance| balance.seller&.prefixed_id }
 
-          %i[earned payable paid balance pending].each do |figure|
-            attribute(figure) { |balance| balance.public_send(figure).to_s }
-            attribute(:"display_#{figure}") { |balance| balance.public_send(:"display_#{figure}").to_s }
+          # Earnings are in the currency the sales were priced in; what the
+          # account holds is in the one it settles in.
+          %i[earned pending].each do |figure|
+            attribute(figure) { |balance| Spree::Money::Rounding.format(balance.public_send(figure), balance.currency) }
+          end
+
+          %i[payable paid balance].each do |figure|
+            attribute(figure) { |balance| Spree::Money::Rounding.format(balance.public_send(figure), balance.settlement_currency) }
           end
         end
       end

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

@@ -13,19 +13,17 @@ module Spree
                    status: [:string, enum: Spree::SellerPayout.statuses, enum_type_name: 'SellerPayoutStatus'],
                    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'],
                    reference: 'string | null',
                    period_start: 'string | null',
                    period_end: 'string | null',
-                   transfers_count: :number,
-                   display_amount: :string
+                   transfers_count: :number
 
           attributes :status, :currency, :reference, :metadata,
                      period_start: :iso8601, period_end: :iso8601,
                      created_at: :iso8601, updated_at: :iso8601
 
-          attribute(:amount) { |payout| payout.amount&.to_s }
-          attribute(:display_amount) { |payout| payout.display_amount.to_s }
+          attribute(:amount) { |payout| Spree::Money::Rounding.format(payout.amount, payout.currency) }
           attribute(:seller_id) { |payout| payout.seller&.prefixed_id }
           attribute(:seller_name) { |payout| payout.seller&.name }
 

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

@@ -37,8 +37,10 @@ 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

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

@@ -18,23 +18,22 @@ module Spree
                    status: [:string, enum: Spree::SellerTransfer.statuses, enum_type_name: 'SellerTransferStatus'],
                    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, :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? }
 

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

@@ -14,9 +14,7 @@ module Spree
                    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],
@@ -34,7 +32,9 @@ module Spree
             Spree::Base.polymorphic_api_type(shipping_label.owner_type)
           end
 
-          attributes cost: :string, display_cost: :string
+          money_attributes :cost, currency: ->(label) { label.currency.presence || label.store.default_currency }
+          typelize cost: [:string, nullable: false]
+
           prefixed_id_attributes :integration
 
           # Whether the file is still being fetched from the carrier; the

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],

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],
@@ -101,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/store_credit_event_serializer.rb

@@ -5,6 +5,11 @@ 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

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,12 +19,14 @@ module Spree
           attributes :memo, :metadata,
                      created_at: :iso8601, updated_at: :iso8601
 
-          attributes amount_authorized: :string
+          money_attributes :amount_authorized
           # Answers the same question as the `outstanding` filter, so the row
           # and the filter cannot disagree.
           attribute :outstanding, &:outstanding?
 
-          attributes display_amount_authorized: :string
+          # 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

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

@@ -4,119 +4,38 @@ 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_email_accent_color: [:string, nullable: true],
-                   preferred_email_background_color: [:string, nullable: true],
-                   preferred_email_card_color: [:string, nullable: true],
-                   preferred_email_text_color: [:string, nullable: true],
-                   preferred_email_heading_color: [:string, nullable: true],
-                   preferred_email_font: [:string, nullable: true, enum: Spree::Emails::Branding::FONTS.keys],
-                   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, comment: 'Order routing strategy. Built-in: rules. Extensions may register more.'],
-                   preferred_pricing_provider: :string,
-                   preferred_inventory_provider: :string,
-                   preferred_pricing_provider_failure_policy: :string,
-                   preferred_inventory_provider_failure_policy: :string,
-                   preferred_payout_provider: [:string, nullable: true, comment: 'Payout provider; null uses the installation default. Built-in: system. Provider gems register more (e.g. stripe).'],
-                   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_email_accent_color,
-                     :preferred_email_background_color,
-                     :preferred_email_card_color,
-                     :preferred_email_text_color,
-                     :preferred_email_heading_color,
-                     :preferred_email_font,
-                     :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_pricing_provider,
-                     :preferred_inventory_provider,
-                     :preferred_pricing_provider_failure_policy,
-                     :preferred_inventory_provider_failure_policy,
-                     :preferred_default_payouts_schedule_interval,
-                     :preferred_auto_approve_sellers,
-                     :preferred_auto_approve_seller_products,
-                     :preferred_send_seller_transactional_emails,
-                     :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 :preferred_order_routing_strategy, :preferred_payout_provider
+          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
@@ -125,14 +44,14 @@ module Spree
             Spree::NumberSequence.started?(store: store)
           end
 
-          attribute :preferred_default_minimum_payout_amount do |store|
-            store.preferred_default_minimum_payout_amount&.to_f
-          end
+          typelize default_minimum_payout_amount: [:string, nullable: true]
 
-          attribute :preferred_default_commission_tax_rate do |store|
-            store.preferred_default_commission_tax_rate&.to_f
+          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,

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'],

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

@@ -3,9 +3,11 @@ 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],
+                   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]
 

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,15 +18,7 @@ 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
-
-          # 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
+          rate_attributes :rate, :rate_percent
 
           prefixed_id_attributes :tax_category, :store
 

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

@@ -0,0 +1,28 @@
+module Spree
+  module Api
+    module V3
+      module Admin
+        # What the last update check found (Spree::UpdateStatus). A computed
+        # value rather than a record, so it carries no id.
+        class UpdateStatusSerializer < V3::BaseSerializer
+          typelize current_version: :string,
+                   enabled: :boolean,
+                   update_available: :boolean,
+                   latest_version: [:string, nullable: true],
+                   latest_release_url: [:string, nullable: true],
+                   latest_release_published_at: [:string, nullable: true],
+                   checked_at: [:string, nullable: true]
+
+          _attributes.delete(:id)
+
+          attributes :current_version, :enabled, checked_at: :iso8601
+
+          attribute(:update_available) { |status| status.update_available? }
+          attribute(:latest_version) { |status| status.latest_release&.dig(:version) }
+          attribute(:latest_release_url) { |status| status.latest_release&.dig(:url) }
+          attribute(:latest_release_published_at) { |status| status.latest_release&.dig(:published_at)&.iso8601(3) }
+        end
+      end
+    end
+  end
+end

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

@@ -5,19 +5,21 @@ module Spree
         # Admin API Variant Serializer
         # Full variant data including admin-only fields
         class VariantSerializer < V3::VariantSerializer
+          without_formatted_money
+
           include Concerns::ExternalReferencesAttribute
 
 
           typelize product_name: :string,
                    position: :number, tax_category_id: [:string, nullable: true],
-                   cost_price: [:string, nullable: true], cost_currency: [:string, nullable: true],
+                   cost_price: [:string, nullable: true], cost_currency: [:string, nullable: true, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    barcode: [:string, nullable: true],
                    available_stock: [:number, nullable: true],
                    reserved_quantity: :number, total_on_hand: [:number, nullable: true],
                    preorderable: :boolean, preorder_ships_at: [:string, nullable: true],
                    backorder_limit: [:number, nullable: true],
                    hs_code: [:string, nullable: true],
-                   country_of_origin: [:string, nullable: true],
+                   country_of_origin: [:string, nullable: true, enum: Spree::IsoData.country_codes, enum_type_name: 'CountryCode'],
                    customs_description: [:string, nullable: true],
                    deleted_at: [:string, nullable: true],
                    delivery_profile_id: [:string, nullable: true],
@@ -32,7 +34,7 @@ module Spree
           # The last three override the store serializer's buyer-resolved
           # values with the variant's OWN: a merchant edits what is stored on
           # the row, not what some catalog resolves to for a buyer they are not.
-          attributes :metadata, :position, :cost_price, :cost_currency,
+          attributes :metadata, :position, :cost_currency,
                      :barcode, :backorder_limit,
                      :hs_code, :country_of_origin, :customs_description,
                      :minimum_order_quantity, :order_multiple, :purchase_unit,
@@ -40,6 +42,8 @@ module Spree
                      preorder_ships_at: :iso8601, deleted_at: :iso8601,
                      created_at: :iso8601, updated_at: :iso8601
 
+          money_attributes :cost_price, currency: :cost_currency, unit_price: true
+
           attribute :preorderable, &:preorderable?
 
           # Stored on the row only — nil means inherit from the product. The