spree_api 6.0.0.beta4 → 6.0.0.rc2

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

@@ -21,34 +21,13 @@ module Spree
         # the one contact detail that lets a marketplace's customer be taken
         # off it, and it is not needed to pack, post or invoice.
         class OrderSerializer < V3::BaseSerializer
-          typelize number: :string,
-                   customer_note: [:string, nullable: true],
-                   currency: :string,
+          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],
-                   item_total: [:string, nullable: true], display_item_total: [:string, nullable: true],
-                   delivery_total: [:string, nullable: true], display_delivery_total: [:string, nullable: true],
-                   discount_total: [:string, nullable: true], display_discount_total: [:string, nullable: true],
-                   adjustment_total: [:string, nullable: true], display_adjustment_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],
-                   tax_total: [:string, nullable: true], display_tax_total: [:string, nullable: true],
-                   total: [:string, nullable: true], display_total: [:string, nullable: true],
-                   payment_total: [:string, nullable: true], display_payment_total: [:string, nullable: true],
-                   amount_due: [:string, nullable: true], display_amount_due: [:string, nullable: true],
-                   commission_amount_total: [:string, nullable: true],
-                   display_commission_amount_total: [:string, nullable: true],
-                   commission_tax_total: [:string, nullable: true],
-                   display_commission_tax_total: [:string, nullable: true],
-                   commission_total: [:string, nullable: true],
-                   display_commission_total: [:string, nullable: true],
-                   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]
+                   status: [:string, enum: Spree::Order::STATUSES], 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]
 
           attributes :number, :customer_note, :currency, :total_quantity,
                      :status, :fulfillment_status, :payment_status,
@@ -68,16 +47,16 @@ module Spree
           # What this seller is owed for the goods, and what the buyer paid for
           # them. Deliberately not the whole money surface: gift cards, store
           # credit and the payment breakdown belong to the marketplace.
-          money_attributes :item_total, :display_item_total,
-                           :delivery_total, :display_delivery_total,
-                           :discount_total, :display_discount_total,
-                           :adjustment_total, :display_adjustment_total,
-                           :included_tax_total, :display_included_tax_total,
-                           :additional_tax_total, :display_additional_tax_total,
-                           :tax_total, :display_tax_total,
-                           :total, :display_total,
-                           :payment_total, :display_payment_total,
-                           :amount_due, :display_amount_due
+          money_attributes :item_total,
+                           :delivery_total,
+                           :discount_total,
+                           :adjustment_total,
+                           :included_tax_total,
+                           :additional_tax_total,
+                           :tax_total,
+                           :total,
+                           :payment_total,
+                           :amount_due
 
           # What the marketplace charged the seller on this sale, and the tax
           # on that charge. The ledger remains where a seller sees what they
@@ -85,9 +64,9 @@ module Spree
           # commission is a B2B supply from the platform, so this is the
           # seller's input tax to reclaim, and it has to be attributable to
           # the sale that produced it.
-          money_attributes :commission_amount_total, :display_commission_amount_total,
-                           :commission_tax_total, :display_commission_tax_total,
-                           :commission_total, :display_commission_total
+          money_attributes :commission_amount_total,
+                           :commission_tax_total,
+                           :commission_total
 
           # Why the sale was called off, when it was. The reason is the
           # marketplace's vocabulary, so it is rendered as a name rather than
@@ -110,8 +89,8 @@ module Spree
           many :payment_splits, resource: proc { Spree.api.seller_payment_split_serializer },
                                 if: proc { expand?('payment_splits') }
           many :fulfillments, resource: proc { Spree.api.seller_fulfillment_serializer }
-          one :shipping_address, resource: proc { Spree.api.address_serializer }
-          one :billing_address, resource: proc { Spree.api.address_serializer }
+          one :shipping_address, resource: proc { Spree.api.seller_address_serializer }
+          one :billing_address, resource: proc { Spree.api.seller_address_serializer }
         end
       end
     end

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

@@ -13,19 +13,18 @@ module Spree
           AMOUNTS = %i[authorized_amount captured_amount refunded_amount claimed_amount
                        net_captured_amount refundable_amount].freeze
 
