spree_api 6.0.0.beta4 → 6.0.0.rc2

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

@@ -7,7 +7,8 @@ module Spree
         typelize email: :string, first_name: [:string, nullable: true], last_name: [:string, nullable: true],
                  full_name: :string,
                  phone: [:string, nullable: true], accepts_email_marketing: :boolean,
-                 available_store_credit_total: :string, display_available_store_credit_total: :string,
+                 available_store_credit_total: :string,
+                 display_available_store_credit_total: display_money_type(:display_available_store_credit_total, nullable: false),
                  default_billing_address: { nullable: true }, default_shipping_address: { nullable: true },
                  newsletter_subscriber: { nullable: true },
                  email_marketing_consent_updated_at: [:string, nullable: true]
@@ -28,7 +29,7 @@ module Spree
         attribute :available_store_credit_total do |user, params|
           store = params&.dig(:store) || Spree::Current.store
           currency = params&.dig(:currency) || Spree::Current.currency || store&.default_currency
-          user.total_available_store_credit(currency, store).to_s
+          Spree::Money::Rounding.format(user.total_available_store_credit(currency, store), currency)
         end
 
         attribute :display_available_store_credit_total do |user, params|

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

@@ -3,29 +3,22 @@ module Spree
     module V3
       class DeliveryRateSerializer < BaseSerializer
         typelize name: :string, selected: :boolean, delivery_method_id: :string,
-                 cost: :string, display_cost: :string,
-                 total: :string, display_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,
                  carrier: [:string, nullable: true],
                  service_level: [:string, nullable: true],
                  estimated_delivery_date: [:string, nullable: true],
                  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
         # methods. Provider metadata stays admin-only.
-        attributes :name, :selected,
-                   :cost, :total,
-                   :additional_tax_total, :included_tax_total,
-                   :tax_total,
-                   :carrier, :service_level, :estimated_delivery_date,
+        attributes :name, :selected
+
+        money_attributes :cost, :total, :additional_tax_total, :included_tax_total, :tax_total
+
+        attributes :carrier, :service_level, :estimated_delivery_date,
                    :unpriced
 
         # What the shipment looks like to a freight forwarder — cartons,
@@ -35,25 +28,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
+        money_attributes :display_cost, :display_total, :display_additional_tax_total,
+                         :display_included_tax_total, :display_tax_total
 
         one :delivery_method, resource: proc { Spree.api.delivery_method_serializer }
       end

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

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

data/app/serializers/spree/api/v3/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,27 +7,19 @@ 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]
 
         attributes :label, :kind, :code, :value_type
 
+        # A percent discount carries a rate; a flat one an amount.
         attribute :value do |record|
-          record.value&.to_s
-        end
-
-        attribute :promotion_id do |record|
-          record.promotion&.prefixed_id
-        end
+          next Spree::Money::Rounding.format_decimal(record.value) if record.value_type == 'percent'
 
-        attribute :line_item_id do |record|
-          record.line_item&.prefixed_id
+          Spree::Money::Rounding.format(record.value, record.currency) unless params[:hide_prices]
         end
 
-        attribute :fulfillment_id do |record|
-          record.fulfillment&.prefixed_id
-        end
+        prefixed_id_attributes :promotion, :line_item, :fulfillment
 
         money_attributes :amount, :display_amount
       end

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

@@ -7,9 +7,6 @@ module Spree
         typelize quantity: :number,
                  received_quantity: :number,
                  resellable: :boolean,
-                 original_price: :string,
-                 new_variant_price: :string,
-                 price_difference: :string,
                  original_variant_id: [:string, nullable: true],
                  new_variant_id: [:string, nullable: true],
                  line_item_id: [:string, nullable: true],
@@ -17,33 +14,12 @@ module Spree
 
         attributes :quantity, :received_quantity, :resellable
 
-        attribute :original_price do |line|
-          line.original_price.to_s
-        end
-
-        attribute :new_variant_price do |line|
-          line.new_variant_price.to_s
-        end
-
-        attribute :price_difference do |line|
-          line.price_difference.to_s
-        end
-
-        attribute :original_variant_id do |line|
-          line.original_variant&.prefixed_id
-        end
-
-        attribute :new_variant_id do |line|
-          line.new_variant&.prefixed_id
-        end
-
-        attribute :line_item_id do |line|
-          line.line_item&.prefixed_id
-        end
-
-        attribute :fulfillment_item_id do |line|
-          line.fulfillment_item&.prefixed_id
-        end
+        # What the customer paid for the units coming back, after discounts
+        # and with their tax.
+        money_attributes :original_price
+        # The replacement at the same discount, with its own tax.
+        money_attributes :new_variant_price, :price_difference, :original_tax_total, :new_tax_total
+        prefixed_id_attributes :original_variant, :new_variant, :line_item, :fulfillment_item
 
         one :original_variant, resource: proc { Spree.api.variant_serializer }, if: proc { expand?('original_variant') }
         one :new_variant, resource: proc { Spree.api.variant_serializer }, if: proc { expand?('new_variant') }

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

@@ -9,8 +9,6 @@ module Spree
                  status: [:string, enum: Spree::Exchange.statuses, enum_type_name: 'ExchangeStatus'],
                  order_id: [:string, nullable: true],
                  reason_id: [:string, nullable: true],
-                 price_difference: :string,
-                 display_price_difference: :string,
                  approved_at: [:string, nullable: true],
                  received_at: [:string, nullable: true],
                  fulfilled_at: [:string, nullable: true],
@@ -18,21 +16,9 @@ module Spree
 
         attributes :number, :status
 
-        attribute :order_id do |exchange|
-          exchange.order&.prefixed_id
-        end
-
-        attribute :reason_id do |exchange|
-          exchange.reason&.prefixed_id
-        end
+        prefixed_id_attributes :order, :reason
 
-        attribute :price_difference do |exchange|
-          exchange.price_difference.to_s
-        end
-
-        attribute :display_price_difference do |exchange|
-          exchange.display_price_difference.to_s
-        end
+        money_attributes :price_difference, :display_price_difference
 
         attribute :approved_at do |exchange|
           exchange.approved_at&.iso8601

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

@@ -18,9 +18,7 @@ module Spree
           Spree::Export.api_type_for(export.type)
         end
 
-        attribute :user_id do |export|
-          export.user&.prefixed_id
-        end
+        prefixed_id_attributes :user
       end
     end
   end

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

@@ -5,20 +5,12 @@ module Spree
       # Order-level when both adjustable IDs are null.
       class FeeSerializer < BaseSerializer
         typelize label: :string,
-                 kind: [:string, enum: Spree::Fee::KINDS, enum_type_name: 'FeeKind',
-                        comment: 'What sort of charge this is. `duty` is a customs duty on a cross-border order and is not taxed; the other kinds are. Extensions may register further kinds.'],
-                 amount: [:string, nullable: true], display_amount: [:string, nullable: true],
+                 kind: [:string, enum: Spree::Fee::KINDS, enum_type_name: 'FeeKind',                         comment: 'What sort of charge this is. `duty` is a customs duty on a cross-border order and is not taxed; the other kinds are. Extensions may register further kinds.'],
                  line_item_id: [:string, nullable: true], fulfillment_id: [:string, nullable: true]
 
         attributes :label, :kind
 
-        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 :line_item, :fulfillment
 
         money_attributes :amount, :display_amount
       end

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

