spree_api 6.0.0.rc4 → 6.0.0.rc5

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

@@ -8,7 +8,7 @@ module Spree
         class CollectionSerializer < V3::CollectionSerializer
           include Spree::Api::V3::Admin::Translatable
 
-          typelize automatic: :boolean, rules_match_policy: [:string, enum: Spree::Collection::RULES_MATCH_POLICIES],
+          typelize automatic: :boolean, rules_match_policy: [:string, enum: Spree::Collection::RULES_MATCH_POLICIES, enum_type_name: 'MatchPolicy'],
                    metadata: 'Record<string, unknown>'
 
           attributes :automatic, :rules_match_policy, :metadata,

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

@@ -19,8 +19,8 @@ module Spree
                    line_item_id: 'string | null',
                    fulfillment_id: 'string | null',
                    commission_rate_id: 'string | null',
-                   kind: [:string, enum: Spree::CommissionRate::KINDS],
-                   taxability_reason: 'string | null',
+                   kind: [:string, enum: Spree::CommissionRate::KINDS, enum_type_name: 'CommissionKind'],
+                   taxability_reason: [:string, nullable: true, enum: Spree::TaxLine::BUILT_IN_TAXABILITY_REASONS, enum_type_name: 'TaxabilityReason'],
                    country_code: [:string, nullable: true, enum: Spree::IsoData.country_codes, enum_type_name: 'CountryCode'],
                    state_code: 'string | null',
                    currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode']

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

@@ -15,7 +15,7 @@ module Spree
                    enabled: :boolean,
                    position: :number,
                    global: :boolean,
-                   kind: [:string, enum: Spree::CommissionRate::KINDS],
+                   kind: [:string, enum: Spree::CommissionRate::KINDS, enum_type_name: 'CommissionKind'],
                    amounts: 'Record<string, string>',
                    bounds: 'Record<string, { min_amount: string | null; max_amount: string | null }>',
                    tax_inclusive: :boolean,

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

@@ -5,7 +5,7 @@ module Spree
         # Admin API Consent Record Serializer
         # The evidence trail behind a customer's consent state.
         class ConsentRecordSerializer < BaseSerializer
-          typelize purpose: :string, source: [:string, enum: Spree::ConsentRecord::SOURCES], accepted: :boolean,
+          typelize purpose: :string, source: [:string, enum: Spree::ConsentRecord::SOURCES, enum_type_name: 'ConsentSource'], accepted: :boolean,
                    email: [:string, nullable: true],
                    ip_address: [:string, nullable: true],
                    recorded_at: [:string, nullable: true],

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

@@ -7,7 +7,7 @@ module Spree
         # default, and the draft in progress.
         class EmailTemplateSerializer < V3::BaseSerializer
           typelize key: :string,
-                   kind: [:string, enum: Spree::Emails::EditableTemplates::KINDS.map(&:to_s)],
+                   kind: [:string, enum: Spree::Emails::EditableTemplates::KINDS.map(&:to_s), enum_type_name: 'EmailTemplateKind'],
                    language: :string,
                    customized: :boolean,
                    customized_languages: [:string, multi: true],

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

@@ -31,7 +31,7 @@ module Spree
                    total: [:string, nullable: false],
                    amount_due: [:string, nullable: false]
 
-          typelize status: [:string, enum: Spree::Order::STATUSES],
+          typelize status: [:string, enum: Spree::Order::STATUSES, enum_type_name: 'OrderStatus'],
                    last_ip_address: [:string, nullable: true],
                    considered_risky: :boolean, confirmation_delivered: :boolean,
                    store_owner_notification_delivered: [:boolean, nullable: true],

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

@@ -7,14 +7,14 @@ module Spree
         # only — a shopper never picks their packaging.
         class PackageTypeSerializer < V3::BaseSerializer
           typelize name: :string,
-                   kind: [:string, enum: Spree::PackageType::KINDS],
+                   kind: [:string, enum: Spree::PackageType::KINDS, enum_type_name: 'PackageTypeKind'],
                    length: [:string, nullable: true],
                    width: [:string, nullable: true],
                    height: [:string, nullable: true],
