spree_api 5.4.0.rc3 → 5.4.0.rc4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 314545a7037d2f446a6d764b8d130a6ba14c89cfdb82c380132595f74aa62435
-  data.tar.gz: 5976dd28153ffc543f658ca56fab3a2d97cefb162ec25481e192deb599743939
+  metadata.gz: 4646295f332844bfdbf16d865c67f5441d3418eb8136a18899f14e4651955ea5
+  data.tar.gz: 49693605ce4d13a68b9008d6677984812f9839e764758460597d08de211069f0
 SHA512:
-  metadata.gz: 6856dc5fbe6411874444f3bc9ea16b4047ab11470d85b625daca9e054bc6289a37ac023a1fa899a6e9199aebfe1e6a2b1b4f3716611d34bc80ad829e0c57cf04
-  data.tar.gz: ab453e9b05648c4ce61feca5febcaf815d898b17f098696b27dff28d006d015130987d9d8233532b5b74d4fb5c31f6e3f7d12ca4fac10d6ac070bfbb5a4f384b
+  metadata.gz: 74009ca81a6f9b0feef636f9868a8b415d098a729d68e5fbed018e3b8de8a89fc69db79265b6ba889b09895546e2d3c218327d89c349e8b22265d1e1c2ffb3db
+  data.tar.gz: 2ba9f53edc7610636143d874b5d2511a705098d54294ee5cdac318f0c6d45297c96d7fff8752747c7d34933449e616c0e9de044e260022ac6116cfca08d7229e

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

@@ -0,0 +1,20 @@
+module Spree
+  module Api
+    module V3
+      module Store
+        class DataFeedsController < Store::BaseController
+          skip_before_action :authenticate_api_key!
+          skip_before_action :authenticate_user
+
+          # GET /api/v3/store/feeds/:slug.xml
+          def show
+            data_feed = current_store.data_feeds.active.find_by!(slug: params[:slug])
+            presenter = data_feed.class.presenter_class.new(data_feed)
+
+            render xml: presenter.call
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,13 +7,11 @@ module Spree
         class AllowedOriginSerializer < V3::BaseSerializer
           typelize store_id: :string
 
-          attributes :id, :origin
+          attributes :id, :origin, created_at: :iso8601, updated_at: :iso8601
 
           attribute :store_id do |allowed_origin|
             allowed_origin.store&.prefixed_id
           end
-
-          attributes created_at: :iso8601, updated_at: :iso8601
         end
       end
     end

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

@@ -8,7 +8,7 @@ module Spree
           typelize lft: :number, rgt: :number
 
           # Nested set columns for tree operations
-          attributes :lft, :rgt
+          attributes :lft, :rgt, created_at: :iso8601, updated_at: :iso8601
 
           # Override inherited associations to use admin serializers
           one :parent,
@@ -24,8 +24,9 @@ module Spree
                if: proc { expand?('ancestors') }
 
           many :metafields,
-               resource: Spree.api.admin_metafield_serializer,
-               if: proc { expand?('metafields') }
+               key: :custom_fields,
+               resource: Spree.api.admin_custom_field_serializer,
+               if: proc { expand?('custom_fields') }
         end
       end
     end

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

@@ -0,0 +1,19 @@
+module Spree
+  module Api
+    module V3
+      module Admin
+        # Admin API Custom Field Serializer
+        # Full custom field data including admin-only fields
+        class CustomFieldSerializer < V3::CustomFieldSerializer
+          typelize storefront_visible: :boolean
+
+          attributes created_at: :iso8601, updated_at: :iso8601
+
+          attribute :storefront_visible do |metafield|
+            metafield.display_on.in?(%w[both front_end])
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -12,7 +12,8 @@ module Spree
 
           # Admin-only attributes
           attributes :login,
-                     last_sign_in_at: :iso8601, current_sign_in_at: :iso8601
+                     last_sign_in_at: :iso8601, current_sign_in_at: :iso8601,
+                     created_at: :iso8601, updated_at: :iso8601
 
           attribute :sign_in_count do |user|
             user.sign_in_count

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

@@ -3,6 +3,8 @@ module Spree
     module V3
       module Admin
         class DeliveryRateSerializer < V3::DeliveryRateSerializer
+          attributes created_at: :iso8601, updated_at: :iso8601
+
           one :shipping_method, key: :delivery_method, resource: Spree.api.admin_delivery_method_serializer, if: proc { expand?('delivery_method') }
         end
       end

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

@@ -3,6 +3,7 @@ module Spree
     module V3
       module Admin
         class DigitalLinkSerializer < V3::DigitalLinkSerializer
