solidus_core 3.4.2 → 4.1.0

data/app/models/spree/promotion.rb

@@ -2,9 +2,6 @@
 
 module Spree
   class Promotion < Spree::Base
-
-    autoload(:MATCH_POLICIES, "spree/promotion/match_policies")
-
     UNACTIVATABLE_ORDER_STATES = ["complete", "awaiting_return", "returned"]
 
     attr_reader :eligibility_errors
@@ -167,27 +164,13 @@ module Spree
       specific_rules = rules.select { |rule| rule.applicable?(promotable) }
       return [] if specific_rules.none?
 
-      if match_all?
-        # If there are rules for this promotion, but no rules for this
-        # particular promotable, then the promotion is ineligible by default.
-        unless specific_rules.all?(&eligible)
-          @eligibility_errors = specific_rules.map(&:eligibility_errors).detect(&:present?)
-          return nil
-        end
-        specific_rules
-      else
-        Spree::Deprecation.warn(
-        <<~WARN
-          Your promotion "#{name}" with ID #{id} has a match_policy of 'any'.
-          This is deprecated, please split the promotion into separate promotions for each rule.
-        WARN
-        )
-        unless specific_rules.any?(&eligible)
-          @eligibility_errors = specific_rules.map(&:eligibility_errors).detect(&:present?)
-          return nil
-        end
-        specific_rules.select(&eligible)
+      # If there are rules for this promotion, but no rules for this
+      # particular promotable, then the promotion is ineligible by default.
+      unless specific_rules.all?(&eligible)
+        @eligibility_errors = specific_rules.map(&:eligibility_errors).detect(&:present?)
+        return nil
       end
+      specific_rules
     end
 
     def products
@@ -224,9 +207,7 @@ module Spree
         if rules.blank?
           true
         else
-          rules.send(match_all? ? :all? : :any?) do |rule|
-            rule.actionable? line_item
-          end
+          rules.all? { |rule| rule.actionable? line_item }
         end
       else
         false
@@ -271,10 +252,6 @@ module Spree
       self[:path] = nil if self[:path].blank?
     end
 
-    def match_all?
-      match_policy == "all"
-    end
-
     def apply_automatically_disallowed_with_paths
       return unless apply_automatically
 

data/app/models/spree/promotion_rule.rb

@@ -18,11 +18,6 @@ module Spree
       []
     end
 
-    def self.for(promotable)
-      all.select { |rule| rule.applicable?(promotable) }
-    end
-    deprecate :for, "Please select promotion rules by their applicable status on the promotable instead."
-
     def applicable?(_promotable)
       raise NotImplementedError, "applicable? should be implemented in a sub-class of Spree::PromotionRule"
     end

data/app/models/spree/refund.rb

@@ -90,7 +90,7 @@ module Spree
     end
 
     def update_order
-      payment.order.updater.update
+      payment.order.recalculate
     end
   end
 end

data/app/models/spree/taxon/paperclip_attachment.rb

@@ -25,6 +25,6 @@ module Spree::Taxon::PaperclipAttachment
     attached_file = send(definition)
     return false unless attached_file.exists?
 
-    attached_file.destroy
+    attached_file.destroy && save
   end
 end

data/app/models/spree/taxon.rb

@@ -18,11 +18,11 @@ module Spree
     after_update :update_child_permalinks, if: :saved_change_to_permalink?
 
     validates :name, presence: true
-    validates :name, uniqueness: { scope: :parent_id, message: :must_be_unique_under_same_parent }, if: -> { Spree::Config.extra_taxon_validations}
+    validates :name, uniqueness: { scope: :parent_id, message: :must_be_unique_under_same_parent }
     validates :meta_keywords, length: { maximum: 255 }
     validates :meta_description, length: { maximum: 255 }
     validates :meta_title, length: { maximum: 255 }
-    validates :taxonomy_id, uniqueness: { message: :can_have_only_one_root }, if: -> { Spree::Config.extra_taxon_validations && root? }
+    validates :taxonomy_id, uniqueness: { scope: :parent_id, message: :can_have_only_one_root }, if: -> { root? }
 
     after_save :touch_ancestors_and_taxonomy
     after_touch :touch_ancestors_and_taxonomy

