spree_core 4.7.2 → 4.8.0

data/lib/spree/money.rb

@@ -5,8 +5,15 @@ Money.rounding_mode = BigDecimal::ROUND_HALF_UP
 
 module Spree
   class Money
+    include Comparable
+
     class << self
       attr_accessor :default_formatting_rules
+
+      def from_cents(amount_in_cents, options = {})
+        money = ::Money.from_cents(amount_in_cents, options[:currency])
+        new(money.to_d, options)
+      end
     end
 
     self.default_formatting_rules = {
@@ -17,10 +24,10 @@ module Spree
 
     attr_reader :money
 
-    delegate    :cents, :currency, to: :money
+    delegate    :cents, :currency, :to_d, :positive?, :zero?, to: :money
 
     def initialize(amount, options = {})
-      use_default_currency
+      ::Money.default_currency ||= Spree::Store.default.default_currency || 'USD'
       @money   = Monetize.parse([amount, (options[:currency] || Spree::Store.default.default_currency)].join)
       @options = Spree::Money.default_formatting_rules.merge(options)
     end
@@ -29,10 +36,18 @@ module Spree
       (cents / currency.subunit_to_unit.to_f * 100).round
     end
 
+    def abs
+      self.class.new(money.abs, options)
+    end
+
     def to_s
       money&.format(options)
     end
 
+    def inspect
+      "#{self.class}(cents: #{cents}, currency: #{currency})"
+    end
+
     # 1) prevent blank, breaking spaces
     # 2) prevent escaping of HTML character entities
     def to_html(opts = { html: true })
@@ -65,9 +80,27 @@ module Spree
       money == obj.money
     end
 
-    def use_default_currency
-      currency = Spree::Store.default.default_currency
-      ::Money.default_currency = currency
+    def +(other)
+      result_money = money + other.money
+      self.class.new(result_money.to_s, options)
+    end
+
+    def -(other)
+      result_money = money - other.money
+      self.class.new(result_money.to_s, options)
+    end
+
+    def *(value)
+      result_money = money * value
+      self.class.new(result_money.to_s, options)
+    end
+
+    def <=>(other)
+      money <=> other.money
+    end
+
+    def -@
+      self.class.new((-money).to_s, options)
     end
 
     private

data/lib/spree/testing_support/authorization_helpers.rb

@@ -37,12 +37,14 @@ module Spree
             ability_class.register_ability(ability)
           end
 
+          let(:user) { Spree.user_class.new }
           let(:admin_app) { Spree::OauthApplication.create!(name: 'Admin Panel', scopes: 'admin') }
           let(:admin_token) { Spree::OauthAccessToken.create!(application: admin_app, scopes: 'admin').token }
 
           before do
-            allow(Spree.user_class).to receive(:find_by).and_return(Spree.user_class.new)
+            allow(Spree.user_class).to receive(:find_by).and_return(user)
             if defined?(Spree::Admin)
+              allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(user)
               allow_any_instance_of(Spree::Admin::BaseController).to receive(:admin_oauth_application).and_return(admin_app)
               allow_any_instance_of(Spree::Admin::BaseController).to receive(:admin_oauth_token).and_return(admin_token)
             end

data/lib/spree/testing_support/common_rake.rb

@@ -14,21 +14,21 @@ namespace :common do
     ENV['RAILS_ENV'] = 'test'
     Rails.env = 'test'
 
-    if ENV['LIB_NAME'] == 'spree/backend'
-      puts 'Preparing NPM package...'
-      system('yarn install')
-      system('yarn build')
-      system('yarn link')
+    Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}"]
+
+    # install frontend libraries
+    unless ['spree/api', 'spree/core', 'spree/sample'].include?(ENV['LIB_NAME'])
+      system('bin/rails importmap:install')
+      system('bin/rails turbo:install')
+      system('bin/rails stimulus:install')
     end
 