+          attributes created_at: :iso8601, updated_at: :iso8601
         end
       end
     end

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

@@ -3,6 +3,7 @@ module Spree
     module V3
       module Admin
         class DiscountSerializer < V3::DiscountSerializer
+          attributes created_at: :iso8601, updated_at: :iso8601
         end
       end
     end

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

@@ -11,7 +11,8 @@ module Spree
                    pre_tax_amount: :string
 
           attributes :adjustment_total, :additional_tax_total,
-                     :included_tax_total, :promo_total, :pre_tax_amount
+                     :included_tax_total, :promo_total, :pre_tax_amount,
+                     created_at: :iso8601, updated_at: :iso8601
 
           attribute :metadata do |shipment|
             shipment.metadata.presence

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

@@ -10,6 +10,8 @@ module Spree
                    tax_category_id: [:string, nullable: true],
                    order_id: [:string, nullable: true]
 
+          attributes created_at: :iso8601, updated_at: :iso8601
+
           attribute :metadata do |line_item|
             line_item.metadata.presence
           end

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

@@ -5,6 +5,8 @@ module Spree
         class MediaSerializer < V3::MediaSerializer
           typelize viewable_type: :string, viewable_id: :string
 
+          attributes created_at: :iso8601, updated_at: :iso8601
+
           attribute :viewable_id do |asset|
             asset.viewable&.prefixed_id
           end

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

@@ -3,6 +3,8 @@ module Spree
     module V3
       module Admin
         class OptionTypeSerializer < V3::OptionTypeSerializer
+          attributes created_at: :iso8601, updated_at: :iso8601
+
           many :option_values,
                resource: Spree.api.admin_option_value_serializer,
                if: proc { expand?('option_values') }

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

@@ -3,6 +3,8 @@ module Spree
     module V3
       module Admin
         class OptionValueSerializer < V3::OptionValueSerializer
+          attributes created_at: :iso8601, updated_at: :iso8601
+
           one :option_type,
               resource: Spree.api.admin_option_type_serializer,
               if: proc { expand?('option_type') }

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

@@ -6,7 +6,7 @@ module Spree
         # Full order data including admin-only fields
         class OrderSerializer < V3::OrderSerializer
 
-          typelize channel: [:string, nullable: true], last_ip_address: [:string, nullable: true],
+          typelize last_ip_address: [:string, nullable: true],
                    considered_risky: :boolean, confirmation_delivered: :boolean,
                    store_owner_notification_delivered: :boolean,
                    internal_note: [:string, nullable: true], approver_id: [:string, nullable: true],
@@ -17,10 +17,11 @@ module Spree
                    metadata: 'Record<string, unknown> | null'
 
           # Admin-only attributes
-          attributes :channel, :last_ip_address, :considered_risky,
+          attributes :last_ip_address, :considered_risky,
                      :confirmation_delivered, :store_owner_notification_delivered,
                      :internal_note, :payment_total, :display_payment_total,
-                     canceled_at: :iso8601, approved_at: :iso8601
+                     canceled_at: :iso8601, approved_at: :iso8601,
+                     created_at: :iso8601, updated_at: :iso8601
 
           attribute :metadata do |order|
             order.metadata.presence

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

@@ -10,7 +10,8 @@ module Spree
                    cvv_response_code: [:string, nullable: true],
                    cvv_response_message: [:string, nullable: true]
 
-          attributes :avs_response, :cvv_response_code, :cvv_response_message
+          attributes :avs_response, :cvv_response_code, :cvv_response_message,
+                     created_at: :iso8601, updated_at: :iso8601
 
           attribute :metadata do |payment|
             payment.metadata.presence

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

@@ -3,6 +3,7 @@ module Spree
     module V3
       module Admin
         class PaymentSourceSerializer < V3::PaymentSourceSerializer
+          attributes created_at: :iso8601, updated_at: :iso8601
         end
       end
     end

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

@@ -13,7 +13,8 @@ module Spree
                    deleted_at: [:string, nullable: true]
 
           # Admin-only attributes
-          attributes :status, :make_active_at, :discontinue_on, deleted_at: :iso8601
+          attributes :status, :make_active_at, :discontinue_on, deleted_at: :iso8601,
+                     created_at: :iso8601, updated_at: :iso8601
 
           attribute :cost_price do |product|
             product.master&.cost_price
@@ -54,8 +55,9 @@ module Spree
                if: proc { expand?('categories') }
 
           many :metafields,
-               resource: Spree.api.admin_metafield_serializer,
-               if: proc { expand?('metafields') }
+               key: :custom_fields,
+               resource: Spree.api.admin_custom_field_serializer,
+               if: proc { expand?('custom_fields') }
         end
       end
     end

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

