solidus_core 2.11.6 → 3.0.0

data/config/locales/en.yml

@@ -26,8 +26,6 @@ en:
         address2: Street Address (cont'd)
         city: City
         company: Company
-        firstname: First Name
-        lastname: Last Name
         name: Name
         phone: Phone
         zipcode: Zip Code
@@ -76,7 +74,6 @@ en:
         created_at: Date/Time
         name: Name
         number: Return Number
-        pre_tax_total: Pre-Tax Total
         reimbursement_status: Reimbursement status
         total: Total
         total_excluding_vat: Pre-Tax Total
@@ -130,8 +127,6 @@ en:
       spree/order/bill_address:
         address1: Billing address street
         city: Billing address city
-        firstname: Billing address first name
-        lastname: Billing address last name
         name: Billing address name
         phone: Billing address phone
         state: Billing address state
@@ -139,8 +134,6 @@ en:
       spree/order/ship_address:
         address1: Shipping address street
         city: Shipping address city
-        firstname: Shipping address first name
-        lastname: Shipping address last name
         name: Shipping address name
         phone: Shipping address phone
         state: Shipping address state
@@ -282,7 +275,6 @@ en:
         type: Type
       spree/return_authorization:
         amount: Amount
-        pre_tax_total: Pre-Tax Total
         total_excluding_vat: Pre-Tax Total
       spree/return_item:
         acceptance_status: Acceptance Status

data/db/migrate/20180416083007_add_apply_to_all_to_variant_property_rule.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddApplyToAllToVariantPropertyRule < ActiveRecord::Migration[5.1]
-  def up
+  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

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

@@ -15,6 +15,7 @@ module Solidus
     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 :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
@@ -51,6 +52,16 @@ module Solidus
       template 'config/initializers/spree.rb.tt', 'config/initializers/spree.rb'
     end
 
+    def install_file_attachment
+      if options[:active_storage]
+        say "Installing Active Storage", :green
+        rake 'active_storage:install'
+      else
+        say "Installing Paperclip", :green
+        gsub_file 'config/initializers/spree.rb', "ActiveStorageAttachment", "PaperclipAttachment"
+      end
+    end
+
     def additional_tweaks
       return unless File.exist? 'public/robots.txt'
 
@@ -171,10 +182,10 @@ module Solidus
       end
 
       bundle_cleanly{ run "bundle install" } if @plugins_to_be_installed.any?
-      run "spring stop"
+      run "spring stop" if defined?(Spring)
 
       @plugin_generators_to_run.each do |plugin_generator_name|
-        generate "#{plugin_generator_name} --skip_migrations=false"
+        generate "#{plugin_generator_name} --skip_migrations=true"
       end
     end
 

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

@@ -10,15 +10,6 @@ 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
 
@@ -27,38 +18,11 @@ Spree.config do |config|
   # any inventory changes.
   # config.inventory_cache_threshold = 3
 
-  # Enable Paperclip adapter for attachments on images and taxons
-  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
+  # Configure adapter for attachments on products and taxons (use ActiveStorageAttachment or PaperclipAttachment)
+  config.image_attachment_module = 'Spree::Image::ActiveStorageAttachment'
+  config.taxon_attachment_module = 'Spree::Taxon::ActiveStorageAttachment'
 
   # 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:
 
   # Uncomment and customize the following line to add custom permission sets

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

@@ -43,7 +43,7 @@ module Spree
       opts[:skip_test] = true
       opts[:skip_yarn] = true
       opts[:skip_bootsnap] = true
-      opts[:skip_webpack_install] = true
+      opts[:skip_javascript] = true
 
       puts "Generating dummy Rails application..."
       invoke Rails::Generators::AppGenerator,
@@ -55,6 +55,7 @@ module Spree
       @database = options[:database]
 
       template "rails/database.yml", "#{dummy_path}/config/database.yml", force: true
+      template "rails/storage.yml", "#{dummy_path}/config/storage/test.yml", force: true
       template "rails/boot.rb", "#{dummy_path}/config/boot.rb", force: true
       template "rails/application.rb.tt", "#{dummy_path}/config/application.rb", force: true
       template "rails/routes.rb", "#{dummy_path}/config/routes.rb", force: true

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -32,6 +32,8 @@ production:
   encoding: utf8
 <% when 'postgres', 'postgresql' %>
 <% db_host = ENV['DB_HOST'] -%>
+<% db_username = ENV['DB_USERNAME'] -%>
+<% db_password = ENV['DB_PASSWORD'] -%>
 development:
   adapter: postgresql
   database: <%= database_prefix %><%= options[:lib_name] %>_solidus_development
@@ -43,7 +45,10 @@ development:
 test:
   adapter: postgresql
   database: <%= database_prefix %><%= options[:lib_name] %>_solidus_test
-  username: postgres
+  username: <%= db_username || 'postgres' %>
+<% unless db_password.blank? %>
+  password: <%= db_password %>
+<% end %>
   min_messages: warning
 <% unless db_host.blank? %>
   host: <%= db_host %>

data/lib/generators/spree/dummy/templates/rails/storage.yml

@@ -0,0 +1,3 @@
+test:
+  service: Disk
+  root: <%= File.expand_path("#{dummy_path}/tmp/storage", destination_root) %>

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -29,6 +29,8 @@ Dummy::Application.configure do
   config.action_mailer.delivery_method = :test
   ActionMailer::Base.default from: "solidus@example.com"
 
+  config.active_storage.service = :test
+
   # Raise on deprecation warnings
   if ENV['SOLIDUS_RAISE_DEPRECATIONS'].present?
     Spree::Deprecation.behavior = :raise

data/lib/spree/app_configuration.rb

@@ -34,10 +34,6 @@ module Spree
     #   @return [Boolean] should state/state_name be required (default: +true+)
     preference :address_requires_state, :boolean, default: true
 
-    # @!attribute [rw] legacy
-    #   @return [Boolean] use the legacy address' state validation logic (default: +true+)
-    preference :use_legacy_address_state_validator, :boolean, default: true
-
     # @!attribute [rw] admin_interface_logo
     #   @return [String] URL of logo used in admin (default: +'logo/solidus.svg'+)
     preference :admin_interface_logo, :string, default: 'logo/solidus.svg'
@@ -111,16 +107,6 @@ module Spree
     #   @return [Boolean]
     preference :billing_address_required, :boolean, default: false
 
-    # @!attribute [rw] binary_inventory_cache
-    #   Only invalidate product caches when they change from in stock to out of
-    #   stock. By default, caches are invalidated on any change of inventory
-    #   quantity. Setting this to true should make operations on inventory
-    #   faster.
-    #   (default: +false+)
-    #   @deprecated - use inventory_cache_threshold instead
-    #   @return [Boolean]
-    preference :binary_inventory_cache, :boolean, default: false
-
     # @!attribute [rw] can_restrict_stock_management
     #   @return [Boolean] Indicates if stock management can be restricted by location
     preference :can_restrict_stock_management, :boolean, default: false
@@ -154,20 +140,11 @@ module Spree
     #   @return [Integer] Customer returns to show per-page in the admin (default: +15+)
     preference :customer_returns_per_page, :integer, default: 15
 
-    # @!attribute [rw] default_country_id
-    #   @deprecated Use the default country ISO preference instead
-    #   @return [Integer,nil] id of {Spree::Country} to be selected by default in dropdowns (default: nil)
-    preference :default_country_id, :integer
-
     # @!attribute [rw] default_country_iso
     #   Default customer country ISO code
     #   @return [String] Two-letter ISO code of a {Spree::Country} to assumed as the country of an unidentified customer (default: "US")
     preference :default_country_iso, :string, default: 'US'
 
-    # @!attribute [rw] use_custom_cancancan_actions
-    #   @return [Boolean] Allow to use legacy Solidus custom CanCanCan action aliases (default: +true+)
-    preference :use_custom_cancancan_actions, :boolean, default: true
-
     # @!attribute [rw] generate_api_key_for_all_roles
     #   @return [Boolean] Allow generating api key automatically for user
     #   at role_user creation for all roles. (default: +false+)
@@ -225,23 +202,6 @@ module Spree
     #   @return [Integer] Promotions to show per-page in the admin (default: +15+)
     preference :promotions_per_page, :integer, default: 15
 
-    # @!attribute [rw] disable_actionless_promotion_validation
-    #   @return [Boolean] Promotions should have actions associated before being considered active (default: +true+)
-    preference :consider_actionless_promotion_active, :boolean, default: true
-
-    # @!attribute [rw] raise_with_invalid_currency
-    #   Whether to raise an exception if trying to set a line item currency
-    #   different from the order currency. When false a validation error
-    #   is added to the instance instead.
-    #   @return [Boolean] (default: +true+)
-    preference :raise_with_invalid_currency, :boolean, default: true
-
-    # @!attribute [rw] redirect_back_on_unauthorized
-    #   Whether to try to redirect users back when they try to access
-    #   unauthorized routes, before redirect them to /unauthorized.
-    #   @return [Boolean] (default: +false+)
-    preference :redirect_back_on_unauthorized, :boolean, default: false
-
     # @!attribute [rw] require_master_price
     #   @return [Boolean] Require a price on the master variant of a product (default: +true+)
     preference :require_master_price, :boolean, default: true
@@ -268,10 +228,6 @@ module Spree
     #   (default: +['IT']+)
     preference :countries_that_use_nested_subregions, :array, default: ['IT']
 
-    # @!attribute [rw] run_order_validations_on_order_updater
-    #   @return [Boolean] Whether to run validation when updating an order with the OrderUpdater
-    preference :run_order_validations_on_order_updater, :boolean, default: false
-
     # @!attribute [rw] send_core_emails
     #   @return [Boolean] Whether to send transactional emails (default: true)
     preference :send_core_emails, :boolean, default: true
@@ -307,21 +263,6 @@ module Spree
     #   @return [] Track on_hand values for variants / products. (default: true)
     preference :track_inventory_levels, :boolean, default: true
 
-    # @!attribute [rw] use_combined_first_and_last_name_in_address
-    #   @return [Boolean] Use Spree::Address combined first and last name in HTML views and
-    #   API responses. (default: +false+)
-    preference :use_combined_first_and_last_name_in_address, :boolean, default: false
-
-    # @!attribute [rw] use_legacy_order_state_machine
-    #   @return [Boolean] Uses the legacy order state machine from Spree::Order::Checkout
-    #   (default: +false+)
-    preference :use_legacy_order_state_machine, :boolean, default: true
-
-    # The legacy_store_credit_category_name allows to control whether the legacy
-    # way of fetching the category should be used.
-    #
-    # @param [Boolean] enable/disable the legacy way of fetching the store category name
-    preference :use_legacy_store_credit_reimbursement_category_name, :boolean, default: true
 
     # Other configurations
 
@@ -496,23 +437,31 @@ module Spree
 
     # Allows switching attachment library for Image
     #
-    # `Spree::Image::PaperclipAttachment`
-    # is the default and provides the classic Paperclip implementation.
+    # `Spree::Image::ActiveStorageAttachment`
+    # is the default and provides the Active Storage implementation.
     #
     # @!attribute [rw] image_attachment_module
     # @return [Module] a module that can be included into Spree::Image to allow attachments
     # Enumerable of images adhering to the present_image_class interface
-    class_name_attribute :image_attachment_module, default: 'Spree::Image::PaperclipAttachment'
+    class_name_attribute :image_attachment_module, default: 'Spree::Image::ActiveStorageAttachment'
+
+    # @!attribute [rw] allowed_image_mime_types
+    #
+    # Defines which MIME types are allowed for images
+    # `%w(image/jpeg image/jpg image/png image/gif).freeze` is the default.
+    #
+    # @return [Array]
+    class_name_attribute :allowed_image_mime_types, default: %w(image/jpeg image/jpg image/png image/gif).freeze
 
     # Allows switching attachment library for Taxon
     #
-    # `Spree::Taxon::PaperclipAttachment`
-    # is the default and provides the classic Paperclip implementation.
+    # `Spree::Taxon::ActiveStorageAttachment`
+    # is the default and provides the Active Storage implementation.
     #
     # @!attribute [rw] taxon_attachment_module
     # @return [Module] a module that can be included into Spree::Taxon to allow attachments
     # Enumerable of taxons adhering to the present_taxon_class interface
-    class_name_attribute :taxon_attachment_module, default: 'Spree::Taxon::PaperclipAttachment'
+    class_name_attribute :taxon_attachment_module, default: 'Spree::Taxon::ActiveStorageAttachment'
 
     # Allows providing your own class instance for generating order numbers.
     #

data/lib/spree/core.rb

@@ -1,6 +1,14 @@
 # frozen_string_literal: true
 
-require 'rails/all'
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_view/railtie"
+require "active_job/railtie"
+require "active_model/railtie"
+require "active_record/railtie"
+require "active_storage/engine"
+require "sprockets/railtie"
+
 require 'acts_as_list'
 require 'awesome_nested_set'
 require 'cancan'
@@ -9,12 +17,10 @@ require 'kaminari/activerecord'
 require 'mail'
 require 'monetize'
 require 'paperclip'
-require 'paranoia'
 require 'ransack'
 require 'state_machines-activerecord'
 
 require 'spree/deprecation'
-require 'spree/paranoia_deprecations'
 
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.
@@ -47,9 +53,6 @@ module Spree
 
   module Core
     class GatewayError < RuntimeError; end
-
-    include ActiveSupport::Deprecation::DeprecatedConstantAccessor
-    deprecate_constant 'DestroyWithOrdersError', ActiveRecord::DeleteRestrictionError, deprecator: Spree::Deprecation
   end
 end
 
@@ -61,7 +64,6 @@ require 'spree/core/environment_extension'
 require 'spree/core/environment/calculators'
 require 'spree/core/environment/promotions'
 require 'spree/core/environment'
-require 'spree/promo/environment'
 require 'spree/migrations'
 require 'spree/migration_helpers'
 require 'spree/event'
@@ -75,7 +77,6 @@ require 'spree/permitted_attributes'
 require 'spree/core/importer'
 require 'spree/core/permalinks'
 require 'spree/core/product_duplicator'
-require 'spree/core/current_store'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/current_host'

data/lib/spree/core/class_constantizer.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/module'
+
 module Spree
   module Core
     module ClassConstantizer

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

@@ -22,20 +22,7 @@ module Spree
           class_attribute :unauthorized_redirect
           self.unauthorized_redirect = -> do
             flash[:error] = I18n.t('spree.authorization_failure')
-            if Spree::Config.redirect_back_on_unauthorized
-              redirect_back(fallback_location: "/unauthorized")
-            else
-              Spree::Deprecation.warn <<-WARN.strip_heredoc, caller
-                Having Spree::Config.redirect_back_on_unauthorized set
-                to `false` is deprecated and will not be supported in Solidus 3.0.
-
-                Please change this configuration to `true` and be sure that your
-                application does not break trying to redirect back when there is
-                an unauthorized access.
-              WARN
-
-              redirect_to "/unauthorized"
-            end
+            redirect_back(fallback_location: "/unauthorized")
           end
 
           rescue_from CanCan::AccessDenied do

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

@@ -11,23 +11,8 @@ module Spree
 
         included do
           helper_method :current_order
-          helper_method :simple_current_order
         end
 
-        def simple_current_order
-          return @simple_current_order if @simple_current_order
-
-          @simple_current_order = find_order_by_token_or_user
-
-          if @simple_current_order
-            @simple_current_order.last_ip_address = ip_address
-            return @simple_current_order
-          else
-            @simple_current_order = Spree::Order.new(current_order_params)
-          end
-        end
-        deprecate simple_current_order: :current_order, deprecator: Spree::Deprecation
-
         # The current incomplete order from the guest_token for use in cart and during checkout
         def current_order(options = {})
           should_create = options[:create_order_if_necessary] || false
@@ -84,16 +69,11 @@ module Spree
           current_order_params.merge(last_ip_address: ip_address)
         end
 
-        def find_order_by_token_or_user(options = {}, with_adjustments = false)
+        def find_order_by_token_or_user(options = {})
           should_lock = options[:lock] || false
 
           # Find any incomplete orders for the guest_token
-          if with_adjustments
-            Spree::Deprecation.warn "The second argument to find_order_by_token_or_user is deprecated, and will be removed in a future version."
-            order = Spree::Order.incomplete.includes(:adjustments).lock(should_lock).find_by(current_order_params)
-          else
-            order = Spree::Order.incomplete.lock(should_lock).find_by(current_order_params)
-          end
+          order = Spree::Order.incomplete.lock(should_lock).find_by(current_order_params)
 
           # Find any incomplete orders for the current user
           if order.nil? && try_spree_current_user