spree_api 5.4.0.rc5 → 5.4.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bf4fd91d6d248fb992f0897c4b6f2500383739bea4428287a7d23dcd43f821f
-  data.tar.gz: dd8574c47b2bb4384741192c2126d265890cdda143e59f06c941d2bb2eb76e54
+  metadata.gz: 3c6d59935273b4cebfd26475ed05ea9840f29fee02e48dcb1157d085f3f64fca
+  data.tar.gz: a123d6fc36a3da09c3c4dd20e49038dda91fe3b9975bcdb84d8d0d69da2be1b0
 SHA512:
-  metadata.gz: 97e1cd5bc0b694680f2deff318bf085f73ab265ce7332a92d6b91f4acf2e5f4bca64e248ab13032af8b81f819aa0e336e2bbd91761f51eb0e3d5faa94e8af246
-  data.tar.gz: 2faea7ab9506da06796b87cc4c891a429809f0535d2408e67e99435a328f34e27e1f320caabf913922f9250b161c2d7d35c9603f0862b77c79d3f7ae9f36853b
+  metadata.gz: 73d708653cef72adfc6b5b4af0e341746187c19f2f752de81cdcd3222ca9855115df204f3bfda74665ce33bb7273eed11f2c7c0038bf18ee86a3c56f3f5cbb12
+  data.tar.gz: 48ede905487d71fdb3d5944c3fdc1c43478036d6fd12dd946118fcb338d8ed3a15c739cc3e67701f73ae6ad5f60f78b50151872ee066d29e15d5166ddf56bd0a

data/app/controllers/spree/api/v3/store/carts_controller.rb