@@ -7,6 +7,8 @@ module Spree
                    refund_reason_id: [:string, nullable: true],
                    reimbursement_id: [:string, nullable: true]
 
+          attributes created_at: :iso8601, updated_at: :iso8601
+
           one :payment,
               resource: Spree.api.admin_payment_serializer,
               if: proc { expand?('payment') }

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

@@ -3,6 +3,8 @@ module Spree
     module V3
       module Admin
         class ReimbursementSerializer < V3::ReimbursementSerializer
+          attributes created_at: :iso8601, updated_at: :iso8601
+
           one :order,
               resource: Spree.api.admin_order_serializer,
               if: proc { expand?('order') }

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

@@ -3,6 +3,8 @@ module Spree
     module V3
       module Admin
         class ReturnAuthorizationSerializer < V3::ReturnAuthorizationSerializer
+          attributes created_at: :iso8601, updated_at: :iso8601
+
           one :order,
               resource: Spree.api.admin_order_serializer,
               if: proc { expand?('order') }

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

@@ -3,6 +3,8 @@ module Spree
     module V3
       module Admin
         class StockItemSerializer < V3::StockItemSerializer
+          attributes created_at: :iso8601, updated_at: :iso8601
+
           one :stock_location,
               resource: Spree.api.admin_stock_location_serializer,
               if: proc { expand?('stock_location') }

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

@@ -7,6 +7,8 @@ module Spree
                    created_by_id: [:string, nullable: true],
                    metadata: 'Record<string, unknown> | null'
 
+          attributes created_at: :iso8601, updated_at: :iso8601
+
           attribute :customer_id do |store_credit|
             store_credit.user&.prefixed_id
           end

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

@@ -13,11 +13,8 @@ module Spree
                    deleted_at: [:string, nullable: true]
 
           # Admin-only attributes
-          attributes :position, :tax_category_id, :cost_price, :cost_currency, deleted_at: :iso8601
-
-          attribute :total_on_hand do |variant|
-            variant.total_on_hand
-          end
+          attributes :position, :total_on_hand, :tax_category_id, :cost_price, :cost_currency, deleted_at: :iso8601,
+                     created_at: :iso8601, updated_at: :iso8601
 
           # Override inherited associations to use admin serializers
           one :primary_media,
@@ -37,8 +34,9 @@ module Spree
                if: proc { expand?('prices') }
 
           many :metafields,
-               resource: Spree.api.admin_metafield_serializer,
-               if: proc { expand?('metafields') }
+               key: :custom_fields,
+               resource: Spree.api.admin_custom_field_serializer,
+               if: proc { expand?('custom_fields') }
         end
       end
     end

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

@@ -38,8 +38,7 @@ module Spree
                    :additional_tax_total, :display_additional_tax_total, :total, :display_total,
                    :gift_card_total, :display_gift_card_total,
                    :amount_due, :display_amount_due,
-                   :delivery_total, :display_delivery_total, :warnings,
-                   created_at: :iso8601, updated_at: :iso8601
+                   :delivery_total, :display_delivery_total, :warnings
 
         attribute :store_credit_total do |order|
           order.total_applied_store_credit.to_s

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

@@ -11,8 +11,7 @@ module Spree
 
         attributes :name, :permalink, :position, :depth,
                    :meta_title, :meta_description, :meta_keywords,
-                   :children_count,
-                   created_at: :iso8601, updated_at: :iso8601
+                   :children_count
 
         attribute :parent_id do |category|
           category.parent&.prefixed_id
@@ -62,9 +61,9 @@ module Spree
              if: proc { expand?('ancestors') }
 
         many :public_metafields,
-             key: :metafields,
-             resource: Spree.api.metafield_serializer,
-             if: proc { expand?('metafields') }
+             key: :custom_fields,
+             resource: Spree.api.custom_field_serializer,
+             if: proc { expand?('custom_fields') }
       end
     end
   end

data/app/serializers/spree/api/v3/{metafield_serializer.rb → custom_field_serializer.rb}

@@ -1,9 +1,9 @@
 module Spree
   module Api
     module V3
-      # Store API Metafield Serializer
-      # Customer-facing metafield data (public metafields only)
-      class MetafieldSerializer < BaseSerializer
+      # Store API Custom Field Serializer
+      # Customer-facing custom field data (public metafields only)
+      class CustomFieldSerializer < BaseSerializer
         typelize key: :string, name: :string, type: :string, value: :any
 
         attributes :name, :type

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

@@ -9,8 +9,7 @@ module Spree
                  available_store_credit_total: :string, display_available_store_credit_total: :string,
                  default_billing_address: { nullable: true }, default_shipping_address: { nullable: true }
 
