spree_api 5.5.3 → 5.6.0.rc2

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

@@ -8,7 +8,8 @@ module Spree
                  full_name: :string,
                  phone: [:string, nullable: true], accepts_email_marketing: :boolean,
                  available_store_credit_total: :string, display_available_store_credit_total: :string,
-                 default_billing_address: { nullable: true }, default_shipping_address: { nullable: true }
+                 default_billing_address: { nullable: true }, default_shipping_address: { nullable: true },
+                 newsletter_subscriber: { nullable: true }
 
         attributes :email, :first_name, :last_name, :phone, :accepts_email_marketing
 
@@ -31,6 +32,11 @@ module Spree
         many :addresses, resource: proc { Spree.api.address_serializer }
         one :bill_address, key: :default_billing_address, resource: proc { Spree.api.address_serializer }
         one :ship_address, key: :default_shipping_address, resource: proc { Spree.api.address_serializer }
+
+        one :newsletter_subscriber, resource: proc { Spree.api.newsletter_subscriber_serializer } do |user, params|
+          store = params&.dig(:store) || Spree::Current.store
+          user.newsletter_subscriber(store)
+        end
       end
     end
   end

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

@@ -5,13 +5,17 @@ module Spree
       # Replaces CartPromotionSerializer and OrderPromotionSerializer.
       class DiscountSerializer < BaseSerializer
         typelize name: :string, description: [:string, nullable: true], code: [:string, nullable: true],
-                 amount: :string, display_amount: :string, promotion_id: :string
+                 amount: [:string, nullable: true], display_amount: [:string, nullable: true], promotion_id: :string
 
         attribute :promotion_id do |record|
           record.promotion&.prefixed_id
         end
 
-        attributes :name, :description, :code, :amount, :display_amount
+        attributes :name, :description, :code
+
+        # Nulled for gated (prices_hidden) guests so an applied discount can't
+        # leak the amount the cart/order totals already withhold.
+        money_attributes :amount, :display_amount
       end
     end
   end

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

@@ -5,21 +5,24 @@ module Spree
         typelize number: :string, status: :string, fulfillment_type: :string,
                  tracking: [:string, nullable: true],
                  tracking_url: [:string, nullable: true], fulfilled_at: [:string, nullable: true],
-                 cost: :string, display_cost: :string,
-                 total: :string, display_total: :string,
-                 discount_total: :string, display_discount_total: :string,
-                 additional_tax_total: :string, display_additional_tax_total: :string,
-                 included_tax_total: :string, display_included_tax_total: :string,
-                 tax_total: :string, display_tax_total: :string,
+                 cost: [:string, nullable: true], display_cost: [:string, nullable: true],
+                 total: [:string, nullable: true], display_total: [:string, nullable: true],
+                 discount_total: [:string, nullable: true], display_discount_total: [:string, nullable: true],
+                 additional_tax_total: [:string, nullable: true], display_additional_tax_total: [:string, nullable: true],
+                 included_tax_total: [:string, nullable: true], display_included_tax_total: [:string, nullable: true],
+                 tax_total: [:string, nullable: true], display_tax_total: [:string, nullable: true],
                  items: 'Array<{ item_id: string; variant_id: string; quantity: number }>'
 
-        attributes :number, :tracking, :tracking_url,
-                   :cost, :display_cost,
-                   :total, :display_total,
-                   :discount_total, :display_discount_total,
-                   :additional_tax_total, :display_additional_tax_total,
-                   :included_tax_total, :display_included_tax_total,
-                   :tax_total, :display_tax_total
+        attributes :number, :tracking, :tracking_url
+
+        # Nulled for gated (prices_hidden) guests so a fulfillment can't leak the
+        # shipping/tax amounts the cart/order totals already withhold.
+        money_attributes :cost, :display_cost,
+                         :total, :display_total,
+                         :discount_total, :display_discount_total,
+                         :additional_tax_total, :display_additional_tax_total,
+                         :included_tax_total, :display_included_tax_total,
+                         :tax_total, :display_tax_total
 
         attribute :status do |shipment|
           shipment.state

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

@@ -4,13 +4,13 @@ module Spree
       class GiftCardSerializer < BaseSerializer
         typelize code: :string,
                  status: :string,