-          typelize currency: :string,
-                   authorized_amount: :string, display_authorized_amount: :string,
-                   captured_amount: :string, display_captured_amount: :string,
-                   refunded_amount: :string, display_refunded_amount: :string,
-                   claimed_amount: :string, display_claimed_amount: :string,
-                   net_captured_amount: :string, display_net_captured_amount: :string,
-                   refundable_amount: :string, display_refundable_amount: :string
+          typelize currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
+                   authorized_amount: :string,
+                   captured_amount: :string,
+                   refunded_amount: :string,
+                   claimed_amount: :string,
+                   net_captured_amount: :string,
+                   refundable_amount: :string
 
           attributes :currency, created_at: :iso8601
 
           AMOUNTS.each do |amount|
-            attribute(amount) { |split| split.public_send(amount).to_s }
-            attribute(:"display_#{amount}") { |split| split.public_send(:"display_#{amount}").to_s }
+            attribute(amount) { |split| Spree::Money::Rounding.format(split.public_send(amount), split.currency) }
           end
         end
       end

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

@@ -5,21 +5,19 @@ module Spree
         # One settlement to this seller, as the seller reads it.
         class PayoutSerializer < V3::BaseSerializer
           typelize status: :string,
-                   currency: :string,
-                   provider: :string,
+                   currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
+                   provider: [:string, comment: 'Payout provider. Built-in: system. Provider gems register more (e.g. stripe).'],
                    amount: :string,
-                   display_amount: :string,
                    reference: 'string | null',
                    period_start: 'string | null',
                    period_end: 'string | null',
                    transfers_count: :number
 
-          attributes :status, :currency, :provider, :reference,
+          attributes :status, :currency, :reference,
                      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) }
 
           # How many earnings this settlement covers. Read from a count the
           # controller made for the whole page when there is one; a single
@@ -29,6 +27,8 @@ module Spree
 
             counts ? counts.fetch(payout.id, 0) : payout.transfers.count
           end
+
+          api_type_attributes :provider
         end
       end
     end

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

@@ -0,0 +1,11 @@
+module Spree
+  module Api
+    module V3
+      module Seller
+        class PriceHistorySerializer < V3::PriceHistorySerializer
+          without_formatted_money(:seller)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Spree
+  module Api
+    module V3
+      module Seller
+        class PriceSerializer < V3::PriceSerializer
+          without_formatted_money(:seller)
+        end
+      end
+    end
+  end
+end

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

@@ -13,6 +13,8 @@ module Spree
         # both from the marketplace's list
         # (docs/plans/6.0-multi-vendor-marketplace.md, Decision 13).
         class ProductSerializer < V3::ProductSerializer
+          without_formatted_money(:seller)
+
           typelize status: [:string, enum: Spree::Product.statuses, enum_type_name: 'ProductStatus'], metadata: 'Record<string, unknown>',
                    product_type_id: [:string, nullable: true],
                    delivery_profile_id: [:string, nullable: true],
@@ -20,13 +22,7 @@ module Spree
 
           attributes :status, :metadata, created_at: :iso8601, updated_at: :iso8601
 
-          attribute :product_type_id do |product|
-            product.product_type&.prefixed_id
-          end
-
-          attribute :delivery_profile_id do |product|
-            product.delivery_profile&.prefixed_id
-          end
+          prefixed_id_attributes :product_type, :delivery_profile
 
           many :variants,
                resource: proc { Spree.api.seller_variant_serializer },

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

@@ -2,27 +2,7 @@ module Spree
   module Api
     module V3
       module Seller
-        # The marketplace's answer on a listing, as the seller sees it.
-        #
-        # The reviewer's identity is deliberately absent: a seller needs to
-        # know what to change, not which member of the marketplace's staff
-        # decided (docs/plans/6.0-seller-product-submission.md).
-        class ProductSubmissionSerializer < BaseSerializer
-          typelize status: [:string, enum: Spree::ProductSubmission.statuses, enum_type_name: 'ProductSubmissionStatus'],
-                   product_id: :string,
-                   review_note: [:string, nullable: true],
-                   reviewed_at: [:string, nullable: true]
-
-          attributes :status, :review_note,
-                     reviewed_at: :iso8601,
-                     created_at: :iso8601
-
-          # Carried for the event payload, which is this serializer's other
-          # job: a subscriber holding only the submission id would have to
-          # fetch the row back to learn which product was decided on.
-          attribute :product_id do |submission|
-            submission.product&.prefixed_id
-          end
+        class ProductSubmissionSerializer < V3::ProductSubmissionSerializer
         end
       end
     end

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