-        attributes :email, :first_name, :last_name, :phone, :accepts_email_marketing,
-                   created_at: :iso8601, updated_at: :iso8601
+        attributes :email, :first_name, :last_name, :phone, :accepts_email_marketing
 
         attribute :available_store_credit_total do |user, params|
           store = params&.dig(:store) || Spree::Current.store

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

@@ -6,8 +6,7 @@ module Spree
                  download_url: :string,
                  authorizable: :boolean, expired: :boolean, access_limit_exceeded: :boolean
 
-        attributes :access_counter, :filename, :content_type,
-                   created_at: :iso8601, updated_at: :iso8601
+        attributes :access_counter, :filename, :content_type
 
         attribute :download_url do |digital_link|
           Spree::Core::Engine.routes.url_helpers.api_v3_store_digital_download_path(token: digital_link.token)

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

@@ -9,8 +9,7 @@ module Spree
                  items: 'Array<{ item_id: string; variant_id: string; quantity: number }>'
 
         attributes :number, :tracking, :tracking_url,
-                   :cost, :display_cost,
-                   created_at: :iso8601, updated_at: :iso8601
+                   :cost, :display_cost
 
         attribute :status do |shipment|
           shipment.state

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

@@ -55,7 +55,6 @@ module Spree
           gift_card.active?
         end
 
-        attributes created_at: :iso8601, updated_at: :iso8601
       end
     end
   end

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

@@ -26,8 +26,7 @@ module Spree
                    :discount_total, :display_discount_total,
                    :pre_tax_amount, :display_pre_tax_amount,
                    :discounted_amount, :display_discounted_amount,
-                   :display_compare_at_amount,
-                   created_at: :iso8601, updated_at: :iso8601
+                   :display_compare_at_amount
 
         # Return compare_at_amount as string, nil if zero
         attribute :compare_at_amount do |line_item|

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

@@ -29,8 +29,7 @@ module Spree
         end
 
         attributes :position, :alt, :media_type,
-                   :focal_point_x, :focal_point_y, :external_video_url,
-                   created_at: :iso8601, updated_at: :iso8601
+                   :focal_point_x, :focal_point_y, :external_video_url
 
         attribute :original_url do |asset|
           image_url_for(asset)

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

@@ -33,7 +33,7 @@ module Spree
                    :gift_card_total, :display_gift_card_total,
                    :amount_due, :display_amount_due,
                    :delivery_total, :display_delivery_total, :fulfillment_status, :payment_status,
-                   completed_at: :iso8601, created_at: :iso8601, updated_at: :iso8601
+                   completed_at: :iso8601
 
         attribute :store_credit_total do |order|
           order.total_applied_store_credit.to_s

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

@@ -12,8 +12,7 @@ module Spree
           payment.payment_method&.prefixed_id
         end
 
-        attributes :response_code, :number, :amount, :display_amount,
-                   created_at: :iso8601, updated_at: :iso8601
+        attributes :response_code, :number, :amount, :display_amount
 
         attribute :status do |payment|
           payment.state

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

@@ -9,7 +9,7 @@ module Spree
 
         attributes :status, :currency, :external_id, :external_data,
                    :customer_external_id,
-                   expires_at: :iso8601, created_at: :iso8601, updated_at: :iso8601
+                   expires_at: :iso8601
 
         attribute :amount do |session|
           session.amount&.to_s

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

@@ -7,8 +7,7 @@ module Spree
                  payment_method_id: [:string, nullable: true], payment_source_id: [:string, nullable: true],
                  payment_source_type: [:string, nullable: true], customer_id: [:string, nullable: true]
 
-        attributes :status, :external_id, :external_client_secret, :external_data,
-                   created_at: :iso8601, updated_at: :iso8601
+        attributes :status, :external_id, :external_client_secret, :external_data
 
         attribute :payment_method_id do |session|
           session.payment_method&.prefixed_id

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

@@ -15,7 +15,6 @@ module Spree
           policy.body&.body&.to_s.to_s
         end
 
-        attributes created_at: :iso8601, updated_at: :iso8601
       end
     end
   end

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

@@ -18,7 +18,7 @@ module Spree
         attributes :name, :slug,
                    :meta_description, :meta_keywords,
                    :variant_count,
-                   available_on: :iso8601, created_at: :iso8601, updated_at: :iso8601
+                   available_on: :iso8601
 
         attribute :purchasable do |product|
           product.purchasable?
@@ -108,9 +108,9 @@ module Spree
              if: proc { expand?('categories') }
 
         many :public_metafields,