-                 amount: :string,
-                 amount_used: :string,
-                 amount_authorized: :string,
-                 amount_remaining: :string,
-                 display_amount: :string,
-                 display_amount_used: :string,
-                 display_amount_remaining: :string,
+                 amount: [:string, nullable: true],
+                 amount_used: [:string, nullable: true],
+                 amount_authorized: [:string, nullable: true],
+                 amount_remaining: [:string, nullable: true],
+                 display_amount: [:string, nullable: true],
+                 display_amount_used: [:string, nullable: true],
+                 display_amount_remaining: [:string, nullable: true],
                  currency: :string,
                  expires_at: [:string, nullable: true],
                  redeemed_at: [:string, nullable: true],
@@ -25,18 +25,22 @@ module Spree
           gift_card.display_state
         end
 
-        attributes :currency, :amount, :amount_used, :amount_authorized, :amount_remaining
+        attributes :currency
+
+        # Nulled for gated (prices_hidden) guests so a gift card applied to a
+        # cart can't leak balances the cart/order totals already withhold.
+        money_attributes :amount, :amount_used, :amount_authorized, :amount_remaining
 
         attribute :display_amount do |gift_card|
-          gift_card.display_amount.to_s
+          gift_card.display_amount.to_s unless params[:hide_prices]
         end
 
         attribute :display_amount_used do |gift_card|
-          gift_card.display_amount_used.to_s
+          gift_card.display_amount_used.to_s unless params[:hide_prices]
         end
 
         attribute :display_amount_remaining do |gift_card|
-          gift_card.display_amount_remaining.to_s
+          gift_card.display_amount_remaining.to_s unless params[:hide_prices]
         end
 
         attribute :expires_at do |gift_card|

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

@@ -5,7 +5,7 @@ module Spree
     module V3
       class ImportRowSerializer < BaseSerializer
         typelize import_id: [:string, nullable: true], row_number: :number,
-                 status: :string, validation_errors: 'unknown',
+                 status: :string, validation_errors: [:string, nullable: true],
                  item_type: [:string, nullable: true], item_id: [:string, nullable: true]
 
         attributes :row_number, :status, :validation_errors, :item_type,

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

@@ -4,32 +4,50 @@ module Spree
       class LineItemSerializer < BaseSerializer
         typelize variant_id: :string, quantity: :number, currency: :string,
                  name: :string, slug: :string, options_text: :string,
-                 price: :string, display_price: :string, total: :string, display_total: :string,
-                 adjustment_total: :string, display_adjustment_total: :string,
-                 additional_tax_total: :string, display_additional_tax_total: :string,
-                 included_tax_total: :string, display_included_tax_total: :string,
-                 discount_total: :string, display_discount_total: :string,
-                 pre_tax_amount: :string, display_pre_tax_amount: :string,
-                 discounted_amount: :string, display_discounted_amount: :string,
+                 price: [:string, nullable: true], display_price: [:string, nullable: true],
+                 total: [:string, nullable: true], display_total: [:string, nullable: true],
+                 adjustment_total: [:string, nullable: true], display_adjustment_total: [:string, nullable: true],
+                 additional_tax_total: [:string, nullable: true], display_additional_tax_total: [:string, nullable: true],
+                 included_tax_total: [:string, nullable: true], display_included_tax_total: [:string, nullable: true],
+                 discount_total: [:string, nullable: true], display_discount_total: [:string, nullable: true],
+                 pre_tax_amount: [:string, nullable: true], display_pre_tax_amount: [:string, nullable: true],
+                 discounted_amount: [:string, nullable: true], display_discounted_amount: [:string, nullable: true],
                  compare_at_amount: [:string, nullable: true], display_compare_at_amount: [:string, nullable: true],
-                 thumbnail_url: [:string, nullable: true]
+                 thumbnail_url: [:string, nullable: true],
+                 preorder: :boolean, preorder_ships_at: [:string, nullable: true]
 
         attribute :variant_id do |line_item|
           line_item.variant&.prefixed_id
         end
 
