solidus_core 2.9.6 → 2.11.0

data/db/default/spree/countries.rb

@@ -5,7 +5,7 @@ require 'carmen'
 # Insert Countries into the spree_countries table, checking to ensure that no
 # duplicates are created, using as few SQL statements as possible (2)
 
-connection = ApplicationRecord.connection
+connection = Spree::Base.connection
 
 country_mapper = ->(country) do
   name            = connection.quote country.name

data/db/default/spree/states.rb

@@ -1,14 +1,22 @@
 # frozen_string_literal: true
 
+def create_states(subregions, country)
+  subregions.each do |subregion|
+    Spree::State.where(abbr: subregion.code, country: country).first_or_create!(
+      name: subregion.name
+    )
+  end
+end
+
 ActiveRecord::Base.transaction do
   Spree::Country.all.each do |country|
     carmen_country = Carmen::Country.coded(country.iso)
     next unless carmen_country.subregions?
 
-    carmen_country.subregions.each do |subregion|
-      Spree::State.where(abbr: subregion.code, country: country).first_or_create!(
-        name: subregion.name
-      )
+    if Spree::Config[:countries_that_use_nested_subregions].include? country.iso
+      create_states(carmen_country.subregions.flat_map(&:subregions), country)
+    else
+      create_states(carmen_country.subregions, country)
     end
   end
 end