-             key: :metafields,
-             resource: Spree.api.metafield_serializer,
-             if: proc { expand?('metafields') }
+             key: :custom_fields,
+             resource: Spree.api.custom_field_serializer,
+             if: proc { expand?('custom_fields') }
 
         typelize prior_price: ['PriceHistory', nullable: true]
 

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

@@ -8,7 +8,7 @@ module Spree
                  payment_id: [:string, nullable: true], refund_reason_id: [:string, nullable: true],
                  reimbursement_id: [:string, nullable: true]
 
-        attributes :transaction_id, created_at: :iso8601, updated_at: :iso8601
+        attributes :transaction_id
 
         attribute :amount do |refund|
           refund.amount&.to_s

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

@@ -8,8 +8,7 @@ module Spree
                  total: [:string, nullable: true],
                  order_id: [:string, nullable: true], customer_return_id: [:string, nullable: true]
 
-        attributes :number, :reimbursement_status,
-                   created_at: :iso8601, updated_at: :iso8601
+        attributes :number, :reimbursement_status
 
         attribute :total do |reimbursement|
           reimbursement.total&.to_s

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

@@ -9,8 +9,7 @@ module Spree
                  currency: [:string, nullable: true],
                  date_from: [:string, nullable: true], date_to: [:string, nullable: true]
 
-        attributes :type, :currency,
-                   created_at: :iso8601, updated_at: :iso8601
+        attributes :type, :currency
 
         attribute :user_id do |report|
           report.user&.prefixed_id

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

@@ -8,7 +8,7 @@ module Spree
                  order_id: [:string, nullable: true], stock_location_id: [:string, nullable: true],
                  return_authorization_reason_id: [:string, nullable: true]
 
-        attributes :number, created_at: :iso8601, updated_at: :iso8601
+        attributes :number
 
         attribute :status do |return_authorization|
           return_authorization.state.to_s

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

@@ -7,8 +7,7 @@ module Spree
         typelize count_on_hand: :number, backorderable: :boolean,
                  stock_location_id: [:string, nullable: true], variant_id: [:string, nullable: true]
 
-        attributes :count_on_hand, :backorderable,
-                   created_at: :iso8601, updated_at: :iso8601
+        attributes :count_on_hand, :backorderable
 
         attribute :stock_location_id do |stock_item|
           stock_item.stock_location&.prefixed_id

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

@@ -16,8 +16,7 @@ module Spree
           variant.product&.prefixed_id
         end
 
-        attributes :sku, :options_text, :track_inventory, :media_count,
-                   created_at: :iso8601, updated_at: :iso8601
+        attributes :sku, :options_text, :track_inventory, :media_count
 
         # Main variant image URL for listings (cached primary_media)
         attribute :thumbnail_url do |variant|
@@ -82,9 +81,9 @@ module Spree
         many :option_values, resource: Spree.api.option_value_serializer
 
         many :public_metafields,
-             key: :metafields,
-             resource: Spree.api.metafield_serializer,
-             if: proc { expand?('metafields') }
+             key: :custom_fields,
+             resource: Spree.api.custom_field_serializer,
+             if: proc { expand?('custom_fields') }
 
         typelize prior_price: ['PriceHistory', nullable: true]
 

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

@@ -12,8 +12,7 @@ module Spree
           wished_item.wishlist&.prefixed_id
         end
 
-        attributes :quantity,
-                   created_at: :iso8601, updated_at: :iso8601
+        attributes :quantity
 
         one :variant, resource: Spree.api.variant_serializer
       end

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

@@ -4,8 +4,7 @@ module Spree
       class WishlistSerializer < BaseSerializer
         typelize name: :string, token: :string, is_default: :boolean, is_private: :boolean
 
-        attributes :name, :token,
-                   created_at: :iso8601, updated_at: :iso8601
+        attributes :name, :token
 
         attribute :is_default do |wishlist|
           wishlist.is_default?

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

@@ -2,13 +2,17 @@ module Spree
   module Api
     module V3
       class FiltersAggregator
-        # @param scope [ActiveRecord::Relation] Base product scope (already filtered by store, availability, category, etc.)
+        # @param scope [ActiveRecord::Relation] Base product scope (fully filtered, including option values)
         # @param currency [String] Currency for price range
         # @param category [Spree::Category, nil] Optional category for default_sort and category filtering context
-        def initialize(scope:, currency:, category: nil)
+        # @param option_value_ids [Array<String>] Currently selected option value prefixed IDs (for disjunctive facet counts)
+        # @param scope_before_options [ActiveRecord::Relation] Scope before option value filters (for disjunctive counts)
+        def initialize(scope:, currency:, category: nil, option_value_ids: [], scope_before_options: nil)
           @scope = scope
           @currency = currency
           @category = category