-        attributes :quantity, :currency, :name, :slug, :options_text,
-                   :price, :display_price, :total, :display_total,
-                   :adjustment_total, :display_adjustment_total,
-                   :additional_tax_total, :display_additional_tax_total,
-                   :included_tax_total, :display_included_tax_total,
-                   :discount_total, :display_discount_total,
-                   :pre_tax_amount, :display_pre_tax_amount,
-                   :discounted_amount, :display_discounted_amount,
-                   :display_compare_at_amount
+        # True when the line item's variant is currently a pre-order, so the
+        # cart/checkout can flag it as shipping later.
+        attribute :preorder do |line_item|
+          line_item.variant&.preorder? || false
+        end
+
+        # The variant's "ships by" promise while it's a pre-order.
+        attribute :preorder_ships_at do |line_item|
+          line_item.variant&.preorder_ships_at&.iso8601 if line_item.variant&.preorder?
+        end
+
+        attributes :quantity, :currency, :name, :slug, :options_text
+
+        # Nulled for gated (prices_hidden) guests so the cart's line items can't
+        # leak the prices that product/variant serializers already withhold.
+        money_attributes :price, :display_price, :total, :display_total,
+                         :adjustment_total, :display_adjustment_total,
+                         :additional_tax_total, :display_additional_tax_total,
+                         :included_tax_total, :display_included_tax_total,
+                         :discount_total, :display_discount_total,
+                         :pre_tax_amount, :display_pre_tax_amount,
+                         :discounted_amount, :display_discounted_amount,
+                         :display_compare_at_amount
 
         # Return compare_at_amount as string, nil if zero
         attribute :compare_at_amount do |line_item|
+          next nil if params[:hide_prices]
+
           amount = line_item.compare_at_amount
           amount.present? && amount.positive? ? amount.to_s : nil
         end

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

@@ -1,13 +1,18 @@
 module Spree
   module Api
     module V3
+      # Serializes a Spree::Locale. The display name, default flag, and RTL
+      # direction all live on the model — this is a thin projection of it.
       class LocaleSerializer
         include Alba::Resource
         include Typelizer::DSL
 
-        typelize code: :string, name: :string
+        typelize code: :string, name: :string, default: :boolean, rtl: :boolean
 
         attributes :code, :name
+
+        attribute(:default, &:default?)
+        attribute(:rtl, &:rtl?)
       end
     end
   end

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

@@ -9,18 +9,18 @@ module Spree
                  market_id: [:string, nullable: true], channel_id: [:string, nullable: true],
                  currency: :string, locale: [:string, nullable: true], total_quantity: :number,
                  fulfillment_status: [:string, nullable: true], payment_status: [:string, nullable: true],
-                 item_total: :string, display_item_total: :string,
-                 delivery_total: :string, display_delivery_total: :string,
-                 adjustment_total: :string, display_adjustment_total: :string,
-                 discount_total: :string, display_discount_total: :string,
-                 tax_total: :string, display_tax_total: :string,
-                 included_tax_total: :string, display_included_tax_total: :string,
-                 additional_tax_total: :string, display_additional_tax_total: :string,
-                 store_credit_total: :string, display_store_credit_total: :string,
-                 gift_card_total: :string, display_gift_card_total: :string,
+                 item_total: [:string, nullable: true], display_item_total: [:string, nullable: true],
+                 delivery_total: [:string, nullable: true], display_delivery_total: [:string, nullable: true],
+                 adjustment_total: [:string, nullable: true], display_adjustment_total: [:string, nullable: true],
+                 discount_total: [:string, nullable: true], display_discount_total: [:string, nullable: true],
+                 tax_total: [:string, nullable: true], display_tax_total: [:string, nullable: true],
+                 included_tax_total: [:string, nullable: true], display_included_tax_total: [:string, nullable: true],
+                 additional_tax_total: [:string, nullable: true], display_additional_tax_total: [:string, nullable: true],
+                 store_credit_total: [:string, nullable: true], display_store_credit_total: [:string, nullable: true],
+                 gift_card_total: [:string, nullable: true], display_gift_card_total: [:string, nullable: true],
                  covered_by_store_credit: :boolean,
-                 total: :string, display_total: :string,
-                 amount_due: :string, display_amount_due: :string,
+                 total: [:string, nullable: true], display_total: [:string, nullable: true],
+                 amount_due: [:string, nullable: true], display_amount_due: [:string, nullable: true],
                  completed_at: [:string, nullable: true],
                  billing_address: { nullable: true }, shipping_address: { nullable: true },
                  gift_card: { nullable: true }, market: { nullable: true }
