spree_api 5.4.0.rc1 → 5.4.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4378e0d0d201591ada81caa1958a92ca6aa55d8e2ff79d8b90b58016ff1b834b
-  data.tar.gz: 32fddc14b53ae38f7c80192be53a456e84b4862f58ddc3492a499ccbf2e67d53
+  metadata.gz: 314545a7037d2f446a6d764b8d130a6ba14c89cfdb82c380132595f74aa62435
+  data.tar.gz: 5976dd28153ffc543f658ca56fab3a2d97cefb162ec25481e192deb599743939
 SHA512:
-  metadata.gz: 8f597f0fcb3d074cb90593a0feb619220642e13dbeefc994839b208f7639eabd0273e5b4a8223e8c4aa6ebbe9bd05add4559a9c6aac0de50cd837ee56060dcec
-  data.tar.gz: 03e32f252a79ec570e5d91fc5ed4113367b6892c384c7bc49eb0772b3f00c899d2007fc3be6424676cdbab7522b00f6db550425c9c68e932b761f582061bda14
+  metadata.gz: 6856dc5fbe6411874444f3bc9ea16b4047ab11470d85b625daca9e054bc6289a37ac023a1fa899a6e9199aebfe1e6a2b1b4f3716611d34bc80ad829e0c57cf04
+  data.tar.gz: ab453e9b05648c4ce61feca5febcaf815d898b17f098696b27dff28d006d015130987d9d8233532b5b74d4fb5c31f6e3f7d12ca4fac10d6ac070bfbb5a4f384b

data/app/controllers/concerns/spree/api/v3/cart_resolvable.rb

@@ -26,7 +26,8 @@ module Spree
 
         # Render the cart as JSON using the cart serializer.
         def render_cart(status: :ok)
-          render json: Spree.api.cart_serializer.new(@cart.reload, params: serializer_params).to_h, status: status
+          @cart = @cart.remove_out_of_stock_items!
+          render json: Spree.api.cart_serializer.new(@cart, params: serializer_params).to_h, status: status
         end
 
         # Render the order as JSON using the order serializer (for complete action).

data/app/controllers/concerns/spree/api/v3/error_handler.rb

@@ -48,6 +48,11 @@ module Spree
           payment_processing_error: 'payment_processing_error',
           gateway_error: 'gateway_error',
 
+          # Gift card errors
+          gift_card_not_found: 'gift_card_not_found',
+          gift_card_expired: 'gift_card_expired',
+          gift_card_already_redeemed: 'gift_card_already_redeemed',
+
           # Digital download errors
           attachment_missing: 'attachment_missing',
           download_unauthorized: 'download_unauthorized',

data/app/controllers/spree/api/v3/base_controller.rb

@@ -2,6 +2,9 @@ module Spree
   module Api
     module V3
       class BaseController < ActionController::API
+        # API v3 uses flat params — disable Rails' automatic parameter wrapping
+        wrap_parameters false
+
         include ActiveStorage::SetCurrent
         include CanCan::ControllerAdditions
         include Spree::Core::ControllerHelpers::StrongParameters

data/app/controllers/spree/api/v3/store/carts/{coupon_codes_controller.rb → discount_codes_controller.rb}

@@ -3,14 +3,14 @@ module Spree
     module V3
       module Store
         module Carts
-          class CouponCodesController < Store::BaseController
+          class DiscountCodesController < Store::BaseController
             include Spree::Api::V3::CartResolvable
             include Spree::Api::V3::OrderLock
 
             before_action :find_cart!
 
-            # POST  /api/v3/store/carts/:cart_id/coupon_codes
-            # Apply a coupon code to the cart
+            # POST  /api/v3/store/carts/:cart_id/discount_codes
+            # Apply a discount code to the cart
             def create
               with_order_lock do
                 @cart.coupon_code = permitted_params[:code]
@@ -25,9 +25,9 @@ module Spree
               end
             end
 
-            # DELETE  /api/v3/store/carts/:cart_id/coupon_codes/:id
-            # Remove a coupon code from the cart
-            # :id is the coupon code string (e.g., SAVE10)
+            # DELETE  /api/v3/store/carts/:cart_id/discount_codes/:id
+            # Remove a discount code from the cart
+            # :id is the discount code string (e.g., SAVE10)
             def destroy
               with_order_lock do
                 coupon_handler.remove(params[:id])
@@ -43,7 +43,7 @@ module Spree
             private
 
             def coupon_handler