+          @option_value_ids = option_value_ids
+          @scope_before_options = scope_before_options || scope
         end
 
         def call
@@ -78,25 +82,26 @@ module Spree
 
         def option_type_filters
           Spree::OptionType.filterable.includes(:option_values).order(:position).filter_map do |option_type|
-            values = option_type.option_values.for_products(@scope).distinct.order(:position)
+            # Disjunctive: count against scope WITHOUT this option type's filter
+            count_scope = disjunctive_scope_for(option_type)
+            values = option_type.option_values.for_products(count_scope).distinct.order(:position)
             next if values.empty?
 
+            count_ids = count_scope.reorder('').distinct.pluck(:id)
+
             {
               id: option_type.prefixed_id,
               type: 'option',
               name: option_type.name,
               label: option_type.label,
-              options: values.map { |ov| option_value_data(option_type, ov) }
+              options: values.map { |ov| option_value_data(count_ids, ov) }
             }
           end
         end
 
-        def option_value_data(option_type, option_value)
-          # Count products in scope that have this option value
-          # We use a subquery approach to avoid GROUP BY conflicts when scope includes joins (like in_category)
-          # Join directly to option_value_variants for efficiency (skips joining through option_values table)
+        def option_value_data(product_ids, option_value)
           count = Spree::Product
-            .where(id: base_scope_product_ids)
+            .where(id: product_ids)
             .joins(:option_value_variants)
             .where(Spree::OptionValueVariant.table_name => { option_value_id: option_value.id })
             .distinct
@@ -111,8 +116,38 @@ module Spree
           }
         end
 
-        def base_scope_product_ids
-          @base_scope_product_ids ||= @scope.reorder('').distinct.pluck(:id)
+        # Returns the scope with all option type filters EXCEPT the given one applied.
+        # This gives disjunctive counts: selecting Blue still shows Red's true count.
+        def disjunctive_scope_for(option_type)
+          return @scope_before_options if grouped_selected_options.empty?
+
+          other_groups = grouped_selected_options.except(option_type.id)
+
+          # If this type has selections but no other types do, use scope before any option filters
+          return @scope_before_options if other_groups.empty?
+
+          # Rebuild: start from scope before options, apply only other option types
+          scope = @scope_before_options
+          other_groups.each_value do |ov_ids|
+            matching = Spree::Variant.where(deleted_at: nil)
+                                     .joins(:option_value_variants)
+                                     .where(Spree::OptionValueVariant.table_name => { option_value_id: ov_ids })
+                                     .select(:product_id)
+            scope = scope.where(id: matching)
+          end
+          scope
+        end
+
+        # Group selected option value IDs by option type (cached, single query)
+        def grouped_selected_options
+          @grouped_selected_options ||= begin
+            return {} if @option_value_ids.blank?
+
+            decoded = @option_value_ids.filter_map { |id| Spree::OptionValue.decode_prefixed_id(id) }
+            return {} if decoded.empty?
+
+            Spree::OptionValue.where(id: decoded).group_by(&:option_type_id).transform_values { |ovs| ovs.map(&:id) }
+          end
         end
 
         def category_filter

data/app/services/spree/webhooks/deliver_webhook.rb

@@ -49,22 +49,31 @@ module Spree
       private
 
       def make_request
-        SsrfFilter.post(
-          @delivery.url,
-          headers: {
-            'Content-Type' => 'application/json',
-            'User-Agent' => 'Spree-Webhooks/1.0',
-            'X-Spree-Webhook-Signature' => generate_signature,
-            'X-Spree-Webhook-Timestamp' => webhook_timestamp.to_s,
-            'X-Spree-Webhook-Event' => @delivery.event_name
-          },
-          body: @delivery.payload.to_json,
-          http_options: {
-            open_timeout: TIMEOUT,
-            read_timeout: TIMEOUT,
-            verify_mode: ssl_verify_mode
-          }
-        )
+        headers = {
+          'Content-Type' => 'application/json',
+          'User-Agent' => 'Spree-Webhooks/1.0',
+          'X-Spree-Webhook-Signature' => generate_signature,
+          'X-Spree-Webhook-Timestamp' => webhook_timestamp.to_s,
+          'X-Spree-Webhook-Event' => @delivery.event_name
+        }
+        body = @delivery.payload.to_json
+        http_options = { open_timeout: TIMEOUT, read_timeout: TIMEOUT, verify_mode: ssl_verify_mode }
+
+        # SSRF protection is disabled in development so webhooks can reach
+        # localhost / host.docker.internal (the storefront running on the host).
+        if Rails.env.development?
+          uri = URI.parse(@delivery.url)
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = uri.scheme == 'https'
+          http_options.each { |k, v| http.send(:"#{k}=", v) }
+
+          request = Net::HTTP::Post.new(uri.request_uri)
+          headers.each { |k, v| request[k] = v }
+          request.body = body
+          http.request(request)
+        else
+          SsrfFilter.post(@delivery.url, headers: headers, body: body, http_options: http_options)
+        end
       end
 
       def generate_signature

data/app/subscribers/spree/webhook_event_subscriber.rb

@@ -21,13 +21,15 @@ module Spree
       return unless Spree::Api::Config.webhooks_enabled
       return if event.store_id.blank?
 
-      # Find all active endpoints for this store subscribed to this event
-      endpoints = Spree::WebhookEndpoint.active.where(store_id: event.store_id).select { |endpoint| endpoint.subscribed_to?(event.name) }
+      # Only load the columns we need for matching and delivery
+      endpoints = Spree::WebhookEndpoint
+        .enabled
+        .where(store_id: event.store_id)
+        .select(:id, :subscriptions)
 
-      return if endpoints.empty?
-
-      # Queue delivery for each endpoint
       endpoints.each do |endpoint|
+        next unless endpoint.subscribed_to?(event.name)
+
         queue_delivery(endpoint, event)
       end
     rescue StandardError => e
@@ -38,17 +40,25 @@ module Spree
     private
 
     def queue_delivery(endpoint, event)
-      # Build base payload (without delivery ID)
       payload = build_payload(event)
 
-      # Create delivery record
+      # Deduplicate: skip if we already have a delivery for this event + endpoint
+      if event.id.present?
+        return if Spree::WebhookDelivery.exists?(
+          webhook_endpoint_id: endpoint.id,
+          event_id: event.id
+        )
+      end
+
       delivery = endpoint.webhook_deliveries.create!(
         event_name: event.name,
+        event_id: event.id,
         payload: payload
       )
 
-      # Queue the delivery job
       Spree::WebhookDeliveryJob.perform_later(delivery.id)
+    rescue ActiveRecord::RecordNotUnique
+      # Race condition: another thread already created this delivery — safe to ignore
     rescue StandardError => e
       Rails.logger.error "[Spree Webhooks] Error queuing delivery for endpoint #{endpoint.id}: #{e.message}"
       Rails.error.report(e)

data/config/routes.rb

@@ -27,9 +27,7 @@ Spree::Core::Engine.add_routes do
             get :filters, to: 'products/filters#index'
           end
         end
-        resources :categories, only: [:index, :show], id: /.+/ do
-          resources :products, only: [:index], controller: 'categories/products'
-        end
+        resources :categories, only: [:index, :show], id: /.+/
 
         # Carts
         resources :carts, only: [:index, :show, :create, :update, :destroy] do
@@ -88,6 +86,8 @@ Spree::Core::Engine.add_routes do
         # Access via token in URL
         get 'digitals/:token', to: 'digitals#show', as: :digital_download
 
+        # Data Feeds (public, no auth required)
+        resources :feeds, only: [:show], controller: 'data_feeds', param: :slug
       end
 
       # Webhooks (outside of store namespace — no API key authentication)

data/lib/spree/api/dependencies.rb

@@ -131,7 +131,7 @@ module Spree
         currency_serializer: 'Spree::Api::V3::CurrencySerializer',
         locale_serializer: 'Spree::Api::V3::LocaleSerializer',
         policy_serializer: 'Spree::Api::V3::PolicySerializer',
-        metafield_serializer: 'Spree::Api::V3::MetafieldSerializer',
+        custom_field_serializer: 'Spree::Api::V3::CustomFieldSerializer',
         shipping_category_serializer: 'Spree::Api::V3::ShippingCategorySerializer',
         tax_category_serializer: 'Spree::Api::V3::TaxCategorySerializer',
 
@@ -163,7 +163,7 @@ module Spree
         admin_variant_serializer: 'Spree::Api::V3::Admin::VariantSerializer',
         admin_price_serializer: 'Spree::Api::V3::Admin::PriceSerializer',
         admin_price_history_serializer: 'Spree::Api::V3::Admin::PriceHistorySerializer',
-        admin_metafield_serializer: 'Spree::Api::V3::Admin::MetafieldSerializer',
+        admin_custom_field_serializer: 'Spree::Api::V3::Admin::CustomFieldSerializer',
         admin_category_serializer: 'Spree::Api::V3::Admin::CategorySerializer',
         admin_line_item_serializer: 'Spree::Api::V3::Admin::LineItemSerializer',
         admin_option_type_serializer: 'Spree::Api::V3::Admin::OptionTypeSerializer',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 5.4.0.rc3
