spree_api 6.0.0.beta4 → 6.0.0.rc1

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

@@ -16,6 +16,12 @@ module Spree
                    customer_support_email: [:string, nullable: true],
                    new_order_notifications_email: [:string, nullable: true],
                    preferred_send_consumer_transactional_emails: :boolean,
+                   preferred_email_accent_color: [:string, nullable: true],
+                   preferred_email_background_color: [:string, nullable: true],
+                   preferred_email_card_color: [:string, nullable: true],
+                   preferred_email_text_color: [:string, nullable: true],
+                   preferred_email_heading_color: [:string, nullable: true],
+                   preferred_email_font: [:string, nullable: true, enum: Spree::Emails::Branding::FONTS.keys],
                    preferred_admin_locale: [:string, nullable: true],
                    preferred_timezone: :string,
                    preferred_weight_unit: [:string, enum: Spree::Variant::WEIGHT_UNITS],
@@ -34,12 +40,12 @@ module Spree
                    preferred_track_price_history: :boolean,
                    preferred_show_products_without_price: :boolean,
                    preferred_disable_sku_validation: :boolean,
-                   preferred_order_routing_strategy: :string,
+                   preferred_order_routing_strategy: [:string, comment: 'Order routing strategy. Built-in: rules. Extensions may register more.'],
                    preferred_pricing_provider: :string,
                    preferred_inventory_provider: :string,
                    preferred_pricing_provider_failure_policy: :string,
                    preferred_inventory_provider_failure_policy: :string,
-                   preferred_payout_provider: 'string | null',
+                   preferred_payout_provider: [:string, nullable: true, comment: 'Payout provider; null uses the installation default. Built-in: system. Provider gems register more (e.g. stripe).'],
                    preferred_default_payouts_schedule_interval: :string,
                    preferred_default_minimum_payout_amount: :number,
                    preferred_auto_approve_sellers: :boolean,
@@ -68,6 +74,12 @@ module Spree
                      :customer_support_email,
                      :new_order_notifications_email,
                      :preferred_send_consumer_transactional_emails,
+                     :preferred_email_accent_color,
+                     :preferred_email_background_color,
+                     :preferred_email_card_color,
+                     :preferred_email_text_color,
+                     :preferred_email_heading_color,
+                     :preferred_email_font,
                      :preferred_admin_locale,
                      :preferred_timezone,
                      :preferred_weight_unit,
@@ -86,18 +98,14 @@ module Spree
                      :preferred_track_price_history,
                      :preferred_show_products_without_price,
                      :preferred_disable_sku_validation,
-                     :preferred_order_routing_strategy,
                      :preferred_pricing_provider,
                      :preferred_inventory_provider,
                      :preferred_pricing_provider_failure_policy,
                      :preferred_inventory_provider_failure_policy,
-                     :preferred_payout_provider,
                      :preferred_default_payouts_schedule_interval,
-                     :preferred_default_minimum_payout_amount,
                      :preferred_auto_approve_sellers,
                      :preferred_auto_approve_seller_products,
                      :preferred_send_seller_transactional_emails,
-                     :preferred_default_commission_tax_rate,
                      :preferred_document_number_format,
                      :preferred_order_number_prefix,
                      :preferred_order_number_suffix,
@@ -108,6 +116,8 @@ module Spree
                      :preferred_digital_asset_authorized_days,
                      created_at: :iso8601, updated_at: :iso8601
 
+          api_type_attributes :preferred_order_routing_strategy, :preferred_payout_provider
+
           # Once the counter has issued a number the starting value no longer
           # applies, so the settings page can say that instead of accepting a
           # value that does nothing.
@@ -115,6 +125,14 @@ module Spree
             Spree::NumberSequence.started?(store: store)
           end
 
+          attribute :preferred_default_minimum_payout_amount do |store|
+            store.preferred_default_minimum_payout_amount&.to_f
+          end
+
+          attribute :preferred_default_commission_tax_rate do |store|
+            store.preferred_default_commission_tax_rate&.to_f
+          end
+
           attribute :url, &:storefront_url
 
           # The backend's own public URL — what a headless client sets as its

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

@@ -29,9 +29,7 @@ module Spree
 
           # Lets the dashboard hide the delete control rather than offer one
           # the model will refuse.
-          attribute :can_be_deleted do |supplier|
-            supplier.can_be_deleted?
-          end
+          attribute :can_be_deleted, &:can_be_deleted?
         end
       end
     end

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

@@ -19,9 +19,7 @@ module Spree
                      issued_at: :iso8601, expires_at: :iso8601, verified_at: :iso8601,
                      created_at: :iso8601, updated_at: :iso8601
 
-          attribute :company_id do |certificate|
-            certificate.company&.prefixed_id
-          end
+          prefixed_id_attributes :company
 
           # The jurisdiction the certificate holds in, in the same vocabulary the
           # tax lines use.
@@ -33,14 +31,10 @@ module Spree
             certificate.verified? && !certificate.lapsed?
           end
 
-          attribute :lapsed do |certificate|
-            certificate.lapsed?
-          end
+          attribute :lapsed, &:lapsed?
 
           # Lets the dashboard hide a delete the model will refuse.
-          attribute :can_be_deleted do |certificate|
-            certificate.can_be_deleted?
-          end
+          attribute :can_be_deleted, &:can_be_deleted?
 
           attribute :document_filename do |certificate|
             certificate.document.blob&.filename&.to_s if certificate.document.attached?

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

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

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

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

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

@@ -30,13 +30,7 @@ module Spree
             tax_rate.amount_percentage&.to_f
           end
 
-          attribute :tax_category_id do |tax_rate|
-            tax_rate.tax_category&.prefixed_id
-          end
-
-          attribute :store_id do |tax_rate|
-            tax_rate.store&.prefixed_id
-          end
+          prefixed_id_attributes :tax_category, :store
 
           # The jurisdiction the rate taxes, as codes: a null country means every
           # country, and a country with no state means the whole country. Read

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

@@ -40,12 +40,13 @@ module Spree
                      preorder_ships_at: :iso8601, deleted_at: :iso8601,
                      created_at: :iso8601, updated_at: :iso8601
 
-          attribute :preorderable do |variant|
-            variant.preorderable?
-          end
+          attribute :preorderable, &:preorderable?
 
+          # Stored on the row only — nil means inherit from the product. The
+          # model's +tax_category+ reader resolves the effective category for
+          # tax; the admin form needs the raw column to tell override from inherit.
           attribute :tax_category_id do |variant|
-            variant.tax_category&.prefixed_id
+            Spree::TaxCategory.prefixed_id_for(variant[:tax_category_id])
           end
 
           # Encoded from the foreign key: loading the carton row just to
@@ -82,9 +83,7 @@ module Spree
           # seller's row ships; on an owned product the write is a no-op, since
           # every variant ships as the product does. The dashboard need not
           # know which.
-          attribute :delivery_profile_id do |variant|
-            variant.resolved_delivery_profile&.prefixed_id
-          end
+          prefixed_id_attributes delivery_profile_id: :resolved_delivery_profile
 
           one :seller,
               resource: proc { Spree.api.admin_seller_serializer },

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

@@ -38,9 +38,7 @@ module Spree
             Spree::WebhookPayloadRedaction.split(delivery.payload).first
           end
 
-          attribute :webhook_endpoint_id do |delivery|
-            delivery.webhook_endpoint&.prefixed_id
-          end
+          prefixed_id_attributes :webhook_endpoint
 
           # Delegated from the parent endpoint — saves callers from having to
           # join the endpoint payload to show "where did this delivery go?".

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

@@ -0,0 +1,23 @@
+module Spree
+  module Api
+    module V3
+      module Admin
+        # One event catalog entry (Spree::Events::Catalog::Entry).
+        class WebhookEventSerializer
+          include Alba::Resource
+          include Typelizer::DSL
+
+          typelize name: :string, group: :string, credential: :boolean,
+                   credential_permission: [:string, nullable: true],
+                   deprecated: :boolean, replaced_by: [:string, nullable: true]
+
+          attributes :name, :group, :credential_permission
+
+          attribute(:credential, &:credential?)
+          attribute(:deprecated, &:deprecated?)
+          attribute(:replaced_by, &:deprecated_alias_of)
+        end
+      end
+    end
+  end
+end

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

@@ -6,11 +6,9 @@ module Spree
       # the typed Spree::Discount money rows.
       class AppliedPromotionSerializer < BaseSerializer
         typelize name: :string, description: [:string, nullable: true], code: [:string, nullable: true],
-                 amount: [:string, nullable: true], display_amount: [:string, nullable: true], promotion_id: :string
+                 promotion_id: :string
 
-        attribute :promotion_id do |record|
-          record.promotion&.prefixed_id
-        end
+        prefixed_id_attributes :promotion
 
         attributes :name, :description, :code
 

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

@@ -22,11 +22,31 @@ module Spree
         # (product prices AND cart/order/line-item totals) is gated from one
         # place instead of per-attribute opt-in.
         def self.money_attributes(*names)
+          typelize(**names.index_with { [:string, nullable: true] })
+
           names.each do |name|
             attribute(name) { |object| object.public_send(name) unless params[:hide_prices] }
           end
         end
 
+        # Declares `<association>_id` attributes carrying the associated
+        # record's prefixed id, or nil when there is none. Pass
+        # `seller_id: :resolved_seller` when the attribute name and the
+        # association it reads differ.
+        def self.prefixed_id_attributes(*associations, **renamed)
+          associations.index_by { |association| :"#{association}_id" }.merge(renamed).each do |name, association|
+            attribute(name) { |object| object.public_send(association)&.prefixed_id }
+          end
+        end
+
+        # Declares attributes whose column stores a provider or strategy class
+        # name, sent as its shorthand (`manual`, `rules`) instead.
+        def self.api_type_attributes(*names)
+          names.each do |name|
+            attribute(name) { |object| Spree::ApiTyped.api_type_for(object.public_send(name)) }
+          end
+        end
+
         # Declares the wire form of an `acted_by` association: the actor's
         # prefixed id, the kind of actor it is, and the expansion. Both
         # halves read off the columns, so naming an actor costs no query and

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

@@ -4,58 +4,36 @@ module Spree
       # Store API Cart Serializer
       # Pre-purchase cart data with checkout progression info
       class CartSerializer < BaseSerializer
-        typelize number: :string, current_step: :string, completed_steps: 'string[]', token: :string, email: [:string, nullable: true],
-                 customer_note: [:string, nullable: true], market_id: [:string, nullable: true], channel_id: [:string, nullable: true],
-                 currency: :string, locale: [:string, nullable: true], total_quantity: :number,
-                 coupon_code: [:string, nullable: true],
-                 preferred_stock_location_id: [:string, nullable: true],
-                 company_id: [:string, nullable: true], company_name: [:string, nullable: true],
-                 po_number: [:string, nullable: true], po_number_required: :boolean,
-                 po_document_filename: [:string, nullable: true],
-                 po_document_byte_size: ['number | null'],
-                 order_minimum: ['number | null'], order_minimum_shortfall: ['number | null'],
-                 below_order_minimum: ['boolean | null'],
+        typelize number: :string, current_step: :string, completed_steps: 'string[]', token: :string,
+                 email: [:string, nullable: true], customer_note: [:string, nullable: true],
+                 market_id: [:string, nullable: true], channel_id: [:string, nullable: true], currency: :string,
+                 locale: [:string, nullable: true], total_quantity: :number, coupon_code: [:string, nullable: true],
+                 preferred_stock_location_id: [:string, nullable: true], company_id: [:string, nullable: true],
+                 company_name: [:string, nullable: true], po_number: [:string, nullable: true],
+                 po_number_required: :boolean, po_document_filename: [:string, nullable: true],
+                 po_document_byte_size: ['number | null'], order_minimum: ['number | null'],
+                 order_minimum_shortfall: ['number | null'], below_order_minimum: ['boolean | null'],
                  freight_summary: [:FreightSummary, nullable: true],
                  requirements: 'Array<{step: string, field: string, code: string, message: 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],
