spree_core 5.4.0.beta2 → 5.4.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af6f55a25483bfb02dab0b15f67356a2732cbeb190074b9ddb75a1692594fb7a
-  data.tar.gz: 8f0b8f77983432ef1e1baa52def6ed2674f9e0794bc632dd91757551c4ee71c4
+  metadata.gz: ea9fcfc9e4ac5937296c789f151d5d431b60a2fadb131e5a7bca034cae47b2ab
+  data.tar.gz: e89e3fd21bf14b0bb0bda0de42c0ecc49d173add3d9ce58c29b3c781eafb55fa
 SHA512:
-  metadata.gz: 46c6fc812dc90ba1ae3061b2e4066df5e9dd8ad530fde2db85095a7b5cb444fec2d51f4736a528c61ee4423e64d986478fdcf5478c40888e99818b849e444d60
-  data.tar.gz: aa2913c4e9882dd0e77d03ddcfae4f8277e4657b807080ce2d3549fd63f5c6da18448e2574b7742ad82b227a299dccfce3717a7df504be4442e3c7f0bf21629e
+  metadata.gz: b9bd748be9f9b4949d9b71887990fe3ac2377a6f4e7ed3d3060b0be073d6c199bd92a633bb2c62e7b8ee13dc0d7dae07e1bedd3d4d9dc5edebf3e4fc3839cae7
+  data.tar.gz: 8f8639ca080722372b01f91df71e54e0dc3f8f39d82cdbd1b3ad72103d995dbaf9bc50ef0f2a6032b0d400c2e94387edd2e06f64a52f3932391ed49ee5650014

data/app/finders/spree/products/find.rb

@@ -22,14 +22,8 @@ module Spree
         @in_stock         = params.dig(:filter, :in_stock)
         @backorderable    = params.dig(:filter, :backorderable)
         @purchasable      = params.dig(:filter, :purchasable)
-        @out_of_stock     = params.dig(:filter, :out_of_stock).to_b
         @tags             = params.dig(:filter, :tags).to_s.split(',').compact_blank
         @vendor_ids       = params.dig(:filter, :vendor_ids)&.split(',')&.compact_blank || []
-
-        if @purchasable.present? && @out_of_stock.present?
-          @purchasable = false
-          @out_of_stock = false
-        end
       end
 
       def execute
@@ -50,7 +44,6 @@ module Spree
         products = show_only_stock(products)
         products = show_only_backorderable(products)
         products = show_only_purchasable(products)
-        products = show_only_out_of_stock(products)
         products = by_taxonomies(products)
         products = ordered(products)
         products = by_vendor_ids(products)
@@ -62,7 +55,7 @@ module Spree
 
       attr_reader :ids, :skus, :price, :currency, :taxons, :concat_taxons, :name, :options, :option_value_ids, :scope,
                   :sort_by, :deleted, :discontinued, :store, :in_stock, :backorderable, :purchasable, :tags,
-                  :query, :vendor_ids, :out_of_stock, :slug, :taxonomies
+                  :query, :vendor_ids, :slug, :taxonomies
 
       def query?
         query.present?
@@ -294,12 +287,6 @@ module Spree
         products.in_stock_or_backorderable
       end
 
-      def show_only_out_of_stock(products)
-        return products unless out_of_stock.present?
-
-        products.out_of_stock
-      end
-
       def map_prices(prices)
         prices.map do |price|
           price == 'Infinity' ? BigDecimal::INFINITY : price.to_f

data/app/models/concerns/spree/product_scopes.rb

@@ -81,9 +81,26 @@ module Spree
         where(Price.table_name => { amount: price.. })
       end
 
-      add_search_scope :in_stock do
-        joins(:variants_including_master).merge(Spree::Variant.in_stock)
+      # Can't use add_search_scope for this as it needs a default argument
+      # Ransack calls with '1' to activate, '0' or nil to skip
+      # In Ruby code: in_stock(true) for in-stock, in_stock(false) for out-of-stock
+      def self.in_stock(in_stock = true)
+        if in_stock == '0' || !in_stock
+          all
+        else
+          joins(:variants_including_master).merge(Spree::Variant.in_stock_or_backorderable)
+        end
+      end
+      search_scopes << :in_stock
+
+      def self.out_of_stock(out_of_stock = true)
+        if out_of_stock == '0' || !out_of_stock
+          all
+        else
+          where.not(id: joins(:variants_including_master).merge(Spree::Variant.in_stock_or_backorderable))
+        end
       end
+      search_scopes << :out_of_stock
 
       add_search_scope :backorderable do
         joins(:variants_including_master).merge(Spree::Variant.backorderable)

data/app/models/spree/api_key.rb

@@ -6,11 +6,14 @@ module Spree
     PREFIXES = { 'publishable' => 'pk_', 'secret' => 'sk_' }.freeze
     TOKEN_LENGTH = 24
 
-    # @!attribute [r] plaintext_token
-    #   The raw token value, only available in memory immediately after creation
-    #   of a secret key. Not persisted to the database.
-    #   @return [String, nil]
-    attr_reader :plaintext_token
+    # Returns the raw token value. For publishable keys this is the persisted
+    # +token+ column. For secret keys it is only available in memory immediately
+    # after creation (not persisted).
+    #
+    # @return [String, nil]
+    def plaintext_token
+      publishable? ? token : @plaintext_token
+    end
 
     belongs_to :store, class_name: 'Spree::Store'
     belongs_to :created_by, polymorphic: true, optional: true