@@ -0,0 +1,28 @@
+module Spree
+  module Api
+    module V3
+      # A file accepted by an upload endpoint ({Spree::FileUpload}).
+      #
+      # `signed_id` is opaque: clients pass it back unchanged to the endpoint
+      # that uses the file and never parse it. It stops being attachable at
+      # `expires_at`. `upload` is where a presigned upload sends its bytes, and
+      # null once the file is already stored.
+      class FileUploadSerializer < BaseSerializer
+        # A value object, not a record — it has no id of its own.
+        _attributes.delete(:id)
+
+        typelize signed_id: :string,
+                 filename: :string,
+                 content_type: :string,
+                 byte_size: :number,
+                 visibility: [:string, enum: Spree::FileUpload::VISIBILITIES],
+                 expires_at: :string,
+                 upload: [:FileUploadTarget, nullable: true]
+
+        attributes :signed_id, :filename, :content_type, :byte_size, :visibility, expires_at: :iso8601
+
+        one :upload_target, key: :upload, resource: proc { Spree.api.file_upload_target_serializer }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Spree
+  module Api
+    module V3
+      # Where a presigned upload sends its bytes. Clients send them with
+      # `method` to `url` carrying exactly `headers`, and treat all three as
+      # opaque: the storage service decides them.
+      class FileUploadTargetSerializer < BaseSerializer
+        _attributes.delete(:id)
+
+        typelize method: :string, url: :string, headers: 'Record<string, string>'
+
+        attribute :method, &:http_method
+        attributes :url, :headers
+      end
+    end
+  end
+end

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

@@ -2,18 +2,11 @@ module Spree
   module Api
     module V3
       class FulfillmentSerializer < BaseSerializer
-        typelize number: :string, status: [:string, enum: Spree::Fulfillment.statuses, enum_type_name: 'FulfillmentStatus'],
+        typelize number: :string,
+                 status: [:string, enum: Spree::Fulfillment.statuses, enum_type_name: 'FulfillmentStatus'],
                  fulfillment_type: [:string, enum: %w[shipping digital pickup pickup_point]],
-                 tracking: [:string, nullable: true],
-                 tracking_url: [:string, nullable: true], fulfilled_at: [:string, nullable: true],
-                 delivered_at: [:string, nullable: true],
-                 cost: [:string, nullable: true], display_cost: [:string, nullable: true],
-                 unpriced: :boolean,
-                 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],
+                 tracking: [:string, nullable: true], tracking_url: [:string, nullable: true],
+                 fulfilled_at: [:string, nullable: true], delivered_at: [:string, nullable: true], unpriced: :boolean,
                  items: 'Array<{ item_id: string; variant_id: string; quantity: number }>',
                  pickup_point_data: ['Record<string, unknown>', nullable: true],
                  selected_delivery_rate_id: [:string, nullable: true]

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

@@ -4,24 +4,20 @@ module Spree
   module Api
     module V3
       class GiftCardBatchSerializer < BaseSerializer
-        typelize codes_count: :number, amount: [:string, nullable: true], currency: [:string, nullable: true],
+        typelize codes_count: :number, currency: [:string, nullable: true, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                  prefix: [:string, nullable: true], expires_at: [:string, nullable: true],
                  created_by_id: [:string, nullable: true]
 
         attributes :codes_count, :currency, :prefix,
                    created_at: :iso8601, updated_at: :iso8601
 
-        attribute :amount do |batch|
-          batch.amount&.to_s
-        end
+        money_attributes :amount
 
         attribute :expires_at do |batch|
           batch.expires_at&.iso8601
         end
 
-        attribute :created_by_id do |batch|
-          batch.created_by&.prefixed_id
-        end
+        prefixed_id_attributes :created_by
       end
     end
   end

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

@@ -4,17 +4,11 @@ module Spree
       class GiftCardSerializer < BaseSerializer
         typelize code: :string,
                  status: [:string, enum: Spree::GiftCard::DISPLAY_STATUSES, enum_type_name: 'GiftCardStatus'],
-                 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],
-                 expired: :boolean,
+                 display_amount: display_money_type(:display_amount),
+                 display_amount_used: display_money_type(:display_amount_used),
+                 display_amount_remaining: display_money_type(:display_amount_remaining),
+                 currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
+                 expires_at: [:string, nullable: true], redeemed_at: [:string, nullable: true], expired: :boolean,
                  active: :boolean
 
         # A bearer credential: masked when the order is shown to someone other
@@ -53,13 +47,9 @@ module Spree
           gift_card.redeemed_at&.iso8601
         end
 
