spree_core 4.2.7 → 4.3.0.rc1

data/db/migrate/20210721120857_add_index_on_permalink_parent_id_and_taxonomy_id_on_spree_taxons.rb

@@ -0,0 +1,31 @@
+class AddIndexOnPermalinkParentIdAndTaxonomyIdOnSpreeTaxons < ActiveRecord::Migration[5.2]
+  def up
+    klass   = Spree::Taxon
+    columns = %w[permalink parent_id taxonomy_id]
+
+    unless index_exists?(klass.table_name, columns)
+      remove_index klass.table_name, columns if index_exists?(klass.table_name, columns)
+
+      say "Find duplicate #{klass} records"
+      duplicates = klass.
+        select((columns + %w[COUNT(*)]).join(',')).
+        group("#{columns.join(',')}").
+        having('COUNT(*) > 1').
+        map { |row| row.attributes.slice(*columns) }
+
+      say "Delete all but the oldest duplicate #{klass} record"
+      duplicates.each do |conditions|
+        klass.where(conditions).order(:created_at).drop(1).each(&:destroy)
+      end
+
+      duplicates.each do |conditions| puts klass.where(conditions).order(:created_at).drop(1) end
+
+      say "Add unique index to #{klass.table_name} for #{columns.inspect}"
+      add_index klass.table_name, columns, unique: true
+    end
+  end
+
+  def down
+    remove_index :spree_taxons, [:permalink, :parent_id, :taxonomy_id]
+  end
+end

data/db/migrate/20210721125657_create_spree_promotions_stores.rb

@@ -0,0 +1,29 @@
+class CreateSpreePromotionsStores < ActiveRecord::Migration[5.2]
+  def up
+    unless table_exists?(:spree_promotions_stores)
+      create_table :spree_promotions_stores do |t|
+        t.references :promotion, index: true
+        t.references :store,  index: true
+        t.timestamps
+
+        t.index [:promotion_id, :store_id], unique: true
+      end
+
+      stores = Spree::Store.all
+      promotion_ids = Spree::Promotion.order(:id).ids
+
+      stores.find_each do |store|
+        prepared_values = promotion_ids.map { |id| "(#{id}, #{store.id}, '#{Time.current.to_s(:db)}', '#{Time.current.to_s(:db)}')" }.join(', ')
+        next if prepared_values.empty?
+
+        begin
+          execute "INSERT INTO spree_promotions_stores (promotion_id, store_id, created_at, updated_at) VALUES #{prepared_values};"
+        rescue ActiveRecord::RecordNotUnique; end
+      end
+    end
+  end
+
+  def down
+    drop_table :spree_promotions_stores
+  end
+end

data/db/migrate/20210722090705_add_store_id_to_spree_customer_returns.rb

@@ -0,0 +1,11 @@
+class AddStoreIdToSpreeCustomerReturns < ActiveRecord::Migration[5.2]
+  def change
+    unless column_exists?(:spree_customer_returns, :store_id)
+      add_column :spree_customer_returns, :store_id, :bigint
+      add_index :spree_customer_returns, :store_id
+      Spree::CustomerReturn.reset_column_information
+      default_store_id = Spree::Store.default.id
+      Spree::CustomerReturn.find_each { |cr| cr.update_column(:store_id, cr.order&.store_id || default_store_id) }
+    end
+  end
+end

data/db/migrate/20210726065456_change_integer_id_columns_into_bigint.rb