-              @coupon_handler ||= Spree.coupon_handler.new(@cart)
+              @coupon_handler ||= Spree.coupon_handler.new(@cart, enable_gift_cards: false)
             end
 
             def permitted_params

data/app/controllers/spree/api/v3/store/carts/gift_cards_controller.rb

@@ -0,0 +1,72 @@
+module Spree
+  module Api
+    module V3
+      module Store
+        module Carts
+          class GiftCardsController < Store::BaseController
+            include Spree::Api::V3::CartResolvable
+            include Spree::Api::V3::OrderLock
+
+            before_action :find_cart!
+
+            # POST /api/v3/store/carts/:cart_id/gift_cards
+            def create
+              with_order_lock do
+                gift_card = find_gift_card!
+                return unless gift_card
+
+                result = @cart.apply_gift_card(gift_card)
+
+                if result.success?
+                  render_cart(status: :created)
+                else
+                  render_service_error(result.error)
+                end
+              end
+            end
+
+            # DELETE /api/v3/store/carts/:cart_id/gift_cards/:id
+            def destroy
+              with_order_lock do
+                result = @cart.remove_gift_card
+
+                if result.success?
+                  render_cart
+                else
+                  render_service_error(result.error)
+                end
+              end
+            end
+
+            private
+
+            def find_gift_card!
+              gift_card = @cart.store.gift_cards.find_by(code: permitted_params[:code]&.downcase)
+
+              if gift_card.nil?
+                render_error(code: ERROR_CODES[:gift_card_not_found], message: Spree.t(:gift_card_not_found), status: :not_found)
+                return
+              end
+
+              if gift_card.expired?
+                render_error(code: ERROR_CODES[:gift_card_expired], message: Spree.t(:gift_card_expired), status: :unprocessable_content)
+                return
+              end
+
+              if gift_card.redeemed?
+                render_error(code: ERROR_CODES[:gift_card_already_redeemed], message: Spree.t(:gift_card_already_redeemed), status: :unprocessable_content)
+                return
+              end
+
+              gift_card
+            end
+
+            def permitted_params
+              params.permit(:code)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v3/store/carts/payments_controller.rb

@@ -3,9 +3,11 @@ module Spree
     module V3
       module Store
         module Carts
-          class PaymentsController < Store::ResourceController
+          class PaymentsController < Store::BaseController
             include Spree::Api::V3::CartResolvable
 
+            before_action :find_cart!
+
             # POST /api/v3/store/carts/:cart_id/payments
             # Creates a payment for non-session payment methods (e.g. Check, Cash on Delivery, Bank Transfer)
             def create
@@ -19,7 +21,7 @@ module Spree
                 )
               end
 
-              unless payment_method.available_for_order?(@parent)
+              unless payment_method.available_for_order?(@cart)
                 return render_error(
                   code: 'payment_method_unavailable',
                   message: Spree.t('api.v3.payments.method_unavailable'),
@@ -27,43 +29,20 @@ module Spree
                 )
               end
 
-              amount = params[:amount].presence || @parent.total_minus_store_credits
+              amount = params[:amount].presence || @cart.total_minus_store_credits
 
