spree_core 5.0.3 → 5.1.0.beta

data/db/migrate/20250418174652_add_resource_to_spree_role_users.rb

@@ -0,0 +1,8 @@
+class AddResourceToSpreeRoleUsers < ActiveRecord::Migration[7.2]
+  def change
+    add_reference :spree_role_users, :resource, polymorphic: true, null: true
+    add_reference :spree_role_users, :invitation, null: true
+
+    add_index :spree_role_users, [:resource_id, :resource_type, :user_id, :user_type, :role_id], unique: true
+  end
+end

data/db/migrate/20250508060800_add_selected_locale_to_spree_admin_users.rb

@@ -0,0 +1,8 @@
+class AddSelectedLocaleToSpreeAdminUsers < ActiveRecord::Migration[7.2]
+  def change
+    if Spree.admin_user_class.present?
+      users_table_name = Spree.admin_user_class.table_name
+      add_column users_table_name, :selected_locale, :string unless column_exists?(users_table_name, :selected_locale)
+    end
+  end
+end

data/db/migrate/20250509143831_add_session_id_to_spree_assets.rb

@@ -0,0 +1,5 @@
+class AddSessionIdToSpreeAssets < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_assets, :session_id, :string
+  end
+end

data/lib/generators/spree/authentication/devise/devise_generator.rb

@@ -33,6 +33,8 @@ module Spree
     include Spree::UserPaymentSource
             RUBY
           end
+          gsub_file user_class_file, "< ApplicationRecord", "< Spree.base_class"
+
           say "Successfully added Spree user modules into #{user_class_file}"
         else
           say "Could not locate user model file at #{user_class_file}. Please add these lines manually:", :red
@@ -42,13 +44,14 @@ module Spree
             include Spree::UserMethods
             include Spree::UserPaymentSource
           RUBY
+
+          say "Please replace < ApplicationRecord with < Spree.base_class in #{user_class_file}"
         end
 
         append_file 'config/initializers/spree.rb' do
           %Q{
             if defined?(Devise) && Devise.respond_to?(:parent_controller)
-              Devise.parent_controller = "Spree::StoreController"
-              Devise.parent_mailer = "Spree::BaseMailer"
+              Devise.parent_controller = "Spree::BaseController"
             end\n}
         end
       end

data/lib/generators/spree/authentication/devise/templates/authentication_helpers.rb.tt

@@ -38,13 +38,13 @@ module Spree
     end
 
     def spree_admin_login_path(opts = {})
-      spree_login_path(opts)
+      new_session_path(Spree.admin_user_class.model_name.singular_route_key, opts)
     end
 
     def spree_admin_logout_path(opts = {})
-      spree_logout_path(opts)
+      destroy_session_path(Spree.admin_user_class.model_name.singular_route_key, opts)
     end
   end
 end
 
-ApplicationController.include Spree::AuthenticationHelpers if defined?(ApplicationController)
+ApplicationController.include Spree::AuthenticationHelpers if defined?(ApplicationController)

data/lib/generators/spree/install/install_generator.rb

@@ -78,6 +78,11 @@ module Spree
     def install_storefront
       if @install_storefront && Spree::Core::Engine.frontend_available?
         generate 'spree:storefront:install'
+
+        # generate devise controllers if authentication is devise
+        if @authentication == 'devise'
+          generate 'spree:storefront:devise'
+        end
       end
     end
 

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

@@ -17,15 +17,16 @@ module Spree
 
         # Needs to be overridden so that we use Spree's Ability rather than anyone else's.
         def current_ability
-          @current_ability ||= Spree::Dependencies.ability_class.constantize.new(try_spree_current_user)
+          @current_ability ||= Spree::Dependencies.ability_class.constantize.new(try_spree_current_user, { store: current_store })
         end
 
         def redirect_back_or_default(default)
-          redirect_to(session['spree_user_return_to'] || request.env['HTTP_REFERER'] || default)
-          session['spree_user_return_to'] = nil
+          Spree::Deprecation.warn('redirect_back_or_default is deprecated and will be removed in Spree 5.2. Please use redirect_back(fallback_location: default) instead.')
+          redirect_back(fallback_location: default)
         end
 
         def set_token