@@ -35,22 +35,26 @@ module Spree
 
         attributes :number, :email, :customer_note,
                    :currency, :locale, :total_quantity,
-                   :item_total, :display_item_total,
-                   :adjustment_total, :display_adjustment_total,
-                   :discount_total, :display_discount_total,
-                   :tax_total, :display_tax_total, :included_tax_total, :display_included_tax_total,
-                   :additional_tax_total, :display_additional_tax_total, :total, :display_total,
-                   :gift_card_total, :display_gift_card_total,
-                   :amount_due, :display_amount_due,
-                   :delivery_total, :display_delivery_total, :fulfillment_status, :payment_status,
+                   :fulfillment_status, :payment_status,
                    completed_at: :iso8601
 
+        # Nulled for gated (prices_hidden) guests, consistent with cart and
+        # catalog price hiding.
+        money_attributes :item_total, :display_item_total,
+                         :adjustment_total, :display_adjustment_total,
+                         :discount_total, :display_discount_total,
+                         :tax_total, :display_tax_total, :included_tax_total, :display_included_tax_total,
+                         :additional_tax_total, :display_additional_tax_total, :total, :display_total,
+                         :gift_card_total, :display_gift_card_total,
+                         :amount_due, :display_amount_due,
+                         :delivery_total, :display_delivery_total
+
         attribute :store_credit_total do |order|
-          order.total_applied_store_credit.to_s
+          order.total_applied_store_credit.to_s unless params[:hide_prices]
         end
 
         attribute :display_store_credit_total do |order|
-          order.display_total_applied_store_credit.to_s
+          order.display_total_applied_store_credit.to_s unless params[:hide_prices]
         end
 
         attribute :covered_by_store_credit do |order|

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

@@ -3,7 +3,7 @@ module Spree
     module V3
       class PaymentSerializer < BaseSerializer
         typelize status: :string, payment_method_id: :string, response_code: [:string, nullable: true],
-                 number: :string, amount: :string, display_amount: :string,
+                 number: :string, amount: [:string, nullable: true], display_amount: [:string, nullable: true],
                  source_type: [:string, nullable: true, enum: %w[credit_card store_credit payment_source]],
                  source_id: [:string, nullable: true],
                  source: 'CreditCard | StoreCredit | PaymentSource | null'
@@ -12,7 +12,11 @@ module Spree
           payment.payment_method&.prefixed_id
         end
 
-        attributes :response_code, :number, :amount, :display_amount
+        attributes :response_code, :number
+
+        # Nulled for gated (prices_hidden) guests so a payment can't leak the
+        # amount the cart/order totals already withhold.
+        money_attributes :amount, :display_amount
 
         attribute :status do |payment|
           payment.state

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

@@ -11,7 +11,9 @@ module Spree
                  default_variant_id: :string,
                  thumbnail_url: [:string, nullable: true],
                  available_on: [:string, nullable: true],
+                 preorder_ships_at: [:string, nullable: true],
                  purchasable: :boolean, in_stock: :boolean, backorderable: :boolean, available: :boolean,
+                 preorder: :boolean,
                  price: 'Price',
                  original_price: ['Price', nullable: true],
                  tags: [:string, multi: true]
@@ -19,12 +21,18 @@ module Spree
         attributes :name, :slug,
                    :meta_title, :meta_description, :meta_keywords,
                    :variant_count,
-                   available_on: :iso8601
+                   available_on: :iso8601, preorder_ships_at: :iso8601
 
         attribute :purchasable do |product|
           product.purchasable?
         end
 
+        # True when this product is currently offered as a pre-order on the
+        # requesting channel.
+        attribute :preorder do |product|
+          product.preorder?
+        end
+
         attribute :in_stock do |product|
           product.in_stock?
         end

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

@@ -7,7 +7,8 @@ module Spree
         typelize product_id: :string, sku: [:string, nullable: true],
                  options_text: :string, track_inventory: :boolean, media_count: :number,
                  thumbnail_url: [:string, nullable: true],