-                 fee_total: [:string, nullable: true], display_fee_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, nullable: true], display_total: [:string, nullable: true],
-                 amount_due: [:string, nullable: true], display_amount_due: [:string, nullable: true],
-                 shipping_eq_billing_address: :boolean,
+                 covered_by_store_credit: :boolean, shipping_eq_billing_address: :boolean,
                  warnings: 'Array<{code: string, message: string, line_item_id?: string, variant_id?: string, item_index?: number}>',
                  billing_address: { nullable: true }, shipping_address: { nullable: true },
                  gift_card: { nullable: true }, market: { nullable: true }
 
-        attribute :market_id do |order|
-          order.market&.prefixed_id
-        end
+        prefixed_id_attributes :market
 
         # Which surface this cart belongs to — lets a multi-channel storefront
         # verify a cookie-persisted cart against its own channel before
         # adopting it (see the wholesale reference storefront's cart guard).
-        attribute :channel_id do |order|
-          order.channel&.prefixed_id
-        end
+        prefixed_id_attributes :channel
 
         # Pickup selection — mirrors the writable param on cart update.
-        attribute :preferred_stock_location_id do |cart|
-          cart.preferred_stock_location&.prefixed_id
-        end
+        prefixed_id_attributes :preferred_stock_location
 
         # Which company node the purchase is for — mirrors the writable
         # `company_id` param. Read from the column, never re-resolved.
-        attribute :company_id do |cart|
-          cart.company&.prefixed_id
-        end
+        prefixed_id_attributes :company
 
         attribute :company_name do |cart|
           cart.company&.name
@@ -64,9 +42,7 @@ module Spree
         # The buyer's own purchase-order reference, and whether their company
         # demands one — the storefront marks the field required from this
         # rather than fetching the company to ask.
-        attribute :po_number_required do |cart|
-          cart.po_number_required?
-        end
+        attribute :po_number_required, &:po_number_required?
 
         attribute :po_document_filename do |cart|
           cart.po_document.blob&.filename&.to_s if cart.po_document.attached?
@@ -101,9 +77,7 @@ module Spree
           order.display_total_applied_store_credit.to_s unless params[:hide_prices]
         end
 
-        attribute :covered_by_store_credit do |order|
-          order.covered_by_store_credit?
-        end
+        attribute :covered_by_store_credit, &:covered_by_store_credit?
 
         attribute :current_step do |order|
           order.current_checkout_step
@@ -153,9 +127,7 @@ module Spree
         # withhold.
         one :freight_summary, resource: proc { Spree.api.freight_summary_serializer }
 
-        attribute :shipping_eq_billing_address do |order|
-          order.shipping_eq_billing_address?
-        end
+        attribute :shipping_eq_billing_address, &:shipping_eq_billing_address?
 
         many :order_promotions, key: :discounts, resource: proc { Spree.api.applied_promotion_serializer }
         # Itemized charges (duties, surcharges, COD, handling). Storefronts

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

@@ -13,17 +13,13 @@ module Spree
                    :meta_title, :meta_description, :meta_keywords,
                    :children_count
 
-        attribute :parent_id do |category|
-          category.parent&.prefixed_id
-        end
+        prefixed_id_attributes :parent
 
         attribute :description do |category|
           Spree::RichTextHelper.to_plain_text(category.description)
         end
 
-        attribute :description_html do |category|
-          category.description_html
-        end
+        attributes :description_html
 
         attribute :image_url do |category|
           image_url_for(category.image)