-                   dimensions_unit: [:string, enum: Spree::Variant::DIMENSION_UNITS],
+                   dimensions_unit: [:string, enum: Spree::Variant::DIMENSION_UNITS, enum_type_name: 'DimensionUnit'],
                    weight: [:string, nullable: true],
                    max_weight: [:string, nullable: true],
-                   weight_unit: [:string, enum: Spree::Variant::WEIGHT_UNITS],
+                   weight_unit: [:string, enum: Spree::Variant::WEIGHT_UNITS, enum_type_name: 'WeightUnit'],
                    volume: [:string, nullable: true],
                    default: :boolean,
                    seller_id: [:string, nullable: true],

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

@@ -10,7 +10,7 @@ module Spree
           include Alba::Resource
           include Typelizer::DSL
 
-          typelize key: :string, resource: :string, kind: [:string, enum: %w[read write]], group: :string,
+          typelize key: :string, resource: :string, kind: [:string, enum: %w[read write], enum_type_name: 'PermissionKind'], group: :string,
                    group_label: :string, label: :string, description: :string
 
           attributes :key

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

@@ -14,7 +14,7 @@ module Spree
                    starts_at: 'string | null',
                    ends_at: 'string | null',
                    deleted_at: 'string | null',
-                   match_policy: [:string, enum: Spree::PriceList::MATCH_POLICIES],
+                   match_policy: [:string, enum: Spree::PriceList::MATCH_POLICIES, enum_type_name: 'MatchPolicy'],
                    price_adjustment_percentage: 'string | null',
                    adjust_compare_at: :boolean,
                    automatic_pricing: :boolean,

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

@@ -6,7 +6,7 @@ module Spree
         # the merchant owes and expects, which no customer ever sees.
         class PurchaseOrderSerializer < V3::BaseSerializer
           typelize number: :string,
-                   status: :string,
+                   status: [:string, enum: Spree::PurchaseOrder.statuses, enum_type_name: 'PurchaseOrderStatus'],
                    currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    reference: 'string | null',
                    notes: 'string | null',

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

@@ -12,7 +12,7 @@ module Spree
 
           typelize id: :string, kind: [:string, comment: 'Requirement kind. Built-in: accept_terms, complete_profile, billing_address, returns_address, delivery_method, package_type, minimum_products, payout_account, required_custom_fields, policy, attestation, operator_review, document. Extensions may register more.'], name: :string,
                    description: [:string, nullable: true],
-                   required: :boolean, position: :number, status: [:string, enum: Spree::SellerRequirementStatus::STATUSES],
+                   required: :boolean, position: :number, status: [:string, enum: Spree::SellerRequirementStatus::STATUSES, enum_type_name: 'SellerRequirementState'],
                    blocking: :boolean, action_url: [:string, nullable: true],
                    blocker: ['{ state: string; message: string | null } | null'],
                    required_policy_name: [:string, nullable: true]

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

@@ -10,8 +10,8 @@ module Spree
                    legal_name: [:string, nullable: true],
                    registration_number: [:string, nullable: true],
                    contact_email: [:string, nullable: true], billing_email: [:string, nullable: true],
-                   tax_remittance: :string,
-                   payouts_schedule_interval: [:string, nullable: true],
+                   tax_remittance: [:string, enum: Spree::Seller::TAX_REMITTANCES, enum_type_name: 'TaxRemittance'],
+                   payouts_schedule_interval: [:string, nullable: true, enum: Spree::Seller::PAYOUT_INTERVALS, enum_type_name: 'PayoutScheduleInterval'],
                    minimum_payout_amount: [:string, nullable: true],
                    holiday_mode_until: [:string, nullable: true],
                    terms_accepted_at: [:string, nullable: true],

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

@@ -14,7 +14,7 @@ module Spree
                    refund_id: 'string | null',
                    seller_name: 'string | null',
                    order_number: 'string | null',
-                   kind: [:string, enum: Spree::SellerTransfer::KINDS],
+                   kind: [:string, enum: Spree::SellerTransfer::KINDS, enum_type_name: 'SellerTransferKind'],
                    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,

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