@@ -0,0 +1,305 @@
+class ChangeIntegerIdColumnsIntoBigint < ActiveRecord::Migration[5.2]
+  def change
+    change_table(:active_storage_attachments) do |t|
+      t.change :record_id, :bigint
+      t.change :blob_id, :bigint
+    end
+
+    change_column :friendly_id_slugs, :sluggable_id, :bigint
+
+    change_table(:spree_addresses) do |t|
+      t.change :state_id, :bigint
+      t.change :country_id, :bigint
+      t.change :user_id, :bigint
+    end
+
+    change_table(:spree_adjustments) do |t|
+      t.change :source_id, :bigint
+      t.change :adjustable_id, :bigint
+      t.change :order_id, :bigint
+    end
+
+    change_column :spree_assets, :viewable_id, :bigint
+
+    change_column :spree_calculators, :calculable_id, :bigint
+
+    change_table(:spree_credit_cards) do |t|
+      t.change :address_id, :bigint
+      t.change :user_id, :bigint
+      t.change :payment_method_id, :bigint
+    end
+
+    change_column :spree_customer_returns, :stock_location_id, :bigint
+
+    change_table(:spree_inventory_units) do |t|
+      t.change :variant_id, :bigint
+      t.change :order_id, :bigint
+      t.change :shipment_id, :bigint
+      t.change :line_item_id, :bigint
+      t.change :original_return_item_id, :bigint
+    end
+
+    change_table(:spree_line_items) do |t|
+      t.change :variant_id, :bigint
+      t.change :order_id, :bigint
+      t.change :tax_category_id, :bigint
+    end
+
+    change_column :spree_log_entries, :source_id, :bigint
+
+    change_table(:spree_menu_items) do |t|
+      t.change :linked_resource_id, :bigint
+      t.change :parent_id, :bigint
+      t.change :lft, :bigint
+      t.change :rgt, :bigint
+      t.change :menu_id, :bigint
+    end
+
+    change_column :spree_menus, :store_id, :bigint
+
+    change_table(:spree_option_type_prototypes) do |t|
+      t.change :prototype_id, :bigint
+      t.change :option_type_id, :bigint
+    end
+
+    change_table(:spree_option_value_variants) do |t|
+      t.change :variant_id, :bigint
+      t.change :option_value_id, :bigint
+    end
+
+    change_column :spree_option_values, :option_type_id, :bigint
+
+    change_table(:spree_order_promotions) do |t|
+      t.change :order_id, :bigint
+      t.change :promotion_id, :bigint
+    end
+
+    change_table(:spree_orders) do |t|
+      t.change :user_id, :bigint
+      t.change :bill_address_id, :bigint
+      t.change :ship_address_id, :bigint
+      t.change :created_by_id, :bigint
+      t.change :approver_id, :bigint
+      t.change :canceler_id, :bigint
+      t.change :store_id, :bigint
+    end
+
+    change_column :spree_payment_capture_events, :payment_id, :bigint
+
+    change_table(:spree_payment_methods_stores) do |t|
+      t.change :payment_method_id, :bigint
+      t.change :store_id, :bigint
+    end
+
+    change_table(:spree_payments) do |t|
+      t.change :order_id, :bigint
+      t.change :source_id, :bigint
+      t.change :payment_method_id, :bigint
+    end
+
+    change_column :spree_prices, :variant_id, :bigint
+
+    change_table(:spree_product_option_types) do |t|
+      t.change :product_id, :bigint
+      t.change :option_type_id, :bigint
+    end
+
+    change_table(:spree_product_promotion_rules) do |t|
+      t.change :product_id, :bigint
+      t.change :promotion_rule_id, :bigint
+    end
+
+    change_table(:spree_product_properties) do |t|
+      t.change :product_id, :bigint
+      t.change :property_id, :bigint
+    end
+
+    change_table(:spree_products) do |t|
+      t.change :tax_category_id, :bigint
+      t.change :shipping_category_id, :bigint
+    end
+
+    change_table(:spree_products_stores) do |t|
+      t.change :product_id, :bigint
+      t.change :store_id, :bigint
+    end
+
+    change_table(:spree_products_taxons) do |t|
+      t.change :product_id, :bigint
+      t.change :taxon_id, :bigint
+    end
+
+    change_table(:spree_promotion_action_line_items) do |t|
+      t.change :promotion_action_id, :bigint
+      t.change :variant_id, :bigint
+    end
+
+    change_column :spree_promotion_actions, :promotion_id, :bigint
+
+    change_table(:spree_promotion_rule_taxons) do |t|
+      t.change :taxon_id, :bigint
+      t.change :promotion_rule_id, :bigint
+    end
+
+    change_table(:spree_promotion_rule_users) do |t|
+      t.change :user_id, :bigint
+      t.change :promotion_rule_id, :bigint
+    end
+
+    change_table(:spree_promotion_rules) do |t|
+      t.change :promotion_id, :bigint
+      t.change :user_id, :bigint
+      t.change :product_group_id, :bigint
+    end
+
+    change_column :spree_promotions, :promotion_category_id, :bigint
+
+    change_table(:spree_promotions_stores) do |t|
+      t.change :promotion_id, :bigint
+      t.change :store_id, :bigint
+    end
+
+    change_table(:spree_property_prototypes) do |t|
+      t.change :prototype_id, :bigint
+      t.change :property_id, :bigint
+    end
+
+    change_table(:spree_prototype_taxons) do |t|
+      t.change :taxon_id, :bigint
+      t.change :prototype_id, :bigint
+    end
+
+    change_table(:spree_refunds) do |t|
+      t.change :payment_id, :bigint
+      t.change :refund_reason_id, :bigint
+      t.change :reimbursement_id, :bigint
+    end
+
+    change_table(:spree_reimbursement_credits) do |t|
+      t.change :reimbursement_id, :bigint
+      t.change :creditable_id, :bigint
+    end
+
+    change_table(:spree_reimbursements) do |t|
+      t.change :customer_return_id, :bigint
+      t.change :order_id, :bigint
+    end
+
+    change_table(:spree_return_authorizations) do |t|
+      t.change :order_id, :bigint
+      t.change :stock_location_id, :bigint
+      t.change :return_authorization_reason_id, :bigint
+    end
+
+    change_table(:spree_return_items) do |t|
+      t.change :return_authorization_id, :bigint
+      t.change :inventory_unit_id, :bigint
+      t.change :exchange_variant_id, :bigint
+      t.change :customer_return_id, :bigint
+      t.change :reimbursement_id, :bigint
+      t.change :preferred_reimbursement_type_id, :bigint
+      t.change :override_reimbursement_type_id, :bigint
+    end
+
+    change_table(:spree_role_users) do |t|
+      t.change :role_id, :bigint
+      t.change :user_id, :bigint
+    end
+
+    change_table(:spree_shipments) do |t|
+      t.change :order_id, :bigint
+      t.change :address_id, :bigint
+      t.change :stock_location_id, :bigint
+    end
+
+    change_table(:spree_shipping_method_categories) do |t|
+      t.change :shipping_method_id, :bigint
+      t.change :shipping_category_id, :bigint
+    end
+
+    change_table(:spree_shipping_method_zones) do |t|
+      t.change :shipping_method_id, :bigint
+      t.change :zone_id, :bigint
+    end
+
+    change_column :spree_shipping_methods, :tax_category_id, :bigint
+
+    change_table(:spree_shipping_rates) do |t|
+      t.change :shipment_id, :bigint
+      t.change :shipping_method_id, :bigint
+      t.change :tax_rate_id, :bigint
+    end
+
+    change_table(:spree_state_changes) do |t|
+      t.change :stateful_id, :bigint
+      t.change :user_id, :bigint
+    end
+
+    change_column :spree_states, :country_id, :bigint
+
+    change_table(:spree_stock_items) do |t|
+      t.change :stock_location_id, :bigint
+      t.change :variant_id, :bigint
+    end
+
+    change_table(:spree_stock_locations) do |t|
+      t.change :state_id, :bigint
+      t.change :country_id, :bigint
+    end
+
+    change_table(:spree_stock_movements) do |t|
+      t.change :stock_item_id, :bigint
+      t.change :originator_id, :bigint
+    end
+
+    change_table(:spree_stock_transfers) do |t|
+      t.change :source_location_id, :bigint
+      t.change :destination_location_id, :bigint
+    end
+
+    change_table(:spree_store_credit_events) do |t|
+      t.change :store_credit_id, :bigint
+      t.change :originator_id, :bigint
+    end
+
+    change_table(:spree_store_credits) do |t|
+      t.change :user_id, :bigint
+      t.change :category_id, :bigint
+      t.change :created_by_id, :bigint
+      t.change :originator_id, :bigint
+      t.change :type_id, :bigint
+    end
+
+    change_table(:spree_stores) do |t|
+      t.change :default_country_id, :bigint
+      t.change :checkout_zone_id, :bigint
+    end
+
+    change_table(:spree_tax_rates) do |t|
+      t.change :zone_id, :bigint
+      t.change :tax_category_id, :bigint
+    end
+
+    change_table(:spree_taxons) do |t|
+      t.change :parent_id, :bigint
+      t.change :taxonomy_id, :bigint
+      t.change :lft, :bigint
+      t.change :rgt, :bigint
+    end
+
+    change_table(:spree_users) do |t|
+      t.change :ship_address_id, :bigint
+      t.change :bill_address_id, :bigint
+    end
+
+    change_table(:spree_variants) do |t|
+      t.change :product_id, :bigint
+      t.change :tax_category_id, :bigint
+    end
+
+    change_table(:spree_zone_members) do |t|
+      t.change :zoneable_id, :bigint
+      t.change :zone_id, :bigint
+    end
+  end
+end