-                 purchasable: :boolean, in_stock: :boolean, backorderable: :boolean,
+                 purchasable: :boolean, in_stock: :boolean, backorderable: :boolean, preorder: :boolean,
+                 preorder_ships_at: [:string, nullable: true],
                  weight: [:number, nullable: true], height: [:number, nullable: true], width: [:number, nullable: true], depth: [:number, nullable: true],
                  price: 'Price',
                  original_price: ['Price', nullable: true]
@@ -18,6 +19,12 @@ module Spree
 
         attributes :sku, :options_text, :track_inventory, :media_count
 
+        # Customer-facing "ships by" promise — only while the variant is a
+        # pre-order (nil otherwise, even if a stale date lingers on the column).
+        attribute :preorder_ships_at do |variant|
+          variant.preorder_ships_at&.iso8601 if variant.preorder?
+        end
+
         # Main variant image URL for listings (cached primary_media)
         attribute :thumbnail_url do |variant|
           image_url_for(variant.primary_media)
@@ -35,6 +42,10 @@ module Spree
           variant.backorderable?
         end
 
+        attribute :preorder do |variant|
+          variant.preorder?
+        end
+
         attribute :weight do |variant|
           variant.weight&.to_f
         end

data/app/services/spree/api/v3/filters_aggregator.rb

@@ -87,9 +87,9 @@ module Spree
           type_ids = option_types.map(&:id)
 
           # Pluck only the columns we need — avoids instantiating thousands of AR models.
-          # Force default locale so Mobility returns column values (not translations);
+          # Force the content locale so Mobility returns column values (not translations);
           # translated labels are overlaid separately via load_option_value_translations.
-          ov_rows = Mobility.with_locale(I18n.default_locale) do
+          ov_rows = Mobility.with_locale(Spree::Current.content_locale) do
             Spree::OptionValue
               .where(option_type_id: type_ids)
               .order(:position)
@@ -144,10 +144,10 @@ module Spree
         end
 
         # Load translated presentations for option values.
-        # Returns { option_value_id => translated_presentation } or empty hash when using the default locale.
+        # Returns { option_value_id => translated_presentation } or empty hash when using the content locale.
         def load_option_value_translations(ov_ids)
           locale = Spree::Current.locale || I18n.locale.to_s
-          return {} if locale.to_s == I18n.default_locale.to_s
+          return {} if locale.to_s == Spree::Current.content_locale
 
           Spree::OptionValue::Translation
             .where(spree_option_value_id: ov_ids, locale: locale)

data/app/subscribers/spree/webhook_event_subscriber.rb

@@ -17,9 +17,15 @@ module Spree
   class WebhookEventSubscriber < Spree::Subscriber
     subscribes_to '*'
 
+    # Admin auth events carry live credentials (password reset tokens) and have
+    # no legitimate external consumer — core delivers those emails itself.
+    # Never forward them to webhook endpoints, including '*' subscriptions.
+    NON_DELIVERABLE_EVENTS = %w[admin_user.password_reset_requested].freeze
+
     def handle(event)
       return unless Spree::Api::Config.webhooks_enabled
       return if event.store_id.blank?
+      return if NON_DELIVERABLE_EVENTS.include?(event.name)
 
       # Only load the columns we need for matching and delivery
       endpoints = Spree::WebhookEndpoint

data/config/initializers/typelizer.rb

@@ -10,6 +10,16 @@ Rails.application.config.after_initialize do
     config.comments = true
     config.listen = false
 