@@ -33,17 +29,11 @@ module Spree
           image_url_for(category.square_image)
         end
 
-        attribute :is_root do |category|
-          category.root?
-        end
+        attribute :is_root, &:root?
 
-        attribute :is_child do |category|
-          category.child?
-        end
+        attribute :is_child, &:child?
 
-        attribute :is_leaf do |category|
-          category.leaf?
-        end
+        attribute :is_leaf, &:leaf?
 
         # Conditional associations
         # Note: We pass empty expand to nested categories to prevent infinite recursion

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

@@ -9,6 +9,10 @@ module Spree
                  refund_amount: :string,
                  display_refund_amount: :string,
                  paid_amount: :string,
+                 pre_tax_amount: :string,
+                 included_tax_total: :string,
+                 additional_tax_total: :string,
+                 tax_total: :string,
                  description: [:string, nullable: true],
                  variant_id: [:string, nullable: true],
                  replacement_variant_id: [:string, nullable: true],
@@ -16,32 +20,13 @@ module Spree
 
         attributes :quantity, :send_replacement, :description
 
-        attribute :refund_amount do |line|
-          line.refund_amount.to_s
-        end
-
-        # What the customer actually paid for these units — the ceiling the
-        # resolve workflow enforces, and what the dashboard offers when the
-        # claim carries no explicit amount.
-        attribute :paid_amount do |line|
-          line.paid_amount.to_s
-        end
-
-        attribute :display_refund_amount do |line|
-          line.display_refund_amount.to_s
-        end
-
-        attribute :variant_id do |line|
-          line.variant&.prefixed_id
-        end
-
-        attribute :replacement_variant_id do |line|
-          line.replacement_variant&.prefixed_id
-        end
-
-        attribute :line_item_id do |line|
-          line.line_item&.prefixed_id
-        end
+        attributes refund_amount: :string
+        # What the customer actually paid for these units, tax included — the
+        # ceiling the resolve workflow enforces, and what the dashboard offers
+        # when the claim carries no explicit amount.
+        attributes paid_amount: :string, pre_tax_amount: :string, included_tax_total: :string,
+                   additional_tax_total: :string, tax_total: :string, display_refund_amount: :string
+        prefixed_id_attributes :variant, :replacement_variant, :line_item
 
         one :variant, resource: proc { Spree.api.variant_serializer }, if: proc { expand?('variant') }
       end

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

@@ -19,22 +19,9 @@ module Spree
 
         attributes :number, :status, :resolution
 
-        attribute :order_id do |claim|
-          claim.order&.prefixed_id
-        end
-
-        attribute :reason_id do |claim|
-          claim.reason&.prefixed_id
-        end
-
-        attribute :refund_total do |claim|
-          claim.refund_total.to_s
-        end
-
-        attribute :display_refund_total do |claim|
-          claim.display_refund_total.to_s
-        end
+        prefixed_id_attributes :order, :reason
 
+        attributes refund_total: :string, display_refund_total: :string
         attribute :approved_at do |claim|
           claim.approved_at&.iso8601
         end

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

@@ -19,9 +19,7 @@ module Spree
           Spree::RichTextHelper.to_plain_text(collection.description)
         end
 
-        attribute :description_html do |collection|
-          collection.description_html
-        end
+        attributes :description_html
 
         attribute :image_url do |collection|
           image_url_for(collection.image)

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

@@ -15,9 +15,7 @@ module Spree
         # the PO field required from it.
         attributes :name, :kind, :po_number_required
 
-        attribute :parent_id do |company|
-          company.parent&.prefixed_id
-        end
+        prefixed_id_attributes :parent
 
         # The path above this node, root first — lets a client render
         # "Acme / EMEA / Berlin" without a request per level. Bounded by the

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

@@ -6,11 +6,10 @@ module Spree
       class CustomFieldSerializer < BaseSerializer
         typelize key: :string,
                  label: :string,