-        attribute :expired do |gift_card|
-          gift_card.expired?
-        end
+        attribute :expired, &:expired?
 
-        attribute :active do |gift_card|
-          gift_card.active?
-        end
+        attribute :active, &:active?
 
       end
     end

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

@@ -11,18 +11,14 @@ module Spree
         attributes :row_number, :status, :validation_errors,
                    created_at: :iso8601, updated_at: :iso8601
 
-        attribute :import_id do |row|
-          row.import&.prefixed_id
-        end
+        prefixed_id_attributes :import
 
         # `"product"` / `"variant"`, not the polymorphic class name.
         attribute :item_type do |row|
           Spree::Base.polymorphic_api_type(row.item_type)
         end
 
-        attribute :item_id do |row|
-          row.item&.prefixed_id
-        end
+        prefixed_id_attributes :item
       end
     end
   end

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

@@ -6,7 +6,6 @@ module Spree
       class ImportSerializer < BaseSerializer
         typelize number: :string,
                  type: [:string, nullable: true, comment: 'Import type. Built-in: products, product_translations, customers, price_list_prices. Extensions may register more.'], status: [:string, enum: Spree::Import.statuses, enum_type_name: 'ImportStatus'],
-                 owner_type: [:string, nullable: true], owner_id: [:string, nullable: true],
                  store_id: [:string, nullable: true], seller_id: [:string, nullable: true],
                  user_id: [:string, nullable: true], rows_count: :number
 
@@ -21,34 +20,12 @@ module Spree
           Spree::Import.api_type_for(import.type)
         end
 
-        attribute :status do |import|
-          import.status.to_s
-        end
-
+        attributes status: :string
         # Which marketplace this import belongs to, and — when a seller ran it —
         # whose it is. A null `seller_id` means the operator's own.
-        attribute :store_id do |import|
-          import.store&.prefixed_id
-        end
-
-        attribute :seller_id do |import|
-          import.seller&.prefixed_id
-        end
+        prefixed_id_attributes :store, :seller
 
-        # @deprecated Read `store_id` / `seller_id` — removed in 6.1. Emitted
-        #   from the pair above rather than the dropped columns, so a client
-        #   still reading them sees the same answer.
-        attribute :owner_type do |import|
-          Spree::Base.polymorphic_api_type(import.seller_id.present? ? 'Spree::Seller' : 'Spree::Store')
-        end
-
-        attribute :owner_id do |import|
-          (import.seller || import.store)&.prefixed_id
-        end
-
-        attribute :user_id do |import|
-          import.user&.prefixed_id
-        end
+        prefixed_id_attributes :user
       end
     end
   end

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

@@ -14,10 +14,7 @@ module Spree
         attributes :email,
                    created_at: :iso8601, updated_at: :iso8601
 
-        attribute :status do |invitation|
-          invitation.status.to_s
-        end
-
+        attributes status: :string
         # `"store"` / `"admin_user"`, not the polymorphic class names.
         attribute :resource_type do |invitation|
           Spree::Base.polymorphic_api_type(invitation.resource_type)
@@ -31,21 +28,7 @@ module Spree
           Spree::Base.polymorphic_api_type(invitation.invitee_type)
         end
 
-        attribute :resource_id do |invitation|
-          invitation.resource&.prefixed_id
-        end
-
-        attribute :inviter_id do |invitation|
-          invitation.inviter&.prefixed_id
-        end
-
-        attribute :invitee_id do |invitation|
-          invitation.invitee&.prefixed_id
-        end
-
-        attribute :role_id do |invitation|
-          invitation.role&.prefixed_id
-        end
+        prefixed_id_attributes :resource, :inviter, :invitee, :role
 
         attribute :expires_at do |invitation|
           invitation.expires_at&.iso8601

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

@@ -2,32 +2,18 @@ module Spree
   module Api
     module V3
       class LineItemSerializer < BaseSerializer