@@ -15,11 +15,11 @@ module Spree
                    terms_accepted_at: [:string, nullable: true],
                    on_holiday: :boolean, sellable: :boolean,
                    products_count: :number,
-                   default_currency: :string,
-                   supported_currencies: [:string, multi: true],
-                   preferred_timezone: [:string, nullable: true]
+                   default_currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
+                   supported_currencies: [:string, multi: true, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
+                   timezone: [:string, nullable: true]
 
-          attributes :preferred_timezone,
+          attributes :timezone,
                      :status, :legal_name, :registration_number,
                      :contact_email, :billing_email,
                      :tax_remittance, :payouts_schedule_interval,
@@ -28,7 +28,7 @@ module Spree
                      created_at: :iso8601
 
           attribute :minimum_payout_amount do |seller|
-            seller.minimum_payout_amount&.to_s
+            Spree::Money::Rounding.format(seller.minimum_payout_amount, seller.store&.default_currency, unit_price: true)
           end
 
           # Rebound from the inherited store declaration to this branch's own
@@ -40,13 +40,9 @@ module Spree
                resource: proc { Spree.api.seller_policy_serializer },
                if: proc { expand?('policies') }
 
-          attribute :on_holiday do |seller|
-            seller.on_holiday?
-          end
+          attribute :on_holiday, &:on_holiday?
 
-          attribute :sellable do |seller|
-            seller.sellable?
-          end
+          attribute :sellable, &:sellable?
 
           # What this seller prices in. Theirs by way of the marketplace: a
           # seller has no currency of their own, so the store's is the answer
@@ -64,11 +60,11 @@ module Spree
           end
 
           one :billing_address,
-              resource: proc { Spree.api.address_serializer },
+              resource: proc { Spree.api.seller_address_serializer },
               if: proc { |seller| seller.billing_address.present? }
 
           one :returns_address,
-              resource: proc { Spree.api.address_serializer },
+              resource: proc { Spree.api.seller_address_serializer },
               if: proc { |seller| seller.returns_address.present? }
         end
       end

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

@@ -18,9 +18,7 @@ module Spree
 
           attributes :id, :kind, :name, :description, :required, :position, :status, :action_url, :blocker
 
-          attribute :blocking do |status|
-            status.blocking?
-          end
+          attribute :blocking, &:blocking?
 
           attribute :accepts_submissions do |status|
             status.requirement.class.accepts_submissions?
@@ -36,15 +34,11 @@ module Spree
 
           # The document this line asks for, so the panel can offer to create
           # exactly that policy. Null for every other kind.
-          attribute :required_policy_name do |status|
-            status.required_policy_name
-          end
+          attributes :required_policy_name
 
           # The marketplace terms this line asks the seller to accept. Null
           # for every other kind, and null while nothing has been written.
-          attribute :terms_html do |status|
-            status.terms_html
-          end
+          attributes :terms_html
 
           one :submission,
               resource: proc { Spree.api.seller_requirement_submission_serializer },

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

@@ -10,6 +10,14 @@ module Spree
         # its option values but no product name, so a card built from the
         # variant alone would show a bare id for anything unSKU'd.
         class ReturnLineItemSerializer < V3::ReturnLineItemSerializer
+          without_formatted_money(:seller)
+
+          # 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]
+
           typelize name: [:string, nullable: true]
 
           attribute :name do |line|

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

@@ -13,31 +13,22 @@ module Spree
         # What it adds over the shared one is the pair of figures a seller
         # needs to settle: what has already gone back, and what may still.
         class ReturnSerializer < V3::ReturnSerializer
+          without_formatted_money(:seller)
+
           typelize memo: [:string, nullable: true],
                    stock_location_id: [:string, nullable: true],
-                   refunded_total: :string,
-                   refundable_total: :string,
-                   display_refunded_total: :string
+                   refund_total: [:string, nullable: false],
+                   refund_tax_total: [:string, nullable: false]
 
           attributes :memo
 
-          attribute :stock_location_id do |return_record|
-            return_record.stock_location&.prefixed_id
-          end
-
-          attribute :refunded_total do |return_record|
-            return_record.refunded_total.to_s
-          end
+          prefixed_id_attributes :stock_location
 
+          money_attributes :refunded_total
           # What the refund dialog opens on — never more than this may be
           # given back, whatever amount is typed.
-          attribute :refundable_total do |return_record|
-            return_record.refundable_total.to_s
-          end
-
-          attribute :display_refunded_total do |return_record|
-            return_record.display_refunded_total.to_s
-          end
+          money_attributes :refundable_total
+          typelize refunded_total: [:string, nullable: false], refundable_total: [:string, nullable: false]
 
           many :return_line_items,
                resource: proc { Spree.api.seller_return_line_item_serializer },

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

@@ -0,0 +1,10 @@
+module Spree
+  module Api
+    module V3
+      module Seller
+        class StateSerializer < V3::StateSerializer
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,9 @@ module Spree
     module V3
       module Seller
         class StockLocationSerializer < V3::StockLocationSerializer
+          # The Store API keeps these deprecated names until 6.1.
+          %i[country_iso state_abbr].each { |key| _attributes.delete(key) }
+
           typelize address2: [:string, nullable: true], state_name: [:string, nullable: true],
                    phone: [:string, nullable: true], company: [:string, nullable: true],
                    active: :boolean, default: :boolean, kind: [:string, enum: Spree::StockLocation::KINDS, enum_type_name: 'StockLocationKind'],

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

@@ -11,29 +11,28 @@ module Spree
         class TransferSerializer < V3::BaseSerializer
           typelize kind: :string,
                    status: :string,
-                   currency: :string,
-                   provider: :string,
+                   currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
+                   provider: [:string, comment: 'Payout provider. Built-in: system. Provider gems register more (e.g. stripe).'],
                    amount: :string,
                    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,
-                   display_amount: :string,
                    reference: 'string | null',
                    order_id: 'string | null',
                    order_number: 'string | null',
                    payout_id: 'string | null',
                    reversed_from_id: 'string | null'
 
-          attributes :kind, :status, :currency, :provider, :reference,
+          attributes :kind, :status, :currency, :reference,
                      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 this 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? }
 