data/app/models/spree/taxonomy.rb

@@ -5,7 +5,7 @@ module Spree
     acts_as_list
 
     validates :name, presence: true
-    validates :name, uniqueness: true, if: -> { Spree::Config.extra_taxonomy_validations }
+    validates :name, uniqueness: true
 
     has_many :taxons, inverse_of: :taxonomy
     has_one :root, -> { where parent_id: nil }, class_name: "Spree::Taxon", dependent: :destroy

data/app/models/spree/variant/price_selector.rb

@@ -3,7 +3,7 @@
 module Spree
   class Variant < Spree::Base
     # This class is responsible for selecting a price for a variant given certain pricing options.
-    # A variant can have multiple or even dynamic prices. The `price_for`
+    # A variant can have multiple or even dynamic prices. The `price_for_options`
     # method determines which price applies under the given circumstances.
     #
     class PriceSelector
@@ -22,19 +22,6 @@ module Spree
         @variant = variant
       end
 
-      # The variant's price, given a set of pricing options
-      # @param [Spree::Variant::PricingOptions] price_options Pricing Options to abide by
-      # @return [Spree::Money, nil] The most specific price for this set of pricing options.
-      def price_for(price_options)
-        Spree::Deprecation.warn(
-          "price_for is deprecated and will be removed. The price_for method
-          should return a Spree::Price as described. Please use
-          #price_for_options and adjust your frontend code to explicitly call
-          &.money where required"
-        )
-        price_for_options(price_options)&.money
-      end
-
       # The variant's Spree::Price record, given a set of pricing options
       # @param [Spree::Variant::PricingOptions] price_options Pricing Options to abide by
       # @return [Spree::Price, nil] The most specific price for this set of pricing options.

data/app/models/spree/variant.rb

@@ -39,6 +39,7 @@ module Spree
     delegate :shipping_category, :shipping_category_id,
       to: :product, prefix: true
     delegate :tax_rates, to: :tax_category
+    delegate :price_for_options, to: :price_selector
 
     has_many :inventory_units, inverse_of: :variant
     has_many :line_items, inverse_of: :variant
@@ -287,12 +288,6 @@ module Spree
       @price_selector ||= Spree::Config.variant_price_selector_class.new(self)
     end
 
-    # Chooses an appropriate price for the given pricing options
-    # This has been deprecated in favor of #price_for_options.
-    #
-    # @see Spree::Variant::PriceSelector#price_for_options
-    delegate :price_for, to: :price_selector
-
     # Returns the difference in price from the master variant
     def price_difference_from_master(pricing_options = Spree::Config.default_pricing_options)
       master_price = product.master.price_for_options(pricing_options)
@@ -306,17 +301,6 @@ module Spree
       diff && diff.zero?
     end
 
-    def price_for_options(price_options)
-      if price_selector.respond_to?(:price_for_options)
-        price_selector.price_for_options(price_options)
-      else
-        money = price_for(price_options)
-        return if money.nil?
-
-        Spree::Price.new(amount: money.to_d, variant: self, currency: price_options.currency)
-      end
-    end
-
     # Generates a friendly name and sku string.
     #
     # @return [String]

data/bin/rails

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/spree/core/engine', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __dir__)
+require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+
+require "rails/all"
+require "rails/engine/commands"

data/config/locales/en.yml

@@ -1598,7 +1598,6 @@ en:
     gateway_config_unavailable: Gateway unavailable for environment
     gateway_error: Gateway Error
     general: General
-    general_settings: Store
     google_analytics: Google Analytics
     google_analytics_id: Analytics ID
     group_size: Group size