-              @payment = @parent.payments.build(
+              @payment = @cart.payments.build(
                 payment_method: payment_method,
                 amount: amount,
                 metadata: params[:metadata].present? ? params[:metadata].to_unsafe_h : {}
               )
 
               if @payment.save
-                render json: serialize_resource(@payment), status: :created
+                render json: Spree.api.payment_serializer.new(@payment, params: serializer_params).to_h, status: :created
               else
                 render_errors(@payment.errors)
               end
             end
-
-            protected
-
-            def set_parent
-              find_cart!
-              @parent = @cart
-            end
-
-            def parent_association
-              :payments
-            end
-
-            def model_class
-              Spree::Payment
-            end
-
-            def serializer_class
-              Spree.api.payment_serializer
-            end
-
-            # Authorization is handled by find_cart! in set_parent
-            def authorize_resource!(*)
-            end
           end
         end
       end

data/app/controllers/spree/api/v3/store/customer/addresses_controller.rb

@@ -5,9 +5,9 @@ module Spree
         module Customer
           class AddressesController < ResourceController
             prepend_before_action :require_authentication!
-            before_action :set_resource, only: [:show, :update, :destroy, :mark_as_default]
+            before_action :set_resource, only: [:show, :update, :destroy]
 
-            # POST /api/v3/store/customer/addresses
+            # POST /api/v3/store/customers/me/addresses
             def create
               result = Spree.address_create_service.call(
                 address_params: permitted_params,
@@ -21,25 +21,7 @@ module Spree
               end
             end
 
-            # PATCH /api/v3/store/customer/addresses/:id/mark_as_default
-            def mark_as_default
-              kind = params[:kind].to_s
-
-              unless %w[billing shipping].include?(kind)
-                return render_error(
-                  code: ERROR_CODES[:invalid_request],
-                  message: 'kind must be billing or shipping',
-                  status: :unprocessable_content
-                )
-              end
-
-              attribute = kind == 'billing' ? :bill_address_id : :ship_address_id
-              current_user.update!(attribute => @resource.id)
-
-              render json: serialize_resource(@resource.reload)
-            end
-
-            # PATCH /api/v3/store/customer/addresses/:id
+            # PATCH /api/v3/store/customers/me/addresses/:id
             def update
               result = Spree.address_update_service.call(
                 address: @resource,
@@ -74,7 +56,8 @@ module Spree
             def permitted_params
               params.permit(
                 :first_name, :last_name, :address1, :address2, :city,
-                :postal_code, :phone, :company, :country_iso, :state_abbr, :state_name
+                :postal_code, :phone, :company, :country_iso, :state_abbr, :state_name,
+                :is_default_billing, :is_default_shipping
               )
             end
           end

data/app/controllers/spree/api/v3/store/customer/password_resets_controller.rb

@@ -13,7 +13,7 @@ module Spree
 
             skip_before_action :authenticate_user
 
-            # POST /api/v3/store/customer/password_resets
+            # POST /api/v3/store/password_resets
             def create
               redirect_url = params[:redirect_url]
 
@@ -41,7 +41,7 @@ module Spree
               render json: { message: Spree.t(:password_reset_requested, scope: :api) }, status: :accepted
             end
 
-            # PATCH /api/v3/store/customer/password_resets/:id
+            # PATCH /api/v3/store/password_resets/:id
             def update
               user = Spree.user_class.find_by_password_reset_token(params[:id])
 

data/app/controllers/spree/api/v3/store/customer/store_credits_controller.rb

@@ -0,0 +1,39 @@
+module Spree
+  module Api
+    module V3
+      module Store
+        module Customer
+          class StoreCreditsController < ResourceController
+            prepend_before_action :require_authentication!
+
+            protected
+
+            def set_parent
+              @parent = current_user
+            end
+
+            def parent_association
+              :store_credits
+            end
+
+            def scope
+              super.for_store(current_store).where(currency: current_currency)
+            end
+
+            def model_class
+              Spree::StoreCredit
+            end
+
+            def serializer_class
+              Spree.api.store_credit_serializer
+            end
+
+            # Authorization is handled by set_parent scoping to current_user
+            def authorize_resource!(*)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module Spree
+  module Api
+    module V3
+      module Store
+        class PoliciesController < Store::ResourceController
+          include Spree::Api::V3::HttpCaching
+
+          protected
+
+          def model_class
+            Spree::Policy
+          end
+
+          def serializer_class
+            Spree.api.policy_serializer
+          end
+
+          # Accept slug (e.g., return-policy) or prefixed ID (e.g., pol_abc123)
+          def find_resource
+            if params[:id].to_s.start_with?('pol_')
+              scope.find_by_prefix_id!(params[:id])
+            else
+              scope.friendly.find(params[:id])
+            end
+          end
+
+          def scope
+            super.order(:name)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,11 +7,11 @@ module Spree
                  city: [:string, nullable: true], postal_code: [:string, nullable: true], phone: [:string, nullable: true],
                  company: [:string, nullable: true], state_abbr: [:string, nullable: true], state_name: [:string, nullable: true],
                  state_text: [:string, nullable: true], country_iso: :string, country_name: :string,
-                 quick_checkout: :boolean
+                 quick_checkout: :boolean, is_default_billing: :boolean, is_default_shipping: :boolean
 
         attributes :first_name, :last_name, :full_name, :address1, :address2, :postal_code,
                    :city, :phone, :company, :country_name, :country_iso, :state_text,
-                   :state_abbr, :quick_checkout
+                   :state_abbr, :quick_checkout, :is_default_billing, :is_default_shipping
 
         # State name - used for countries without predefined states
         attribute :state_name do |address|

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

@@ -0,0 +1,17 @@
+module Spree
+  module Api
+    module V3
+      module Admin
+        class GiftCardSerializer < V3::GiftCardSerializer
+          typelize metadata: 'Record<string, unknown> | null'
+
+          attribute :metadata do |gift_card|
+            gift_card.metadata.presence
+          end
+
+          attributes created_at: :iso8601, updated_at: :iso8601
+        end
+      end
+    end
+  end
+end

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

@@ -50,6 +50,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
 
           many :payment_methods, resource: Spree.api.admin_payment_method_serializer, if: proc { expand?('payment_methods') }
 

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Spree
+  module Api
+    module V3
+      module Admin
+        class PriceHistorySerializer < V3::PriceHistorySerializer
+          typelize variant_id: :string,
+                   price_id: :string,
+                   compare_at_amount: [:string, nullable: true],
+                   created_at: :string
+
+          attribute :variant_id do |price_history|
+            price_history.variant.prefixed_id
+          end
+
+          attribute :price_id do |price_history|
+            price_history.price.prefixed_id
+          end
+
+          attributes :compare_at_amount, created_at: :iso8601
+        end
+      end
+    end
+  end
+end

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

@@ -14,9 +14,15 @@ module Spree
                  tax_total: :string, display_tax_total: :string,
                  included_tax_total: :string, display_included_tax_total: :string,
                  additional_tax_total: :string, display_additional_tax_total: :string,
+                 store_credit_total: :string, display_store_credit_total: :string,
+                 gift_card_total: :string, display_gift_card_total: :string,
+                 covered_by_store_credit: :boolean,
                  total: :string, display_total: :string,
+                 amount_due: :string, display_amount_due: :string,
                  shipping_eq_billing_address: :boolean,
-                 billing_address: { nullable: true }, shipping_address: { nullable: true }
+                 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 }
 
         # Override ID to use cart_ prefix
         attribute :id do |order|
@@ -30,9 +36,23 @@ module Spree
                    :discount_total, :display_discount_total,
                    :tax_total, :display_tax_total, :included_tax_total, :display_included_tax_total,
                    :additional_tax_total, :display_additional_tax_total, :total, :display_total,
-                   :delivery_total, :display_delivery_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
 
+        attribute :store_credit_total do |order|
+          order.total_applied_store_credit.to_s
+        end
+
+        attribute :display_store_credit_total do |order|
+          order.display_total_applied_store_credit.to_s
+        end
+
+        attribute :covered_by_store_credit do |order|
+          order.covered_by_store_credit?
+        end
+
         attribute :current_step do |order|
           order.current_checkout_step
         end
@@ -57,6 +77,7 @@ module Spree
         one :shipping_address, resource: Spree.api.address_serializer
 
         many :payment_methods, resource: Spree.api.payment_method_serializer
+        one :gift_card, resource: Spree.api.gift_card_serializer
       end
     end
   end

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

@@ -6,11 +6,24 @@ module Spree
       class CustomerSerializer < BaseSerializer
         typelize email: :string, first_name: [:string, nullable: true], last_name: [:string, nullable: true],
                  phone: [:string, nullable: true], accepts_email_marketing: :boolean,
+                 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
 
+        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
+        end
+
+        attribute :display_available_store_credit_total do |user, params|
+          store = params&.dig(:store) || Spree::Current.store
+          currency = params&.dig(:currency) || Spree::Current.currency || store&.default_currency
+          Spree::Money.new(user.total_available_store_credit(currency, store), currency: currency).to_s
+        end
+
         many :addresses, resource: Spree.api.address_serializer
         one :bill_address, key: :default_billing_address, resource: Spree.api.address_serializer
         one :ship_address, key: :default_shipping_address, resource: Spree.api.address_serializer

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

@@ -14,8 +14,14 @@ module Spree
                  tax_total: :string, display_tax_total: :string,
                  included_tax_total: :string, display_included_tax_total: :string,
                  additional_tax_total: :string, display_additional_tax_total: :string,
-                 total: :string, display_total: :string, completed_at: [:string, nullable: true],
-                 billing_address: { nullable: true }, shipping_address: { nullable: true }
+                 store_credit_total: :string, display_store_credit_total: :string,
+                 gift_card_total: :string, display_gift_card_total: :string,
+                 covered_by_store_credit: :boolean,
+                 total: :string, display_total: :string,
+                 amount_due: :string, display_amount_due: :string,
+                 completed_at: [:string, nullable: true],
+                 billing_address: { nullable: true }, shipping_address: { nullable: true },
+                 gift_card: { nullable: true }
 
         attributes :number, :email, :customer_note,
                    :currency, :locale, :total_quantity,
@@ -24,15 +30,30 @@ module Spree
                    :discount_total, :display_discount_total,
                    :tax_total, :display_tax_total, :included_tax_total, :display_included_tax_total,
                    :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, :fulfillment_status, :payment_status,
                    completed_at: :iso8601, created_at: :iso8601, updated_at: :iso8601
 
+        attribute :store_credit_total do |order|
+          order.total_applied_store_credit.to_s
+        end
+
+        attribute :display_store_credit_total do |order|
+          order.display_total_applied_store_credit.to_s
+        end
+
+        attribute :covered_by_store_credit do |order|
+          order.covered_by_store_credit?
+        end
+
         many :discounts, resource: Spree.api.discount_serializer
         many :line_items, key: :items, resource: Spree.api.line_item_serializer
         many :fulfillments, resource: Spree.api.fulfillment_serializer
         many :payments, resource: Spree.api.payment_serializer
         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
       end
     end
   end

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

@@ -0,0 +1,22 @@
+module Spree
+  module Api
+    module V3
+      class PolicySerializer < BaseSerializer
+        typelize name: :string, slug: :string,
+                 body: [:string, nullable: true], body_html: [:string, nullable: true]
+
+        attributes :name, :slug
+
+        attribute :body do |policy|
+          policy.body&.to_plain_text
+        end
+
+        attribute :body_html do |policy|
+          policy.body&.body&.to_s.to_s
+        end
+
+        attributes created_at: :iso8601, updated_at: :iso8601
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Spree
+  module Api
+    module V3
+      class PriceHistorySerializer < BaseSerializer
+        typelize amount: :string,
+                 amount_in_cents: :number,
+                 display_amount: :string,
+                 currency: :string,
+                 recorded_at: :string
+
+        attributes :amount, :amount_in_cents, :currency
+
+        attribute :display_amount do |price_history|
+          price_history.display_amount
+        end
+
+        attribute :recorded_at do |price_history|
+          price_history.recorded_at&.iso8601
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Spree
       # Store API Product Serializer
       # Customer-facing product data with limited fields
       class ProductSerializer < BaseSerializer
-        typelize name: :string, description: [:string, nullable: true], slug: :string,
+        typelize name: :string, description: [:string, nullable: true], description_html: [:string, nullable: true], slug: :string,
                  meta_description: [:string, nullable: true], meta_keywords: [:string, nullable: true],
                  variant_count: :number,
                  default_variant_id: :string,
@@ -15,7 +15,7 @@ module Spree
                  original_price: ['Price', nullable: true],
                  tags: [:string, multi: true]
 
-        attributes :name, :description, :slug,
+        attributes :name, :slug,
                    :meta_description, :meta_keywords,
                    :variant_count,
                    available_on: :iso8601, created_at: :iso8601, updated_at: :iso8601
@@ -36,6 +36,16 @@ module Spree
           product.available?
         end
 
+        attribute :description do |product|
+          next if product.description.blank?
+
+          Nokogiri::HTML.fragment(product.description).text.squish
+        end
+
+        attribute :description_html do |product|
+          product.description
+        end
+
         attribute :default_variant_id do |product|
           product.default_variant&.prefixed_id
         end
@@ -101,6 +111,14 @@ module Spree
              key: :metafields,
              resource: Spree.api.metafield_serializer,
              if: proc { expand?('metafields') }
+
+        typelize prior_price: ['PriceHistory', nullable: true]
+
+        attribute :prior_price,
+                  if: proc { expand?('prior_price') } do |product|
+          record = price_in(product.default_variant)&.prior_price
+          Spree.api.price_history_serializer.new(record, params: params).to_h if record
+        end
       end
     end
   end

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

@@ -85,6 +85,14 @@ module Spree
              key: :metafields,
              resource: Spree.api.metafield_serializer,
              if: proc { expand?('metafields') }
+
+        typelize prior_price: ['PriceHistory', nullable: true]
+
+        attribute :prior_price,
+                  if: proc { expand?('prior_price') } do |variant|
+          record = price_in(variant)&.prior_price
+          Spree.api.price_history_serializer.new(record, params: params).to_h if record
+        end
       end
     end
   end

data/config/locales/en.yml

@@ -2,24 +2,24 @@
 en:
   spree:
     api:
+      current_password_invalid: Current password is invalid or missing
       gateway_error: 'There was a problem with the payment gateway: %{text}'
       invalid_api_key: Invalid API key (%{key}) specified.
       invalid_resource: Invalid resource. Please fix errors and try again.
       invalid_taxonomy_id: Invalid taxonomy id.
-      current_password_invalid: Current password is invalid or missing
-      password_reset_requested: If an account exists for that email, password reset instructions have been sent.
-      password_reset_token_invalid: Password reset token is invalid or has expired.
-      redirect_url_not_allowed: The redirect URL is not from an allowed origin for this store.
       must_specify_api_key: You must specify an API key.
       negative_quantity: quantity is negative
       order:
         could_not_transition: The order could not be transitioned. Please fix the errors and try again.
         insufficient_quantity: An item in your cart has become unavailable.
         invalid_shipping_method: Invalid shipping method specified.
+      password_reset_requested: If an account exists for that email, password reset instructions have been sent.
+      password_reset_token_invalid: Password reset token is invalid or has expired.
       payment:
         credit_over_limit: This payment can only be credited up to %{limit}. Please specify an amount less than or equal to this number.
         update_forbidden: This payment cannot be updated because it is %{state}.
-      record_not_found: '%{model} not found'
+      record_not_found: "%{model} not found"
+      redirect_url_not_allowed: The redirect URL is not from an allowed origin for this store.
       resource_not_found: The resource you were looking for could not be found.
       shipment:
         cannot_ready: Cannot ready shipment.
@@ -27,10 +27,6 @@ en:
       shipment_transfer_success: Variants successfully transferred
       stock_location_required: A stock_location_id parameter must be provided in order to retrieve stock movements.
       unauthorized: You are not authorized to perform that action.
-      v3:
-        payments:
-          session_required: This payment method requires a payment session. Use the payment sessions endpoint instead.
-          method_unavailable: This payment method is not available for this order.
       v2:
         cart:
           no_coupon_code: No coupon code provided and the Order doesn't have any coupon code promotions applied
@@ -47,4 +43,8 @@ en:
           errors:
             the_wishlist_could_not_be_destroyed: The wishlist could not be destroyed.
           wrong_quantity: Quantity has to be greater than 0
+      v3:
+        payments:
+          method_unavailable: This payment method is not available for this order.
+          session_required: This payment method requires a payment session. Use the payment sessions endpoint instead.
       wrong_shipment_target: target shipment is the same as original shipment

data/config/routes.rb

@@ -38,10 +38,10 @@ Spree::Core::Engine.add_routes do
             post :complete
           end
           resources :items, only: [:create, :update, :destroy], controller: 'carts/items'
-          resources :coupon_codes, only: [:create, :destroy], controller: 'carts/coupon_codes'
-          resources :fulfillments, only: [:index, :update], controller: 'carts/fulfillments'
-          resources :payment_methods, only: [:index], controller: 'carts/payment_methods'
-          resources :payments, only: [:index, :show, :create], controller: 'carts/payments'
+          resources :discount_codes, only: [:create, :destroy], controller: 'carts/discount_codes'
+          resources :gift_cards, only: [:create, :destroy], controller: 'carts/gift_cards'
+          resources :fulfillments, only: [:update], controller: 'carts/fulfillments'
+          resources :payments, only: [:create], controller: 'carts/payments'
           resources :payment_sessions, only: [:create, :show, :update], controller: 'carts/payment_sessions' do
             member do
               patch :complete
@@ -53,23 +53,25 @@ Spree::Core::Engine.add_routes do
         # Orders (single order lookup, guest-accessible via order token)
         resources :orders, only: [:show]
 
-        # Customer (current user profile)
+        # Policies (return policy, privacy policy, terms of service, etc.)
+        resources :policies, only: [:index, :show]
+
+        # Password Resets (top-level, no auth required)
+        resources :password_resets, only: [:create, :update], controller: 'customer/password_resets'
+
+        # Customers
         resources :customers, only: [:create]
-        get 'customer', to: 'customers#show'
-        patch 'customer', to: 'customers#update'
 
-        # Customer nested resources
-        namespace :customer, path: 'customer' do
-          resources :password_resets, only: [:create, :update]
+        # Current customer profile and nested resources (/customers/me/...)
+        namespace :customer, path: 'customers/me' do
+          get '/', action: :show, controller: '/spree/api/v3/store/customers'
+          patch '/', action: :update, controller: '/spree/api/v3/store/customers'
 
           resources :orders, only: [:index, :show]
-          resources :addresses, only: [:index, :show, :create, :update, :destroy] do
-            member do
-              patch :mark_as_default
-            end
-          end
+          resources :addresses, only: [:index, :show, :create, :update, :destroy]
           resources :credit_cards, only: [:index, :show, :destroy]
           resources :gift_cards, only: [:index, :show]
+          resources :store_credits, only: [:index, :show]
           resources :payment_setup_sessions, only: [:create, :show] do
             member do
               patch :complete

data/lib/spree/api/dependencies.rb

@@ -94,6 +94,7 @@ module Spree
         # v3 serializers (API v3)
         credit_card_serializer: 'Spree::Api::V3::CreditCardSerializer',
         price_serializer: 'Spree::Api::V3::PriceSerializer',
+        price_history_serializer: 'Spree::Api::V3::PriceHistorySerializer',
         product_serializer: 'Spree::Api::V3::ProductSerializer',
         variant_serializer: 'Spree::Api::V3::VariantSerializer',
         media_serializer: 'Spree::Api::V3::MediaSerializer',
@@ -129,6 +130,7 @@ module Spree
         gift_card_serializer: 'Spree::Api::V3::GiftCardSerializer',
         currency_serializer: 'Spree::Api::V3::CurrencySerializer',
         locale_serializer: 'Spree::Api::V3::LocaleSerializer',
+        policy_serializer: 'Spree::Api::V3::PolicySerializer',
         metafield_serializer: 'Spree::Api::V3::MetafieldSerializer',
         shipping_category_serializer: 'Spree::Api::V3::ShippingCategorySerializer',
         tax_category_serializer: 'Spree::Api::V3::TaxCategorySerializer',
@@ -160,6 +162,7 @@ module Spree
         admin_product_serializer: 'Spree::Api::V3::Admin::ProductSerializer',
         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_category_serializer: 'Spree::Api::V3::Admin::CategorySerializer',
         admin_line_item_serializer: 'Spree::Api::V3::Admin::LineItemSerializer',
@@ -170,6 +173,7 @@ module Spree
         admin_stock_item_serializer: 'Spree::Api::V3::Admin::StockItemSerializer',
         admin_shipment_serializer: 'Spree::Api::V3::Admin::FulfillmentSerializer',
         admin_fulfillment_serializer: 'Spree::Api::V3::Admin::FulfillmentSerializer',
+        admin_gift_card_serializer: 'Spree::Api::V3::Admin::GiftCardSerializer',
         admin_payment_serializer: 'Spree::Api::V3::Admin::PaymentSerializer',
         admin_refund_serializer: 'Spree::Api::V3::Admin::RefundSerializer',
         admin_adjustment_serializer: 'Spree::Api::V3::Admin::AdjustmentSerializer',

data/lib/spree/api/openapi/schema_helper.rb

@@ -95,6 +95,17 @@ module Spree
               },
               required: %w[step field message]
             },