@@ -141,6 +141,7 @@ module Spree
             params.permit(
               :email,
               :customer_note,
+              :market_id,
               :currency,
               :locale,
               :shipping_address_id,

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

@@ -0,0 +1,15 @@
+module Spree
+  module Api
+    module V3
+      module Admin
+        class CountrySerializer < V3::CountrySerializer
+          attributes created_at: :iso8601, updated_at: :iso8601
+
+          many :states,
+               resource: Spree.api.admin_state_serializer,
+               if: proc { expand?(:states) }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Spree
+  module Api
+    module V3
+      module Admin
+        class MarketSerializer < V3::MarketSerializer
+          attributes created_at: :iso8601, updated_at: :iso8601
+
+          many :countries,
+               resource: Spree.api.admin_country_serializer,
+               if: proc { expand?(:countries) }
+        end
+      end
+    end
+  end
+end

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

@@ -52,6 +52,7 @@ module Spree
           one :billing_address, resource: Spree.api.admin_address_serializer, if: proc { expand?('billing_address') }
           one :shipping_address, resource: Spree.api.admin_address_serializer, if: proc { expand?('shipping_address') }
           one :gift_card, resource: Spree.api.admin_gift_card_serializer
+          one :market, resource: Spree.api.admin_market_serializer
 
           many :payment_methods, resource: Spree.api.admin_payment_method_serializer, if: proc { expand?('payment_methods') }
 

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

@@ -0,0 +1,11 @@
+module Spree
+  module Api
+    module V3
+      module Admin
+        class StateSerializer < V3::StateSerializer
+          attributes created_at: :iso8601, updated_at: :iso8601
+        end
+      end
+    end
+  end
+end

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

@@ -60,10 +60,12 @@ module Spree
         private
 
         # Override Alba's fetch_attribute to automatically inject nested expand params
-        # into child serializers via nested_params
+        # into child serializers via nested_params.
+        # Uses `key` (the public API name, e.g. :categories) for expand lookup,
+        # not `attribute.name` (the internal association name, e.g. :taxons).
         def fetch_attribute(obj, key, attribute)
           if attribute.is_a?(Alba::Association)
-            nested = nested_params(attribute.name)
+            nested = nested_params(key)
             yield_if_within(attribute.name.to_sym) { |within| attribute.to_h(obj, params: nested, within: within) }
           else
             super

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

@@ -5,7 +5,8 @@ module Spree
       # 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], currency: :string, locale: [:string, nullable: true], total_quantity: :number,
+                 customer_note: [:string, nullable: true], market_id: [:string, nullable: true],
+                 currency: :string, locale: [:string, nullable: true], total_quantity: :number,
                  requirements: 'Array<{step: string, field: string, message: string}>',
                  item_total: :string, display_item_total: :string,
                  delivery_total: :string, display_delivery_total: :string,
@@ -22,13 +23,17 @@ module Spree
                  shipping_eq_billing_address: :boolean,
                  warnings: 'Array<{code: string, message: string, line_item_id?: string, variant_id?: string}>',
                  billing_address: { nullable: true }, shipping_address: { nullable: true },
-                 gift_card: { nullable: true }
+                 gift_card: { nullable: true }, market: { nullable: true }
 
         # Override ID to use cart_ prefix
         attribute :id do |order|
           "cart_#{Spree::PrefixedId::SQIDS.encode([order.id])}"
         end
 
+        attribute :market_id do |order|
+          order.market&.prefixed_id
+        end
+
         attributes :number, :token, :email, :customer_note,
                    :currency, :locale, :total_quantity,
                    :item_total, :display_item_total,
@@ -77,6 +82,7 @@ module Spree
 
         many :payment_methods, resource: Spree.api.payment_method_serializer
         one :gift_card, resource: Spree.api.gift_card_serializer
+        one :market, resource: Spree.api.market_serializer
       end
     end
   end

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

@@ -2,9 +2,9 @@ module Spree
   module Api
     module V3
       class OptionTypeSerializer < BaseSerializer
-        typelize name: :string, label: :string, position: :number
+        typelize name: :string, label: :string, position: :number, kind: :string
 
-        attributes :name, :label, :position
+        attributes :name, :label, :position, :kind
       end
     end
   end

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

@@ -3,13 +3,14 @@ module Spree
     module V3
       class OptionValueSerializer < BaseSerializer
         typelize name: :string, label: :string, position: :number, option_type_id: :string,
-                 option_type_name: :string, option_type_label: :string
+                 option_type_name: :string, option_type_label: :string,
+                 color_code: 'string | null', image_url: 'string | null'
 
         attribute :option_type_id do |option_value|
           option_value.option_type&.prefixed_id
         end
 
-        attributes :name, :label, :position
+        attributes :name, :label, :position, :color_code
 
         attribute :option_type_name do |option_value|
           option_value.option_type.name
@@ -18,6 +19,10 @@ module Spree
         attribute :option_type_label do |option_value|
           option_value.option_type.label
         end
+
+        attribute :image_url do |option_value|
+          image_url_for(option_value.image)
+        end
       end
     end
   end

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

@@ -5,7 +5,8 @@ module Spree
       # Post-purchase order data (completed orders)
       class OrderSerializer < BaseSerializer
         typelize number: :string, email: :string,
-                 customer_note: [:string, nullable: true], currency: :string, locale: [:string, nullable: true], total_quantity: :number,
+                 customer_note: [:string, nullable: true], market_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,
@@ -21,7 +22,11 @@ module Spree
                  amount_due: :string, display_amount_due: :string,
                  completed_at: [:string, nullable: true],
                  billing_address: { nullable: true }, shipping_address: { nullable: true },
-                 gift_card: { nullable: true }
+                 gift_card: { nullable: true }, market: { nullable: true }
+
+        attribute :market_id do |order|
+          order.market&.prefixed_id
+        end
 
         attributes :number, :email, :customer_note,
                    :currency, :locale, :total_quantity,
@@ -54,6 +59,7 @@ module Spree
         one :billing_address, resource: Spree.api.address_serializer
         one :shipping_address, resource: Spree.api.address_serializer
         one :gift_card, resource: Spree.api.gift_card_serializer
+        one :market, resource: Spree.api.market_serializer
       end
     end
   end

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

@@ -94,6 +94,7 @@ module Spree
               type: 'option',
               name: option_type.name,
               label: option_type.label,
+              kind: option_type.kind,
               options: values.map { |ov| option_value_data(count_ids, ov) }
             }
           end