data/db/migrate/20210730154425_fix_promotion_code_and_path_unique_indexes.rb

@@ -0,0 +1,9 @@
+class FixPromotionCodeAndPathUniqueIndexes < ActiveRecord::Migration[5.2]
+  def change
+    # removing unique indexes
+    remove_index :spree_promotions, :code
+    # applying standard indexes
+    add_index :spree_promotions, :code
+    add_index :spree_promotions, :path unless index_exists?(:spree_promotions, :path)
+  end
+end

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

@@ -4,6 +4,8 @@ require 'spree/core/version'
 
 module Spree
   class DummyGenerator < Rails::Generators::Base
+    SPREE_GEMS = %w(spree_backend spree_frontend spree_api spree_emails).freeze
+
     desc 'Creates blank Rails application, installs Spree and all sample data'
 
     class_option :lib_name, default: ''
@@ -56,15 +58,18 @@ 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
-      template 'initializers/bullet.rb', "#{dummy_path}/config/initializers/bullet.rb", force: true
     end
 
     def test_dummy_inject_extension_requirements
       if DummyGeneratorHelper.inject_extension_requirements
-        inside dummy_path do
-          inject_require_for('spree_frontend')
-          inject_require_for('spree_backend')
-          inject_require_for('spree_api')
+        SPREE_GEMS.each do |gem|
+          begin
+            require "#{gem}"
+            inside dummy_path do
+              inject_require_for(gem)
+            end
+          rescue
+          end
         end
       end
     end