+            CartWarning: {
+              type: :object,
+              description: 'A warning about a cart issue (e.g., item removed due to stock change)',
+              properties: {
+                code: { type: :string, description: 'Machine-readable warning code', example: 'line_item_removed' },
+                message: { type: :string, description: 'Human-readable warning message', example: 'Blue T-Shirt was removed because it was sold out' },
+                line_item_id: { type: :string, nullable: true, description: 'Prefixed line item ID (when applicable)', example: 'li_abc123' },
+                variant_id: { type: :string, nullable: true, description: 'Prefixed variant ID (when applicable)', example: 'variant_abc123' }
+              },
+              required: %w[code message]
+            },
             FulfillmentManifestItem: {
               type: :object,
               description: 'An item within a fulfillment — which line item and how many units are in this fulfillment',
@@ -152,6 +163,14 @@ module Spree
               items: { '$ref' => '#/components/schemas/CheckoutRequirement' }
             }
           end
+
+          warn_key = props.key?('warnings') ? 'warnings' : :warnings
+          if props[warn_key]
+            props[warn_key] = {
+              type: :array,
+              items: { '$ref' => '#/components/schemas/CartWarning' }
+            }
+          end
         end
 
         # Typelizer cannot represent Array<{...}> inline object types in OpenAPI,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 5.4.0.rc1
+  version: 5.4.0.rc3
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-20 00:00:00.000000000 Z
+date: 2026-03-25 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.rc1
+        version: 5.4.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.0.rc1
+        version: 5.4.0.rc3
 description: Spree's API
 email:
 - hello@spreecommerce.org
@@ -121,10 +121,10 @@ files:
 - app/controllers/spree/api/v3/resource_controller.rb
 - app/controllers/spree/api/v3/store/auth_controller.rb
 - app/controllers/spree/api/v3/store/base_controller.rb
-- app/controllers/spree/api/v3/store/carts/coupon_codes_controller.rb
+- app/controllers/spree/api/v3/store/carts/discount_codes_controller.rb
 - app/controllers/spree/api/v3/store/carts/fulfillments_controller.rb
+- app/controllers/spree/api/v3/store/carts/gift_cards_controller.rb
 - app/controllers/spree/api/v3/store/carts/items_controller.rb
-- app/controllers/spree/api/v3/store/carts/payment_methods_controller.rb
 - app/controllers/spree/api/v3/store/carts/payment_sessions_controller.rb
 - app/controllers/spree/api/v3/store/carts/payments_controller.rb
 - app/controllers/spree/api/v3/store/carts/store_credits_controller.rb
@@ -139,12 +139,14 @@ files:
 - app/controllers/spree/api/v3/store/customer/orders_controller.rb
 - app/controllers/spree/api/v3/store/customer/password_resets_controller.rb
 - 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/digitals_controller.rb
 - app/controllers/spree/api/v3/store/locales_controller.rb
 - app/controllers/spree/api/v3/store/markets/countries_controller.rb
 - app/controllers/spree/api/v3/store/markets_controller.rb
 - app/controllers/spree/api/v3/store/orders_controller.rb