data/db/migrate/20210815004823_add_unique_index_to_option_values_variants.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddUniqueIndexToOptionValuesVariants < ActiveRecord::Migration[5.2]
+  def up
+    remove_index :spree_option_values_variants, [:variant_id, :option_value_id]
+    add_index :spree_option_values_variants, [:variant_id, :option_value_id],
+              name: "index_option_values_variants_on_variant_id_and_option_value_id",
+              unique: true
+  end
+
+  def down
+    remove_index :spree_option_values_variants, [:variant_id, :option_value_id]
+    add_index :spree_option_values_variants, [:variant_id, :option_value_id],
+              name: "index_option_values_variants_on_variant_id_and_option_value_id"
+  end
+end

data/db/migrate/20230321161854_change_column_null_option_values_option_type_id.rb

@@ -0,0 +1,5 @@
+class ChangeColumnNullOptionValuesOptionTypeId < ActiveRecord::Migration[5.2]
+  def change
+    change_column_null(:spree_option_values, :option_type_id, false)
+  end
+end

data/db/migrate/20230322085416_remove_match_policy_from_spree_promotion.rb

@@ -0,0 +1,5 @@
+class RemoveMatchPolicyFromSpreePromotion < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :spree_promotions, :match_policy, :string, default: "all"
+  end
+end

data/db/migrate/20230325132905_remove_unused_columns_from_promotion_rules.rb

@@ -0,0 +1,6 @@
+class RemoveUnusedColumnsFromPromotionRules < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :spree_promotion_rules, :code, :string
+    remove_column :spree_promotion_rules, :product_group_id, :integer
+  end
+end

data/db/migrate/20230325161633_drop_unused_promo_action_line_items.rb

@@ -0,0 +1,13 @@
+class DropUnusedPromoActionLineItems < ActiveRecord::Migration[5.2]
+  def change
+    drop_table :spree_promotion_action_line_items, force: :cascade do |t|
+      t.integer "promotion_action_id"
+      t.integer "variant_id"
+      t.integer "quantity", default: 1
+      t.datetime "created_at", precision: 6
+      t.datetime "updated_at", precision: 6
+      t.index ["promotion_action_id"], name: "index_spree_promotion_action_line_items_on_promotion_action_id"
+      t.index ["variant_id"], name: "index_spree_promotion_action_line_items_on_variant_id"
+    end
+  end
+end

data/db/migrate/20230425103509_remove_taxon_position.rb

@@ -0,0 +1,5 @@
+class RemoveTaxonPosition < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :spree_taxons, :position, :integer, default: 0
+  end
+end

data/db/migrate/20230427095534_drop_deprecated_address_id_from_shipments.rb

@@ -0,0 +1,11 @@
+class DropDeprecatedAddressIdFromShipments < ActiveRecord::Migration[5.2]
+  def up
+    remove_index :spree_shipments, column: [:deprecated_address_id], name: :index_spree_shipments_on_deprecated_address_id
+    remove_column :spree_shipments, :deprecated_address_id
+  end
+
+  def down
+    add_column :spree_shipments, :deprecated_address_id
+    add_index :spree_shipments, :deprecated_address_id, name: :index_spree_shipments_on_deprecated_address_id
+  end
+end

data/lib/generators/solidus/install/app_templates/frontend/none.rb

@@ -1,2 +1 @@
-apply "#{__dir__}/break_down_solidus_gem.rb"
-run_bundle
+# noop

data/lib/generators/solidus/install/app_templates/frontend/starter.rb

@@ -1,3 +1 @@
-apply "#{__dir__}/break_down_solidus_gem.rb"
-run_bundle
-apply 'https://github.com/solidusio/solidus_starter_frontend/raw/v3.4/template.rb'
+apply 'https://github.com/solidusio/solidus_starter_frontend/raw/v4.1/template.rb'

data/lib/generators/solidus/install/app_templates/payment_method/paypal.rb

@@ -1,17 +1,5 @@
-unless Bundler.locked_gems.dependencies['solidus_frontend']
-  say_status :warning, "Support for frontends other than `solidus_frontend` by `solidus_paypal_commerce_platform` is still in progress.", :yellow
-end
-
-if @selected_frontend == 'classic'
-  version = '< 1'
-  migrations_flag = options[:migrate] ? '--auto-run-migrations' : '--skip-migrations'
-else
-  version = '~> 1.0'
-  migrations_flag = "--migrate=#{options[:migrate]}"
-end
-
 unless Bundler.locked_gems.dependencies['solidus_paypal_commerce_platform']