+          Spree::Deprecation.warn('set_token is deprecated and will be removed in Spree 5.2. Please use create_token_cookie(token) instead.')
           cookies.permanent.signed[:token] ||= cookies.signed[:guest_token]
           cookies.permanent.signed[:token] ||= {
             value: generate_token,
@@ -43,18 +44,19 @@ module Spree
           @current_oauth_token ||= get_last_access_token.call(user) || create_access_token.call(user)
         end
 
-        def store_location
-          # disallow return to login, logout, signup pages
-          authentication_routes = [:spree_signup_path, :spree_login_path, :spree_logout_path]
-          disallowed_urls = []
-          authentication_routes.each do |route|
-            disallowed_urls << send(route) if respond_to?(route)
-          end
+        # this will work for devise out of the box
+        # for other auth systems you will need to override this method
+        def store_location(location = nil)
+          return if try_spree_current_user
 
-          disallowed_urls.map! { |url| url[/\/\w+$/] }
-          unless disallowed_urls.include?(request.fullpath)
-            session['spree_user_return_to'] = request.fullpath.gsub('//', '/')
-          end
+          location ||= request.fullpath
+          session_key = store_location_session_key
+
+          session[session_key] = location
+        end
+
+        def store_location_session_key
+          "#{Spree.user_class.model_name.singular_route_key.to_sym}_return_to"
         end
 
         # proxy method to *possible* spree_current_user method

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

@@ -14,6 +14,8 @@ module Spree
           end
         end
 
+        # Returns the currently selected currency.
+        # @return [String] the currently selected currency, eg. `USD`
         def current_currency
           @current_currency ||= if defined?(session) && session.key?(:currency) && supported_currency?(session[:currency])
                                   session[:currency]
@@ -26,10 +28,14 @@ module Spree
                                 end&.upcase
         end
 
+        # Returns the list of supported currencies for the current store.
+        # @return [Array<Money::Currency>] the list of supported currencies
         def supported_currencies
           @supported_currencies ||= current_store&.supported_currencies_list
         end
 
+        # Returns the list of supported currencies for all stores.
+        # @return [Array<String>] the list of supported currencies, eg. `["USD", "EUR"]`
         def supported_currencies_for_all_stores
           @supported_currencies_for_all_stores ||= begin
             (
@@ -39,12 +45,17 @@ module Spree
           end
         end
 
+        # Checks if the given currency is supported.
+        # @param currency_iso_code [String] the ISO code of the currency, eg. `USD`
+        # @return [Boolean] `true` if the currency is supported, `false` otherwise
         def supported_currency?(currency_iso_code)
           return false if supported_currencies.nil?
 
           supported_currencies.map(&:iso_code).include?(currency_iso_code.upcase)
         end
 
+        # Returns the currency parameter from the request.
+        # @return [String] the currency parameter, eg. `USD`
         def currency_param
           return if current_currency == current_store.default_currency
 

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

@@ -118,7 +118,8 @@ module Spree
             value: token,
             expires: 90.days.from_now,
             secure: Rails.configuration.force_ssl || Rails.application.config.ssl_options[:secure_cookies],
-            domain: current_store.url_or_custom_domain
+            domain: current_store.url_or_custom_domain,
+            httponly: true
           }
         end
 

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

@@ -33,8 +33,9 @@ module Spree
 
         def permitted_product_attributes
           permitted_attributes.product_attributes + [
-            :store_id,
-            product_properties_attributes: permitted_product_properties_attributes
+            variants_attributes: permitted_variant_attributes + ['id', :_destroy],
+            master_attributes: permitted_variant_attributes + ['id'],
+            product_properties_attributes: permitted_product_properties_attributes + ['id', :_destroy]
           ]
         end
 

data/lib/spree/core/engine.rb

@@ -21,8 +21,10 @@ module Spree
                                :page_sections,
                                :page_blocks,
                                :reports,
+                               :translatable_resources,
                                :analytics_events,
-                               :analytics_event_handlers)
+                               :analytics_event_handlers,
+                               :integrations)
       SpreeCalculators = Struct.new(:shipping_methods, :tax_rates, :promotion_actions_create_adjustments, :promotion_actions_create_item_adjustments)
       PromoEnvironment = Struct.new(:rules, :actions)
       isolate_namespace Spree
@@ -234,6 +236,13 @@ module Spree
           Spree::Reports::SalesTotal
         ]
 