data/db/default/spree/store_credit.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-Spree::StoreCreditCategory.find_or_create_by!(name: I18n.t('spree.store_credit_category.default'))
 
 Spree::PaymentMethod.create_with(
   name: "Store Credit",
@@ -18,6 +17,7 @@ Spree::StoreCreditType.create_with(priority: 2).find_or_create_by!(name: Spree::
 Spree::ReimbursementType.create_with(name: "Store Credit").find_or_create_by!(type: 'Spree::ReimbursementType::StoreCredit')
 Spree::ReimbursementType.create_with(name: "Original").find_or_create_by!(type: 'Spree::ReimbursementType::OriginalPayment')
 
-Spree::StoreCreditCategory.find_or_create_by!(name: 'Gift Card')
+Spree::StoreCreditCategory.find_or_create_by!(name: Spree::StoreCreditCategory::GIFT_CARD)
+Spree::StoreCreditCategory.find_or_create_by!(name: Spree::StoreCreditCategory::REIMBURSEMENT)
 
 Spree::StoreCreditReason.find_or_create_by!(name: 'Credit Given In Error')

data/db/migrate/20180416083007_add_apply_to_all_to_variant_property_rule.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddApplyToAllToVariantPropertyRule < ActiveRecord::Migration[5.1]
+  def change
+    add_column :spree_variant_property_rules, :apply_to_all, :boolean, default: false, null: false
+    change_column :spree_variant_property_rules, :apply_to_all, :boolean, default: true
+  end
+
+  def down
+    remove_column :spree_variant_property_rules, :apply_to_all
+  end
+end

data/db/migrate/20200320144521_add_default_billng_flag_to_user_addresses.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class AddDefaultBillngFlagToUserAddresses < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_user_addresses, :default_billing, :boolean, default: false
+  end
+end

data/db/migrate/20200530111458_add_bcc_email_to_spree_stores.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddBccEmailToSpreeStores < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_stores, :bcc_email, :string
+  end
+end

data/db/migrate/20201008213609_add_discontinue_on_to_spree_products.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDiscontinueOnToSpreeProducts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_products, :discontinue_on, :datetime
+  end
+end

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

@@ -0,0 +1,253 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+
+module Solidus
+  # @private
+  class InstallGenerator < Rails::Generators::Base
+    CORE_MOUNT_ROUTE = "mount Spree::Core::Engine"
+
+    PAYMENT_METHODS = {
+      'paypal' => 'solidus_paypal_commerce_platform',
+      'none' => nil,
+    }
+
+    class_option :migrate, type: :boolean, default: true, banner: 'Run Solidus 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 :auto_accept, type: :boolean
+    class_option :user_class, type: :string
+    class_option :admin_email, type: :string
+    class_option :admin_password, type: :string
+    class_option :lib_name, type: :string, default: 'spree'
+    class_option :with_authentication, type: :boolean, default: true
+    class_option :enforce_available_locales, type: :boolean, default: nil
+    class_option :payment_method,
+                 type: :string,
+                 enum: PAYMENT_METHODS.keys,
+                 default: PAYMENT_METHODS.keys.first,
+                 desc: "Indicates which payment method to install."
+
+    def self.source_paths
+      paths = superclass.source_paths
+      paths << File.expand_path('../templates', "../../#{__FILE__}")
+      paths << File.expand_path('../templates', "../#{__FILE__}")
+      paths << File.expand_path('templates', __dir__)
+      paths.flatten
+    end
+
+    def prepare_options
+      @run_migrations = options[:migrate]
+      @load_seed_data = options[:seed]
+      @load_sample_data = options[:sample]
+
+      unless @run_migrations
+         @load_seed_data = false
+         @load_sample_data = false
+      end
+    end
+
+    def add_files
+      template 'config/initializers/spree.rb.tt', 'config/initializers/spree.rb'
+    end
+
+    def additional_tweaks
+      return unless File.exist? 'public/robots.txt'
+
+      append_file "public/robots.txt", <<-ROBOTS.strip_heredoc
+        User-agent: *
+        Disallow: /checkout
+        Disallow: /cart
+        Disallow: /orders
+        Disallow: /user
+        Disallow: /account
+        Disallow: /api
+        Disallow: /password
+      ROBOTS
+    end
+
+    def setup_assets
+      @lib_name = 'spree'
+
+      empty_directory 'app/assets/images'
+
+      %w{javascripts stylesheets images}.each do |path|
+        empty_directory "vendor/assets/#{path}/spree/frontend" if defined? Spree::Frontend || Rails.env.test?
+        empty_directory "vendor/assets/#{path}/spree/backend" if defined? Spree::Backend || Rails.env.test?
+      end
+
+      if defined? Spree::Frontend || Rails.env.test?
+        template "vendor/assets/javascripts/spree/frontend/all.js"
+        template "vendor/assets/stylesheets/spree/frontend/all.css"
+      end
+
+      if defined? Spree::Backend || 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
+
+    def configure_application
+      application <<-RUBY
+    # Load application's model / class decorators
+    initializer 'spree.decorators' do |app|
+      config.to_prepare do
+        Dir.glob(Rails.root.join('app/**/*_decorator*.rb')) do |path|
+          require_dependency(path)
+        end
+      end
+    end
+      RUBY
+
+      if !options[:enforce_available_locales].nil?
+        application <<-RUBY
+    # Prevent this deprecation message: https://github.com/svenfuchs/i18n/commit/3b6e56e
+    I18n.enforce_available_locales = #{options[:enforce_available_locales]}
+        RUBY
+      end
+    end
+
+    def plugin_install_preparation
+      @plugins_to_be_installed = []
+      @plugin_generators_to_run = []
+    end
+
+    def install_auth_plugin
+      if options[:with_authentication] && (options[:auto_accept] || !no?("
+        Solidus has a default authentication extension that uses Devise.
+        You can find more info at https://github.com/solidusio/solidus_auth_devise.
+
+        Would you like to install it? (y/n)"))
+
+        @plugins_to_be_installed << 'solidus_auth_devise'
+        @plugin_generators_to_run << 'solidus:auth:install'
+      end
+    end
+
+    def install_payment_method
+      name = options[:payment_method]
+
+      unless options[:auto_accept]
+        available_names = PAYMENT_METHODS.keys
+
+        name = ask("
+  You can select a payment method to be included in the installation process.
+  Please select a payment method name:", limited_to: available_names, default: available_names.first)
+      end
+
+      gem_name = PAYMENT_METHODS.fetch(name)
+
+      if gem_name
+        @plugins_to_be_installed << gem_name
+        @plugin_generators_to_run << "#{gem_name}:install"
+      end
+    end
+
+    def include_seed_data
+      append_file "db/seeds.rb", <<-RUBY.strip_heredoc
+
+        Spree::Core::Engine.load_seed if defined?(Spree::Core)
+        Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
+      RUBY
+    end
+
+    def install_migrations
+      say_status :copying, "migrations"
+      `rake railties:install:migrations`
+    end
+
+    def create_database
+      say_status :creating, "database"
+      rake 'db:create'
+    end
+
+    def run_bundle_install_if_needed_by_plugins
+      @plugins_to_be_installed.each do |plugin_name|
+        gem plugin_name
+      end
+
+      bundle_cleanly{ run "bundle install" } if @plugins_to_be_installed.any?
+      run "spring stop"
+
+      @plugin_generators_to_run.each do |plugin_generator_name|
+        generate "#{plugin_generator_name} --skip_migrations=false"
+      end
+    end
+
+    def run_migrations
+      if @run_migrations
+        say_status :running, "migrations"
+
+        rake 'db:migrate VERBOSE=false'
+      else
+        say_status :skipping, "migrations (don't forget to run rake db:migrate)"
+      end
+    end
+
+    def populate_seed_data
+      if @load_seed_data
+        say_status :loading,  "seed data"
+        rake_options = []
+        rake_options << "AUTO_ACCEPT=1" if options[:auto_accept]
+        rake_options << "ADMIN_EMAIL=#{options[:admin_email]}" if options[:admin_email]
+        rake_options << "ADMIN_PASSWORD=#{options[:admin_password]}" if options[:admin_password]
+
+        rake("db:seed #{rake_options.join(' ')}")
+      else
+        say_status :skipping, "seed data (you can always run rake db:seed)"
+      end
+    end
+
+    def load_sample_data
+      if @load_sample_data
+        say_status :loading, "sample data"
+        rake 'spree_sample:load'
+      else
+        say_status :skipping, "sample data (you can always run rake spree_sample:load)"
+      end
+    end
+
+    def install_routes
+      routes_file_path = File.join('config', 'routes.rb')
+      unless File.read(routes_file_path).include? CORE_MOUNT_ROUTE
+        insert_into_file routes_file_path, after: "Rails.application.routes.draw do\n" do
+          <<-RUBY
+  # This line mounts Solidus's routes at the root of your application.
+  # This means, any requests to URLs such as /products, will go to Spree::ProductsController.
+  # If you would like to change where this engine is mounted, simply change the :at option to something different.
+  #
+  # We ask that you don't use the :as option here, as Solidus relies on it being the default of "spree"
+  #{CORE_MOUNT_ROUTE}, at: '/'
+
+          RUBY
+        end
+      end
+
+      unless options[:quiet]
+        puts "*" * 50
+        puts "We added the following line to your application's config/routes.rb file:"
+        puts " "
+        puts "    #{CORE_MOUNT_ROUTE}, at: '/'"
+      end
+    end
+
+    def complete
+      unless options[:quiet]
+        puts "*" * 50
+        puts "Solidus has been installed successfully. You're all ready to go!"
+        puts " "
+        puts "Enjoy!"
+      end
+    end
+
+    private
+
+    def bundle_cleanly(&block)
+      Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&block) : Bundler.with_clean_env(&block)
+    end
+  end
+end

data/lib/generators/{spree → solidus}/install/templates/config/initializers/spree.rb.tt

@@ -10,6 +10,15 @@ Spree.config do |config|
   # from address for transactional emails
   config.mails_from = "store@example.com"
 
+  # Use combined first and last name attribute in HTML views and API responses
+  config.use_combined_first_and_last_name_in_address = true
+
+  # Use legacy Spree::Order state machine
+  config.use_legacy_order_state_machine = false
+
+  # Use the legacy address' state validation logic
+  config.use_legacy_address_state_validator = false
+
   # Uncomment to stop tracking inventory levels in the application
   # config.track_inventory_levels = false
 
@@ -22,6 +31,33 @@ Spree.config do |config|
   config.image_attachment_module = 'Spree::Image::PaperclipAttachment'
   config.taxon_attachment_module = 'Spree::Taxon::PaperclipAttachment'
 
+  # Disable legacy Solidus custom CanCanCan actions aliases
+  config.use_custom_cancancan_actions = false
+
+  # Defaults
+
+  # Set this configuration to `true` to raise an exception when
+  # an order is populated with a line item with a mismatching
+  # currency. The `false` value will just add a validation error
+  # and will be the only behavior accepted in future versions.
+  # See https://github.com/solidusio/solidus/pull/3456 for more info.
+  config.raise_with_invalid_currency = false
+
+  # Set this configuration to false to always redirect the user to
+  # /unauthorized when needed, without trying to redirect them to
+  # their previous location first.
+  config.redirect_back_on_unauthorized = true
+
+  # Set this configuration to `true` to allow promotions
+  # with no associated actions to be considered active for use by customers.
+  # See https://github.com/solidusio/solidus/pull/3749 for more info.
+  config.consider_actionless_promotion_active = false
+
+  # Set this configuration to `false` to avoid running validations when
+  # updating an order. Be careful since you can end up having inconsistent
+  # data in your database turning it on.
+  # See https://github.com/solidusio/solidus/pull/3645 for more info.
+  config.run_order_validations_on_order_updater = true
 
   # Permission Sets:
 
@@ -89,7 +125,10 @@ end
 
 Spree.user_class = <%= (options[:user_class].blank? ? "Spree::LegacyUser" : options[:user_class]).inspect %>
 
-# If you want to add a field to the whitelisted ransackable attributes,
-# just uncomment the following code and change it as you need.
+# Rules for avoiding to store the current path into session for redirects
+# When at least one rule is matched, the request path will not be stored
+# in session.
+# You can add your custom rules by uncommenting this line and changing
+# the class name:
 #
-# Spree::Model.whitelisted_ransackable_attributes << 'field'
+# Spree::UserLastUrlStorer.rules << 'Spree::UserLastUrlStorer::Rules::AuthenticationRule'

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

@@ -42,6 +42,8 @@ module Spree
       opts[:skip_spring] = true
       opts[:skip_test] = true
       opts[:skip_yarn] = true
+      opts[:skip_bootsnap] = true
+      opts[:skip_webpack_install] = true
 
       puts "Generating dummy Rails application..."
       invoke Rails::Generators::AppGenerator,

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

@@ -1,197 +1,15 @@
 # frozen_string_literal: true
 
-require 'rails/generators'
-require 'bundler'
-require 'bundler/cli'
+require 'generators/solidus/install/install_generator'
 
 module Spree
   # @private
-  class InstallGenerator < Rails::Generators::Base
-    CORE_MOUNT_ROUTE = "mount Spree::Core::Engine"
-
-    class_option :migrate, type: :boolean, default: true, banner: 'Run Solidus 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 :auto_accept, type: :boolean
-    class_option :user_class, type: :string
-    class_option :admin_email, type: :string
-    class_option :admin_password, type: :string
-    class_option :lib_name, type: :string, default: 'spree'
-    class_option :enforce_available_locales, type: :boolean, default: nil
-
-    def self.source_paths
-      paths = superclass.source_paths
-      paths << File.expand_path('../templates', "../../#{__FILE__}")
-      paths << File.expand_path('../templates', "../#{__FILE__}")
-      paths << File.expand_path('templates', __dir__)
-      paths.flatten
-    end
-
-    def prepare_options
-      @run_migrations = options[:migrate]
-      @load_seed_data = options[:seed]
-      @load_sample_data = options[:sample]
-
-      unless @run_migrations
-         @load_seed_data = false
-         @load_sample_data = false
-      end
-    end
-
-    def add_files
-      template 'config/initializers/spree.rb.tt', 'config/initializers/spree.rb'
-    end
-
-    def additional_tweaks
-      return unless File.exist? 'public/robots.txt'
-      append_file "public/robots.txt", <<-ROBOTS.strip_heredoc
-        User-agent: *
-        Disallow: /checkout
-        Disallow: /cart
-        Disallow: /orders
-        Disallow: /user
-        Disallow: /account
-        Disallow: /api
-        Disallow: /password
-      ROBOTS
-    end
-
-    def setup_assets
-      @lib_name = 'spree'
-
-      empty_directory 'app/assets/images'
-
-      %w{javascripts stylesheets images}.each do |path|
-        empty_directory "vendor/assets/#{path}/spree/frontend" if defined? Spree::Frontend || Rails.env.test?
-        empty_directory "vendor/assets/#{path}/spree/backend" if defined? Spree::Backend || Rails.env.test?
-      end
-
-      if defined? Spree::Frontend || Rails.env.test?
-        template "vendor/assets/javascripts/spree/frontend/all.js"
-        template "vendor/assets/stylesheets/spree/frontend/all.css"
-      end
-
-      if defined? Spree::Backend || 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
-
-    def configure_application
-      application <<-RUBY
-    # Load application's model / class decorators
-    initializer 'spree.decorators' do |app|
-      config.to_prepare do
-        Dir.glob(Rails.root.join('app/**/*_decorator*.rb')) do |path|
-          require_dependency(path)
-        end
-      end
-    end
-
-    # Load application's view overrides
-    initializer 'spree.overrides' do |app|
-      config.to_prepare do
-        Dir.glob(Rails.root.join('app/overrides/*.rb')) do |path|
-          require_dependency(path)
-        end
-      end
-    end
-      RUBY
-
-      if !options[:enforce_available_locales].nil?
-        application <<-RUBY
-    # Prevent this deprecation message: https://github.com/svenfuchs/i18n/commit/3b6e56e
-    I18n.enforce_available_locales = #{options[:enforce_available_locales]}
-        RUBY
-      end
-    end
-
-    def include_seed_data
-      append_file "db/seeds.rb", <<-RUBY.strip_heredoc
-
-        Spree::Core::Engine.load_seed if defined?(Spree::Core)
-        Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
-      RUBY
-    end
-
-    def install_migrations
-      say_status :copying, "migrations"
-      `rake railties:install:migrations`
-    end
-
-    def create_database
-      say_status :creating, "database"
-      rake 'db:create'
-    end
-
-    def run_migrations
-      if @run_migrations
-        say_status :running, "migrations"
-
-        rake 'db:migrate VERBOSE=false'
-      else
-        say_status :skipping, "migrations (don't forget to run rake db:migrate)"
-      end
-    end
-
-    def populate_seed_data
-      if @load_seed_data
-        say_status :loading,  "seed data"
-        rake_options = []
-        rake_options << "AUTO_ACCEPT=1" if options[:auto_accept]
-        rake_options << "ADMIN_EMAIL=#{options[:admin_email]}" if options[:admin_email]
-        rake_options << "ADMIN_PASSWORD=#{options[:admin_password]}" if options[:admin_password]
-
-        rake("db:seed #{rake_options.join(' ')}")
-      else
-        say_status :skipping, "seed data (you can always run rake db:seed)"
-      end
-    end
-
-    def load_sample_data
-      if @load_sample_data
-        say_status :loading, "sample data"
-        rake 'spree_sample:load'
-      else
-        say_status :skipping, "sample data (you can always run rake spree_sample:load)"
-      end
-    end
-
-    def install_routes
-      routes_file_path = File.join('config', 'routes.rb')
-      unless File.read(routes_file_path).include? CORE_MOUNT_ROUTE
-        insert_into_file routes_file_path, after: "Rails.application.routes.draw do\n" do
-          <<-RUBY
-  # This line mounts Solidus's routes at the root of your application.
-  # This means, any requests to URLs such as /products, will go to Spree::ProductsController.
-  # If you would like to change where this engine is mounted, simply change the :at option to something different.
-  #
-  # We ask that you don't use the :as option here, as Solidus relies on it being the default of "spree"
-  #{CORE_MOUNT_ROUTE}, at: '/'
-
-          RUBY
-        end
-      end
-
-      unless options[:quiet]
-        puts "*" * 50
-        puts "We added the following line to your application's config/routes.rb file:"
-        puts " "
-        puts "    #{CORE_MOUNT_ROUTE}, at: '/'"
-      end
-    end
-
-    def complete
-      unless options[:quiet]
-        puts "*" * 50
-        puts "Solidus has been installed successfully. You're all ready to go!"
-        puts " "
-        puts "Enjoy!"
-      end
+  class InstallGenerator < Solidus::InstallGenerator
+    def print_deprecation_warning
+      puts " "
+      puts "*" * 50
+      puts "spree:install generator is deprecated, please use solidus:install."
+      puts " "
     end
   end
 end