data/app/models/spree/market.rb

@@ -44,8 +44,7 @@ module Spree
       joins(:market_countries)
         .where(store_id: store.id)
         .where(spree_market_countries: { country_id: country.id })
-        .order(:position)
-        .first
+        .take
     end
 
     # Returns the default market for a store, or falls back to the first by position

data/app/models/spree/market_country.rb

@@ -8,6 +8,7 @@ module Spree
     validates :market, :country, presence: true
     validates :country_id, uniqueness: { scope: :market_id }
     validate :country_covered_by_shipping_zone
+    validate :country_unique_per_store
 
     private
 
@@ -21,5 +22,21 @@ module Spree
         errors.add(:country, :not_in_shipping_zone)
       end
     end
+
+    def country_unique_per_store
+      return if market.blank? || country.blank?
+
+      store = market.store
+      return if store.blank?
+
+      existing = self.class.joins(:market)
+                     .where(country_id: country_id)
+                     .where(spree_markets: { store_id: store.id, deleted_at: nil })
+                     .where.not(id: id)
+
+      if existing.exists?
+        errors.add(:country, :already_in_market)
+      end
+    end
   end
 end

data/app/models/spree/newsletter_subscriber.rb

@@ -1,10 +1,7 @@
-require_dependency 'spree/newsletter_subscriber/emails'
-
 module Spree
   class NewsletterSubscriber < Spree.base_class
     has_prefix_id :sub
 
-    include Spree::NewsletterSubscriber::Emails
     include Spree::Metafields
 
     publishes_lifecycle_events

data/app/models/spree/order.rb

@@ -3,7 +3,6 @@ require_dependency 'spree/order/currency_updater'
 require_dependency 'spree/order/digital'
 require_dependency 'spree/order/payments'
 require_dependency 'spree/order/store_credit'
-require_dependency 'spree/order/emails'
 require_dependency 'spree/order/gift_card'
 
 module Spree
@@ -22,7 +21,6 @@ module Spree
     include Spree::Order::Payments
     include Spree::Order::StoreCredit
     include Spree::Order::AddressBook
-    include Spree::Order::Emails
     include Spree::Order::Webhooks
     include Spree::Core::NumberGenerator.new(prefix: 'R')
     include Spree::Order::GiftCard
@@ -311,9 +309,9 @@ module Spree
     # @return [Boolean]
     def order_refunded?
       return false if item_count.zero?
+      return false if refunds_total.zero?
 
-      (payment_state.in?(%w[void failed]) && refunds_total.positive?) ||
-        refunds_total == total_minus_store_credits - additional_tax_total.abs
+      payment_state.in?(%w[void failed]) || refunds_total == total_minus_store_credits - additional_tax_total.abs
     end
 
     def refunds_total
@@ -965,7 +963,6 @@ module Spree
         payments.store_credits.pending.each(&:void!)
       end
 
-      send_cancel_email
       update_with_updater!
       send_order_canceled_webhook
       publish_order_canceled_event

data/app/models/spree/product.rb

@@ -197,18 +197,6 @@ module Spree
     scope :by_source, ->(source) { send(source) }
     scope :paused, -> { where(status: 'paused') }
     scope :published, -> { where(status: 'active') }
-    scope :in_stock_items, -> { joins(:variants).merge(Spree::Variant.in_stock_or_backorderable) }
-    scope :out_of_stock_items, lambda {
-      joins(variants_including_master: :stock_items).
-        where(spree_variants: { track_inventory: true }).
-        where.not(id: Spree::Variant.where(track_inventory: false).pluck(:product_id).uniq).
-        where(spree_stock_items: { backorderable: false }).
-        group(:id).
-        having("SUM(#{Spree::StockItem.table_name}.count_on_hand) <= 0")
-    }
-    scope :out_of_stock, lambda {
-                           joins(:stock_items).where("#{Spree::Variant.table_name}.track_inventory = ? OR #{Spree::StockItem.table_name}.count_on_hand <= ?", false, 0)
-                         }
 
     attr_accessor :option_values_hash
 