-    Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--quiet']
     Spree::InstallGenerator.start [
       "--lib_name=#{ENV['LIB_NAME']}",
       '--auto-accept',
       '--migrate=false',
       '--seed=false',
       '--sample=false',
-      '--quiet',
       '--copy_storefront=false',
       "--install_storefront=#{args[:install_storefront]}",
       "--install_admin=#{args[:install_admin]}",
@@ -41,12 +41,6 @@ namespace :common do
     Spree::DummyModelGenerator.start
     system('bundle exec rake db:migrate')
 
-    unless ['spree/api', 'spree/core', 'spree/sample', 'spree/emails'].include?(ENV['LIB_NAME'])
-      puts 'Setting up node environment'
-      system('bin/rails javascript:install:esbuild')
-      system('bin/rails turbo:install')
-    end
-
     begin
       require "generators/#{ENV['LIB_NAME']}/install/install_generator"
       puts 'Running extension installation generator...'
@@ -56,11 +50,6 @@ namespace :common do
     end
 
     unless ['spree/api', 'spree/core', 'spree/sample'].include?(ENV['LIB_NAME'])
-      if ENV['LIB_NAME'] == 'spree/backend'
-        puts 'Installing node dependencies...'
-        system('yarn link @spree/dashboard')
-        system('yarn install')
-      end
       puts 'Precompiling assets...'
       system('bundle exec rake assets:precompile')
     end

data/spree_core.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.metadata = {
     "bug_tracker_uri"   => "https://github.com/spree/spree/issues",
     "changelog_uri"     => "https://github.com/spree/spree/releases/tag/v#{s.version}",
-    "documentation_uri" => "https://dev-docs.spreecommerce.org/",
+    "documentation_uri" => "https://docs.spreecommerce.org/",
     "source_code_uri"   => "https://github.com/spree/spree/tree/v#{s.version}",
   }
 
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
     actionpack actionview activejob activemodel activerecord
     activestorage activesupport railties
   ].each do |rails_gem|
-    s.add_dependency rails_gem, '>= 6.1', '< 7.2'
+    s.add_dependency rails_gem, '>= 6.1', '< 8.0'
   end
 
   s.add_dependency 'activemerchant', '~> 1.67'
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'carmen', '>= 1.0'
   s.add_dependency 'cancancan', '~> 3.2'
   s.add_dependency 'friendly_id', '~> 5.2', '>= 5.2.1'
-  s.add_dependency 'highline', '~> 2.0' # Necessary for the install generator
+  s.add_dependency 'highline', '>= 2', '< 4' # Necessary for the install generator
   s.add_dependency 'kaminari', '~> 1.2'
   s.add_dependency 'money', '~> 6.13'
   s.add_dependency 'monetize', '~> 1.9'
@@ -52,9 +52,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'stringex'
   s.add_dependency 'validates_zipcode'
   s.add_dependency 'image_processing', '~> 1.2'
-  s.add_dependency 'active_storage_validations', '~> 0.9', '<= 0.9.5'
+  s.add_dependency 'active_storage_validations', '~> 1.1'
   s.add_dependency 'activerecord-typedstore'
-  s.add_dependency 'mobility', '~> 1.2.9'
-  s.add_dependency 'mobility-ransack', '~> 1.2.1'
-  s.add_dependency 'friendly_id-mobility', '~> 1.0.4'
+  s.add_dependency 'mobility', '~> 1.2'
+  s.add_dependency 'mobility-ransack', '~> 1.2'
+  s.add_dependency 'friendly_id-mobility', '~> 1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.7.2
+  version: 4.8.0
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-21 00:00:00.000000000 Z
+date: 2024-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -20,7 +20,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +140,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -150,7 +150,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +160,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -285,16 +285,22 @@ dependencies:
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -455,20 +461,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: activerecord-typedstore
   requirement: !ruby/object:Gem::Requirement
@@ -489,42 +489,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mobility-ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: friendly_id-mobility
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: '1.0'
 description: Spree Models, Helpers, Services and core libraries
 email: hello@spreecommerce.org
 executables: []