@@ -112,6 +113,8 @@ module Spree
             name: option_value.name,
             label: option_value.label,
             position: option_value.position,
+            color_code: option_value.color_code,
+            image_url: option_value.image.attached? ? Rails.application.routes.url_helpers.cdn_image_url(option_value.image) : nil,
             count: count
           }
         end

data/lib/spree/api/dependencies.rb

@@ -156,6 +156,8 @@ module Spree
         stock_transfer_serializer: 'Spree::Api::V3::StockTransferSerializer',
 
         # v3 admin serializers (API v3 Admin)
+        admin_country_serializer: 'Spree::Api::V3::Admin::CountrySerializer',
+        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_order_serializer: 'Spree::Api::V3::Admin::OrderSerializer',
@@ -183,6 +185,7 @@ module Spree
         admin_reimbursement_serializer: 'Spree::Api::V3::Admin::ReimbursementSerializer',
         admin_admin_user_serializer: 'Spree::Api::V3::Admin::AdminUserSerializer',
         admin_address_serializer: 'Spree::Api::V3::Admin::AddressSerializer',
+        admin_market_serializer: 'Spree::Api::V3::Admin::MarketSerializer',
         admin_shipping_method_serializer: 'Spree::Api::V3::Admin::DeliveryMethodSerializer',
         admin_delivery_method_serializer: 'Spree::Api::V3::Admin::DeliveryMethodSerializer',
         admin_stock_location_serializer: 'Spree::Api::V3::Admin::StockLocationSerializer',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 5.4.0.rc5
+  version: 5.4.0.rc6
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-30 00:00:00.000000000 Z
+date: 2026-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rswag-specs
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.0.rc5
+        version: 5.4.0.rc6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.0.rc5
+        version: 5.4.0.rc6
 description: Spree's API
 email:
 - hello@spreecommerce.org
@@ -162,6 +162,7 @@ files:
 - app/serializers/spree/api/v3/admin/allowed_origin_serializer.rb
 - app/serializers/spree/api/v3/admin/asset_serializer.rb
 - app/serializers/spree/api/v3/admin/category_serializer.rb
+- app/serializers/spree/api/v3/admin/country_serializer.rb
 - app/serializers/spree/api/v3/admin/credit_card_serializer.rb
 - app/serializers/spree/api/v3/admin/custom_field_serializer.rb
 - app/serializers/spree/api/v3/admin/customer_serializer.rb
@@ -172,6 +173,7 @@ files:
 - app/serializers/spree/api/v3/admin/fulfillment_serializer.rb
 - app/serializers/spree/api/v3/admin/gift_card_serializer.rb
 - app/serializers/spree/api/v3/admin/line_item_serializer.rb
+- app/serializers/spree/api/v3/admin/market_serializer.rb
 - app/serializers/spree/api/v3/admin/media_serializer.rb
 - app/serializers/spree/api/v3/admin/option_type_serializer.rb
 - app/serializers/spree/api/v3/admin/option_value_serializer.rb
@@ -186,6 +188,7 @@ files:
 - app/serializers/spree/api/v3/admin/reimbursement_serializer.rb
 - app/serializers/spree/api/v3/admin/return_authorization_serializer.rb
 - app/serializers/spree/api/v3/admin/shipping_category_serializer.rb
+- app/serializers/spree/api/v3/admin/state_serializer.rb
 - app/serializers/spree/api/v3/admin/stock_item_serializer.rb
 - app/serializers/spree/api/v3/admin/stock_location_serializer.rb
 - app/serializers/spree/api/v3/admin/store_credit_serializer.rb
@@ -274,9 +277,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.rc5
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.rc6
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc5
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc6
 post_install_message:
 rdoc_options: []
 require_paths: