spree_api 6.0.0.beta4 → 6.0.0.rc1

data/app/controllers/spree/api/v3/admin/seller_payouts_controller.rb

@@ -30,11 +30,7 @@ module Spree
               reference: params[:reference].to_s.presence
             )
 
-            if result.success?
-              render json: serialize_resource(result.value)
-            else
-              render_result_error(result)
-            end
+            render_result(result)
           end
 
           protected
@@ -47,10 +43,6 @@ module Spree
             Spree.api.admin_seller_payout_serializer
           end
 
-          def scope
-            super.for_store(current_store)
-          end
-
           # Deliberately without `transfers`: the serializer wants their number,
           # not the rows, and a monthly settlement can hold hundreds.
           def collection_includes

data/app/controllers/spree/api/v3/admin/seller_requirement_submissions_controller.rb

@@ -30,11 +30,7 @@ module Spree
               review_note: params[:review_note]
             )
 
-            if result.success?
-              render json: serialize_resource(result.value), status: :created
-            else
-              render_result_error(result)
-            end
+            render_result(result, status: :created)
           end
 
           # PATCH /api/v3/admin/sellers/:seller_id/requirement_submissions/:id/accept
@@ -126,11 +122,7 @@ module Spree
               review_note: params[:review_note]
             )
 
-            if result.success?
-              render json: serialize_resource(result.value)
-            else
-              render_result_error(result)
-            end
+            render_result(result)
           end
         end
       end

data/app/controllers/spree/api/v3/admin/seller_transfers_controller.rb

@@ -20,10 +20,6 @@ module Spree
             Spree.api.admin_seller_transfer_serializer
           end
 
-          def scope
-            super.for_store(current_store)
-          end
-
           # Every association the serializer reads, so a page of rows costs a
           # fixed number of queries rather than one per row.
           def collection_includes

data/app/controllers/spree/api/v3/admin/sellers/invitations_controller.rb

@@ -38,7 +38,7 @@ module Spree
               if @invitation.expired?
                 return render_error(
                   code: ErrorHandler::ERROR_CODES[:processing_error],
-                  message: Spree.t(:invitation_expired),
+                  message: I18n.t('spree.invitation_expired'),
                   status: :unprocessable_content
                 )
               end

data/app/controllers/spree/api/v3/admin/sellers/payouts_controller.rb

@@ -47,7 +47,7 @@ module Spree
                 # than a success that produced no payout.
                 render_error(
                   code: ErrorHandler::ERROR_CODES[:validation_error],
-                  message: Spree.t(:seller_payout_nothing_to_settle),
+                  message: I18n.t('spree.seller_payout_nothing_to_settle'),
                   status: :unprocessable_content
                 )
               end

data/app/controllers/spree/api/v3/admin/sellers_controller.rb

@@ -31,11 +31,7 @@ module Spree
               inviter: try_spree_current_user
             )
 
-            if result.success?
-              render json: serialize_resource(result.value), status: :created
-            else
-              render_result_error(result)
-            end
+            render_result(result, status: :created)
           end
 
           # GET /api/v3/admin/sellers/:id/onboarding
@@ -176,11 +172,7 @@ module Spree
           def run_workflow(workflow, **arguments)
             result = workflow.call(seller: @resource, **arguments)
 
-            if result.success?
-              render json: serialize_resource(result.value)
-            else
-              render_result_error(result)
-            end
+            render_result(result)
           end
 
           # Read through the seller's own roles: a role id naming somewhere

data/app/controllers/spree/api/v3/admin/setup_controller.rb

@@ -149,20 +149,12 @@ module Spree
           # would point a storefront at a language with nothing behind it.
           # English closes the gap for countries whose languages all fall
           # through, and is always offered alongside.
-          #
-          # Installs without spree_i18n only have English, and filtering
-          # against that would leave every country English-only. There the
-          # unfiltered list is the better answer: the merchant's own language
-          # is still the right default for their storefront, whether or not
-          # this install carries a translation bundle for it.
           def offerable_locales(country)
-            return country.official_locales if translated_locales.size <= 1
-
-            (country.official_locales & translated_locales).presence || ['en']
+            country.official_locales.filter_map { |language| Spree.locale_for_language(language, available_locales) }.presence || ['en']
           end
 
-          def translated_locales
-            @translated_locales ||= Spree.available_locales.map { |locale| locale.to_s.split('-').first }.uniq
+          def available_locales
+            @available_locales ||= Spree.available_locales
           end
 
           # Token mismatch, spent token, and already-set-up all render the

data/app/controllers/spree/api/v3/admin/stock_transfers_controller.rb

@@ -38,7 +38,7 @@ module Spree
             unless @resource.draft?
               return render_error(
                 code: 'invalid_status',
-                message: Spree.t('stock_transfer.errors.only_draft_can_be_deleted'),
+                message: I18n.t('spree.stock_transfer.errors.only_draft_can_be_deleted'),
                 status: :unprocessable_content
               )
             end

data/app/controllers/spree/api/v3/admin/store_controller.rb

@@ -56,7 +56,6 @@ module Spree
               {
                 key: provider_class.key,
                 name: provider_class.provider_name,
-                integration_class: provider_class.integration_class,
                 integration_type: provider_class.integration_class.presence&.safe_constantize&.api_type,
                 available: provider_class.available_for_store?(current_store)
               }
@@ -117,6 +116,12 @@ module Spree
               :customer_support_email,
               :new_order_notifications_email,
               :preferred_send_consumer_transactional_emails,
+              :preferred_email_accent_color,
+              :preferred_email_background_color,
+              :preferred_email_card_color,
+              :preferred_email_text_color,
+              :preferred_email_heading_color,
+              :preferred_email_font,
               :mailer_logo
             )
           end

data/app/controllers/spree/api/v3/admin/tags_controller.rb

@@ -45,16 +45,19 @@ module Spree
 
           private
 
+          # The class name taggings store for the requested shorthand
+          # (`product` → `Spree::Product`), or nil when it is not taggable.
           def taggable_type
-            params[:taggable_type].to_s
+            @taggable_type ||= Spree::Base.polymorphic_type_for(params[:taggable_type], allowed_taggable_types)
           end
 
           def valid_taggable_type?
-            return true if allowed_taggable_types.include?(taggable_type)
+            return true if taggable_type
 
+            allowed = allowed_taggable_types.map { |type| Spree::Base.polymorphic_api_type(type) }
             render_error(
               code: 'invalid_taggable_type',
-              message: "taggable_type must be one of #{allowed_taggable_types.join(', ')}",
+              message: "taggable_type must be one of #{allowed.join(', ')}",
               status: :unprocessable_content
             )
             false
@@ -83,7 +86,7 @@ module Spree
           # admins are gated by store membership + CanCanCan, not scopes.
           def authorize_taggable_scope!
             return unless current_api_key
-            return unless allowed_taggable_types.include?(taggable_type)
+            return unless taggable_type
 
             required = self.class.scope_for_taggable_type.fetch(taggable_type, 'read_all')
             return if current_api_key.has_scope?(required)
@@ -101,7 +104,7 @@ module Spree
           # list in an initializer without overriding this controller:
           #   Spree.taggable_types << 'MyApp::Seller'
           def allowed_taggable_types
-            Spree.taggable_types
+            Spree.taggable_types.map(&:to_s)
           end
         end
       end

data/app/controllers/spree/api/v3/admin/webhook_endpoints_controller.rb

@@ -73,27 +73,32 @@ module Spree
 
           private
 
-          # Customer password reset tokens are account credentials, so the
-          # webhooks permission alone cannot subscribe an endpoint to them, or
-          # repoint an endpoint that already receives them.
+          # A customer's password reset token is an account credential, so the
+          # webhooks permission alone cannot subscribe an endpoint to it, or
+          # repoint an endpoint that already receives it: that needs the
+          # permission the event catalog names for it (`write_customers`).
           def reject_unauthorized_credential_subscription!
-            return if holds_permission?('write_customers')
-
-            requested = Array(permitted_params[:subscriptions]) & Spree::WebhookEndpoint::CREDENTIAL_EVENTS
-            return if requested.empty? && !repoints_credential_endpoint?
+            events = requested_credential_events | repointed_credential_events
+            missing = events.reject { |entry| holds_permission?(entry.credential_permission) }
+            return if missing.empty?
 
             render_error(
               code: Spree::Api::V3::ErrorHandler::ERROR_CODES[:access_denied],
-              message: "Receiving #{Spree::WebhookEndpoint::CREDENTIAL_EVENTS.to_sentence} requires permission to manage customers",
+              message: "Receiving #{missing.map(&:name).to_sentence} requires the " \
+                       "#{missing.map(&:credential_permission).uniq.to_sentence} permission",
               status: :forbidden
             )
           end
 
-          def repoints_credential_endpoint?
-            return false unless action_name == 'update'
-            return false unless permitted_params.key?(:url) || permitted_params.key?(:subscriptions)
+          def requested_credential_events
+            Spree::Events.catalog.credential_events(Array(permitted_params[:subscriptions]))
+          end
+
+          def repointed_credential_events
+            return [] unless action_name == 'update'
+            return [] unless permitted_params.key?(:url) || permitted_params.key?(:subscriptions)
 
-            current_store.webhook_endpoints.find_by_prefix_id(params[:id])&.receives_credentials?
+            current_store.webhook_endpoints.find_by_prefix_id(params[:id])&.credential_subscriptions || []
           end
         end
       end

data/app/controllers/spree/api/v3/admin/webhook_events_controller.rb

@@ -0,0 +1,25 @@
+module Spree
+  module Api
+    module V3
+      module Admin
+        # The events a webhook endpoint can subscribe to — every event Spree
+        # and the installed extensions declare, so the endpoint picker never
+        # drifts from what the server really publishes.
+        class WebhookEventsController < Admin::BaseController
+          scoped_resource :webhooks
+
+          # GET /api/v3/admin/webhook_events
+          def index
+            authorize!(:show, Spree::WebhookEndpoint)
+            entries = Spree::Events.catalog.webhook_events
+
+            render json: {
+              data: entries.map { |entry| Spree.api.admin_webhook_event_serializer.new(entry).to_h },
+              meta: { count: entries.size }
+            }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -70,6 +70,16 @@ module Spree
           request.headers['x-spree-token']
         end
 
+        # Renders a workflow's result: the serialized record on success, its
+        # errors otherwise.
+        def render_result(result, status: :ok)
+          if result.success?
+            render json: serialize_resource(result.value), status: status
+          else
+            render_result_error(result)
+          end
+        end
+
         # Renders a failed service/workflow Result: validation errors become a
         # 422 field-error payload, anything else a plain service error. Shared
         # by both APIs — Store endpoints surface workflow failures (a rejected

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

@@ -80,7 +80,7 @@ module Spree
         # which raises before the controller hook fires and yields 403.
         def destroy
           if @resource.respond_to?(:can_be_deleted?) && !@resource.can_be_deleted?