@@ -42,6 +41,8 @@ module Spree
           end
 
           attribute(:order_number) { |transfer| transfer.order&.number }
+
+          api_type_attributes :provider
         end
       end
     end

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

@@ -10,9 +10,11 @@ module Spree
         # those are marketplace configuration and the seller cannot write them,
         # so showing them would invite an edit that silently does nothing.
         class VariantSerializer < V3::VariantSerializer
+          without_formatted_money(:seller)
+
           typelize position: :number,
                    cost_price: [:string, nullable: true],
-                   cost_currency: [: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],
                    total_on_hand: [:number, nullable: true],
@@ -20,18 +22,20 @@ module Spree
                    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],
                    minimum_order_quantity: ['number | null'], order_multiple: ['number | null'],
                    purchase_unit: [:string, nullable: true, enum: Spree::Variant::PURCHASE_UNITS],
                    metadata: 'Record<string, unknown>'
 
-          attributes :metadata, :position, :cost_price, :cost_currency,
+          attributes :metadata, :position, :cost_currency,
                      :barcode, :backorder_limit,
                      :hs_code, :country_of_origin, :customs_description,
                      preorder_ships_at: :iso8601,
                      created_at: :iso8601, updated_at: :iso8601
 
+          money_attributes :cost_price, currency: :cost_currency, unit_price: true
+
           # The variant's own stored rules, not a buyer's resolved ones — a
           # seller edits the row.
           attribute :minimum_order_quantity, &:minimum_order_quantity
@@ -58,7 +62,7 @@ module Spree
                if: proc { expand?('media') }
 
           many :prices,
-               resource: proc { Spree.api.price_serializer },
+               resource: proc { Spree.api.seller_price_serializer },
                if: proc { expand?('prices') }
 
           many :stock_levels,

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

@@ -21,9 +21,7 @@ module Spree
           Spree::RichTextHelper.to_plain_text(seller.about)
         end
 
-        attribute :about_html do |seller|
-          seller.about_html
-        end
+        attributes :about_html
 
         attribute :logo_url do |seller|
           image_url_for(seller.logo)

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

@@ -1,10 +1,28 @@
 module Spree
   module Api
     module V3