-                 type: [:string, deprecated: 'Use `field_type` instead. The legacy `type` field returns the Ruby STI class name (e.g. `Spree::CustomFields::ShortText`) and will be removed in a future minor.'],
                  field_type: Spree::CustomField::FIELD_TYPE_TOKENS,
                  value: :any
 
-        attributes :label, :type, :field_type
+        attributes :label, :field_type
 
         attribute :key, &:full_key
         attribute :value, &:serialize_value

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

@@ -14,9 +14,7 @@ module Spree
                  unpriced: :boolean,
                  freight_summary: [:FreightSummary, nullable: true]
 
-        attribute :delivery_method_id do |deliver_rate|
-          deliver_rate.delivery_method&.prefixed_id
-        end
+        prefixed_id_attributes :delivery_method
 
         # Carrier, service level and delivery date come from the rate provider
         # and are what the customer chooses between; nil on calculator-priced
@@ -35,26 +33,8 @@ module Spree
         # froze it here when it quoted.
         one :freight_summary, resource: proc { Spree.api.freight_summary_serializer }
 
-        attribute :display_cost do |deliver_rate|
-          deliver_rate.display_cost.to_s
-        end
-
-        attribute :display_total do |deliver_rate|
-          deliver_rate.display_total.to_s
-        end
-
-        attribute :display_additional_tax_total do |deliver_rate|
-          deliver_rate.display_additional_tax_total.to_s
-        end
-
-        attribute :display_included_tax_total do |deliver_rate|
-          deliver_rate.display_included_tax_total.to_s
-        end
-
-        attribute :display_tax_total do |deliver_rate|
-          deliver_rate.display_tax_total.to_s
-        end
-
+        attributes display_cost: :string, display_total: :string, display_additional_tax_total: :string,
+                   display_included_tax_total: :string, display_tax_total: :string
         one :delivery_method, resource: proc { Spree.api.delivery_method_serializer }
       end
     end

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

@@ -8,9 +8,7 @@ module Spree
                  filename: [:string, nullable: true],
                  content_type: [:string, nullable: true]
 
-        attribute :variant_id do |digital_asset|
-          digital_asset.variant&.prefixed_id
-        end
+        prefixed_id_attributes :variant
 
         attribute :filename do |digital_asset|
           digital_asset.filename&.to_s

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

@@ -16,17 +16,11 @@ module Spree
           digital_link.expires_at&.iso8601
         end
 
-        attribute :authorizable do |digital_link|
-          digital_link.authorizable?
-        end
+        attribute :authorizable, &:authorizable?
 
-        attribute :expired do |digital_link|
-          digital_link.expired?
-        end
+        attribute :expired, &:expired?
 
-        attribute :access_limit_exceeded do |digital_link|
-          digital_link.access_limit_exceeded?
-        end
+        attribute :access_limit_exceeded, &:access_limit_exceeded?
       end
     end
   end

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

@@ -7,7 +7,6 @@ module Spree
       class DiscountSerializer < BaseSerializer
         typelize label: :string, kind: [:string, enum: Spree::Discount::KINDS], code: [:string, nullable: true],
                  value: [:string, nullable: true], value_type: [:string, nullable: true],
-                 amount: [:string, nullable: true], display_amount: [:string, nullable: true],
                  promotion_id: [:string, nullable: true], line_item_id: [:string, nullable: true],
                  fulfillment_id: [:string, nullable: true]
 
@@ -17,17 +16,7 @@ module Spree
           record.value&.to_s
         end
 
-        attribute :promotion_id do |record|
-          record.promotion&.prefixed_id
-        end
-
-        attribute :line_item_id do |record|
-          record.line_item&.prefixed_id
-        end
-
-        attribute :fulfillment_id do |record|
-          record.fulfillment&.prefixed_id
-        end
+        prefixed_id_attributes :promotion, :line_item, :fulfillment
 
         money_attributes :amount, :display_amount
       end