@@ -232,7 +220,7 @@ module Spree
     self.whitelisted_ransackable_associations = %w[taxons stores variants_including_master master variants tags labels
                                                    shipping_category classifications option_types]
     self.whitelisted_ransackable_scopes = %w[not_discontinued search_by_name in_taxon price_between
-                                             multi_search in_stock_items out_of_stock_items with_option_value_ids
+                                             multi_search in_stock out_of_stock with_option_value_ids
                                              ascend_by_price descend_by_price]
 
     [

data/app/models/spree/reimbursement.rb

@@ -4,7 +4,6 @@ module Spree
 
     include Spree::Core::NumberGenerator.new(prefix: 'RI', length: 9)
     include Spree::NumberIdentifier
-    include Spree::Reimbursement::Emails
 
     class IncompleteReimbursementError < StandardError; end
 
@@ -116,7 +115,6 @@ module Spree
       if unpaid_amount_within_tolerance?
         reimbursed!
         reimbursement_success_hooks.each { |h| h.call self }
-        send_reimbursement_email
       else
         errored!
         reimbursement_failure_hooks.each { |h| h.call self }

data/app/models/spree/shipment.rb

@@ -14,7 +14,6 @@ module Spree
     if defined?(Spree::VendorConcern)
       include Spree::VendorConcern
     end
-    include Spree::Shipment::Emails
     include Spree::Shipment::Webhooks
     include Spree::Shipment::CustomEvents
 

data/app/models/spree/shipment_handler.rb

@@ -1,6 +1,5 @@
 module Spree
   class ShipmentHandler
-    include Spree::Shipment::Emails
     include Spree::IntegrationsConcern
 
     class << self
@@ -25,7 +24,6 @@ module Spree
       @shipment.process_order_payments if Spree::Config[:auto_capture_on_dispatch]
       @shipment.touch :shipped_at
       update_order_shipment_state
-      send_shipped_email
     end
 
     protected

data/app/services/spree/newsletter/subscribe.rb

@@ -19,8 +19,8 @@ module Spree
           end
         end
 
-        # deliver confirmation email after the transaction is completed
-        subscriber.deliver_newsletter_email_verification unless subscriber.verified?
+        # publish event to trigger email delivery via subscriber
+        subscriber.publish_event('newsletter_subscriber.subscribed') unless subscriber.verified?
         subscriber
       end
 

data/app/subscribers/spree/invitation_email_subscriber.rb

@@ -34,7 +34,7 @@ module Spree
 
     def find_invitation(event)
       invitation_id = event.payload['id']
-      Spree::Invitation.find_by(id: invitation_id)
+      Spree::Invitation.find_by_prefix_id(invitation_id)
     end
   end
 end

data/config/locales/en.yml

@@ -292,6 +292,7 @@ en:
         spree/market_country:
           attributes:
             country:
+              already_in_market: is already assigned to another market in this store
               not_in_shipping_zone: is not covered by any shipping zone. Please set up a shipping zone first.
         spree/payment:
           attributes:

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.4.0.beta2'.freeze
+  VERSION = '5.4.0.beta3'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -427,7 +427,6 @@ require 'spree/events'
 require 'spree/webhooks'
 
 require 'spree/core/partials'
-require 'spree/core/importer'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/order'

data/lib/tasks/cli.rake

@@ -0,0 +1,50 @@
+namespace :spree do
+  namespace :cli do
+    desc 'Ensure a default publishable API key exists and print its token'
+    task ensure_api_key: :environment do
+      store = Spree::Store.default
+      key = store.api_keys.active.publishable.first ||
+            store.api_keys.create!(name: 'Default', key_type: 'publishable')
+      print key.plaintext_token
+    end
+
+    desc 'Create an API key'
+    task create_api_key: :environment do
+      name = ENV.fetch('NAME')
+      key_type = ENV.fetch('KEY_TYPE')
+      store = Spree::Store.default
+      key = store.api_keys.create!(name: name, key_type: key_type)
+      print key.plaintext_token
+    end
+
+    desc 'List API keys (pipe-delimited)'
+    task list_api_keys: :environment do
+      Spree::Store.default.api_keys.order(created_at: :desc).each do |k|
+        status = k.revoked_at ? 'revoked' : 'active'
+        token = k.secret? ? k.token_prefix : k.token
+        puts [k.prefixed_id, k.name, k.key_type, token, k.created_at.strftime('%Y-%m-%d %H:%M'), status].join('|')
+      end
+    end
+
+    desc 'Revoke an API key by prefixed ID'
+    task revoke_api_key: :environment do
+      id = ENV.fetch('ID')
+      key = Spree::Store.default.api_keys.find_by_prefix_id!(id)
+      key.revoke!
+      print key.name
+    end
+
+    desc 'Create an admin user'
+    task create_admin: :environment do
+      email = ENV.fetch('EMAIL')
+      password = ENV.fetch('PASSWORD')
+      admin = Spree.admin_user_class.create!(
+        email: email,
+        password: password,
+        password_confirmation: password
+      )
+      admin.add_role('admin', Spree::Store.default)
+      print admin.email
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.4.0.beta2
+  version: 5.4.0.beta3
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-28 00:00:00.000000000 Z
+date: 2026-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -859,7 +859,6 @@ files:
 - app/models/concerns/spree/default_price.rb
 - app/models/concerns/spree/display_money.rb
 - app/models/concerns/spree/display_on.rb
-- app/models/concerns/spree/filter_param.rb
 - app/models/concerns/spree/has_image_alt_text.rb
 - app/models/concerns/spree/image_methods.rb
 - app/models/concerns/spree/integrations_concern.rb
@@ -977,7 +976,6 @@ files:
 - app/models/spree/metafields/rich_text.rb
 - app/models/spree/metafields/short_text.rb
 - app/models/spree/newsletter_subscriber.rb
-- app/models/spree/newsletter_subscriber/emails.rb
 - app/models/spree/option_type.rb
 - app/models/spree/option_type_prototype.rb
 - app/models/spree/option_value.rb
@@ -987,7 +985,6 @@ files:
 - app/models/spree/order/checkout.rb
 - app/models/spree/order/currency_updater.rb
 - app/models/spree/order/digital.rb
-- app/models/spree/order/emails.rb
 - app/models/spree/order/gift_card.rb
 - app/models/spree/order/payments.rb
 - app/models/spree/order/store_credit.rb
@@ -1075,7 +1072,6 @@ files:
 - app/models/spree/refund_reason.rb
 - app/models/spree/reimbursement.rb
 - app/models/spree/reimbursement/credit.rb
-- app/models/spree/reimbursement/emails.rb
 - app/models/spree/reimbursement/reimbursement_type_engine.rb
 - app/models/spree/reimbursement/reimbursement_type_validator.rb
 - app/models/spree/reimbursement_performer.rb
@@ -1109,7 +1105,6 @@ files:
 - app/models/spree/role_user.rb
 - app/models/spree/shipment.rb
 - app/models/spree/shipment/custom_events.rb
-- app/models/spree/shipment/emails.rb
 - app/models/spree/shipment/webhooks.rb
 - app/models/spree/shipment_handler.rb
 - app/models/spree/shipping_calculator.rb
@@ -1453,8 +1448,6 @@ files:
 - lib/generators/spree/authentication/dummy/dummy_generator.rb
 - lib/generators/spree/authentication/dummy/templates/authentication_helpers.rb.tt
 - lib/generators/spree/authentication/dummy/templates/create_spree_admin_users.rb.tt
-- lib/generators/spree/cursor_rules/cursor_rules_generator.rb
-- lib/generators/spree/cursor_rules/templates/spree_rules.mdc
 - lib/generators/spree/dummy/dummy_generator.rb
 - lib/generators/spree/dummy/templates/app/assets/config/manifest.js
 - lib/generators/spree/dummy/templates/rails/application.rb
@@ -1486,9 +1479,6 @@ files:
 - lib/spree/core/dependencies.rb
 - lib/spree/core/dependencies_helper.rb
 - lib/spree/core/engine.rb
-- lib/spree/core/importer.rb
-- lib/spree/core/importer/order.rb
-- lib/spree/core/importer/product.rb
 - lib/spree/core/number_generator.rb
 - lib/spree/core/partials.rb
 - lib/spree/core/permission_configuration.rb
@@ -1634,6 +1624,7 @@ files:
 - lib/spree/translation_migrations.rb
 - lib/spree/webhooks.rb
 - lib/spree_core.rb
+- lib/tasks/cli.rake
 - lib/tasks/core.rake
 - lib/tasks/dependencies.rake
 - lib/tasks/images.rake
@@ -1662,9 +1653,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.beta2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.beta3
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta2
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta3
 post_install_message:
 rdoc_options: []
 require_paths:

data/app/models/concerns/spree/filter_param.rb

@@ -1,21 +0,0 @@
-module Spree
-  module FilterParam
-    extend ActiveSupport::Concern
-
-    included do
-      before_save :set_filter_param
-    end
-
-    protected
-
-    def set_filter_param
-      return if param_candidate.blank?
-
-      self.filter_param = param_candidate.parameterize
-    end
-
-    def param_candidate
-      name
-    end
-  end
-end

data/app/models/spree/newsletter_subscriber/emails.rb

@@ -1,12 +0,0 @@
-module Spree
-  class NewsletterSubscriber < Spree.base_class
-    module Emails
-      extend ActiveSupport::Concern
-
-      def deliver_newsletter_email_verification
-        # you can overwrite this method in your application / extension to send out the confirmation email
-        # or use `spree_emails` gem
-      end
-    end
-  end
-end

data/app/models/spree/order/emails.rb

@@ -1,24 +0,0 @@
-module Spree
-  class Order < Spree.base_class
-    module Emails
-      extend ActiveSupport::Concern
-
-      def deliver_order_confirmation_email
-        Spree::Deprecation.warn('Spree::Order#deliver_order_confirmation_email is deprecated and will be removed in Spree 5.5. Please create a Subscriber for order.completed event.')
-      end
-
-      # If you would like to also send confirmation email to store owner(s)
-      def deliver_store_owner_order_notification_email?
-        false
-      end
-
-      def deliver_store_owner_order_notification_email
-        Spree::Deprecation.warn('Spree::Order#deliver_store_owner_order_notification_email is deprecated and will be removed in Spree 5.5. Please create a Subscriber for order.completed event.')
-      end
-
-      def send_cancel_email
-        Spree::Deprecation.warn('Spree::Order#send_cancel_email is deprecated and will be removed in Spree 5.5. Please create a Subscriber for order.canceled event.')
-      end
-    end
-  end
-end

data/app/models/spree/reimbursement/emails.rb

@@ -1,11 +0,0 @@
-module Spree
-  class Reimbursement < Spree.base_class
-    module Emails
-      def send_reimbursement_email
-        # you can overwrite this method in your application / extension to send out the confirmation email
-        # or use `spree_emails` gem
-        # YourEmailVendor.deliver_reimbursement_email(id) # `id` = ID of the Reimbursement being sent, you can also pass the entire object using `self`
-      end
-    end
-  end
-end

data/app/models/spree/shipment/emails.rb

@@ -1,12 +0,0 @@
-module Spree
-  class Shipment < Spree.base_class
-    module Emails
-      def send_shipped_email
-        Spree::Deprecation.warn("Shipment#send_shipped_email is deprecated and will be removed in Spree 5.5. Please use events")
-        # you can overwrite this method in your application / extension to send out the confirmation email
-        # or use `spree_emails` gem
-        # YourEmailVendor.deliver_shipment_notification_email(@shipment.id)
-      end
-    end
-  end
-end

data/lib/generators/spree/cursor_rules/cursor_rules_generator.rb

@@ -1,19 +0,0 @@
-module Spree
-  class CursorRulesGenerator < Rails::Generators::Base
-    desc 'Set up Cursor Rules - copies all Spree cursor rules to .cursor/rules directory'
-
-    def self.source_paths
-      paths = superclass.source_paths
-      paths << File.expand_path('templates', __dir__)
-      paths.flatten
-    end
-
-    def create_cursor_rules_directory
-      empty_directory '.cursor/rules'
-    end
-
-    def copy_cursor_rules
-      copy_file 'spree_rules.mdc', '.cursor/rules/spree_rules.mdc'
-    end
-  end
-end

data/lib/generators/spree/cursor_rules/templates/spree_rules.mdc

@@ -1,385 +0,0 @@
----
-alwaysApply: true
----
-
-# Cursor Rules for Spree Commerce Development
-
-## General Development Guidelines
-
-### Framework & Architecture
-
-- Spree is built on Ruby on Rails and follows MVC architecture
-- All Spree code must be namespaced under `Spree::` module
-- Spree is distributed as Rails engines with separate gems (core, admin, api, storefront, emails, etc.)
-- Follow Rails conventions and the Rails Security Guide
-- Prefer Rails idioms and standard patterns over custom solutions
-
-### Code Organization
-
-- Place all models in `app/models/spree/` directory
-- Place all controllers in `app/controllers/spree/` directory  
-- Place all views in `app/views/spree/` directory
-- Place all services in `app/services/spree/` directory
-- Place all mailers in `app/mailers/spree/` directory
-- Place all API serializers in `app/serializers/spree/` directory
-- Place all helpers in `app/helpers/spree/` directory
-- Place all jobs in `app/jobs/spree/` directory
-- Place all presenters in `app/presenters/spree/` directory
-- Use consistent file naming: `spree/product.rb` for `Spree::Product` class
-- Group related functionality into concerns when appropriate
-- Do not call `Spree::User` directly, use `Spree.user_class` instead
-- Do not call `Spree::AdminUser` directly, use `Spree.admin_user_class` instead
-
-## Naming Conventions & Structure
-
-### Classes & Modules
-
-```ruby
-# ✅ Correct naming
-module Spree
-  class Product < Spree.base_class
-  end
-end
-
-module Spree
-  module Admin
-    class ProductsController < ResourceController
-    end
-  end
-end
-
-# ❌ Incorrect - missing namespace
-class Product < ApplicationRecord
-end
-```
-
-Always inherit from `Spree.base_class` when creating models.
-
-### File Paths
-
-- Models: `app/models/spree/product.rb`
-- Controllers: `app/controllers/spree/admin/products_controller.rb`
-- Views: `app/views/spree/admin/products/`
-- Decorators: `app/models/spree/product_decorator.rb`
-
-## Model Development
-
-### Model Patterns
-
-- Use ActiveRecord associations appropriately, always pass `class_name` and `dependent` options
-- Implement concerns for shared functionality
-- Use scopes for reusable query patterns
-- Include `Spree::Metafields` concern for models that need metadata support
-
-```ruby
-# ✅ Good model structure
-class Spree::Product < Spree.base_class
-  include Spree::Metafields
-  
-  has_many :variants, class_name: 'Spree::Variant', dependent: :destroy
-
-  scope :available, -> { where(available_on: ..Time.current) }
-  
-  validates :name, presence: true
-  validates :slug, presence: true, uniqueness: { scope: spree_base_uniqueness_scope }
-end
-```
-
-For uniqueness validation, always use `scope: spree_base_uniqueness_scope`
-
-## Controller Development
-
-### Controller Inheritance
-
-- Admin controllers inherit from `Spree::Admin::ResourceController` which handles most of CRUD operations
-- API controllers inherit from `Spree::Api::V2::BaseController`
-- Storefront controllers inherit from `Spree::StoreController`
-
-### Parameter Handling
-
-- Always use strong parameters
-
-```ruby
-# ✅ Proper parameter handling
-def permitted_product_params
-  params.require(:product).permit(:name, :description, :price)
-end
-```
-
-## Customization & Extensions
-
-### Spree::Dependencies System (Preferred Method)
-
-Dependencies allow you to replace parts of Spree core with custom implementations. This is the preferred method for customization.
-
-#### Global Customization
-
-In `config/initializers/spree.rb`:
-
-```ruby
-# Single service replacement
-Spree::Dependencies.cart_add_item_service = 'MyAddToCartService'
-
-# Or using block syntax
-Spree.dependencies do |dependencies|
-  dependencies.cart_add_item_service = 'MyAddToCartService'
-  dependencies.checkout_complete_service = 'MyCheckoutCompleteService'
-end
-```
-
-#### API Level Customization
-
-```ruby
-# Storefront API specific
-Spree::Api::Dependencies.storefront_cart_serializer = 'MyCartSerializer'
-Spree::Api::Dependencies.storefront_cart_add_item_service = 'MyAddToCartService'
-
-# Platform API specific
-Spree::Api::Dependencies.platform_product_serializer = 'MyProductSerializer'
-```
-
-#### Service Implementation
-
-```ruby
-# ✅ Proper service inheritance
-class MyAddToCartService < Spree::Cart::AddItem
-  def call(order:, variant:, quantity: nil, public_metadata: {}, private_metadata: {}, options: {})
-    ApplicationRecord.transaction do
-      run :add_to_line_item
-      run Spree.cart_recalculate_service
-      run :update_external_system
-    end
-  end
-
-  private
-
-  def update_external_system(result)
-    # Custom logic here
-  end
-end
-```
-
-#### Available Injection Points
-
-Common dependencies you can override:
-- Cart services: `cart_add_item_service`, `cart_update_service`, `cart_remove_item_service`
-- Checkout services: `checkout_next_service`, `checkout_complete_service`
-- Order services: `order_approve_service`, `order_cancel_service`
-- Payment services: `payment_create_service`, `payment_process_service`
-- Ability classes: `ability_class`
-- Serializers: Various API serializers for different endpoints
-
-### Decorators (Use Sparingly)
-
-Decorators should be a last resort - they make upgrades difficult. Use `Module.prepend` pattern for decorators.
-
-#### Model Decorators
-
-```ruby
-# ✅ Proper decorator structure
-module Spree
-  module ProductDecorator
-    def self.prepended(base)
-      base.has_many :videos, class_name: 'Spree::Video', dependent: :destroy
-      base.before_validation :strip_whitespaces
-    end
-
-    def custom_name
-      name.upcase
-    end
-
-    private
-
-    def strip_whitespaces
-      self.name = name.strip if name.present?
-    end
-  end
-
-  Product.prepend(ProductDecorator)
-end
-```
-
-#### Controller Decorators
-
-```ruby
-# ✅ Controller decorator with dependency injection
-module Spree
-  module Admin
-    module ProductsControllerDecorator
-      def self.prepended(base)
-        base.before_action :load_custom_data, only: [:show, :edit]
-      end
-
-      def custom_action
-        # Custom action implementation
-      end
-
-      private
-
-      def load_custom_data
-        @custom_data = fetch_custom_data
-      end
-    end
-
-    ProductsController.prepend(ProductsControllerDecorator)
-  end
-end
-```
-
-### View Customization
-
-#### Admin Panel Injection Points
-
-Use partial injection for admin customization:
-
-```ruby
-# In config/initializers/spree.rb
-Rails.application.config.spree_admin.head_partials << 'spree/admin/shared/custom_head'
-Rails.application.config.spree_admin.body_end_partials << 'spree/admin/shared/custom_footer'
-```
-
-Available injection points:
-- `head_partials` - Injects into `<head>` tag
-- `body_start_partials` - Injects at start of `<body>`
-- `body_end_partials` - Injects at end of `<body>`
-
-#### Storefront Themes
-
-Create custom themes for storefront customization:
-
-```bash
-bin/rails g spree:storefront:theme MyTheme
-```
-
-```ruby
-# Register theme in config/initializers/spree.rb
-Spree.page_builder.themes << Spree::Themes::MyTheme
-```
-
-#### View Overrides
-
-Override specific views by creating files in your app:
-
-```
-app/views/themes/my_theme/spree/products/index.html.erb
-```
-
-Do not override views for admin, only for storefront. Avoid overriding any views for Checkout or Cart.
-
-### Authentication Integration
-
-```ruby
-# In config/initializers/spree.rb
-Spree.user_class = 'User'
-Spree.admin_user_class = 'AdminUser'
-
-# Custom authentication
-Rails.application.config.to_prepare do
-  Spree::ApplicationController.include MyAuthenticationModule
-end
-```
-
-## Testing Guidelines
-
-### Test Structure
-
-- Use RSpec for testing
-- Place specs in `spec/` directory following Rails conventions
-- Use Spree's testing helpers and factories
-
-```ruby
-# ✅ Proper test structure
-require 'spec_helper'
-
-RSpec.describe Spree::Product, type: :model do
-  let(:product) { create(:product) }
-  
-  describe '#available?' do
-    it 'returns true when product is available' do
-      expect(product.available?).to be true
-    end
-  end
-end
-```
-
-### Factory Usage
-
-```ruby
-# Use Spree factories
-create(:product, name: 'Test Product')
-create(:order_with_line_items)
-create(:user)
-```
-
-## Performance & Security
-
-### Database Queries
-
-- Use includes/joins to avoid N+1 queries
-- Add database indexes for frequently queried fields
-- Use counter caches for associations that are counted frequently
-
-### Security
-
-- Always use strong parameters in controllers
-- Sanitize user input
-- Use Spree's built-in authorization system (CanCanCan)
-- Validate file uploads and restrict file types
-
-## Common Patterns
-
-### Service Objects
-
-```ruby
-# ✅ Spree service pattern
-module Spree
-  class MyCustomService
-    prepend Spree::ServiceModule::Base
-
-    def call(param1:, param2: nil)
-      # Service logic here
-      success(result_data)
-    rescue StandardError => e
-      failure(e.message)
-    end
-  end
-end
-```
-
-### API Development
-
-```ruby
-# ✅ Custom API endpoint
-module Spree
-  module Api
-    module V2
-      class CustomController < Spree::Api::V2::BaseController
-        def index
-          render json: serialized_collection
-        end
-
-        private
-
-        def serialized_collection
-          Spree.api.storefront_product_serializer.new(
-            collection,
-            include: resource_includes,
-            fields: sparse_fields
-          ).serializable_hash
-        end
-      end
-    end
-  end
-end
-```
-
-## Avoid These Patterns
-
-❌ Direct inheritance from Rails classes without Spree namespace
-❌ Monkey patching without using decorators or dependencies
-❌ Hard-coding configuration values
-❌ Direct SQL queries without using ActiveRecord
-❌ Creating models outside Spree namespace when extending core functionality
-❌ Using class_eval decorators (use Module.prepend instead)
-❌ Overriding entire view files when partial injection would work
-❌ Modifying core Spree files directly

data/lib/spree/core/importer/order.rb

@@ -1,244 +0,0 @@
-module Spree
-  module Core
-    module Importer
-      class Order
-        def self.import(user, params)
-          Spree::Deprecation.warn('Spree::Core::Importer::Order is deprecated and will be removed in Spree 5.5. Please use `Spree::Imports::Order` instead.')
-
-          ensure_country_id_from_params params[:ship_address_attributes]
-          ensure_state_id_from_params params[:ship_address_attributes]
-          ensure_country_id_from_params params[:bill_address_attributes]
-          ensure_state_id_from_params params[:bill_address_attributes]
-
-          create_params = params.slice :currency
-          order = Spree::Order.create! create_params
-          order.associate_user!(user)
-
-          shipments_attrs = params.delete(:shipments_attributes)
-
-          create_line_items_from_params(params.delete(:line_items_attributes), order)
-          create_shipments_from_params(shipments_attrs, order)
-          create_adjustments_from_params(params.delete(:adjustments_attributes), order)
-          create_payments_from_params(params.delete(:payments_attributes), order)
-
-          if completed_at = params.delete(:completed_at)
-            order.completed_at = completed_at
-            order.state = 'complete'
-          end
-
-          params.delete(:user_id) unless user.try(:has_spree_role?, 'admin') && params.key?(:user_id)
-
-          order.update!(params)
-
-          order.create_proposed_shipments unless shipments_attrs.present?
-
-          # Really ensure that the order totals & states are correct
-          order.updater.update
-          if shipments_attrs.present?
-            order.shipments.each_with_index do |shipment, index|
-              shipment.update_columns(cost: shipments_attrs[index][:cost].to_f) if shipments_attrs[index][:cost].present?
-            end
-          end
-          order.reload
-        rescue StandardError => e
-          order.destroy if order&.persisted?
-          raise e.message
-        end
-
-        def self.create_shipments_from_params(shipments_hash, order)
-          return [] unless shipments_hash
-
-          shipments_hash.each do |s|
-            shipment = order.shipments.build
-            shipment.tracking       = s[:tracking]
-            shipment.stock_location = Spree::StockLocation.find_by(admin_name: s[:stock_location]) ||
-              Spree::StockLocation.find_by!(name: s[:stock_location])
-            inventory_units = create_inventory_units_from_order_and_params(order, s[:inventory_units])
-
-            inventory_units.each do |inventory_unit|
-              inventory_unit.shipment = shipment
-
-              if s[:shipped_at].present?
-                inventory_unit.pending = false
-                inventory_unit.state = 'shipped'
-              end
-
-              inventory_unit.save!
-            end
-
-            if s[:shipped_at].present?
-              shipment.shipped_at = s[:shipped_at]
-              shipment.state      = 'shipped'
-            end
-
-            shipment.save!
-
-            shipping_method = Spree::ShippingMethod.find_by(name: s[:shipping_method]) ||
-              Spree::ShippingMethod.find_by!(admin_name: s[:shipping_method])
-            rate = shipment.shipping_rates.create!(shipping_method: shipping_method, cost: s[:cost])
-
-            shipment.selected_shipping_rate_id = rate.id
-            shipment.update_amounts
-
-            adjustments = s.delete(:adjustments_attributes)
-            create_adjustments_from_params(adjustments, order, shipment)
-          rescue StandardError => e
-            raise "Order import shipments: #{e.message} #{s}"
-          end
-        end
-
-        def self.create_inventory_units_from_order_and_params(order, inventory_unit_params)
-          inventory_unit_params.each_with_object([]) do |inventory_unit_param, inventory_units|
-            ensure_variant_id_from_params(inventory_unit_param)
-            existing = inventory_units.detect { |unit| unit.variant_id == inventory_unit_param[:variant_id] }
-            if existing
-              existing.quantity += 1
-            else
-              line_item = order.line_items.detect { |ln| ln.variant_id == inventory_unit_param[:variant_id] }
-              inventory_units << InventoryUnit.new(line_item: line_item, order_id: order.id, variant: line_item.variant, quantity: 1)
-            end
-          end
-        end
-
-        def self.create_line_items_from_params(line_items, order)
-          return {} unless line_items
-
-          line_items.each do |line_item|
-            adjustments = line_item.delete(:adjustments_attributes)
-            extra_params = line_item.except(:variant_id, :quantity, :sku)
-            line_item = ensure_variant_id_from_params(line_item)
-            variant = Spree::Variant.find(line_item[:variant_id])
-            line_item = Cart::AddItem.call(order: order, variant: variant, quantity: line_item[:quantity]).value
-            # Raise any errors with saving to prevent import succeeding with line items
-            # failing silently.
-            if extra_params.present?
-              line_item.update!(extra_params)
-            else
-              line_item.save!
-            end
-            create_adjustments_from_params(adjustments, order, line_item)
-          rescue StandardError => e
-            raise "Order import line items: #{e.message} #{line_item}"
-          end
-        end
-
-        def self.create_adjustments_from_params(adjustments, order, adjustable = nil)
-          return [] unless adjustments
-
-          adjustments.each do |a|
-            adjustment = (adjustable || order).adjustments.build(
-              order: order,
-              amount: a[:amount].to_f,
-              label: a[:label],
-              source_type: source_type_from_adjustment(a)
-            )
-            adjustment.save!
-            adjustment.close!
-          rescue StandardError => e
-            raise "Order import adjustments: #{e.message} #{a}"
-          end
-        end
-
-        def self.create_payments_from_params(payments_hash, order)
-          return [] unless payments_hash
-
-          payments_hash.each do |p|
-            payment = order.payments.build order: order
-            payment.amount = p[:amount].to_f
-            # Order API should be using state as that's the normal payment field.
-            # spree_wombat serializes payment state as status so imported orders should fall back to status field.
-            payment.state = p[:state] || p[:status] || 'completed'
-            payment.created_at = p[:created_at] if p[:created_at]
-            payment.payment_method = Spree::PaymentMethod.find_by!(name: p[:payment_method])
-            payment.source = create_source_payment_from_params(p[:source], payment) if p[:source]
-            payment.save!
-          rescue StandardError => e
-            raise "Order import payments: #{e.message} #{p}"
-          end
-        end
-
-        def self.create_source_payment_from_params(source_hash, payment)
-          Spree::CreditCard.create(
-            month: source_hash[:month],
-            year: source_hash[:year],
-            cc_type: source_hash[:cc_type],
-            last_digits: source_hash[:last_digits],
-            name: source_hash[:name],
-            payment_method: payment.payment_method,
-            gateway_customer_profile_id: source_hash[:gateway_customer_profile_id],
-            gateway_payment_profile_id: source_hash[:gateway_payment_profile_id],
-            imported: true
-          )
-        rescue StandardError => e
-          raise "Order import source payments: #{e.message} #{source_hash}"
-        end
-
-        def self.ensure_variant_id_from_params(hash)
-          sku = hash.delete(:sku)
-          unless hash[:variant_id].present?
-            hash[:variant_id] = Spree::Variant.active.find_by!(sku: sku).id
-          end
-          hash
-        rescue ActiveRecord::RecordNotFound => e
-          raise "Ensure order import variant: Variant w/SKU #{sku} not found."
-        rescue StandardError => e
-          raise "Ensure order import variant: #{e.message} #{hash}"
-        end
-
-        def self.ensure_country_id_from_params(address)
-          return if address.nil? || address[:country_id].present? || address[:country].nil?
-
-          begin
-            search = {}
-            if name = address[:country]['name']
-              search[:name] = name
-            elsif iso_name = address[:country]['iso_name']
-              search[:iso_name] = iso_name.upcase
-            elsif iso = address[:country]['iso']
-              search[:iso] = iso.upcase
-            elsif iso3 = address[:country]['iso3']
-              search[:iso3] = iso3.upcase
-            end
-
-            address.delete(:country)
-            address[:country_id] = Spree::Country.where(search).first!.id
-          rescue StandardError => e
-            raise "Ensure order import address country: #{e.message} #{search}"
-          end
-        end
-
-        def self.ensure_state_id_from_params(address)
-          return if address.nil? || address[:state_id].present? || address[:state].nil?
-
-          begin
-            search = {}
-            if name = address[:state]['name']
-              search[:name] = name
-            elsif abbr = address[:state]['abbr']
-              search[:abbr] = abbr.upcase
-            end
-
-            address.delete(:state)
-            search[:country_id] = address[:country_id]
-
-            if state = Spree::State.where(search).first
-              address[:state_id] = state.id
-            else
-              address[:state_name] = search[:name] || search[:abbr]
-            end
-          rescue StandardError => e
-            raise "Ensure order import address state: #{e.message} #{search}"
-          end
-        end
-
-        def self.source_type_from_adjustment(adjustment)
-          if adjustment[:tax]
-            'Spree::TaxRate'
-          elsif adjustment[:promotion]
-            'Spree::PromotionAction'
-          end
-        end
-      end
-    end
-  end
-end

data/lib/spree/core/importer/product.rb

@@ -1,67 +0,0 @@
-module Spree
-  module Core
-    module Importer
-      class Product
-        attr_reader :product, :product_attrs, :variants_attrs, :options_attrs, :store
-
-        def initialize(product, product_params, options = {})
-          Spree::Deprecation.warn('Spree::Core::Importer::Product is deprecated and will be removed in Spree 5.5. Please use `Spree::Imports::Product` instead.')
-
-          @store = options[:store] || Spree::Store.default
-          @product = product || Spree::Product.new(product_params)
-          @product.stores << @store if @product.stores.exclude?(@store)
-
-          @product_attrs = product_params.to_h
-          @variants_attrs = (options[:variants_attrs] || []).map(&:to_h)
-          @options_attrs = options[:options_attrs] || []
-        end
-
-        def create
-          if product.save
-            variants_attrs.each do |variant_attribute|
-              # make sure the product is assigned before the options=
-              product.variants.create({ product: product }.merge(variant_attribute))
-            end
-
-            set_up_options
-          end
-
-          product
-        end
-
-        def update
-          if product.update(product_attrs)
-            variants_attrs.each do |variant_attribute|
-              # update the variant if the id is present in the payload
-              if variant_attribute['id'].present?
-                product.variants.find(variant_attribute['id']).update(variant_attribute)
-              else
-                # make sure the product is assigned before the options=
-                product.variants.create({ product: product }.merge(variant_attribute))
-              end
-            end
-
-            set_up_options
-          end
-
-          product
-        end
-
-        private
-
-        def set_up_options
-          options_attrs.each do |name|
-            option_type = Spree::OptionType.where(name: name).first_or_initialize do |option_type|
-              option_type.presentation = name
-              option_type.save!
-            end
-
-            unless product.option_types.include?(option_type)
-              product.option_types << option_type
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/spree/core/importer.rb

@@ -1,9 +0,0 @@
-module Spree
-  module Core
-    module Importer
-    end
-  end
-end
-
-require 'spree/core/importer/order'
-require 'spree/core/importer/product'