@@ -917,12 +917,9 @@ files:
 - db/migrate/20220613133029_add_metadata_to_spree_stock_items.rb
 - db/migrate/20220706112554_create_product_name_and_description_translations_for_mobility_table_backend.rb
 - db/migrate/20220715083542_create_spree_product_translations_for_mobility.rb
-- db/migrate/20220715120222_change_product_name_null_to_true.rb
 - db/migrate/20220718100743_create_spree_taxon_name_and_description_translations_for_mobility_table_backend.rb
-- db/migrate/20220718100948_change_taxon_name_null_to_true.rb
 - db/migrate/20220802070609_add_locale_to_friendly_id_slugs.rb
 - db/migrate/20220802073225_create_spree_product_slug_translations_for_mobility_table_backend.rb
-- db/migrate/20220804073928_transfer_data_to_translatable_tables.rb
 - db/migrate/20221215151408_add_selected_locale_to_spree_users.rb
 - db/migrate/20221219123957_add_deleted_at_to_product_translations.rb
 - db/migrate/20221220133432_add_uniqueness_constraint_to_product_translations.rb
@@ -930,27 +927,24 @@ files:
 - db/migrate/20230103144439_create_option_type_translations.rb
 - db/migrate/20230103151034_create_option_value_translations.rb
 - db/migrate/20230109084253_create_product_property_translations.rb
-- db/migrate/20230109094907_transfer_options_data_to_translatable_tables.rb
 - db/migrate/20230109105943_create_property_translations.rb
-- db/migrate/20230109110840_transfer_property_data_to_translatable_tables.rb
 - db/migrate/20230110142344_backfill_friendly_id_slug_locale.rb
 - db/migrate/20230111121534_add_additional_taxon_translation_fields.rb
-- db/migrate/20230111122511_transfer_product_and_taxon_data_to_translatable_tables.rb
 - db/migrate/20230117115531_create_taxonomy_translations.rb
-- db/migrate/20230117120430_allow_null_taxonomy_name.rb
-- db/migrate/20230117121303_transfer_taxonomy_data_to_translatable_tables.rb
 - db/migrate/20230210142732_create_store_translations.rb
-- db/migrate/20230210142849_transfer_store_data_to_translatable_tables.rb
 - db/migrate/20230210230434_add_deleted_at_to_store_translations.rb
 - db/migrate/20230415155958_rename_data_feed_settings_table.rb
 - db/migrate/20230415160828_rename_data_feed_table_columns.rb
 - db/migrate/20230415161226_add_indexes_to_data_feeds_table.rb
 - db/migrate/20230512094803_rename_data_feeds_column_provider_to_type.rb
-- db/migrate/20230514162157_add_index_on_locale_and_permalink_to_spree_taxons.rb
+- db/migrate/20240303174340_fix_spree_stock_item_unique_index.rb
+- db/migrate/20240514105216_add_weight_and_dimension_units_to_spree_variants.rb
 - db/seeds.rb
 - lib/friendly_id/paranoia.rb
+- lib/generators/spree/custom_authentication/custom_authentication_generator.rb
+- lib/generators/spree/custom_authentication/templates/authentication_helpers.rb.tt
 - lib/generators/spree/custom_user/custom_user_generator.rb
-- lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
+- lib/generators/spree/custom_user/templates/current_user_helpers.rb.tt
 - lib/generators/spree/custom_user/templates/initializer.rb.tt
 - lib/generators/spree/custom_user/templates/migration.rb.tt
 - lib/generators/spree/dummy/dummy_generator.rb
@@ -989,6 +983,7 @@ files:
 - lib/spree/core/preferences/configuration.rb
 - lib/spree/core/preferences/preferable.rb
 - lib/spree/core/preferences/preferable_class_methods.rb
+- lib/spree/core/preferences/runtime_configuration.rb
 - lib/spree/core/preferences/scoped_store.rb
 - lib/spree/core/preferences/store.rb
 - lib/spree/core/product_duplicator.rb
@@ -999,9 +994,11 @@ files:
 - lib/spree/core/query_filters/number.rb
 - lib/spree/core/query_filters/text.rb
 - lib/spree/core/routes.rb