-      # Payload of the shipping_label.* events. Labels have no storefront
-      # serializer — a customer never sees one — so the event shape is
-      # declared here rather than found by convention.
-      class ShippingLabelEventSerializer < Admin::ShippingLabelSerializer
+      # Payload of the shipping_label.* events: the tracking a customer is
+      # also shown. What the carrier charged, the provider's ids and the file
+      # stay behind the Admin API.
+      class ShippingLabelEventSerializer < BaseSerializer
+        typelize owner_id: :string,
+                 owner_type: [:string, enum: %w[fulfillment return]],
+                 status: [:string, enum: Spree::ShippingLabel.statuses, enum_type_name: 'ShippingLabelStatus'],
+                 carrier: [:string, nullable: true],
+                 service: [:string, nullable: true],
+                 tracking_number: [:string, nullable: true],
+                 refunded_at: [:string, nullable: true]
+
+        attributes :status, :carrier, :service, :tracking_number,
+                   refunded_at: :iso8601, created_at: :iso8601, updated_at: :iso8601
+
+        attribute :owner_id do |shipping_label|
+          shipping_label.owner&.prefixed_id
+        end
+
+        attribute :owner_type do |shipping_label|
+          Spree::Base.polymorphic_api_type(shipping_label.owner_type)
+        end
       end
     end
   end

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

@@ -9,13 +9,7 @@ module Spree
 
         attributes :count_on_hand, :backorderable
 
-        attribute :stock_location_id do |stock_level|
-          stock_level.stock_location&.prefixed_id
-        end
-
-        attribute :variant_id do |stock_level|
-          stock_level.variant&.prefixed_id
-        end
+        prefixed_id_attributes :stock_location, :variant
       end
     end
   end

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

@@ -3,14 +3,21 @@ module Spree
     module V3
       class StockLocationSerializer < BaseSerializer
         typelize name: :string, address1: [:string, nullable: true], city: [:string, nullable: true],
-                 zipcode: [:string, nullable: true], country_code: [:string, nullable: true],
+                 zipcode: [:string, nullable: true], 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_text: [:string, nullable: true],
+                 country_iso: [:string, nullable: true, deprecated: 'Use `country_code`. Removed in 6.1.'],
+                 state_abbr: [:string, nullable: true, deprecated: 'Use `state_code`. Removed in 6.1.'],
                  pickup_ready_in_minutes: [:number, nullable: true],
                  pickup_instructions: [:string, nullable: true]
 
         attributes :name, :address1, :city, :zipcode, :country_code, :country_name, :state_code, :state_text
 
+        # @deprecated Storefronts shipped against these names; use +country_code+
+        #   and +state_code+. Removed in 6.1.
+        attribute :country_iso, &:country_code
+        attribute :state_abbr, &:state_code
+
         # Collection details the customer needs when choosing a counter: how
         # long until the order is ready, and where to go. This serializer
         # backs the pickup-locations endpoint, so without them the two

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

@@ -13,9 +13,7 @@ module Spree
         attributes :quantity, :kind, :reason,
                    created_at: :iso8601, updated_at: :iso8601
 
-        attribute :stock_level_id do |movement|
-          movement.stock_level&.prefixed_id
-        end
+        prefixed_id_attributes :stock_level
       end
     end
   end

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

@@ -1,10 +1,26 @@
 module Spree
   module Api
     module V3
-      # Payload of the stock_receipt.* events. Stock receipts have no
-      # storefront serializer, so the event shape is declared here rather than
-      # found by convention.
-      class StockReceiptEventSerializer < Admin::StockReceiptSerializer
+      # Payload of the stock_receipt.* events. The counted lines and who
+      # received them stay behind the Admin API.
+      class StockReceiptEventSerializer < BaseSerializer
+        typelize number: :string,
+                 received_at: :string,
+                 receivable_type: [:string, enum: %w[purchase_order stock_transfer]],
+                 receivable_id: :string,
+                 quantity_accepted_total: :number,
+                 quantity_rejected_total: :number
+
+        attributes :number, :quantity_accepted_total, :quantity_rejected_total,
+                   received_at: :iso8601, created_at: :iso8601, updated_at: :iso8601
+
+        attribute :receivable_type do |receipt|
+          receipt.receivable_type.demodulize.underscore
+        end
+
+        attribute :receivable_id do |receipt|
+          receipt.receivable&.prefixed_id
+        end
       end
     end
   end

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

@@ -15,13 +15,7 @@ module Spree
         attributes :number, :reference,
                    created_at: :iso8601, updated_at: :iso8601
 
-        attribute :source_location_id do |transfer|
-          transfer.source_location&.prefixed_id
-        end
-
-        attribute :destination_location_id do |transfer|
-          transfer.destination_location&.prefixed_id
-        end
+        prefixed_id_attributes :source_location, :destination_location
       end
     end
   end