@@ -7,15 +7,15 @@ 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.map { |type| Spree::Base.polymorphic_api_type(type) }],
-                   source: [:string, enum: Spree::ShippingLabel::SOURCES],
+                   owner_type: [:string, enum: Spree::ShippingLabel::OWNER_TYPES.map { |type| Spree::Base.polymorphic_api_type(type) }, enum_type_name: 'ShippingLabelOwnerType'],
+                   source: [:string, enum: Spree::ShippingLabel::SOURCES, enum_type_name: 'ShippingLabelSource'],
                    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],
                    currency: [:string, nullable: true, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
-                   format: [:string, nullable: true],
+                   format: [:string, nullable: true, enum: Spree::ShippingLabel::FORMATS, enum_type_name: 'ShippingLabelFormat'],
                    external_id: [:string, nullable: true],
                    integration_id: [:string, nullable: true],
                    download_url: [:string, nullable: true],

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

@@ -15,7 +15,7 @@ module Spree
                    address2: [:string, nullable: true], state_name: [:string, nullable: true],
                    phone: [:string, nullable: true], company: [:string, nullable: true],
                    kind: [:string, enum: Spree::StockLocation::KINDS, enum_type_name: 'StockLocationKind'],
-                   pickup_stock_policy: [:string, enum: Spree::StockLocation::PICKUP_STOCK_POLICIES],
+                   pickup_stock_policy: [:string, enum: Spree::StockLocation::PICKUP_STOCK_POLICIES, enum_type_name: 'PickupStockPolicy'],
                    pickup_ready_in_minutes: [:number, nullable: true],
                    pickup_instructions: [:string, nullable: true]
 

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

@@ -7,9 +7,9 @@ module Spree
         class StockReceiptItemSerializer < V3::BaseSerializer
           typelize quantity_accepted: :number,
                    quantity_rejected: :number,
-                   rejection_reason: [:string, enum: Spree::StockReceiptItem::REJECTION_REASONS, nullable: true],
+                   rejection_reason: [:string, enum: Spree::StockReceiptItem::REJECTION_REASONS, nullable: true, enum_type_name: 'StockReceiptRejectionReason'],
                    notes: 'string | null',
-                   line_type: [:string, enum: %w[purchase_order_item stock_transfer_item]],
+                   line_type: [:string, enum: %w[purchase_order_item stock_transfer_item], enum_type_name: 'StockReceiptLineType'],
                    line_id: 'string | null',
                    product_id: 'string | null',
                    variant_id: 'string | null',

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

@@ -9,7 +9,7 @@ module Spree
                    reference: 'string | null',
                    notes: 'string | null',
                    received_at: :string,
-                   receivable_type: [:string, enum: %w[purchase_order stock_transfer]],
+                   receivable_type: [:string, enum: %w[purchase_order stock_transfer], enum_type_name: 'StockReceiptReceivableType'],
                    receivable_id: :string,
                    received_by_id: 'string | null',
                    received_by_type: [:string, nullable: true, enum: Spree::Actor::BUILT_IN_KINDS, enum_type_name: 'ActorKind'],

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

@@ -6,7 +6,7 @@ module Spree
         # has a middle: `shipped_at` is when the units left the source,
         # `received_at` when the destination finished counting them in.
         class StockTransferSerializer < V3::StockTransferSerializer
-          typelize status: :string,
+          typelize status: [:string, enum: Spree::StockTransfer.statuses, enum_type_name: 'StockTransferStatus'],
                    notes: 'string | null',
                    items_count: :number,
                    quantity_shipped_total: :number,

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

@@ -36,6 +36,7 @@ module Spree
           # 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]
+          typelize weight_unit: [:string, enum: Spree::Variant::WEIGHT_UNITS, enum_type_name: 'WeightUnit']
 
           # Once the counter has issued a number the starting value no longer
           # applies, so the settings page can say that instead of accepting a

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

@@ -3,10 +3,10 @@ module Spree
     module V3
       module Admin
         class TaxIdentifierSerializer < V3::TaxIdentifierSerializer
-          typelize validation_status: [:string, nullable: true, enum: Spree::TaxIdentifier::VALIDATION_STATUSES],
+          typelize validation_status: [:string, nullable: true, enum: Spree::TaxIdentifier::VALIDATION_STATUSES, enum_type_name: 'TaxIdentifierValidationStatus'],
                    validated_at: [:string, nullable: true],
                    validation_evidence: ['Record<string, unknown>', nullable: true],
-                   source: [:string, nullable: true, enum: Spree::TaxIdentifier::SOURCES],
+                   source: [:string, nullable: true, enum: Spree::TaxIdentifier::SOURCES, enum_type_name: 'TaxIdentifierSource'],
                    validatable: :boolean,
                    customer_id: [:string, nullable: true],
                    cart_id: [:string, nullable: true],

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

@@ -7,7 +7,7 @@ module Spree
 
           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, enum: Spree::IsoData.country_codes, enum_type_name: 'CountryCode'],
+                   taxability_reason: [:string, nullable: true, enum: Spree::TaxLine::BUILT_IN_TAXABILITY_REASONS, enum_type_name: 'TaxabilityReason'], 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/variant_serializer.rb

@@ -24,7 +24,7 @@ module Spree
                    deleted_at: [:string, nullable: true],
                    delivery_profile_id: [:string, nullable: true],
                    minimum_order_quantity: ['number | null'], order_multiple: ['number | null'],
-                   purchase_unit: [:string, nullable: true, enum: Spree::Variant::PURCHASE_UNITS],
+                   purchase_unit: [:string, nullable: true, enum: Spree::Variant::PURCHASE_UNITS, enum_type_name: 'PurchaseUnit'],
                    carton_package_type_id: [:string, nullable: true],
                    carton_weight: [:string, nullable: true],
                    cartons_per_pallet: ['number | null'],

data/app/serializers/spree/api/v3/base_serializer.rb

@@ -126,7 +126,7 @@ module Spree
           names = model.exposed_preference_names.to_a - except if names.empty?
           definitions = model.preference_definitions
           names.each do |name|
-            typelize name => preference_type_hint(Spree::PreferenceSchema::JsonSchema.property_schema(definitions.fetch(name)))
+            typelize name => preference_type_hint(Spree::PreferenceSchema::JsonSchema.property_schema(definitions.fetch(name)), name)
             reader = :"preferred_#{name}"
             attribute(name) do |object|
               value = object.public_send(reader)
@@ -138,12 +138,29 @@ module Spree
         TYPELIZER_TYPES = { 'string' => :string, 'integer' => :number, 'number' => :number, 'boolean' => :boolean }.freeze
         private_constant :TYPELIZER_TYPES
 
-        def self.preference_type_hint(schema)
+        # The shared name of each setting's value list, so it is defined once
+        # in `@spree/core` rather than inline wherever the setting appears.
+        PREFERENCE_LIST_NAMES = {
+          capture_method: 'CaptureMethod',
+          default_payouts_schedule_interval: 'PayoutScheduleInterval',
+          document_number_format: 'DocumentNumberFormat',
+          email_font: 'EmailFont',
+          inventory_provider_failure_policy: 'ProviderFailurePolicy',
+          pricing_provider_failure_policy: 'ProviderFailurePolicy',
+          storefront_access: 'StorefrontAccess',
+          unit_system: 'UnitSystem'
+        }.freeze
+        private_constant :PREFERENCE_LIST_NAMES
+
+        def self.preference_type_hint(schema, name)
           types = Array(schema['type'])
           hint = TYPELIZER_TYPES.fetch((types - ['null']).first, :unknown)
           options = {}
           options[:nullable] = true if types.include?('null')
-          options[:enum] = schema['enum'].compact if schema['enum']
+          if schema['enum']
+            options[:enum] = schema['enum'].compact
+            options[:enum_type_name] = PREFERENCE_LIST_NAMES[name.to_sym] if PREFERENCE_LIST_NAMES.key?(name.to_sym)
+          end
           options.empty? ? hint : [hint, options]
         end
         private_class_method :preference_type_hint
@@ -277,6 +294,10 @@ module Spree
             currency: current_currency,
             store: current_store,
             user: current_user,
+            company: params[:company],
+            market: params[:market],
+            channel: params[:channel],
+            country: params[:country],
             quantity: quantity
           )
         end
@@ -295,8 +316,9 @@ module Spree
           return Spree::QuantityRule.new if current_store.nil?
 
           Spree::Current.quantity_rules_resolver_for(
-            company: Spree::Current.standing_company_for(current_user),
-            user: current_user
+            company: params.key?(:company) ? params[:company] : Spree::Current.standing_company_for(current_user),
+            user: current_user,
+            channel: params[:channel]
           ).call(variant)
         end
 

data/app/serializers/spree/api/v3/claim_serializer.rb