+- lib/spree/core/runtime_configuration.rb
 - lib/spree/core/search/base.rb
 - lib/spree/core/token_generator.rb
 - lib/spree/core/version.rb
+- lib/spree/core/webhooks.rb
 - lib/spree/database_type_utilities.rb
 - lib/spree/i18n.rb
 - lib/spree/localized_number.rb
@@ -1122,9 +1119,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.7.2
-  documentation_uri: https://dev-docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.7.2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.8.0
+  documentation_uri: https://docs.spreecommerce.org/
+  source_code_uri: https://github.com/spree/spree/tree/v4.8.0
 post_install_message:
 rdoc_options: []
 require_paths:

data/db/migrate/20220715120222_change_product_name_null_to_true.rb

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

data/db/migrate/20220718100948_change_taxon_name_null_to_true.rb

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

data/db/migrate/20220804073928_transfer_data_to_translatable_tables.rb

@@ -1,66 +0,0 @@
-class TransferDataToTranslatableTables < 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
-    # Products
-    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;
-                                          ")
-    #Taxons
-    ActiveRecord::Base.connection.execute("
-      INSERT INTO #{TAXON_TRANSLATIONS_TABLE} (name, description, locale, spree_taxon_id, created_at, updated_at)
-      SELECT name, description, '#{DEFAULT_LOCALE}' as locale, id, created_at, updated_at FROM #{TAXONS_TABLE}
-                                          ")
-    ActiveRecord::Base.connection.execute("
-      UPDATE #{TAXONS_TABLE}
-      SET name=null, description=null
-                                          ")
-  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) =
-          (t_taxons.name,
-           t_taxons.description)
-      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/20230109094907_transfer_options_data_to_translatable_tables.rb

@@ -1,58 +0,0 @@
-class TransferOptionsDataToTranslatableTables < ActiveRecord::Migration[6.1]
-  DEFAULT_LOCALE = 'en'
-
-  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
-
-    # Option Types
-    if not Spree::OptionType::Translation.exists?
-      ActiveRecord::Base.connection.execute("
-        INSERT INTO spree_option_type_translations (name, presentation, locale, spree_option_type_id, created_at, updated_at)
-        SELECT name, presentation, '#{DEFAULT_LOCALE}', id, created_at, updated_at
-        FROM spree_option_types;
-      ")
-      ActiveRecord::Base.connection.execute("
-        UPDATE spree_option_types
-        SET name=null, presentation=null;
-      ")
-    end
-
-    # Option Values
-    if not Spree::OptionValue::Translation.exists?
-      ActiveRecord::Base.connection.execute("
-        INSERT INTO spree_option_value_translations (name, presentation, locale, spree_option_value_id, created_at, updated_at)
-        SELECT name, presentation, '#{DEFAULT_LOCALE}', id, created_at, updated_at
-        FROM spree_option_values;
-      ")
-      ActiveRecord::Base.connection.execute("
-        UPDATE spree_option_values
-        SET name=null, presentation=null;
-      ")
-    end
-  end
-
-  def down
-    # Option Types
-    ActiveRecord::Base.connection.execute("
-      UPDATE spree_option_types as option_types
-      SET (name, presentation) = (t_option_types.name, t_option_types.presentation)
-      FROM spree_option_type_translations AS t_option_types
-      WHERE t_option_types.spree_option_type_id = option_types.id;
-    ")
-    ActiveRecord::Base.connection.execute("
-      TRUNCATE TABLE spree_option_type_translations;
-    ")
-
-    # Option Values
-    ActiveRecord::Base.connection.execute("
-      UPDATE spree_option_values as option_values
-      SET (name, presentation) = (t_option_values.name, t_option_values.presentation)
-      FROM spree_option_value_translations AS t_option_values
-      WHERE t_option_values.spree_option_value_id = option_values.id;
-    ")
-    ActiveRecord::Base.connection.execute("
-      TRUNCATE TABLE spree_option_value_translations;
-    ")
-  end
-end