spree_core 4.4.0 → 4.6.0

data/db/migrate/20230111122511_transfer_product_and_taxon_data_to_translatable_tables.rb

@@ -0,0 +1,82 @@
+class TransferProductAndTaxonDataToTranslatableTables < ActiveRecord::Migration[6.1]
+  DEFAULT_LOCALE = 'en'
+  PRODUCTS_TABLE = 'spree_products'
+  PRODUCT_TRANSLATIONS_TABLE = 'spree_product_translations'
+  TAXONS_TABLE = 'spree_taxons'
+  TAXON_TRANSLATIONS_TABLE = 'spree_taxon_translations'
+
+  def up
+    # Only transfer data if translation tables are being newly created / no translations exist
+    # Otherwise, assume translation data is already in place from spree_globalize
+
+    # Products
+    if not Spree::Product::Translation.exists?
+      ActiveRecord::Base.connection.execute("
+      INSERT INTO #{PRODUCT_TRANSLATIONS_TABLE} (name, description, locale, spree_product_id, created_at, updated_at, meta_description, meta_keywords, meta_title, slug)
+      SELECT name, description, '#{DEFAULT_LOCALE}' as locale, id, created_at, updated_at, meta_description, meta_keywords, meta_title, slug FROM #{PRODUCTS_TABLE};
+                                            ")
+      ActiveRecord::Base.connection.execute("
+      UPDATE #{PRODUCTS_TABLE}
+      SET name=null, description=null, meta_description=null, meta_keywords=null, meta_title=null, slug=null;
+                                            ")
+    end
+
+    # Taxons
+    if not Spree::Taxon::Translation.exists?
+      ActiveRecord::Base.connection.execute("
+      INSERT INTO #{TAXON_TRANSLATIONS_TABLE} (name, description, meta_title, meta_description, meta_keywords, permalink, locale, spree_taxon_id, created_at, updated_at)
+      SELECT name, description, meta_title, meta_description, meta_keywords, permalink, '#{DEFAULT_LOCALE}' as locale, id, created_at, updated_at FROM #{TAXONS_TABLE};
+                                            ")
+      ActiveRecord::Base.connection.execute("
+      UPDATE #{TAXONS_TABLE}
+      SET name=null, description=null, meta_title=null, meta_description=null, meta_keywords=null, permalink=null;
+                                            ")
+    end
+  end
+
+  def down
+    ActiveRecord::Base.connection.execute("
+      UPDATE #{PRODUCTS_TABLE} as products
+      SET (name,
+           description,
+           meta_description,
+           meta_keywords,
+           meta_title,
+           slug) =
+          (t_products.name,
+           t_products.description,
+           t_products.meta_description,
+           t_products.meta_keywords,
+           t_products.meta_title,
+           t_products.slug)
+      FROM #{PRODUCT_TRANSLATIONS_TABLE} AS t_products
+      WHERE t_products.spree_product_id = products.id
+    ")
+
+    ActiveRecord::Base.connection.execute("
+      TRUNCATE TABLE #{PRODUCT_TRANSLATIONS_TABLE}
+                                          ")
+
+    ActiveRecord::Base.connection.execute("
+      UPDATE #{TAXONS_TABLE} as taxons
+      SET (name,
+           description,
+           meta_title,
+           meta_description,
+           meta_keywords,
+           permalink) =
+          (t_taxons.name,
+           t_taxons.description,
+           t_taxons.meta_title,
+           t_taxons.meta_description,
+           t_taxons.meta_keywords,
+           t_taxons.permalink)
+      FROM #{TAXON_TRANSLATIONS_TABLE} AS t_taxons
+      WHERE t_taxons.spree_taxon_id = taxons.id
+    ")
+
+    ActiveRecord::Base.connection.execute("
+      TRUNCATE TABLE #{TAXON_TRANSLATIONS_TABLE}
+                                          ")
+  end
+end

data/db/migrate/20230117115531_create_taxonomy_translations.rb

@@ -0,0 +1,24 @@
+class CreateTaxonomyTranslations < ActiveRecord::Migration[6.1]
+  def change
+      if ActiveRecord::Base.connection.table_exists?('spree_taxonomy_translations')
+        # manually check for index since Rails if_exists does not always work correctly
+        if ActiveRecord::Migration.connection.index_exists?(:spree_taxonomy_translations, :spree_taxonomy_id)
+          remove_index :spree_taxonomy_translations, column: :spree_taxonomy_id, if_exists: true
+        end
+      else
+        create_table :spree_taxonomy_translations do |t|
+          # Translated attribute(s)
+          t.string :name
+
+          t.string  :locale, null: false
+          t.references :spree_taxonomy, null: false, foreign_key: true, index: false
+
+          t.timestamps null: false
+        end
+
+        add_index :spree_taxonomy_translations, :locale, name: :index_spree_taxonomy_translations_on_locale
+      end
+
+      add_index :spree_taxonomy_translations, [:spree_taxonomy_id, :locale], name: :index_spree_taxonomy_translations_on_spree_taxonomy_id_locale, unique: true
+  end
+end

data/db/migrate/20230117120430_allow_null_taxonomy_name.rb

@@ -0,0 +1,5 @@
+class AllowNullTaxonomyName < ActiveRecord::Migration[6.1]
+  def change
+    change_column_null :spree_taxonomies, :name, true
+  end
+end

data/db/migrate/20230117121303_transfer_taxonomy_data_to_translatable_tables.rb

@@ -0,0 +1,11 @@
+class TransferTaxonomyDataToTranslatableTables < ActiveRecord::Migration[6.1]
+  TRANSLATION_MIGRATION = Spree::TranslationMigrations.new(Spree::Taxonomy, 'en')
+
+  def up
+    TRANSLATION_MIGRATION.transfer_translation_data
+  end
+
+  def down
+    TRANSLATION_MIGRATION.revert_translation_data_transfer
+  end
+end

data/db/migrate/20230210142732_create_store_translations.rb

@@ -0,0 +1,50 @@
+class CreateStoreTranslations < ActiveRecord::Migration[6.1]
+  def change
+    if ActiveRecord::Base.connection.table_exists?('spree_store_translations')
+      add_new_translation_columns_to_globalize_table
+    else
+      create_table :spree_store_translations do |t|
+        # Translated attribute(s)
+        t.string :name
+        t.text :meta_description
+        t.text :meta_keywords
+        t.string :seo_title
+        t.string :facebook
+        t.string :twitter
+        t.string :instagram
+        t.string :customer_support_email
+        t.text :description
+        t.text :address
+        t.string :contact_phone
+        t.string :new_order_notifications_email
+
+        t.string  :locale, null: false
+        t.references :spree_store, null: false, foreign_key: true, index: false
+
+        t.timestamps null: false
+      end
+
+      add_index :spree_store_translations, :locale, name: :index_spree_store_translations_on_locale
+    end
+
+    add_index :spree_store_translations, [:spree_store_id, :locale], name: :index_spree_store_translations_on_spree_store_id_locale, unique: true
+  end
+
+  private
+
+  def add_new_translation_columns_to_globalize_table
+    # manually check for index since Rails if_exists does not always work correctly
+    if ActiveRecord::Migration.connection.index_exists?(:spree_store_translations, :spree_store_id)
+      remove_index :spree_store_translations, column: :spree_store_id, if_exists: true
+    end
+
+    add_column :spree_store_translations, :facebook, :string
+    add_column :spree_store_translations, :twitter, :string
+    add_column :spree_store_translations, :instagram, :string
+    add_column :spree_store_translations, :customer_support_email, :string
+    add_column :spree_store_translations, :description, :text
+    add_column :spree_store_translations, :address, :text
+    add_column :spree_store_translations, :contact_phone, :string
+    add_column :spree_store_translations, :new_order_notifications_email, :string
+  end
+end

data/db/migrate/20230210142849_transfer_store_data_to_translatable_tables.rb

@@ -0,0 +1,11 @@
+class TransferStoreDataToTranslatableTables < ActiveRecord::Migration[6.1]
+  TRANSLATION_MIGRATION = Spree::TranslationMigrations.new(Spree::Store, 'en')
+
+  def up
+    TRANSLATION_MIGRATION.transfer_translation_data
+  end
+
+  def down
+    TRANSLATION_MIGRATION.revert_translation_data_transfer
+  end
+end

data/db/migrate/20230210230434_add_deleted_at_to_store_translations.rb

@@ -0,0 +1,6 @@
+class AddDeletedAtToStoreTranslations < ActiveRecord::Migration[6.1]
+  def change
+    add_column :spree_store_translations, :deleted_at, :datetime
+    add_index :spree_store_translations, :deleted_at
+  end
+end

data/db/migrate/20230415155958_rename_data_feed_settings_table.rb

@@ -0,0 +1,5 @@
+class RenameDataFeedSettingsTable < ActiveRecord::Migration[6.1]
+  def change
+    rename_table :spree_data_feed_settings, :spree_data_feeds
+  end
+end

data/db/migrate/20230415160828_rename_data_feed_table_columns.rb

@@ -0,0 +1,7 @@
+class RenameDataFeedTableColumns < ActiveRecord::Migration[6.1]
+  def change
+    rename_column :spree_data_feeds, :spree_store_id, :store_id
+    rename_column :spree_data_feeds, :enabled, :active
+    rename_column :spree_data_feeds, :uuid, :slug
+  end
+end

data/db/migrate/20230415161226_add_indexes_to_data_feeds_table.rb

@@ -0,0 +1,5 @@
+class AddIndexesToDataFeedsTable < ActiveRecord::Migration[6.1]
+  def change
+    add_index :spree_data_feeds, [:store_id, :slug, :provider]
+  end
+end

data/db/migrate/20230512094803_rename_data_feeds_column_provider_to_type.rb

@@ -0,0 +1,5 @@
+class RenameDataFeedsColumnProviderToType < ActiveRecord::Migration[6.1]
+  def change
+    rename_column :spree_data_feeds, :provider, :type
+  end
+end

data/db/migrate/20230514162157_add_index_on_locale_and_permalink_to_spree_taxons.rb

@@ -0,0 +1,5 @@
+class AddIndexOnLocaleAndPermalinkToSpreeTaxons < ActiveRecord::Migration[6.1]
+  def change
+    add_index :spree_taxon_translations, [:locale, :permalink], unique: true, name: 'unique_permalink_per_locale', if_not_exists: true
+  end
+end

data/lib/friendly_id/paranoia.rb

@@ -0,0 +1,4 @@
+require 'friendly_id'
+require 'paranoia'
+
+FriendlyId::Slug.acts_as_paranoid

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -38,13 +38,12 @@ module Spree
       opts[:skip_rc] = true
       opts[:skip_spring] = true
       opts[:skip_test] = true
-      opts[:skip_yarn] = true
-      opts[:skip_javascript] = true
       opts[:skip_bootsnap] = true
 
       puts 'Generating dummy Rails application...'
       invoke Rails::Generators::AppGenerator,
         [File.expand_path(dummy_path, destination_root)], opts
+      inject_yaml_permitted_classes
     end
 
     def test_dummy_config
@@ -58,6 +57,10 @@ module Spree
       template 'rails/test.rb', "#{dummy_path}/config/environments/test.rb", force: true
       template 'rails/script/rails', "#{dummy_path}/spec/dummy/script/rails", force: true
       template 'initializers/devise.rb', "#{dummy_path}/config/initializers/devise.rb", force: true
+
+      if lib_name == 'spree/backend'
+        template 'package.json', "#{dummy_path}/package.json", force: true
+      end
     end
 
     def test_dummy_inject_extension_requirements
@@ -114,6 +117,14 @@ end
       ], before: /require '#{@lib_name}'/, verbose: true
     end
 
+    def inject_yaml_permitted_classes
+      inside dummy_path do
+        inject_into_file 'config/application.rb', %Q[
+    config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess]
+        ], after: /config\.load_defaults.*$/, verbose: true
+      end
+    end
+
     def dummy_path
       ENV['DUMMY_PATH'] || 'spec/dummy'
     end

data/lib/generators/spree/dummy/templates/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "app",
+  "private": "true",
+  "dependencies": {
+    "@hotwired/turbo-rails": "^7.2.0",
+    "@spree/dashboard": "^0.2.1",
+    "esbuild": "^0.15.10"
+  },
+  "scripts": {
+    "build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds"
+  }
+}

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -37,4 +37,6 @@ Dummy::Application.configure do
   config.active_job.queue_adapter = :test
 
   config.cache_store = :redis_cache_store
+
+  routes.default_url_options = { host: 'localhost', port: 3000 }
 end

data/lib/spree/core/configuration.rb

@@ -0,0 +1,91 @@
+# This is the primary location for defining spree preferences
+#
+# The expectation is that this is created once and stored in
+# the spree environment
+#
+# setters:
+# a.color = :blue
+# a[:color] = :blue
+# a.set :color = :blue
+# a.preferred_color = :blue
+#
+# getters:
+# a.color
+# a[:color]
+# a.get :color
+# a.preferred_color
+#
+require 'spree/core/search/base'
+require 'spree/core/preferences/configuration'
+
+module Spree
+  module Core
+    class Configuration < Preferences::Configuration
+      # Alphabetized to more easily lookup particular preferences
+      preference :address_requires_state, :boolean, default: true # should state/state_name be required
+      preference :address_requires_phone, :boolean, default: true # Determines whether we require phone in address
+      preference :admin_path, :string, deprecated: true
+      preference :admin_products_per_page, :integer, deprecated: true
+      preference :admin_orders_per_page, :integer, deprecated: true
+      preference :admin_properties_per_page, :integer, deprecated: true
+      preference :admin_promotions_per_page, :integer, deprecated: true
+      preference :admin_customer_returns_per_page, :integer, deprecated: true
+      preference :admin_users_per_page, :integer, deprecated: true
+      preference :admin_show_version, :boolean, deprecated: true
+      preference :allow_checkout_on_gateway_error, :boolean, default: false
+      preference :allow_guest_checkout, :boolean, default: true
+      preference :alternative_shipping_phone, :boolean, default: false # Request extra phone for ship addr
+      preference :always_include_confirm_step, :boolean, default: false # Ensures confirmation step is always in checkout_progress bar, but does not force a confirm step if your payment methods do not support it.
+      preference :always_put_site_name_in_title, :boolean, deprecated: true
+      preference :title_site_name_separator, :string, deprecated: true
+      preference :auto_capture, :boolean, default: false # automatically capture the credit card (as opposed to just authorize and capture later)
+      preference :auto_capture_on_dispatch, :boolean, default: false # Captures payment for each shipment in Shipment#after_ship callback, and makes Shipment.ready when payment authorized.
+      preference :binary_inventory_cache, :boolean, default: false # only invalidate product cache when a stock item changes whether it is in_stock
+      preference :checkout_zone, :string, default: nil, deprecated: true # replace with the name of a zone if you would like to limit the countries
+      preference :company, :boolean, default: false # Request company field for billing and shipping addr
+      preference :currency, :string, default: 'USD', deprecated: true
+      preference :default_country_id, :integer, deprecated: true
+      preference :disable_sku_validation, :boolean, default: false # when turned off disables the built-in SKU uniqueness validation
+      preference :disable_store_presence_validation, :boolean, default: false # when turned off disables Store presence validation for Products and Payment Methods
+      preference :expedited_exchanges, :boolean, default: false # NOTE this requires payment profiles to be supported on your gateway of choice as well as a delayed job handler to be configured with activejob. kicks off an exchange shipment upon return authorization save. charge customer if they do not return items within timely manner.
+      preference :expedited_exchanges_days_window, :integer, default: 14 # the amount of days the customer has to return their item after the expedited exchange is shipped in order to avoid being charged
+      preference :layout, :string, deprecated: 'Please use Spree::Frontend::Config[:layout] instead'
+      preference :logo, :string, deprecated: true
+      preference :mailer_logo, :string, deprecated: true
+      preference :max_level_in_taxons_menu, :integer, deprecated: true
+      preference :products_per_page, :integer, default: 12
+      preference :require_master_price, :boolean, default: true
+      preference :restock_inventory, :boolean, default: true # Determines if a return item is restocked automatically once it has been received
+      preference :return_eligibility_number_of_days, :integer, default: 365
+      preference :send_core_emails, :boolean, default: true # Default mail headers settings
+      preference :shipping_instructions, :boolean, deprecated: true
+      preference :show_only_complete_orders_by_default, :boolean, deprecated: true
+      preference :show_variant_full_price, :boolean, default: false # Displays variant full price or difference with product price. Default false to be compatible with older behavior
+      preference :show_products_without_price, :boolean, default: false
+      preference :show_raw_product_description, :boolean, deprecated: true
+      preference :tax_using_ship_address, :boolean, default: true
+      preference :track_inventory_levels, :boolean, default: true # Determines whether to track on_hand values for variants / products.
+      preference :use_user_locale, :boolean, default: true
+
+      # Store credits configurations
+      preference :non_expiring_credit_types, :array, default: []
+      preference :credit_to_new_allocation, :boolean, default: false
+
+      # Multi store configurations
+      preference :show_store_selector, :boolean, deprecated: true
+
+      # searcher_class allows spree extension writers to provide their own Search class
+      def searcher_class
+        ActiveSupport::Deprecation.warn('`Spree::Config.searcher_class` is deprecated and will be removed in Spree v5, please use `Spree.searcher_class` instead.')
+        @searcher_class ||= Spree.searcher_class
+      end
+
+      # Sets the path used for products, taxons and pages.
+      preference :storefront_products_path, :string, default: 'products'
+      preference :storefront_taxons_path, :string, default: 't'
+      preference :storefront_pages_path, :string, default: 'pages'
+
+      attr_writer :searcher_class
+    end
+  end
+end

data/lib/spree/core/controller_helpers/auth.rb

@@ -7,7 +7,9 @@ module Spree
 
         included do
           before_action :set_token
-          helper_method :try_spree_current_user
+          if defined?(helper_method)
+            helper_method :try_spree_current_user
+          end
 
           rescue_from CanCan::AccessDenied do |_exception|
             redirect_unauthorized_access

data/lib/spree/core/controller_helpers/currency.rb

@@ -5,11 +5,13 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          helper_method :supported_currencies
-          helper_method :supported_currencies_for_all_stores
-          helper_method :current_currency
-          helper_method :supported_currency?
-          helper_method :currency_param
+          if defined?(helper_method)
+            helper_method :supported_currencies
+            helper_method :supported_currencies_for_all_stores
+            helper_method :current_currency
+            helper_method :supported_currency?
+            helper_method :currency_param
+          end
         end
 
         def current_currency

data/lib/spree/core/controller_helpers/locale.rb

@@ -7,12 +7,14 @@ module Spree
         included do
           before_action :set_locale
 
-          helper_method :supported_locales
-          helper_method :supported_locales_for_all_stores
-          helper_method :current_locale
-          helper_method :supported_locale?
-          helper_method :available_locales
-          helper_method :locale_param
+          if defined?(helper_method)
+            helper_method :supported_locales
+            helper_method :supported_locales_for_all_stores
+            helper_method :current_locale
+            helper_method :supported_locale?
+            helper_method :available_locales
+            helper_method :locale_param
+          end
         end
 
         def set_locale
@@ -20,15 +22,29 @@ module Spree
         end
 
         def current_locale
-          @current_locale ||= if params[:locale].present? && supported_locale?(params[:locale])
+          @current_locale ||= if user_locale?
+                                try_spree_current_user.selected_locale
+                              elsif params_locale?
                                 params[:locale]
-                              elsif respond_to?(:config_locale, true) && config_locale.present?
+                              elsif config_locale?
                                 config_locale
                               else
                                 current_store&.default_locale || Rails.application.config.i18n.default_locale || I18n.default_locale
                               end
         end
 
+        def config_locale?
+          respond_to?(:config_locale, true) && config_locale.present?
+        end
+
+        def params_locale?
+          params[:locale].present? && supported_locale?(params[:locale])
+        end
+
+        def user_locale?
+          Spree::Config.use_user_locale && try_spree_current_user && supported_locale?(try_spree_current_user.selected_locale)
+        end
+
         def supported_locales
           @supported_locales ||= current_store&.supported_locales_list
         end
@@ -52,6 +68,16 @@ module Spree
 
           I18n.locale.to_s
         end
+
+        def find_with_fallback_default_locale(&block)
+          result = begin
+            block.call
+          rescue ActiveRecord::RecordNotFound => _e
+            nil
+          end
+
+          result || Mobility.with_locale(current_store.default_locale) { block.call }
+        end
       end
     end
   end

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

@@ -5,8 +5,10 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          helper_method :current_order
-          helper_method :simple_current_order
+          if defined?(helper_method)
+            helper_method :current_order
+            helper_method :simple_current_order
+          end
         end
 
         # Used in the link_to_cart helper.

data/lib/spree/core/controller_helpers/search.rb

@@ -3,7 +3,7 @@ module Spree
     module ControllerHelpers
       module Search
         def build_searcher(params)
-          Spree::Config.searcher_class.new(params).tap do |searcher|
+          Spree.searcher_class.new(params).tap do |searcher|
             searcher.current_user = try_spree_current_user
             searcher.current_currency = current_currency&.upcase
             searcher.current_store = current_store

data/lib/spree/core/controller_helpers/store.rb

@@ -5,9 +5,11 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          helper_method :current_store
-          helper_method :current_price_options
-          helper_method :available_menus
+          if defined?(helper_method)
+            helper_method :current_store
+            helper_method :current_price_options
+            helper_method :available_menus
+          end
         end
 
         def current_store

data/lib/spree/core/dependencies.rb

@@ -0,0 +1,106 @@
+require_relative 'dependencies_helper'
+
+module Spree
+  module Core
+    class Dependencies
+      INJECTION_POINTS_WITH_DEFAULTS = {
+        # ability
+        ability_class: 'Spree::Ability',
+
+        # cart
+        cart_compare_line_items_service: 'Spree::CompareLineItems',
+        cart_create_service: 'Spree::Cart::Create',
+        cart_add_item_service: 'Spree::Cart::AddItem',
+        cart_update_service: 'Spree::Cart::Update',
+        cart_recalculate_service: 'Spree::Cart::Recalculate',
+        cart_remove_item_service: 'Spree::Cart::RemoveItem',
+        cart_remove_line_item_service: 'Spree::Cart::RemoveLineItem',
+        cart_set_item_quantity_service: 'Spree::Cart::SetQuantity',
+        cart_estimate_shipping_rates_service: 'Spree::Cart::EstimateShippingRates',
+        cart_empty_service: 'Spree::Cart::Empty',
+        cart_destroy_service: 'Spree::Cart::Destroy',
+        cart_associate_service: 'Spree::Cart::Associate',
+        cart_change_currency_service: 'Spree::Cart::ChangeCurrency',
+
+        # checkout
+        checkout_next_service: 'Spree::Checkout::Next',
+        checkout_advance_service: 'Spree::Checkout::Advance',
+        checkout_update_service: 'Spree::Checkout::Update',
+        checkout_complete_service: 'Spree::Checkout::Complete',
+        checkout_add_store_credit_service: 'Spree::Checkout::AddStoreCredit',
+        checkout_remove_store_credit_service: 'Spree::Checkout::RemoveStoreCredit',
+        checkout_get_shipping_rates_service: 'Spree::Checkout::GetShippingRates',
+        checkout_select_shipping_method_service: 'Spree::Checkout::SelectShippingMethod',
+
+        # order
+        order_approve_service: 'Spree::Orders::Approve',
+        order_cancel_service: 'Spree::Orders::Cancel',
+
+        # shipment
+        shipment_change_state_service: 'Spree::Shipments::ChangeState',
+        shipment_create_service: 'Spree::Shipments::Create',
+        shipment_update_service: 'Spree::Shipments::Update',
+        shipment_add_item_service: 'Spree::Shipments::AddItem',
+        shipment_remove_item_service: 'Spree::Shipments::RemoveItem',
+
+        # sorter
+        collection_sorter: 'Spree::BaseSorter',
+        order_sorter: 'Spree::BaseSorter',
+        products_sorter: 'Spree::Products::Sort',
+
+        # paginator
+        collection_paginator: 'Spree::Shared::Paginate',
+
+        # coupons
+        # TODO: we should split this service into 2 separate - Add and Remove
+        coupon_handler: 'Spree::PromotionHandler::Coupon',
+
+        # account
+        account_create_service: 'Spree::Account::Create',
+        account_update_service: 'Spree::Account::Update',
+
+        # addresses
+        address_create_service: 'Spree::Addresses::Create',
+        address_update_service: 'Spree::Addresses::Update',
+
+        # credit cards
+        credit_cards_destroy_service: 'Spree::CreditCards::Destroy',
+
+        # classifications
+        classification_reposition_service: 'Spree::Classifications::Reposition',
+
+        # line items
+        line_item_create_service: 'Spree::LineItems::Create',
+        line_item_update_service: 'Spree::LineItems::Update',
+        line_item_destroy_service: 'Spree::LineItems::Destroy',
+
+        payment_create_service: 'Spree::Payments::Create',
+
+        # errors
+        error_handler: 'Spree::ErrorReporter',
+
+        # data feeds
+        data_feeds_google_rss_service: 'Spree::DataFeeds::Google::Rss',
+        data_feeds_google_optional_attributes_service: 'Spree::DataFeeds::Google::OptionalAttributes',
+        data_feeds_google_required_attributes_service: 'Spree::DataFeeds::Google::RequiredAttributes',
+        data_feeds_google_optional_sub_attributes_service: 'Spree::DataFeeds::Google::OptionalSubAttributes',
+        data_feeds_google_products_list: 'Spree::DataFeeds::Google::ProductsList',
+
+        # finders
+        address_finder: 'Spree::Addresses::Find',
+        country_finder: 'Spree::Countries::Find',
+        cms_page_finder: 'Spree::CmsPages::Find',
+        menu_finder: 'Spree::Menus::Find',
+        current_order_finder: 'Spree::Orders::FindCurrent',
+        current_store_finder: 'Spree::Stores::FindCurrent',
+        completed_order_finder: 'Spree::Orders::FindComplete',
+        credit_card_finder: 'Spree::CreditCards::Find',
+        products_finder: 'Spree::Products::Find',
+        taxon_finder: 'Spree::Taxons::Find',
+        line_item_by_variant_finder: 'Spree::LineItems::FindByVariant'
+      }.freeze
+
+      include Spree::DependenciesHelper
+    end
+  end
+end