@@ -7,7 +7,7 @@ module Spree
       class ClaimSerializer < BaseSerializer
         typelize number: :string,
                  status: [:string, enum: Spree::Claim.statuses, enum_type_name: 'ClaimStatus'],
-                 resolution: [:string, nullable: true],
+                 resolution: [:string, nullable: true, enum: Spree::Claim::RESOLUTIONS, enum_type_name: 'ClaimResolution'],
                  order_id: [:string, nullable: true],
                  reason_id: [:string, nullable: true],
                  approved_at: [:string, nullable: true],

data/app/serializers/spree/api/v3/collection_serializer.rb

@@ -6,7 +6,7 @@ module Spree
       # back-office state exposed only by the Admin serializer.
       class CollectionSerializer < BaseSerializer
         typelize name: :string, permalink: :string, position: :number,
-                 sort_order: :string,
+                 sort_order: [:string, enum: Spree::Collection::SORT_ORDERS, enum_type_name: 'CollectionSortOrder'],
                  meta_title: [:string, nullable: true], meta_description: [:string, nullable: true], meta_keywords: [:string, nullable: true],
                  description: :string, description_html: :string,
                  image_url: [:string, nullable: true], square_image_url: [:string, nullable: true],

data/app/serializers/spree/api/v3/company_invitation_serializer.rb

@@ -4,7 +4,7 @@ module Spree
       # A pending (or spent) invitation into a company node. The token is
       # deliberately absent — it travels only in the invite email.
       class CompanyInvitationSerializer < BaseSerializer
-        typelize email: :string, company_id: :string, status: [:string, enum: %w[pending accepted revoked expired]],
+        typelize email: :string, company_id: :string, status: [:string, enum: %w[pending accepted revoked expired], enum_type_name: 'CompanyInvitationStatus'],
                  expires_at: [:string, nullable: true]
 
         attributes :email, expires_at: :iso8601

data/app/serializers/spree/api/v3/company_serializer.rb

@@ -7,7 +7,7 @@ module Spree
       # back-office fields stay in one place.
       class CompanySerializer < BaseSerializer
         typelize name: :string,
-                 kind: [:string, enum: Spree::Company::KINDS], parent_id: [:string, nullable: true],
+                 kind: [:string, enum: Spree::Company::KINDS, enum_type_name: 'CompanyKind'], parent_id: [:string, nullable: true],
                  po_number_required: :boolean,
                  ancestors: 'Array<{id: string, name: string, kind: string}>'
 

data/app/serializers/spree/api/v3/data_request_confirmation_requested_event_serializer.rb

@@ -0,0 +1,28 @@
+module Spree
+  module Api
+    module V3
+      # The event shape for `data_request.confirmation_requested`: what a
+      # storefront that sends its own emails needs to ask the person to confirm
+      # a request they raised. `confirmation_token` is a live credential, so
+      # the event reaches only endpoints that name it.
+      class DataRequestConfirmationRequestedEventSerializer < DataRequestEventSerializer
+        typelize email: :string, confirmation_token: :string, store_id: :string,
+                 redirect_url: [:string, optional: true]
+
+        attributes :email
+
+        attribute :confirmation_token do
+          params[:confirmation_token]
+        end
+
+        attribute :store_id do |data_request|
+          data_request.store.prefixed_id
+        end
+
+        attribute :redirect_url, if: proc { params[:redirect_url].present? } do
+          params[:redirect_url]
+        end
+      end
+    end
+  end
+end

data/app/serializers/spree/api/v3/data_request_event_serializer.rb

@@ -11,7 +11,7 @@ module Spree
       # log. Subscribers get the fact that a request finished; fetching the
       # file stays an authenticated act by the person it belongs to.
       class DataRequestEventSerializer < BaseSerializer
-        typelize number: :string, kind: [:string, enum: Spree::DataRequest::KINDS], status: [:string, enum: Spree::DataRequest.statuses, enum_type_name: 'DataRequestStatus'],
+        typelize number: :string, kind: [:string, enum: Spree::DataRequest::KINDS, enum_type_name: 'DataRequestKind'], status: [:string, enum: Spree::DataRequest.statuses, enum_type_name: 'DataRequestStatus'],
                  requested_at: [:string, nullable: true],
                  completed_at: [:string, nullable: true]
 

data/app/serializers/spree/api/v3/data_request_serializer.rb

@@ -4,7 +4,7 @@ module Spree
       # Store API Data Request Serializer
       # A customer's own GDPR access or erasure request.
       class DataRequestSerializer < BaseSerializer
-        typelize number: :string, kind: [:string, enum: Spree::DataRequest::KINDS], status: [:string, enum: Spree::DataRequest.statuses, enum_type_name: 'DataRequestStatus'],
+        typelize number: :string, kind: [:string, enum: Spree::DataRequest::KINDS, enum_type_name: 'DataRequestKind'], status: [:string, enum: Spree::DataRequest.statuses, enum_type_name: 'DataRequestStatus'],
                  requested_at: [:string, nullable: true],
                  completed_at: [:string, nullable: true],
                  expires_at: [:string, nullable: true],
@@ -25,11 +25,15 @@ module Spree
         end
 
         # Present only while the file is still there — a link the storefront
-        # can render without having to reason about expiry itself.
-        attribute :download_url do |data_request, params|
+        # can render without having to reason about expiry itself — and only
+        # to a caller holding the confirmation token, never to the signed-in
+        # account, because the export covers guest orders placed at the address
+        # the request names.
+        attribute :download_url do |data_request|
+          next nil unless params[:download_url_visible]
           next nil unless data_request.downloadable?
 
-          host = (params&.dig(:store) || data_request.store)&.formatted_url
+          host = (params[:store] || data_request.store)&.formatted_url
           next nil if host.blank?
 
           Spree::Api::DataRequestUrls.download_url(data_request, host)

data/app/serializers/spree/api/v3/delivery_serializer.rb

@@ -10,7 +10,7 @@ module Spree
                  carrier: [:string, nullable: true],
                  carrier_name: [:string, nullable: true],
                  service: [:string, nullable: true],
-                 status: [:string, enum: Spree::Delivery::STATUSES],
+                 status: [:string, enum: Spree::Delivery::STATUSES, enum_type_name: 'DeliveryStatus'],
                  estimated_delivery_at: [:string, nullable: true],
                  delivered_at: [:string, nullable: true]
 

data/app/serializers/spree/api/v3/delivery_zone_member_serializer.rb

@@ -2,7 +2,7 @@ module Spree
   module Api
     module V3
       class DeliveryZoneMemberSerializer < BaseSerializer
-        typelize member_type: [:string, enum: Spree::DeliveryZoneMember::MEMBER_TYPES], country_code: [:string, nullable: true, enum: Spree::IsoData.country_codes, enum_type_name: 'CountryCode'],
+        typelize member_type: [:string, enum: Spree::DeliveryZoneMember::MEMBER_TYPES, enum_type_name: 'DeliveryZoneMemberType'], country_code: [:string, nullable: true, enum: Spree::IsoData.country_codes, enum_type_name: 'CountryCode'],
                  country_name: [:string, nullable: true],
                  state_code: [:string, nullable: true], state_name: [:string, nullable: true],
                  postal_code_prefix: [:string, nullable: true],

data/app/serializers/spree/api/v3/discount_serializer.rb

@@ -5,7 +5,7 @@ module Spree
       # line item or fulfillment. The embedded `discounts` key on Cart/Order
       # stays the applied-promotion summary — see AppliedPromotionSerializer.
       class DiscountSerializer < BaseSerializer
-        typelize label: :string, kind: [:string, enum: Spree::Discount::KINDS], code: [:string, nullable: true],
+        typelize label: :string, kind: [:string, enum: Spree::Discount::KINDS, enum_type_name: 'DiscountKind'], code: [:string, nullable: true],
                  value: [:string, nullable: true], value_type: [:string, nullable: true],
                  promotion_id: [:string, nullable: true], line_item_id: [:string, nullable: true],
                  fulfillment_id: [:string, nullable: true]

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

@@ -15,7 +15,7 @@ module Spree
                  filename: :string,
                  content_type: :string,
                  byte_size: :number,
-                 visibility: [:string, enum: Spree::FileUpload::VISIBILITIES],
+                 visibility: [:string, enum: Spree::FileUpload::VISIBILITIES, enum_type_name: 'FileUploadVisibility'],
                  expires_at: :string,
                  upload: [:FileUploadTarget, nullable: true]
 

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

@@ -4,7 +4,7 @@ module Spree
       class FulfillmentSerializer < BaseSerializer
         typelize number: :string,
                  status: [:string, enum: Spree::Fulfillment.statuses, enum_type_name: 'FulfillmentStatus'],
-                 fulfillment_type: [:string, enum: %w[shipping digital pickup pickup_point]],
+                 fulfillment_type: [:string, enum: %w[shipping digital pickup pickup_point], enum_type_name: 'FulfillmentType'],
                  tracking: [:string, nullable: true], tracking_url: [:string, nullable: true],
                  fulfilled_at: [:string, nullable: true], delivered_at: [:string, nullable: true], unpriced: :boolean,
                  items: 'Array<{ item_id: string; variant_id: string; quantity: number }>',

data/app/serializers/spree/api/v3/media_event_serializer.rb

@@ -7,7 +7,7 @@ module Spree
         # `type` is not exposed: the old Spree::Image/Spree::Video STI collapsed
         # into one class, so the column is a legacy vestige with no subclasses
         # — `media_type` is the discriminator (see MediaSerializer).
-        typelize media_type: [:string, enum: Spree::Media::MEDIA_TYPES], viewable_type: :string,
+        typelize media_type: [:string, enum: Spree::Media::MEDIA_TYPES, enum_type_name: 'MediaType'], viewable_type: :string,
                  viewable_id: :string, position: [:number, nullable: true],
                  alt: [:string, nullable: true]
 

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

@@ -5,7 +5,7 @@ module Spree
         typelize position: :number, alt: [:string, nullable: true],
                  product_id: [:string, nullable: true],
                  variant_ids: [:string, multi: true],
-                 media_type: [:string, enum: Spree::Media::MEDIA_TYPES],
+                 media_type: [:string, enum: Spree::Media::MEDIA_TYPES, enum_type_name: 'MediaType'],
                  focal_point_x: [:number, nullable: true],
                  focal_point_y: [:number, nullable: true],
                  external_video_url: [:string, nullable: true],

data/app/serializers/spree/api/v3/option_type_serializer.rb

@@ -2,7 +2,7 @@ module Spree
   module Api
     module V3
       class OptionTypeSerializer < BaseSerializer
-        typelize name: :string, label: :string, position: :number, kind: [:string, enum: Spree::OptionType::KINDS]
+        typelize name: :string, label: :string, position: :number, kind: [:string, enum: Spree::OptionType::KINDS, enum_type_name: 'OptionTypeKind']
 
         attributes :name, :label, :position, :kind
       end

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

@@ -9,8 +9,8 @@ module Spree
       # inside it, each carrying its own items, delivery and tracking.
       class OrderGroupSerializer < BaseSerializer
         typelize number: :string, email: [:string, nullable: true], currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
-                 fulfillment_status: [:string, nullable: true, enum: Spree::Order::FULFILLMENT_STATUSES],
-                 payment_status: [:string, nullable: true, enum: Spree::Order::PAYMENT_STATUSES],
+                 fulfillment_status: [:string, nullable: true, enum: Spree::Order::FULFILLMENT_STATUSES, enum_type_name: 'OrderFulfillmentStatus'],
+                 payment_status: [:string, nullable: true, enum: Spree::Order::PAYMENT_STATUSES, enum_type_name: 'OrderPaymentStatus'],
                  completed_at: [:string, nullable: true],
                  billing_address: { nullable: true }, shipping_address: { nullable: true }
 

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

@@ -11,10 +11,11 @@ module Spree
                  po_document_filename: [:string, nullable: true], po_document_byte_size: ['number | null'],
                  currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'], locale: [:string, nullable: true, enum: Spree::Locales::ALL, enum_type_name: 'LocaleCode'], total_quantity: :number,
                  coupon_code: [:string, nullable: true],
-                 fulfillment_status: [:string, nullable: true, enum: Spree::Order::FULFILLMENT_STATUSES],
-                 payment_status: [:string, nullable: true, enum: Spree::Order::PAYMENT_STATUSES],
+                 fulfillment_status: [:string, nullable: true, enum: Spree::Order::FULFILLMENT_STATUSES, enum_type_name: 'OrderFulfillmentStatus'],
+                 payment_status: [:string, nullable: true, enum: Spree::Order::PAYMENT_STATUSES, enum_type_name: 'OrderPaymentStatus'],
                  completed_at: [:string, nullable: true],
                  withdrawal_period_ends_at: [:string, nullable: true], within_withdrawal_period: :boolean,