-  bundle_command "add solidus_paypal_commerce_platform --version='#{version}'"
+  bundle_command "add solidus_paypal_commerce_platform --version='~> 1.0'"
 end
 
-generate "solidus_paypal_commerce_platform:install #{migrations_flag}"
+generate "solidus_paypal_commerce_platform:install --migrate=#{options[:migrate]}"

data/lib/generators/solidus/install/app_templates/payment_method/stripe.rb

@@ -0,0 +1,5 @@
+unless Bundler.locked_gems.dependencies['solidus_stripe']
+  bundle_command "add solidus_stripe --version '~> 5.a'"
+end
+
+generate 'solidus_stripe:install'

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

@@ -11,70 +11,37 @@ module Solidus
 
     CORE_MOUNT_ROUTE = "mount Spree::Core::Engine"
 
-    FRONTENDS = %w[
-      none
-      classic
-      starter
+    FRONTENDS = [
+      { name: 'starter', description: 'Generate all necessary controllers and views directly in your Rails app', default: true },
+      { name: 'none', description: 'Skip installing a frontend' }
     ]
 
-    LEGACY_FRONTENDS = %w[
-      solidus_starter_frontend
-      solidus_frontend
-    ]
-
-    AUTHENTICATIONS = %w[
-      devise
-      existing
-      custom
-      none
+    AUTHENTICATIONS = [
+      { name: 'devise', description: 'Install and configure the standard `devise` integration', default: true },
+      { name: 'existing', description: 'Integrate and configure an existing `devise` setup' },
+      { name: 'custom', description: 'A starter configuration for rolling your own authentication system' },
+      { name: 'none', description: 'Don\'t add any configuration for authentication' }
     ]
 
     PAYMENT_METHODS = [
-      {
-        name: 'paypal',
-        frontends: %w[none classic starter],
-        description: 'Install `solidus_paypal_commerce_platform`',
-        default: true,
-      },
-      {
-        name: 'bolt',
-        frontends: %w[classic],
-        description: 'Install `solidus_bolt`',
-        default: false,
-      },
-      {
-        name: 'braintree',
-        frontends: %w[none starter],
-        description: 'Install `solidus_braintree`',
-        default: false,
-      },
-      {
-        name: 'none',
-        frontends: %w[none classic starter],
-        description: 'Skip installing a payment method',
-        default: false,
-      },
+      { name: 'paypal', description: 'Install `solidus_paypal_commerce_platform`', default: true },
+      { name: 'stripe', description: 'Install `solidus_stripe`', default: false },
+      { name: 'braintree', description: 'Install `solidus_braintree`', default: false },
+      { name: 'none', description: 'Skip installing a payment method', default: false }
     ]
 
     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 and seeds must be run)'
-    class_option :active_storage, type: :boolean, default: (
-      Rails.gem_version >= Gem::Version.new("6.1.0")
-    ), banner: 'Install ActiveStorage as image attachments handler for products and taxons'
+    class_option :active_storage, type: :boolean, default: true, banner: 'Install ActiveStorage as image attachments handler for products and taxons'
     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 :frontend, type: :string, enum: FRONTENDS + LEGACY_FRONTENDS, default: nil, desc: "Indicates which frontend to install."
-    class_option :authentication, type: :string, enum: AUTHENTICATIONS, default: nil, desc: "Indicates which authentication system to install."
-    class_option :payment_method, type: :string, enum: PAYMENT_METHODS.map { |payment_method| payment_method[:name] }, default: nil, desc: "Indicates which payment method to install."
-
-    # DEPRECATED
-    class_option :with_authentication, type: :boolean, hide: true, default: nil
-    class_option :enforce_available_locales, type: :boolean, hide: true, default: nil
-    class_option :lib_name, type: :string, hide: true, default: nil
+    class_option :frontend, type: :string, enum: FRONTENDS.map { _1[:name] }, default: nil, desc: "Indicates which frontend to install."
+    class_option :authentication, type: :string, enum: AUTHENTICATIONS.map { _1[:name] }, default: nil, desc: "Indicates which authentication system to install."
+    class_option :payment_method, type: :string, enum: PAYMENT_METHODS.map { _1[:name] }, default: nil, desc: "Indicates which payment method to install."
 
     source_root "#{__dir__}/templates"
 
@@ -86,27 +53,37 @@ module Solidus
       @run_migrations = options[:migrate]
       @load_seed_data = options[:seed] && @run_migrations
       @load_sample_data = options[:sample] && @run_migrations && @load_seed_data
-      @selected_frontend = detect_frontend_to_install
-      @selected_authentication = detect_authentication_to_install
-      @selected_payment_method = detect_payment_method_to_install
+
+      @selected_frontend = selected_option_for(
+        'frontend',
+        selected: ENV['FRONTEND'] || options[:frontend],
+        available_options: FRONTENDS,
+      )
+
+      @selected_authentication = selected_option_for(
+        'authentication',
+        selected:
+          ('devise' if @selected_frontend == 'starter') ||
+          ('devise' if has_gem?('solidus_auth_devise')) ||
+          ENV['AUTHENTICATION'] || options[:authentication],
+        available_options: AUTHENTICATIONS,
+      )
+
+      @selected_payment_method = selected_option_for(
+        'payment method',
+        selected:
+          ('paypal' if has_gem?('solidus_paypal_commerce_platform')) ||
+          ('stripe' if has_gem?('solidus_stripe')) ||
+          ('bolt' if has_gem?('solidus_bolt')) ||
+          ENV['PAYMENT_METHOD'] || options[:payment_method],
+        available_options: PAYMENT_METHODS,
+      )
 
       # Silence verbose output (e.g. Rails migrations will rely on this environment variable)
       ENV['VERBOSE'] = 'false'
 
       # No reason to check for their presence if we're about to install them
       ENV['SOLIDUS_SKIP_MIGRATIONS_CHECK'] = 'true'
-
-      if options[:enforce_available_locales] != nil
-        warn \
-          "DEPRECATION WARNING: using `solidus:install --enforce-available-locales` is now deprecated and has no effect. " \
-          "Since Rails 4.1 the default is `true` so we no longer need to explicitly set a value."
-      end
-
-      if options[:lib_name] != nil
-        warn \
-          "DEPRECATION WARNING: using `solidus:install --lib-name` is now deprecated and has no effect. " \
-          "The option is legacy and should be removed from scripts still using it."
-      end
     end
 
     def add_files
@@ -119,7 +96,7 @@ module Solidus
         rake 'active_storage:install'
       else
         say_status :assets, "Paperclip", :green
-        gsub_file 'config/initializers/spree.rb', "ActiveStorageAttachment", "PaperclipAttachment"
+        gsub_file 'config/initializers/spree.rb', "::ActiveStorageAttachment", "::PaperclipAttachment"
       end
     end
 
@@ -181,15 +158,9 @@ module Solidus
       end
     end
 
-    def install_authentication
+    def install_subcomponents
       apply_template_for :authentication, @selected_authentication
-    end
-
-    def install_frontend
       apply_template_for :frontend, @selected_frontend
-    end
-
-    def install_payment_method
       apply_template_for :payment_method, @selected_payment_method
     end
 
@@ -271,93 +242,28 @@ module Solidus
       end
     end
 
-    def detect_frontend_to_install
-      # We need to support names that were available in v3.2
-      selected_frontend = 'starter' if options[:frontend] == 'solidus_starter_frontend'
-      selected_frontend = 'classic' if options[:frontend] == 'solidus_frontend'
-      selected_frontend ||= options[:frontend]
-
-      ENV['FRONTEND'] ||
-        selected_frontend ||
-        (Bundler.locked_gems.dependencies['solidus_frontend'] && 'classic') ||
-        (options[:auto_accept] && 'starter') ||
-        ask_with_description(
-          default: 'starter',
-          limited_to: FRONTENDS,
-          desc: <<~TEXT
-            Which frontend would you like to use?
-
-            - [#{set_color 'starter', :bold}] Generate all necessary controllers and views directly in your Rails app (#{set_color :default, :bold}).
-            - [#{set_color 'classic', :bold}] Install `solidus_frontend`, was the default in previous solidus versions (#{set_color :deprecated, :bold}).
-            - [#{set_color 'none', :bold}] Skip installing a frontend.
-
-            Selecting `starter` is recommended, however, some extensions are still only compatible with `classic`.
-          TEXT
-        )
+    def has_gem?(name)
+      Bundler.locked_gems.dependencies[name]
     end
 
-    def detect_authentication_to_install
-      return 'devise' if @selected_frontend == 'starter'
-
-      if options[:with_authentication] != nil
-        say_status :warning, \
-          "Using `solidus:install --with-authentication` is now deprecated. " \
-          "Please use `--authentication` instead (see --help for the full list of options).",
-          :red
-
-        if options[:with_authentication] == 'false'
-          # Don't use the default authentication if the user explicitly
-          # requested no authentication system.
-          return 'none'
-        else
-          return 'devise'
-        end
-      end
-
-      ENV['AUTHENTICATION'] ||
-        options[:authentication] ||
-        (Bundler.locked_gems.dependencies['solidus_auth_devise'] && 'devise') ||
-        (options[:auto_accept] && 'devise') ||
-        ask_with_description(
-          default: 'devise',
-          limited_to: AUTHENTICATIONS,
-          desc: <<~TEXT
-            Which authentication would you like to use?
-
-            - [#{set_color 'devise', :bold}] Install and configure the standard `devise` integration. (#{set_color :default, :bold}).
-            - [#{set_color 'existing', :bold}] Integrate and configure an existing `devise` setup.
-            - [#{set_color 'custom', :bold}] A starter configuration for rolling your own authentication system.
-            - [#{set_color 'none', :bold}] Don't add any configuration for authentication.
-
-            Selecting `devise` is recommended.
-          TEXT
-        )
-    end
+    def selected_option_for(name, selected:, available_options:)
+      return selected if selected
 
-    def detect_payment_method_to_install
-      return 'paypal' if Bundler.locked_gems.dependencies['solidus_paypal_commerce_platform']
-      return 'bolt' if Bundler.locked_gems.dependencies['solidus_bolt']
+      option_description = ->(name:, description:, default: false, **) do
+        default_label = " (#{set_color :default, :bold})" if default
 
-      selected_frontend_payment_methods = PAYMENT_METHODS.select do |payment_method|
-        payment_method[:frontends].include?(@selected_frontend)
+        "- [#{set_color name, :bold}] #{description}#{default_label}."
       end
 
-      selected = options[:payment_method] || (options[:auto_accept] && 'paypal') ||
-        ask_with_description(
-          default: 'paypal',
-          limited_to: selected_frontend_payment_methods.map { |payment_method| payment_method[:name] },
-          desc: <<~TEXT
-            Which payment method would you like to use?
-
-            #{selected_frontend_payment_methods.map { |payment_method| formatted_payment_method_description(payment_method) }.join("\n")}
-          TEXT
-        )
-    end
-
-    def formatted_payment_method_description(payment_method)
-      default_label = " (#{set_color :default, :bold})" if payment_method[:default]
-
-      "- [#{set_color payment_method[:name], :bold}] #{payment_method[:description]}#{default_label}."
+      default = available_options.find { _1[:default] }
+      (options[:auto_accept] && default[:name]) || ask_with_description(
+        default: default[:name],
+        limited_to: available_options.map { _1[:name] },
+        desc: <<~TEXT
+          Which #{name} would you like to use?
+          #{available_options.map { option_description[**_1] }.join("\n")}
+        TEXT
+      )
     end
   end
 end