-            message = Spree.t(:cannot_delete, scope: 'api', model: @resource.class.model_name.human)
+            message = I18n.t('spree.api.cannot_delete', model: @resource.class.model_name.human)
             return render_error(
               code: ERROR_CODES[:validation_error],
               message: message,
@@ -297,6 +297,7 @@ module Spree
         def ransack_params
           rp = params[:q]&.to_unsafe_h || params[:q] || {}
           rp = decode_prefixed_id_predicates(rp)
+          rp = decode_api_type_predicates(rp)
           sort_value = sort_param
 
           if sort_value.present?
@@ -329,6 +330,48 @@ module Spree
           end
         end
 
+        # Filters on a type column take the same shorthand responses carry
+        # (`type_eq=orders`, `receivable_type_eq=purchase_order`), translated
+        # here to the class name the column stores. Only the model's own STI
+        # column and its polymorphic `*_type` columns are translated; any other
+        # `*_type` attribute (`media_type`, `key_type`) is a plain value.
+        RANSACK_TYPE_PREDICATE_RE = /\A(?<attribute>(?:\w+_)?type)_(?:eq|not_eq|in|not_in)\z/.freeze
+        def decode_api_type_predicates(hash)
+          return hash unless hash.is_a?(Hash)
+
+          hash.each_with_object({}) do |(key, value), result|
+            resolver = api_type_resolver(RANSACK_TYPE_PREDICATE_RE.match(key.to_s)&.[](:attribute))
+            result[key] = if resolver
+                            resolve_api_type_values(value, resolver)
+                          elsif value.is_a?(Hash)
+                            decode_api_type_predicates(value)
+                          else
+                            value
+                          end
+          end
+        end
+
+        # A scalar stays a scalar; a list — including the indexed form
+        # (`type_in[0]=orders`) that arrives as a hash — becomes an array.
+        def resolve_api_type_values(value, resolver)
+          case value
+          when Hash, Array then (value.is_a?(Hash) ? value.values : value).map { |entry| resolve_api_type_values(entry, resolver) }
+          else resolver.call(value.to_s) || value
+          end
+        end
+
+        # @param attribute [String, nil] a `*type` column of {#model_class}
+        # @return [Proc, nil] shorthand → stored class name
+        def api_type_resolver(attribute)
+          return if attribute.nil? || !model_class.respond_to?(:api_type_registry)
+
+          if attribute == model_class.inheritance_column && model_class.api_type_registry.any?
+            ->(api_type) { model_class.class_name_for_api_type(api_type) }
+          elsif model_class.reflect_on_all_associations(:belongs_to).any? { |reflection| reflection.polymorphic? && reflection.foreign_type == attribute }
+            ->(api_type) { Spree::Base.polymorphic_type_for(api_type) }
+          end
+        end
+
         # Matches both prefixed-FK predicates (`product_id_in`, `tax_category_id_eq`)
         # and the bare-`id` predicates (`id_in`, `id_eq`) on the resource's
         # primary key. Without the bare-id branch, `q[id_in][]=prod_x` would

data/app/controllers/spree/api/v3/seller/auth_controller.rb

@@ -48,7 +48,7 @@ module Spree
             # not enough: without a role on some seller there is no panel to
             # sign in to, and minting a token would hand out an audience the
             # holder can do nothing with.
-            return render_authentication_failed(Spree.t(:seller_membership_required)) unless user.seller_member?
+            return render_authentication_failed(I18n.t('spree.seller_membership_required')) unless user.seller_member?
 
             set_refresh_cookie(
               Spree::RefreshToken.create_for(
@@ -100,7 +100,7 @@ module Spree
               clear_refresh_cookie
               return render_error(
                 code: ErrorHandler::ERROR_CODES[:access_denied],
-                message: Spree.t(:seller_membership_required),
+                message: I18n.t('spree.seller_membership_required'),
                 status: :forbidden
               )
             end

data/app/controllers/spree/api/v3/seller/countries_controller.rb

@@ -14,7 +14,7 @@ module Spree
           # GET /api/v3/seller/countries
           #
           # Unpaginated: there are ~250 countries and an address dropdown needs
-          # them all at once, which Pagy's global max_limit would prevent.
+          # them all at once, which Pagy's global client_limit would prevent.
           def index
             countries = Spree::Country.all.sort_by(&:name)
 

data/app/controllers/spree/api/v3/seller/exports_controller.rb

@@ -181,9 +181,9 @@ module Spree
           def render_unsupported_type
             render_error(
               code: Spree::Api::V3::ErrorHandler::ERROR_CODES[:validation_error],
-              message: Spree.t(
-                'api.errors.unsupported_export_type',
-                default: "Unsupported export type. Supported types: #{ALLOWED_TYPES.join(', ')}"
+              message: I18n.t(
+                'spree.api.errors.unsupported_export_type',
+                types: ALLOWED_TYPES.join(', ')
               ),
               status: :unprocessable_content
             )

data/app/controllers/spree/api/v3/seller/invitation_acceptances_controller.rb

@@ -74,7 +74,7 @@ module Spree
             unless @invitation
               render_error(
                 code: ErrorHandler::ERROR_CODES[:record_not_found],
-                message: Spree.t(:invitation_not_acceptable),
+                message: I18n.t('spree.invitation_not_acceptable'),
                 status: :not_found
               )
               return false
@@ -101,7 +101,7 @@ module Spree
 
             render_error(
               code: ErrorHandler::ERROR_CODES[:authentication_failed],
-              message: Spree.t(:invalid_password),
+              message: I18n.t('spree.invalid_password'),
               status: :unauthorized
             )
             nil
@@ -111,7 +111,7 @@ module Spree
             if params[:password].blank?
               render_error(
                 code: ErrorHandler::ERROR_CODES[:parameter_missing],
-                message: Spree.t(:password_required_to_create_account),
+                message: I18n.t('spree.password_required_to_create_account'),
                 status: :unprocessable_content
               )
               return nil

data/app/controllers/spree/api/v3/seller/invitations_controller.rb

@@ -38,7 +38,7 @@ module Spree
             if @invitation.expired?
               return render_error(
                 code: ErrorHandler::ERROR_CODES[:processing_error],
-                message: Spree.t(:invitation_expired),
+                message: I18n.t('spree.invitation_expired'),
                 status: :unprocessable_content
               )
             end

data/app/controllers/spree/api/v3/seller/me_controller.rb

@@ -83,7 +83,7 @@ module Spree
 
             render_error(
               code: ErrorHandler::ERROR_CODES[:record_not_found],
-              message: Spree.t(:me_no_current_user),
+              message: I18n.t('spree.me_no_current_user'),
               status: :not_found
             )
             false

data/app/controllers/spree/api/v3/seller/orders/labels_controller.rb

@@ -27,7 +27,7 @@ module Spree
               if label_params[:file].blank?
                 return render_error(
                   code: ERROR_CODES[:validation_error],
-                  message: Spree.t('shipping_labels.errors.file_required'),
+                  message: I18n.t('spree.shipping_labels.errors.file_required'),
                   status: :unprocessable_content
                 )
               end

data/app/controllers/spree/api/v3/seller/password_resets_controller.rb

@@ -15,6 +15,8 @@ module Spree
           include Spree::Api::V3::Seller::AuthCookies
           include Spree::Api::V3::JwtAuthentication
 
+          RESET_REQUESTED_EVENT = 'seller_user.password_reset_requested'.freeze
+
           # No `skip_scope_check!`: this extends the plain v3 base, which has
           # no authentication or scope gate to lift. The emailed token is the
           # only credential, exactly as on the admin twin.
@@ -32,12 +34,12 @@ module Spree
             # them a seller reset link would be an invitation to a session they
             # cannot hold.
             if user&.seller_member?
-              user.publish_event('seller_user.password_reset_requested', event_payload(user))
+              user.publish_event(RESET_REQUESTED_EVENT, event_payload(user))
             end
 
             # Always 202, whether or not anything matched — this endpoint must
             # not become a way to discover which addresses exist.
-            render json: { message: Spree.t(:password_reset_requested, scope: :api) }, status: :accepted
+            render json: { message: I18n.t('spree.api.password_reset_requested') }, status: :accepted
           end
 
           # PATCH /api/v3/seller/auth/password_resets/:id
@@ -79,7 +81,7 @@ module Spree
           def render_token_invalid
             render_error(
               code: ErrorHandler::ERROR_CODES[:password_reset_token_invalid],
-              message: Spree.t(:password_reset_token_invalid, scope: :api),
+              message: I18n.t('spree.api.password_reset_token_invalid'),
               status: :unprocessable_content
             )
           end
@@ -88,14 +90,11 @@ module Spree
           # right panel origin and locale without a request to read them from.
           def event_payload(user)
             store = seller_store(user)
-            payload = {
-              reset_token: user.generate_token_for(:password_reset),
-              email: user.email,
-              store_id: store&.prefixed_id
-            }
-            redirect_url = validated_redirect_url(store)
-            payload[:redirect_url] = redirect_url if redirect_url.present?
-            payload
+            user.event_payload_for(
+              RESET_REQUESTED_EVENT,
+              reset_token: user.generate_token_for(:password_reset), store: store,
+              redirect_url: validated_redirect_url(store).presence
+            )
           end
 
           # Which store's panel to send them to.

data/app/controllers/spree/api/v3/seller/products_controller.rb

@@ -107,7 +107,7 @@ module Spree
             if resolve_workflow.nil?
               return render_error(
                 code: 'invalid_status',
-                message: Spree.t(:invalid_status, scope: 'errors.messages', default: 'Invalid status'),
+                message: I18n.t('spree.errors.messages.invalid_status'),
                 status: :unprocessable_content
               )
             end
@@ -166,6 +166,7 @@ module Spree
 
           def permitted_params
             attrs = params.permit(
+              *model_class.additional_seller_permitted_attributes,
               :name, :description, :slug,
               :meta_title, :meta_description, :meta_keywords,
               :product_type_id, :delivery_profile_id,

data/app/controllers/spree/api/v3/seller/requirement_submissions_controller.rb

@@ -42,7 +42,7 @@ module Spree
             unless @submission.file.attached?
               return render_error(
                 code: ErrorHandler::ERROR_CODES[:validation_error],
-                message: Spree.t(:seller_submission_no_file),
+                message: I18n.t('spree.seller_submission_no_file'),
                 status: :unprocessable_content
               )
             end

data/app/controllers/spree/api/v3/seller/team_controller.rb

@@ -68,7 +68,7 @@ module Spree
 
             render_error(
               code: ErrorHandler::ERROR_CODES[:processing_error],
-              message: Spree.t(:seller_team_last_member),
+              message: I18n.t('spree.seller_team_last_member'),
               status: :unprocessable_content
             )
           end

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

@@ -64,7 +64,7 @@ module Spree
             def attach_pending_coupon_warning
               @cart.warnings |= [{
                 code: coupon_handler.status_code.to_s,
-                message: coupon_handler.error.presence || Spree.t(:coupon_code_not_eligible)
+                message: coupon_handler.error.presence || I18n.t('spree.coupon_code_not_eligible')
               }]
             end
 

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

@@ -9,15 +9,6 @@ module Spree
 
             before_action :find_cart!
 
-            # GET /api/v3/store/carts/:cart_id/fulfillments
-            def index
-              fulfillments = @cart.fulfillments.includes(delivery_rates: :delivery_method)
-              render json: {
-                data: fulfillments.map { |s| Spree.api.fulfillment_serializer.new(s, params: serializer_params).to_h },
-                meta: { count: fulfillments.size }
-              }
-            end
-
             # PATCH /api/v3/store/carts/:cart_id/fulfillments/:id
             # Selects a delivery rate, and for pickup_point methods a concrete
             # pickup point (validated against the provider, then frozen into
@@ -36,6 +27,7 @@ module Spree
 
                 recalculate
 
+                sweep_unavailable_coupon_code!
                 render_cart
               end
             end
@@ -62,7 +54,7 @@ module Spree
               if provider.nil?
                 render_error(
                   code: ERROR_CODES[:validation_error],
-                  message: Spree.t('errors.messages.no_pickup_point_provider'),
+                  message: I18n.t('spree.errors.messages.no_pickup_point_provider'),
                   status: :unprocessable_entity
                 )
                 return false
@@ -72,7 +64,7 @@ module Spree
               if point.nil?
                 render_error(
                   code: ERROR_CODES[:record_not_found],
-                  message: Spree.t('errors.messages.pickup_point_not_found'),
+                  message: I18n.t('spree.errors.messages.pickup_point_not_found'),
                   status: :not_found
                 )
                 return false

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

@@ -18,6 +18,7 @@ module Spree
                 result = @cart.apply_gift_card(gift_card)
 
                 if result.success?
+                  sweep_unavailable_coupon_code!
                   render_cart(status: :created)
                 else
                   render_service_error(result.error)
@@ -31,6 +32,7 @@ module Spree
                 result = @cart.remove_gift_card
 
                 if result.success?
+                  sweep_unavailable_coupon_code!
                   render_cart
                 else
                   render_service_error(result.error)
@@ -44,17 +46,17 @@ module Spree
               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)
+                render_error(code: ERROR_CODES[:gift_card_not_found], message: I18n.t('spree.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)
+                render_error(code: ERROR_CODES[:gift_card_expired], message: I18n.t('spree.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)
+                render_error(code: ERROR_CODES[:gift_card_already_redeemed], message: I18n.t('spree.gift_card_already_redeemed'), status: :unprocessable_content)
                 return
               end