+                 shipping_eq_billing_address: :boolean,
                  billing_address: { nullable: true }, shipping_address: { nullable: true },
                  gift_card: { nullable: true }, market: { nullable: true }
 
@@ -28,6 +29,7 @@ module Spree
         end
 
         attribute :within_withdrawal_period, &:within_withdrawal_period?
+        attribute :shipping_eq_billing_address, &:shipping_eq_billing_address?
 
         # The checkout handle this order was born from (nil for admin drafts).
         # Lets abandonment tooling match cart.* events to the conversion.

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

@@ -4,7 +4,7 @@ module Spree
       class PaymentSerializer < BaseSerializer
         typelize status: [:string, enum: Spree::Payment.statuses, enum_type_name: 'PaymentStatus'],
                  payment_method_id: :string, response_code: [:string, nullable: true], number: :string,
-                 source_type: [:string, nullable: true, enum: %w[credit_card store_credit payment_source]],
+                 source_type: [:string, nullable: true, enum: %w[credit_card store_credit payment_source], enum_type_name: 'PaymentSourceType'],
                  source_id: [:string, nullable: true], source: 'CreditCard | StoreCredit | PaymentSource | null'
 
         prefixed_id_attributes :payment_method

data/app/serializers/spree/api/v3/product_filter_availability_option_serializer.rb

@@ -2,7 +2,7 @@ module Spree
   module Api
     module V3
       class ProductFilterAvailabilityOptionSerializer < BaseSerializer
-        typelize id: [:string, enum: %w[in_stock out_of_stock]], count: :number
+        typelize id: [:string, enum: %w[in_stock out_of_stock], enum_type_name: 'StockAvailability'], count: :number
 
         attributes :id, :count
       end

data/app/serializers/spree/api/v3/product_filter_option_serializer.rb

@@ -6,7 +6,7 @@ module Spree
                  type: "'option'",
                  name: :string,
                  label: :string,
-                 kind: [:string, enum: Spree::OptionType::KINDS],
+                 kind: [:string, enum: Spree::OptionType::KINDS, enum_type_name: 'OptionTypeKind'],
                  options: [:ProductFilterOptionValue, multi: true]
 
         attributes :id, :type, :name, :label, :kind

data/app/serializers/spree/api/v3/seller/address_serializer.rb

@@ -3,8 +3,9 @@ module Spree
     module V3
       module Seller
         class AddressSerializer < V3::AddressSerializer
-          # The Store API keeps these deprecated names until 6.1.
-          %i[state_abbr country_iso].each { |key| _attributes.delete(key) }
+          # The Store API keeps these deprecated names until 6.1. A seller
+          # keeps no address book of the buyer's, so has no owner to read.
+          %i[state_abbr country_iso owner].each { |key| _attributes.delete(key) }
         end
       end
     end

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

@@ -23,9 +23,9 @@ module Spree
         class OrderSerializer < V3::BaseSerializer
           typelize number: :string, customer_note: [:string, nullable: true], currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    total_quantity: :number,
-                   fulfillment_status: [:string, nullable: true, enum: Spree::Order::FULFILLMENT_STATUSES],
-                   payment_status: [:string, nullable: true, enum: Spree::Order::PAYMENT_STATUSES],
-                   status: [:string, enum: Spree::Order::STATUSES], canceled_at: [:string, nullable: true],
+                   fulfillment_status: [:string, nullable: true, enum: Spree::Order::FULFILLMENT_STATUSES, enum_type_name: 'OrderFulfillmentStatus'],
+                   payment_status: [:string, nullable: true, enum: Spree::Order::PAYMENT_STATUSES, enum_type_name: 'OrderPaymentStatus'],
+                   status: [:string, enum: Spree::Order::STATUSES, enum_type_name: 'OrderStatus'], canceled_at: [:string, nullable: true],
                    cancel_reason_name: [:string, nullable: true], cancel_note: [:string, nullable: true],
                    internal_note: [:string, nullable: true], internal_note_html: [:string, nullable: true]