+  version: 5.4.0.rc4.1
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-25 00:00:00.000000000 Z
+date: 2026-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rswag-specs
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.0.rc3
+        version: 5.4.0.rc4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.0.rc3
+        version: 5.4.0.rc4.1
 description: Spree's API
 email:
 - hello@spreecommerce.org
@@ -129,7 +129,6 @@ files:
 - app/controllers/spree/api/v3/store/carts/payments_controller.rb
 - app/controllers/spree/api/v3/store/carts/store_credits_controller.rb
 - app/controllers/spree/api/v3/store/carts_controller.rb
-- app/controllers/spree/api/v3/store/categories/products_controller.rb
 - app/controllers/spree/api/v3/store/categories_controller.rb
 - app/controllers/spree/api/v3/store/countries_controller.rb
 - app/controllers/spree/api/v3/store/currencies_controller.rb
@@ -141,6 +140,7 @@ files:
 - app/controllers/spree/api/v3/store/customer/payment_setup_sessions_controller.rb
 - app/controllers/spree/api/v3/store/customer/store_credits_controller.rb
 - app/controllers/spree/api/v3/store/customers_controller.rb
+- app/controllers/spree/api/v3/store/data_feeds_controller.rb
 - app/controllers/spree/api/v3/store/digitals_controller.rb
 - app/controllers/spree/api/v3/store/locales_controller.rb
 - app/controllers/spree/api/v3/store/markets/countries_controller.rb
@@ -163,6 +163,7 @@ files:
 - app/serializers/spree/api/v3/admin/asset_serializer.rb
 - app/serializers/spree/api/v3/admin/category_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
 - app/serializers/spree/api/v3/admin/delivery_method_serializer.rb
 - app/serializers/spree/api/v3/admin/delivery_rate_serializer.rb
@@ -172,7 +173,6 @@ files:
 - 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/media_serializer.rb
-- app/serializers/spree/api/v3/admin/metafield_serializer.rb
 - app/serializers/spree/api/v3/admin/option_type_serializer.rb
 - app/serializers/spree/api/v3/admin/option_value_serializer.rb
 - app/serializers/spree/api/v3/admin/order_serializer.rb
@@ -198,6 +198,7 @@ files:
 - app/serializers/spree/api/v3/country_serializer.rb
 - app/serializers/spree/api/v3/credit_card_serializer.rb
 - app/serializers/spree/api/v3/currency_serializer.rb
+- app/serializers/spree/api/v3/custom_field_serializer.rb
 - app/serializers/spree/api/v3/customer_return_serializer.rb
 - app/serializers/spree/api/v3/customer_serializer.rb
 - app/serializers/spree/api/v3/delivery_method_serializer.rb
@@ -216,7 +217,6 @@ files:
 - app/serializers/spree/api/v3/locale_serializer.rb
 - app/serializers/spree/api/v3/market_serializer.rb
 - app/serializers/spree/api/v3/media_serializer.rb
-- app/serializers/spree/api/v3/metafield_serializer.rb
 - app/serializers/spree/api/v3/newsletter_subscriber_serializer.rb
 - app/serializers/spree/api/v3/option_type_serializer.rb
 - app/serializers/spree/api/v3/option_value_serializer.rb
@@ -274,9 +274,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.rc3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.rc4.1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc3
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc4.1
 post_install_message:
 rdoc_options: []
 require_paths:

data/app/controllers/spree/api/v3/store/categories/products_controller.rb

@@ -1,37 +0,0 @@
-module Spree
-  module Api
-    module V3
-      module Store
-        module Categories
-          class ProductsController < Store::ProductsController
-            before_action :set_category
-
-            protected
-
-            def set_category
-              @category = find_category
-            end
-
-            def scope
-              super.in_category(@category)
-            end
-
-            private
-
-            def find_category
-              id = params[:category_id]
-              category_scope = Spree::Category.for_store(current_store).accessible_by(current_ability, :show)
-              category_scope = category_scope.i18n if Spree::Category.include?(Spree::TranslatableResource)
-
-              if id.to_s.start_with?('ctg_')
-                category_scope.find_by_prefix_id!(id)
-              else
-                find_with_fallback_default_locale { category_scope.i18n.find_by!(permalink: id) }
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-module Spree
-  module Api
-    module V3
-      module Admin
-        # Admin API Metafield Serializer
-        # Full metafield data including admin-only fields
-        class MetafieldSerializer < V3::MetafieldSerializer
-          typelize display_on: :string
-
-          attributes :display_on
-        end
-      end
-    end
-  end
-end