+    # Teach typelizer's Alba plugin about custom Alba types (see alba.rb);
+    # unmapped typed attributes crash generation.
+    config.plugin_configs = {
+      alba: {
+        ts_mapper: Typelizer::SerializerPlugins::Alba::ALBA_TS_MAPPER.merge(
+          'iso8601' => { type: :string }
+        )
+      }
+    }
+
     # Serializers that exist only for Admin API or events — no Store API controller
     store_excluded = %w[
       Asset CartPromotion OrderPromotion

data/config/locales/en.yml

@@ -9,7 +9,11 @@ en:
       invalid_resource: Invalid resource. Please fix errors and try again.
       invalid_taxonomy_id: Invalid taxonomy id.
       must_specify_api_key: You must specify an API key.
+      errors:
+        guest_checkout_not_allowed: You must be signed in to complete checkout.
+        storefront_login_required: Authentication required to access this store.
       negative_quantity: quantity is negative
+      newsletter_unsubscribe_token_invalid: Newsletter unsubscribe token is invalid or has expired.
       newsletter_verification_token_invalid: Newsletter verification token is invalid or has expired.
       order:
         could_not_transition: The order could not be transitioned. Please fix the errors and try again.
@@ -20,6 +24,7 @@ en:
       payment:
         credit_over_limit: This payment can only be credited up to %{limit}. Please specify an amount less than or equal to this number.
         update_forbidden: This payment cannot be updated because it is %{state}.
+      invalid_position: new_position must be an integer
       record_not_found: "%{model} not found"
       redirect_url_not_allowed: The redirect URL is not from an allowed origin for this store.
       resource_not_found: The resource you were looking for could not be found.

data/config/routes.rb

@@ -59,10 +59,15 @@ Spree::Core::Engine.add_routes do
         # Customers
         resources :customers, only: [:create]
 
-        # Newsletter Subscriptions (guest-accessible: subscribe + verify by token)
-        resources :newsletter_subscribers, only: [:create] do
+        # Newsletter Subscriptions
+        # - create + verify + request_unsubscribe are guest-accessible
+        # - destroy accepts either an unsubscribe token (from email links) or JWT auth
+        # A signed-in customer reads their own subscription (and its id) off the
+        # `newsletter_subscriber` association on GET /customers/me.
+        resources :newsletter_subscribers, only: [:create, :destroy] do
           collection do
             post :verify
+            post :request_unsubscribe
           end
         end
 
@@ -103,9 +108,26 @@ Spree::Core::Engine.add_routes do
           resources :custom_fields
         end
 
+        # Mounts a read-only nested `translations` matrix on parents in the
+        # Spree.translatable_resources registry. Writes go through the batch
+        # endpoint (POST /translations/batch). One generic controller serves
+        # every translatable model. See docs/plans/5.5-6.0-resource-translations-api.md.
+        concern :translatable do
+          resources :translations, only: [:index], controller: 'translations'
+        end
+
         # Definitions are per resource type, not per instance.
         resources :custom_field_definitions
 
+        # Translation discovery: the translatable-resources registry and the
+        # store's supported locales. See docs/plans/5.5-6.0-resource-translations-api.md.
+        resources :translatable_resources, only: [:index]
+        resources :locales, only: [:index]
+
+        # Atomic multi-record translation upsert (e.g. an option type + all its
+        # option values in one save). Flat list of independent registry writes.
+        post 'translations/batch', to: 'translations/batches#create'
+
         # Authentication
         post 'auth/login', to: 'auth#create'
         post 'auth/refresh', to: 'auth#refresh'
@@ -117,6 +139,12 @@ Spree::Core::Engine.add_routes do
         get 'auth/invitations/:id/lookup', to: 'invitation_acceptances#lookup'
         post 'auth/invitations/:id/accept', to: 'invitation_acceptances#accept'
 
+        # Public password reset — unauthenticated; the token is the credential.
+        # Mounted under `auth/` so the refresh-token cookie issued on success
+        # shares its path with `/auth/refresh`.
+        post 'auth/password_resets', to: 'password_resets#create'
+        patch 'auth/password_resets/:id', to: 'password_resets#update'
+
         # Dashboard
         namespace :dashboard do
           get :analytics
@@ -124,6 +152,8 @@ Spree::Core::Engine.add_routes do
 
         # Current admin user + permissions (for UI permission checks)
         get 'me', to: 'me#show'
+        # Self-service profile updates (e.g. the admin's own UI language)
+        patch 'me', to: 'me#update'
 
         # Store Settings
         resource :store, only: [:show, :update], controller: 'store'
@@ -168,8 +198,21 @@ Spree::Core::Engine.add_routes do
           end
         end
 
+        # CSV Imports — see docs/plans/5.6-admin-spa-csv-import.md
+        resources :imports, only: [:index, :show, :create, :destroy] do
+          collection do
+            get :template
+          end
+          member do
+            patch :complete_mapping
+            patch :retry_failed_rows
+            get :download
+          end
+          resources :rows, only: [:index], controller: 'import_rows'
+        end
+
         # Products
-        resources :products, concerns: :custom_fieldable do
+        resources :products, concerns: [:custom_fieldable, :translatable] do
           member do
             post :clone
           end
@@ -190,10 +233,22 @@ Spree::Core::Engine.add_routes do
         end
 
         # Categories
-        resources :categories, only: [:index, :show], concerns: :custom_fieldable
+        resources :categories, concerns: [:custom_fieldable, :translatable] do
+          member do
+            patch :reposition
+          end
+
+          # Manual product membership + ordering within the category.
+          # (Bulk add/remove reuse POST /products/bulk_{add,remove}_*_categories.)
+          resources :products, controller: 'categories/products', only: [:index, :create, :destroy] do
+            member do
+              patch :reposition
+            end
+          end
+        end
 
         # Option Types (with nested option_values in payload)
-        resources :option_types, concerns: :custom_fieldable
+        resources :option_types, concerns: [:custom_fieldable, :translatable]
 
         # Tax Categories
         resources :tax_categories
@@ -306,7 +361,7 @@ Spree::Core::Engine.add_routes do
           end
 
           resources :items, only: [:index, :show, :create, :update, :destroy], controller: 'orders/items'
-          resources :fulfillments, controller: 'orders/fulfillments', only: [:index, :show, :update] do
+          resources :fulfillments, controller: 'orders/fulfillments', only: [:index, :show, :create, :update] do
             member do
               patch :fulfill
               patch :cancel

data/lib/spree/api/dependencies.rb

@@ -172,6 +172,7 @@ module Spree
         admin_state_serializer: 'Spree::Api::V3::Admin::StateSerializer',
         admin_discount_serializer: 'Spree::Api::V3::Admin::DiscountSerializer',
         admin_customer_serializer: 'Spree::Api::V3::Admin::CustomerSerializer',
+        admin_newsletter_subscriber_serializer: 'Spree::Api::V3::Admin::NewsletterSubscriberSerializer',
         admin_order_serializer: 'Spree::Api::V3::Admin::OrderSerializer',
         admin_product_serializer: 'Spree::Api::V3::Admin::ProductSerializer',
         admin_variant_serializer: 'Spree::Api::V3::Admin::VariantSerializer',
@@ -216,6 +217,7 @@ module Spree
         admin_payment_source_serializer: 'Spree::Api::V3::Admin::PaymentSourceSerializer',
         admin_digital_link_serializer: 'Spree::Api::V3::Admin::DigitalLinkSerializer',
         admin_store_serializer: 'Spree::Api::V3::Admin::StoreSerializer',
+        admin_setup_task_serializer: 'Spree::Api::V3::Admin::SetupTaskSerializer',
         admin_api_key_serializer: 'Spree::Api::V3::Admin::ApiKeySerializer',
         admin_allowed_origin_serializer: 'Spree::Api::V3::Admin::AllowedOriginSerializer',
         admin_webhook_endpoint_serializer: 'Spree::Api::V3::Admin::WebhookEndpointSerializer',
@@ -223,12 +225,16 @@ module Spree
         admin_invitation_serializer: 'Spree::Api::V3::Admin::InvitationSerializer',
         admin_role_serializer: 'Spree::Api::V3::Admin::RoleSerializer',
         admin_export_serializer: 'Spree::Api::V3::Admin::ExportSerializer',
+        admin_import_serializer: 'Spree::Api::V3::Admin::ImportSerializer',
+        admin_import_row_serializer: 'Spree::Api::V3::Admin::ImportRowSerializer',
+        admin_import_mapping_serializer: 'Spree::Api::V3::Admin::ImportMappingSerializer',
         admin_promotion_serializer: 'Spree::Api::V3::Admin::PromotionSerializer',
         admin_promotion_action_serializer: 'Spree::Api::V3::Admin::PromotionActionSerializer',
         admin_promotion_rule_serializer: 'Spree::Api::V3::Admin::PromotionRuleSerializer',
         admin_coupon_code_serializer: 'Spree::Api::V3::Admin::CouponCodeSerializer',
         admin_price_list_serializer: 'Spree::Api::V3::Admin::PriceListSerializer',
         admin_price_rule_serializer: 'Spree::Api::V3::Admin::PriceRuleSerializer',
+        admin_resource_translations_serializer: 'Spree::Api::V3::Admin::ResourceTranslationsSerializer',
 
         # platform serializers
         platform_metafield_serializer: 'Spree::Api::V2::Platform::MetafieldSerializer',