@@ -137,7 +142,7 @@ end
     end
 
     def gemfile_path
-      core_gems = ['spree/core', 'spree/api', 'spree/backend', 'spree/frontend', 'spree/sample']
+      core_gems = ['spree/core', 'spree/api']
 
       if core_gems.include?(lib_name)
         '../../../../../Gemfile'

data/lib/generators/spree/dummy_model/templates/model.rb.tt

@@ -1,5 +1,5 @@
 module Spree
-  class Spree::DummyModel < ApplicationRecord
+  class DummyModel < Spree::Base
     acts_as_list
     validates :name, presence: true
   end

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

@@ -9,8 +9,9 @@ module Spree
   class InstallGenerator < Rails::Generators::Base
     class_option :migrate, type: :boolean, default: true, banner: 'Run Spree migrations'
     class_option :seed, type: :boolean, default: true, banner: 'load seed data (migrations must be run)'
-    class_option :sample, type: :boolean, default: true, banner: 'load sample data (migrations must be run)'
-    class_option :install_storefront, type: :boolean, default: true, banner: 'installs storefront configuration files'
+    class_option :sample, type: :boolean, default: false, banner: 'load sample data (migrations must be run)'
+    class_option :install_storefront, type: :boolean, default: false, banner: 'installs default rails storefront'
+    class_option :install_admin, type: :boolean, default: false, banner: 'installs default rails admin'
     class_option :copy_storefront, type: :boolean, default: false, banner: 'copy all storefront views and stylesheets'
     class_option :auto_accept, type: :boolean
     class_option :user_class, type: :string