-        typelize variant_id: :string, quantity: :number, currency: :string,
-                 name: :string, slug: :string, options_text: :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],
-                 preorder: :boolean, preorder_ships_at: [:string, nullable: true],
-                 seller_id: [:string, nullable: true]
+        typelize variant_id: :string, quantity: :number, currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'], name: :string, slug: :string,
+                 options_text: :string, compare_at_amount: [:string, nullable: true, comment: 'The compare-at price times quantity, or null when the variant has none.'],
+                 thumbnail_url: [:string, nullable: true], preorder: :boolean,
+                 preorder_ships_at: [:string, nullable: true], seller_id: [:string, nullable: true]
 
-        attribute :variant_id do |line_item|
-          line_item.variant&.prefixed_id
-        end
+        prefixed_id_attributes :variant
 
         # Which seller this line was bought from, snapshotted when it was
         # added — nil is the operator's own first-party item. Always present
         # so a storefront can group a multi-seller cart without paying for the
         # expand; `?expand=seller` adds the public profile.
-        attribute :seller_id do |line_item|
-          line_item.seller&.prefixed_id
-        end
+        prefixed_id_attributes :seller
 
         # True when the line item's variant is currently a pre-order, so the
         # cart/checkout can flag it as shipping later.
@@ -44,21 +30,31 @@ module Spree
 
         # 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,
+        money_attributes :price, :display_price, unit_price: true, descriptions: { price: 'The price of one unit.' }
+        money_attributes :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
+                         :display_compare_at_amount,
+                         descriptions: {
+                           total: 'What this line costs: price times quantity, with its discounts, fees and added tax.',
+                           adjustment_total: "This line's discounts, fees and added tax together.",
+                           additional_tax_total: 'Tax added on top of the price.',
+                           included_tax_total: 'Tax already included in the price.',
+                           discount_total: 'What promotions take off this line, as a negative amount.',
+                           pre_tax_amount: 'This line after discounts, without tax.',
+                           discounted_amount: 'Price times quantity, after discounts.'
+                         }
 
         # 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
+          amount.present? && amount.positive? ? Spree::Money::Rounding.format(amount, line_item.currency, unit_price: true) : nil
         end
 
         # Thumbnail URL for line item (variant thumbnail or product thumbnail)

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

@@ -7,7 +7,9 @@ module Spree
         include Alba::Resource
         include Typelizer::DSL
 
-        typelize code: :string, name: :string, default: :boolean, rtl: :boolean
+        typelize code: [:string, enum: Spree::Locales::ALL, enum_type_name: 'LocaleCode'],
+                 name: [:string, deprecated: 'Name the locale from `code` with `Intl.DisplayNames`. Removed in 6.1.'],
+                 default: :boolean, rtl: :boolean
 
         attributes :code, :name
 

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

@@ -2,11 +2,11 @@ module Spree
   module Api
     module V3
       class MarketSerializer < BaseSerializer
-        typelize name: :string, currency: :string,
-                 default_locale: :string,
-                 supported_locales: [:string, multi: true],
-                 country_codes: [:string, multi: true],
-                 country_isos: [:string, multi: true],
+        typelize name: :string, currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
+                 default_locale: [:string, enum: Spree::Locales::ALL, enum_type_name: 'LocaleCode'],
+                 supported_locales: [:string, multi: true, enum: Spree::Locales::ALL, enum_type_name: 'LocaleCode'],
+                 country_codes: [:string, multi: true, enum: Spree::IsoData.country_codes, enum_type_name: 'CountryCode'],
+                 country_isos: [:string, multi: true, deprecated: 'Use `country_codes`. Removed in 6.1.'],
                  tax_inclusive: :boolean,
                  default: :boolean
 

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

@@ -11,9 +11,7 @@ module Spree
                  viewable_id: :string, position: [:number, nullable: true],
                  alt: [:string, nullable: true]
 
-        attribute :viewable_id do |asset|
-          asset.viewable&.prefixed_id
-        end
+        prefixed_id_attributes :viewable
 
         # `"product"` / `"variant"`, not the polymorphic class name.
         attribute :viewable_type do |asset|