+        Rails.application.config.spree.translatable_resources = [
+          Spree::Product,
+          Spree::Taxon,
+          Spree::Taxonomy,
+          Spree::Store
+        ]
+
         Rails.application.config.spree.analytics_events = {
           product_viewed: 'Product Viewed',
           product_list_viewed: 'Product List Viewed',
@@ -257,9 +266,11 @@ module Spree
           checkout_email_entered: 'Checkout Email Entered',
           checkout_step_viewed: 'Checkout Step Viewed',
           checkout_step_completed: 'Checkout Step Completed',
-          order_completed: 'Order Completed'
+          order_completed: 'Order Completed',
         }
         Rails.application.config.spree.analytics_event_handlers = []
+
+        Rails.application.config.spree.integrations = []
       end
 
       initializer 'spree.promo.register.promotions.actions' do |app|

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.0.3'.freeze
+  VERSION = '5.1.0.beta'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -31,6 +31,7 @@ require 'request_store'
 require 'wannabe_bool'
 require 'geocoder'
 require 'oembed'
+require 'safely_block'
 
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.

data/lib/spree/permitted_attributes.rb

@@ -2,38 +2,65 @@ module Spree
   module PermittedAttributes
     ATTRIBUTES = [
       :address_attributes,
+      :asset_attributes,
       :checkout_attributes,
       :classification_attributes,
       :cms_page_attributes,
       :cms_section_attributes,
+      :custom_domain_attributes,
       :customer_return_attributes,
       :digital_attributes,
       :digital_link_attributes,
+      :export_attributes,
       :image_attributes,
+      :integration_attributes,
       :inventory_unit_attributes,
+      :invitation_attributes,
       :line_item_attributes,
       :menu_attributes,
       :menu_item_attributes,
       :option_type_attributes,
       :option_value_attributes,
+      :page_attributes,
+      :page_link_attributes,
+      :page_section_attributes,
       :payment_attributes,
+      :payment_method_attributes,
       :product_attributes,
+      :promotion_attributes,
+      :promotion_rule_attributes,
+      :promotion_action_attributes,
       :product_properties_attributes,
       :property_attributes,
+      :refund_attributes,
+      :refund_reason_attributes,
+      :reimbursement_attributes,
+      :reimbursement_type_attributes,
+      :report_attributes,
       :return_authorization_attributes,
+      :return_authorization_reason_attributes,
+      :role_attributes,
       :shipment_attributes,
+      :shipping_method_attributes,
+      :shipping_category_attributes,
       :source_attributes,
       :stock_item_attributes,
       :stock_location_attributes,
       :stock_movement_attributes,
+      :stock_transfer_attributes,
       :store_attributes,
       :store_credit_attributes,
+      :store_credit_category_attributes,
+      :tax_rate_attributes,
+      :tax_category_attributes,
       :taxon_attributes,
       :taxonomy_attributes,
+      :theme_attributes,
       :user_attributes,
       :variant_attributes,
       :wishlist_attributes,
-      :wished_item_attributes
+      :wished_item_attributes,
+      :zone_attributes
     ]
 
     mattr_reader(*ATTRIBUTES)
@@ -47,6 +74,8 @@ module Spree
         state: [:name, :abbr] }
     ]
 