@@ -32,6 +33,7 @@ module Spree
       @load_seed_data = options[:seed]
       @load_sample_data = options[:sample]
       @install_storefront = options[:install_storefront]
+      @install_admin = options[:install_admin]
       @copy_storefront = options[:copy_storefront]
 
       unless @run_migrations
@@ -62,28 +64,6 @@ module Spree
       ROBOTS
     end
 
-    def setup_assets
-      @lib_name = 'spree'
-      %w{javascripts stylesheets images}.each do |path|
-        if Spree::Core::Engine.frontend_available? || Rails.env.test?
-          empty_directory "vendor/assets/#{path}/spree/frontend"
-        end
-        if Spree::Core::Engine.backend_available? || Rails.env.test?
-          empty_directory "vendor/assets/#{path}/spree/backend"
-        end
-      end
-
-      if Spree::Core::Engine.frontend_available? || Rails.env.test?
-        template 'vendor/assets/javascripts/spree/frontend/all.js'
-        template 'vendor/assets/stylesheets/spree/frontend/all.css'
-      end
-
-      if Spree::Core::Engine.backend_available? || Rails.env.test?
-        template 'vendor/assets/javascripts/spree/backend/all.js'
-        template 'vendor/assets/stylesheets/spree/backend/all.css'
-      end
-    end
-
     def create_overrides_directory
       empty_directory 'app/overrides'
     end
@@ -94,6 +74,12 @@ module Spree
       end
     end
 
+    def install_admin
+      if @install_admin && Spree::Core::Engine.backend_available?
+        generate 'spree:backend:install'
+      end
+    end
+
     def copy_storefront
       if @copy_storefront && Spree::Core::Engine.frontend_available?
         generate 'spree:frontend:copy_storefront'
@@ -185,6 +171,8 @@ module Spree
     end
 
     def load_sample_data
+      return unless Spree::Core::Engine.sample_available?
+
       if @load_sample_data
         say_status :loading, 'sample data'
         silence_stream(STDOUT) do

data/lib/spree/core/components.rb

@@ -12,6 +12,14 @@ module Spree
       def self.frontend_available?
         @@frontend_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('Spree::Frontend::Engine')
       end
+
+      def self.emails_available?
+        @@emails_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('Spree::Emails::Engine')
+      end
+
+      def self.sample_available?
+        @@sample_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('SpreeSample::Engine')
+      end
     end
   end
 end

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

@@ -34,10 +34,12 @@ module Spree
         end
 
         def current_oauth_token
+          get_last_access_token = ->(user) { Doorkeeper::AccessToken.active_for(user).where(expires_in: nil).last }
+          create_access_token = ->(user) { Doorkeeper::AccessToken.create!(resource_owner_id: user.id) }
           user = try_spree_current_user
           return unless user
 
-          @current_oauth_token ||= Doorkeeper::AccessToken.active_for(user).last || Doorkeeper::AccessToken.create!(resource_owner_id: user.id)
+          @current_oauth_token ||= get_last_access_token.call(user) || create_access_token.call(user)
         end
 
         def store_location
@@ -71,6 +73,10 @@ module Spree
         # Override this method in your controllers if you want to have special behavior in case the user is not authorized
         # to access the requested action.  For example, a popup window might simply close itself.
         def redirect_unauthorized_access
+          ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+            Core::ControllerHelpers#redirect_unauthorized_access is deprecated and will be removed in Spree 5.0.
+            This method is implemented differently for Storefront and Admin
+          DEPRECATION
           if try_spree_current_user
             flash[:error] = Spree.t(:authorization_failure)
             redirect_to spree.forbidden_path

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