+- app/controllers/spree/api/v3/store/policies_controller.rb
 - app/controllers/spree/api/v3/store/products/filters_controller.rb
 - app/controllers/spree/api/v3/store/products_controller.rb
 - app/controllers/spree/api/v3/store/resource_controller.rb
@@ -167,6 +169,7 @@ files:
 - app/serializers/spree/api/v3/admin/digital_link_serializer.rb
 - app/serializers/spree/api/v3/admin/discount_serializer.rb
 - 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/media_serializer.rb
 - app/serializers/spree/api/v3/admin/metafield_serializer.rb
@@ -176,6 +179,7 @@ files:
 - app/serializers/spree/api/v3/admin/payment_method_serializer.rb
 - app/serializers/spree/api/v3/admin/payment_serializer.rb
 - app/serializers/spree/api/v3/admin/payment_source_serializer.rb
+- app/serializers/spree/api/v3/admin/price_history_serializer.rb
 - app/serializers/spree/api/v3/admin/price_serializer.rb
 - app/serializers/spree/api/v3/admin/product_serializer.rb
 - app/serializers/spree/api/v3/admin/refund_serializer.rb
@@ -222,6 +226,8 @@ files:
 - app/serializers/spree/api/v3/payment_session_serializer.rb
 - app/serializers/spree/api/v3/payment_setup_session_serializer.rb
 - app/serializers/spree/api/v3/payment_source_serializer.rb
+- app/serializers/spree/api/v3/policy_serializer.rb
+- app/serializers/spree/api/v3/price_history_serializer.rb
 - app/serializers/spree/api/v3/price_serializer.rb
 - app/serializers/spree/api/v3/product_serializer.rb
 - app/serializers/spree/api/v3/promotion_serializer.rb
@@ -268,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.rc1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.rc3
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc1
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc3
 post_install_message:
 rdoc_options: []
 require_paths:

data/app/controllers/spree/api/v3/store/carts/payment_methods_controller.rb

@@ -1,24 +0,0 @@
-module Spree
-  module Api
-    module V3
-      module Store
-        module Carts
-          class PaymentMethodsController < Store::BaseController
-            include Spree::Api::V3::CartResolvable
-
-            before_action :find_cart!
-
-            # GET /api/v3/store/carts/:cart_id/payment_methods
-            def index
-              methods = @cart.collect_frontend_payment_methods
-              render json: {
-                data: methods.map { |m| Spree.api.payment_method_serializer.new(m, params: serializer_params).to_h },
-                meta: { count: methods.size }
-              }
-            end
-          end
-        end
-      end
-    end
-  end
-end