+    @@asset_attributes = [:type, :viewable_id, :viewable_type, :attachment, :alt, :position]
+
     @@checkout_attributes = [
       :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing, :use_shipping,
       :user_id, :bill_address_id, :ship_address_id, :accept_marketing, :signup_for_an_account
@@ -60,6 +89,8 @@ module Spree
 
     @@cms_section_attributes = [:name, :cms_page_id, :fit, :destination, { content: {}, settings: {} }]
 
+    @@custom_domain_attributes = [:url, :default]
+
     @@customer_return_attributes = [:stock_location_id, {
       return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount,
                                 :acceptance_status, :exchange_variant_id, :resellable]
@@ -69,24 +100,39 @@ module Spree
 
     @@digital_link_attributes = [:access_counter]
 
+    @@export_attributes = [:type, :format, :record_selection, search_params: {}]
+
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
+    @@integration_attributes = [:type, :active]
+
     @@inventory_unit_attributes = [:shipment, :shipment_id, :variant_id]
 
+    @@invitation_attributes = [:email, :expires_at, :role_id]
+
     @@line_item_attributes = [:id, :variant_id, :quantity]
 
     @@menu_attributes = [:name, :locale, :location]
 
-    @@menu_item_attributes = [:name, :subtite, :destination, :new_window, :item_type,
+    @@menu_item_attributes = [:name, :subtitle, :destination, :new_window, :item_type,
                               :linked_resource_type, :linked_resource_id, :code, :menu_id]
 
-    @@option_type_attributes = [:name, :presentation, :option_values_attributes]
+    @@option_type_attributes = [:name, :presentation, :position, :filterable,
+                                option_values_attributes: [:id, :name, :presentation, :position, :_destroy]]
+
+    @@option_value_attributes = [:name, :presentation, :position]
+
+    @@page_attributes = [:name, :slug, :meta_title, :meta_description, :meta_keywords]
+
+    @@page_link_attributes = [:linkable_id, :linkable_type, :position, :label, :url]
 
-    @@option_value_attributes = [:name, :presentation]
+    @@page_section_attributes = [:type, :name, :position, :asset]
 
     @@payment_attributes = [:amount, :payment_method_id, :payment_method]
 
-    @@product_properties_attributes = [:property_name, :value, :position]
+    @@payment_method_attributes = [:name, :type, :description, :active, :display_on, :auto_capture, :position]
+
+    @@product_properties_attributes = [:property_name, :property_id, :value, :position, :_destroy]
 
     @@product_attributes = [
       :name, :description, :available_on, :make_active_at, :discontinue_on, :permalink, :meta_description,
@@ -94,24 +140,60 @@ module Spree
       :option_values_hash, :weight, :height, :width, :depth,
       :shipping_category_id, :tax_category_id,
       :cost_currency, :cost_price, :compare_at_price,
-      :slug,
+      :slug, :track_inventory, :backorderable, :barcode, :status,
+      :weight_unit, :dimensions_unit,
       {
         tag_list: [],
+        label_list: [],
         option_type_ids: [],
-        taxon_ids: []
+        taxon_ids: [],
+        store_ids: [],
+        product_option_types_attributes: [:id, :option_type_id, :position, :_destroy]
       }
     ]
 
-    @@property_attributes = [:name, :presentation, :position]
+    @@promotion_attributes = [:name, :description, :starts_at, :expires_at, :code, :usage_limit, :path, :match_policy,
+                              :advertise, :promotion_category_id, :code_prefix, :kind, :number_of_codes, :multi_codes, store_ids: []]
+
+    @@promotion_rule_attributes = [:type, :preferred_match_policy, user_ids_to_add: [], product_ids_to_add: [], taxon_ids_to_add: []]
+
+    @@promotion_action_attributes = [:type, :calculator_type, calculator_attributes: {}, promotion_action_line_items_attributes: [:id, :promotion_action_id, :variant_id, :quantity, :_destroy]]
+
+    @@property_attributes = [:name, :presentation, :position, :kind, :display_on]
+
+    @@refund_attributes = [:amount, :refund_reason_id]
+
+    @@refund_reason_attributes = [:name, :active, :mutable]
+
+    @@reimbursement_attributes = [return_items_attributes: [:id, :override_reimbursement_type_id, :pre_tax_amount, :exchange_variant_id]]
+
+    @@reimbursement_type_attributes = [:name, :active]
+
+    @@report_attributes = [:type, :date_from, :date_to, :currency]
 
     @@return_authorization_attributes = [:amount, :memo, :stock_location_id, :inventory_units_attributes,
-                                         :return_authorization_reason_id]
+                                         :return_authorization_reason_id, {
+                                          return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount,
+                                            :acceptance_status, :exchange_variant_id, :resellable]
+                                        }]
+
+    @@return_authorization_reason_attributes = [:name, :active]
+
+    @@return_item_attributes = [:inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :acceptance_status, :exchange_variant_id, :resellable]
+
+    @@role_attributes = [:name]
 
     @@shipment_attributes = [
       :order, :special_instructions, :stock_location_id, :id,
       :tracking, :address, :inventory_units, :selected_shipping_rate_id
     ]
 
+    @@shipping_category_attributes = [:name]
+
+    @@shipping_method_attributes = [:name, :code,:tracking_url, :tax_category_id, :display_on,
+                                    :estimated_transit_business_days_min, :estimated_transit_business_days_max,
+                                    :calculator_type, :preferences, zone_ids: [], shipping_category_ids: [], calculator_attributes: {}]
+
     # month / year may be provided by some sources, or others may elect to use one field
     @@source_attributes = [
       :id, :number, :month, :year, :expiry, :verification_value,
@@ -119,7 +201,7 @@ module Spree
       :gateway_payment_profile_id, :last_digits, :name, :encrypted_data
     ]
 
-    @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
+    @@stock_item_attributes = [:variant_id, :stock_location_id, :backorderable, :count_on_hand]
 
     @@stock_location_attributes = [
       :name, :active, :address1, :address2, :city, :zipcode,
@@ -131,6 +213,9 @@ module Spree
       :quantity, :stock_item, :stock_item_id, :originator, :action
     ]
 
+    @@stock_transfer_attributes = [:source_location_id, :destination_location_id, :reference,
+                                   stock_movements_attributes: [:variant_id, :quantity, :originator_id, :stock_item_id]]
+
     @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords,
                           :meta_description, :default_currency, :mail_from_address,
                           :customer_support_email, :description, :address, :contact_phone,
@@ -148,28 +233,48 @@ module Spree
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 
+    @@store_credit_category_attributes = [:name]
+
     @@taxonomy_attributes = [:name]
 
+    @@tax_category_attributes = [:name, :tax_code,:description, :is_default]
+
+    @@tax_rate_attributes = [:name, :amount, :zone_id, :tax_category_id, :included_in_price, :show_rate_in_label, :calculator_type, calculator_attributes: {}]
+
     @@taxon_attributes = [
       :name, :parent_id, :position, :icon, :description, :permalink, :hide_from_nav,
-      :taxonomy_id, :meta_description, :meta_keywords, :meta_title, :child_index
+      :taxonomy_id, :meta_description, :meta_keywords, :meta_title, :child_index,
+      :automatic, :rules_match_policy, :sort_order,
+      :image, :square_image, :description,
+      taxon_rules_attributes: [:id, :type, :value, :match_policy, :_destroy],
     ]
 
+    @@theme_attributes = [:name, :type, :default]
+
     @@user_attributes = [:email, :bill_address_id, :ship_address_id, :password, :first_name, :last_name,
                          :password_confirmation, :selected_locale, :avatar, :accepts_email_marketing, :phone,
                          { public_metadata: {}, private_metadata: {}, tag_list: [] }]
 
     @@variant_attributes = [
       :name, :presentation, :cost_price, :discontinue_on, :lock_version,
-      :position, :track_inventory,
+      :position, :track_inventory, :tax_category_id,
       :product_id, :product, :option_values_attributes, :price, :compare_at_price,
       :weight, :height, :width, :depth, :sku, :barcode, :cost_currency,
       :weight_unit, :dimensions_unit,
-      { options: [:name, :value], option_value_ids: [] }
+      {
+        options: [:id, :name, :value, :position, :_destroy],
+        stock_items_attributes: [:id, :count_on_hand, :stock_location_id, :backorderable, :_destroy],
+        prices_attributes: [:id, :amount, :compare_at_amount, :currency, :_destroy],
+        price: {},
+        option_value_variants_attributes: [:id, :option_value_id, :_destroy],
+        option_value_ids: []
+      }
     ]
 
     @@wishlist_attributes = [:name, :is_default, :is_private]
 
     @@wished_item_attributes = [:variant_id, :quantity]
+
+    @@zone_attributes = [:name, :description, :default_tax, :kind, :states_country_id, country_ids: [], state_ids: []]
   end
 end

data/lib/spree/testing_support/capybara_config.rb

@@ -20,7 +20,7 @@ Capybara.register_driver :selenium_chrome_headless do |app|
   options = ::Selenium::WebDriver::Chrome::Options.new
   options.add_argument '--headless'
   options.add_argument '--disable-gpu'
-  options.add_argument '--window-size=1400,900'
+  options.add_argument '--window-size=1440,900'
   options.add_argument '--disable-search-engine-choice-screen'
 
   # Disable timers being throttled in background pages/tabs. Useful for parallel test runs.

data/lib/spree/testing_support/factories/integration_factory.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :integration, class: Spree::Integration do
+    type { 'Spree::Integration' }
+    store { Spree::Store.default }
+    active { true }
+  end
+end

data/lib/spree/testing_support/factories/invitation_factory.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :invitation, class: Spree::Invitation do
+    email { FFaker::Internet.email }
+    inviter { create(:admin_user) }
+  end
+end

data/lib/spree/testing_support/factories/promotion_action_factory.rb

@@ -7,4 +7,8 @@ FactoryBot.define do
     association :promotion
     association :calculator, factory: :flat_rate_calculator
   end
+
+  factory :promotion_action_create_line_items, class: Spree::Promotion::Actions::CreateLineItems do
+    association :promotion
+  end
 end

data/lib/spree/testing_support/factories/stock_item_factory.rb

@@ -11,6 +11,10 @@ FactoryBot.define do
       )&.destroy
     end
 