@@ -19,7 +19,7 @@ module Spree
           def title
             title_string = @title.present? ? @title : accurate_title
             if title_string.present?
-              if Spree::Config[:always_put_site_name_in_title]
+              if Spree::Config[:always_put_site_name_in_title] && !title_string.include?(default_title)
                 [title_string, default_title].join(" #{Spree::Config[:title_site_name_separator]} ")
               else
                 title_string

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

@@ -19,7 +19,7 @@ module Spree
             @simple_current_order.last_ip_address = ip_address
             return @simple_current_order
           else
-            @simple_current_order = Spree::Order.new
+            @simple_current_order = current_store.orders.new
           end
         end
 
@@ -36,7 +36,7 @@ module Spree
           @current_order = find_order_by_token_or_user(options, true)
 
           if options[:create_order_if_necessary] && (@current_order.nil? || @current_order.completed?)
-            @current_order = Spree::Order.create!(current_order_params)
+            @current_order = current_store.orders.create!(current_order_params)
             @current_order.associate_user! try_spree_current_user if try_spree_current_user
             @current_order.last_ip_address = ip_address
           end
@@ -75,7 +75,7 @@ module Spree
         end
 
         def current_order_params
-          { currency: current_currency, token: cookies.signed[:token], store_id: current_store.id, user_id: try_spree_current_user.try(:id) }
+          { currency: current_currency, token: cookies.signed[:token], user_id: try_spree_current_user.try(:id) }
         end
 
         def find_order_by_token_or_user(options = {}, with_adjustments = false)
@@ -88,7 +88,7 @@ module Spree
                      end
 
           # Find any incomplete orders for the token
-          incomplete_orders = Spree::Order.incomplete.includes(includes)
+          incomplete_orders = current_store.orders.incomplete.includes(includes)
 
           token_order_params = current_order_params.except(:user_id)
           order = if with_adjustments

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

@@ -6,6 +6,7 @@ module Spree
           Spree::Config.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
           end
         end
       end

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

@@ -7,10 +7,15 @@ module Spree
         included do
           helper_method :current_store
           helper_method :current_price_options
+          helper_method :available_menus
         end
 
         def current_store
-          @current_store ||= Spree::Store.current(request.env['SERVER_NAME'])
+          @current_store ||= current_store_finder.new(url: request.env['SERVER_NAME']).execute
+        end
+
+        def available_menus
+          @available_menus ||= current_store.menus
         end
 
         def store_locale
@@ -44,6 +49,10 @@ module Spree
         def current_tax_zone
           @current_tax_zone ||= @current_order&.tax_zone || Spree::Zone.default_tax
         end
+
+        def current_store_finder
+          Spree::Dependencies.current_store_finder.constantize
+        end
       end
     end
   end

data/lib/spree/core/engine.rb

@@ -129,6 +129,12 @@ module Spree
         Migrations.new(config, engine_name).check
       end
 
+      initializer 'spree.core.checking_deprecated_preferences' do
+        Spree::Config.deprecated_preferences.each do |pref|
+          warn "[DEPRECATION] Spree::Config[:#{pref[:name]}] is deprecated. #{pref[:message]}"
+        end
+      end
+
       config.to_prepare do
         # Ensure spree locale paths are present before decorators
         I18n.load_path.unshift(*(Dir.glob(

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

@@ -2,10 +2,12 @@ module Spree
   module Core
     module Importer
       class Product
-        attr_reader :product, :product_attrs, :variants_attrs, :options_attrs
+        attr_reader :product, :product_attrs, :variants_attrs, :options_attrs, :store
 
         def initialize(product, product_params, options = {})
+          @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)

data/lib/spree/core/product_duplicator.rb

@@ -28,6 +28,7 @@ module Spree
       product.dup.tap do |new_product|
         new_product.name = "COPY OF #{product.name}"
         new_product.taxons = product.taxons
+        new_product.stores = product.stores
         new_product.created_at = nil
         new_product.deleted_at = nil
         new_product.updated_at = nil