-    after(:create) { |object| object.adjust_count_on_hand(10) }
+    transient do
+      adjust_count_on_hand { true }
+    end
+
+    after(:create) { |object, evaluator| object.adjust_count_on_hand(10) if evaluator.adjust_count_on_hand }
   end
 end

data/lib/spree/testing_support/factories/user_factory.rb

@@ -30,6 +30,19 @@ FactoryBot.define do
     first_name { FFaker::Name.first_name }
     last_name  { FFaker::Name.last_name }
 
-    spree_roles { [Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')] }
+    transient do
+      without_admin_role { false }
+    end
+
+    trait :without_admin_role do
+      without_admin_role { true }
+    end
+
+    after(:create) do |user, evaluator|
+      unless evaluator.without_admin_role
+        admin_role = Spree::Role.default_admin_role
+        create(:role_user, user: user, role: admin_role) unless user.has_spree_role?(admin_role.name)
+      end
+    end
   end
 end

data/lib/spree/translation_migrations.rb

@@ -12,14 +12,24 @@ module Spree
       nullify_translatable_fields = @resource_class.translatable_fields.map { |f| "#{f}=null" }.join(', ')
 
       unless @resource_class::Translation.exists?
-        ActiveRecord::Base.connection.execute("
-          INSERT INTO #{@translations_table} (#{@translatable_fields}, #{@foreign_key}, locale, created_at, updated_at)
-          SELECT #{@translatable_fields}, id, '#{@default_locale}' as locale, created_at, updated_at FROM #{@resource_class.table_name};
-                                              ")
-        ActiveRecord::Base.connection.execute("
-          UPDATE #{@resource_class.table_name}
-          SET #{nullify_translatable_fields};
-                                              ")
+        # Copy data from main table to translations table
+        @resource_class.find_each do |resource|
+          translation_attrs = @resource_class.translatable_fields.each_with_object({}) do |field, attrs|
+            attrs[field] = resource[field]
+          end
+
+          @resource_class::Translation.create!(
+            translation_attrs.merge(
+              @foreign_key => resource.id,
+              locale: @default_locale,
+              created_at: resource.created_at,
+              updated_at: resource.updated_at
+            )
+          )
+        end
+
+        # Nullify translatable fields in main table
+        @resource_class.update_all(nullify_translatable_fields)
       end
     end
 
@@ -27,14 +37,16 @@ module Spree
       translation_table_fields = @resource_class.translatable_fields.map { |f| "#{@translations_table}.#{f}" }.join(', ')
       row_expression = @resource_class.translatable_fields.count == 1 ? 'ROW' : ''
 
-      ActiveRecord::Base.connection.execute("
-          UPDATE #{@resource_class.table_name}
-          SET (#{@translatable_fields}) = #{row_expression}(#{translation_table_fields})
-          FROM #{@translations_table}
-          WHERE #{@translations_table}.#{@foreign_key} = #{@resource_class.table_name}.id
-                                            ")
+      # Update main table with translations
+      @resource_class::Translation.find_each do |translation|
+        resource = @resource_class.find(translation[@foreign_key])
+        @resource_class.translatable_fields.each do |field|
+          resource.update_column(field, translation[field])
+        end
+      end
 
-      ActiveRecord::Base.connection.execute("TRUNCATE TABLE #{@translations_table}")
+      # Clear translations table
+      @resource_class::Translation.delete_all
     end
   end
 end