spree_core 4.3.3 → 4.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96c8f3216e3e5d17e33022ff18a6b6a5eab74963aef31297a70c4c3f1ba4604e
-  data.tar.gz: 479e325b608c5d19bdd7acb6f69b0dac29f894850dcb63a14a289ca3b5e80a23
+  metadata.gz: 7688ca0eb67dbbcd2236ebafb2c3eed22d8d29dbf40924d82b52eba8bf52db9e
+  data.tar.gz: '0689424db68d0822931238faad67fcc9292e0f2cd5487ed6c234acbea8b79720'
 SHA512:
-  metadata.gz: 706ce33cc84d6423d6ed5a120a38dfe84c3aa1515b448fe8521ebb393104e43d541e94fe67dd5105c66b8a022920fa976af00cee7a0b5382ab49351f93da4644
-  data.tar.gz: 967829013d91f08dc944a3ecc1d176a95ccf988af3148e0aa142c38a3949a0b9cf21ad7a35464acdf1cb1b76b010d2e1f525298a5e4217ba00e399d633cdea3f
+  metadata.gz: 4d8dd9a06af740248a017b5f2b608f11cf19f5df647129837de2c3248c529da621402928dce4c5d9338ded7bb4282509eb0723d772a1a93b9006c8845d213fc6
+  data.tar.gz: 7d9689023479c36a36407b650d870d0640f38bff6c456b4722579f5bd0cb9b29a937a9b8c476862e1adcc8bc3339dd801ae4e2b6e8ecf0564e35830d8abc3842

data/app/finders/spree/option_values/find_available.rb

@@ -9,12 +9,20 @@ module Spree
       end
 
       def execute
-        find_available(scope, products_scope)
+        find_available(scope, products_scope).select(select_args).order(order_args)
       end
 
       private
 
       attr_reader :scope, :products_scope
+
+      def select_args
+        "#{OptionValue.table_name}.*, #{OptionType.table_name}.position AS option_type_position"
+      end
+
+      def order_args
+        "option_type_position, #{OptionValue.table_name}.position"
+      end
     end
   end
 end

data/app/finders/spree/products/find.rb

@@ -154,7 +154,7 @@ module Spree
       def by_options(products)
         return products unless options?
 
-        products_ids = options.map { |key, value| products.with_option_value(key, value).ids }
+        products_ids = options.map { |key, value| products.with_option_value(key, value)&.ids }.compact.uniq
         products.where(id: products_ids.reduce(&:intersection))
       end
 

data/app/helpers/spree/base_helper.rb

@@ -65,7 +65,7 @@ module Spree
                      elsif current_store.logo.attached? && current_store.logo.image?
                        main_app.url_for(current_store.logo)
                      else
-                       Spree::Config[:logo]
+                      'logo/spree_50.png'
                      end
 
       path = spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
@@ -269,9 +269,5 @@ module Spree
 
       tag('meta', name: 'robots', content: current_store.seo_robots)
     end
-
-    def taxon_wysiwyg_editor_enabled?
-      Spree::Config[:taxon_wysiwyg_editor_enabled]
-    end
   end
 end

data/app/helpers/spree/currency_helper.rb

@@ -1,7 +1,7 @@
 module Spree
   module CurrencyHelper
     def currency_options(selected_value = nil)
-      selected_value ||= Spree::Config[:currency]
+      selected_value ||= Spree::Store.default.default_currency
       currencies = ::Money::Currency.table.map do |_code, details|
         iso = details[:iso_code]
         [iso, "#{details[:name]} (#{iso})"]

data/app/helpers/spree/products_helper.rb

@@ -44,20 +44,6 @@ module Spree
       variants_option_types_presenter(variants, product).options
     end
 
-    def product_wysiwyg_editor_enabled?
-      Spree::Config[:product_wysiwyg_editor_enabled]
-    end
-
-    # converts line breaks in product description into <p> tags (for html display purposes)
-    def product_description(product)
-      description = if Spree::Config[:show_raw_product_description] || product_wysiwyg_editor_enabled?
-                      product.description
-                    else
-                      product.description.to_s.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>')
-                    end
-      description.blank? ? Spree.t(:product_has_no_description) : description
-    end
-
     def line_item_description_text(description_text)
       if description_text.present?
         truncate(strip_tags(description_text.gsub('&nbsp;', ' ').squish), length: 100)
@@ -82,7 +68,7 @@ module Spree
       cache_key_elements.compact.join('/')
     end
 
-    def limit_descritpion(string)
+    def limit_description(string)
       return string if string.length <= 450
 
       string.slice(0..449) + '...'

data/app/jobs/spree/base_job.rb

@@ -0,0 +1,4 @@
+module Spree
+  class BaseJob < ApplicationJob
+  end
+end

data/app/jobs/spree/stock_locations/stock_items/create_job.rb

@@ -0,0 +1,13 @@
+module Spree
+  module StockLocations
+    module StockItems
+      class CreateJob < Spree::BaseJob
+        queue_as :spree_stock_location_stock_items
+
+        def perform(stock_location)
+          Spree::StockLocations::StockItems::Create.call(stock_location: stock_location)
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/spree/default_price.rb

@@ -4,7 +4,7 @@ module Spree
 
     included do
       has_one :default_price,
-              -> { with_deleted.where(currency: Spree::Config[:currency]) },
+              -> { with_deleted.where(currency: Spree::Store.default.default_currency) },
               class_name: 'Spree::Price',
               dependent: :destroy
 

data/app/models/concerns/spree/display_money.rb

@@ -27,7 +27,9 @@ module Spree
           define_method("display_#{method_name}") do |**args_list|
             default_opts = respond_to?(:currency) ? { currency: currency } : {}
 
-            Spree::Money.new(send(method_name, **args_list), default_opts.merge(opts).merge(args_list.slice(:currency)))
+            amount = args_list.blank? ? send(method_name) : send(method_name, **args_list)
+
+            Spree::Money.new(amount, default_opts.merge(opts).merge(args_list.slice(:currency)))
           end
         end
       end

data/app/models/concerns/spree/memoized_data.rb

@@ -3,7 +3,7 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      # reset cache on save inside trasaction and transaction commit
+      # reset cache on save inside transaction and transaction commit
       after_save :reset_memoized_data
       after_commit :reset_memoized_data
 

data/app/models/concerns/spree/metadata.rb

@@ -0,0 +1,10 @@
+module Spree
+  module Metadata
+    extend ActiveSupport::Concern
+
+    included do
+      store :public_metadata, coder: JSON
+      store :private_metadata, coder: JSON
+    end
+  end
+end

data/app/models/concerns/spree/multi_store_resource.rb

@@ -16,7 +16,7 @@ module Spree
       errors.add(:stores, Spree.t(:must_have_one_store))
     end
 
-    # this can be overriden on model basis
+    # this can be overridden on model basis
     def disable_store_presence_validation?
       Spree::Config[:disable_store_presence_validation]
     end

data/app/models/concerns/spree/named_type.rb

@@ -6,7 +6,7 @@ module Spree
       scope :active, -> { where(active: true) }
       default_scope { order(Arel.sql("LOWER(#{table_name}.name)")) }
 
-      validates :name, presence: true, uniqueness: { case_sensitive: false }
+      include UniqueName
     end
   end
 end

data/app/models/concerns/spree/number_identifier.rb

@@ -0,0 +1,18 @@
+module Spree
+  module NumberIdentifier
+    extend ActiveSupport::Concern
+
+    included do
+      before_validation :uppercase_number
+
+      validates :number, presence: true, length: { maximum: 32, allow_blank: true },
+                         uniqueness: { allow_blank: true, case_sensitive: true, scope: spree_base_uniqueness_scope }
+    end
+
+    protected
+
+    def uppercase_number
+      number&.to_s&.upcase!
+    end
+  end
+end

data/app/models/concerns/spree/product_scopes.rb

@@ -27,16 +27,21 @@ module Spree
           next if name.to_s.include?('master_price')
 
           parts = name.to_s.match(/(.*)_by_(.*)/)
-          scope(name.to_s, -> { order(Arel.sql("#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ? 'ASC' : 'DESC'}")) })
+          scope(name.to_s, -> { order(Arel.sql(sanitize_sql("#{Product.quoted_table_name}.#{parts[2]} #{parts[1] == 'ascend' ? 'ASC' : 'DESC'}"))) })
         end
       end
 
       def self.property_conditions(property)
         properties = Property.table_name
         case property
-        when String   then { "#{properties}.name" => property }
         when Property then { "#{properties}.id" => property.id }
-        else { "#{properties}.id" => property.to_i }
+        when Integer  then { "#{properties}.id" => property }
+        else
+          if Property.column_for_attribute('id').type == :uuid
+            ["#{properties.name} = ? OR #{properties.id} = ?", property, property]
+          else
+            { "#{properties}.name" => property }
+          end
         end
       end
 
@@ -139,26 +144,34 @@ module Spree
       end
 
       add_search_scope :with_option do |option|
-        option_types = OptionType.table_name
-        conditions = case option
-                     when String     then { "#{option_types}.name" => option }
-                     when OptionType then { "#{option_types}.id" => option.id }
-                     else { "#{option_types}.id" => option.to_i }
-                     end
-
-        joins(:option_types).where(conditions)
+        if option.is_a?(OptionType)
+          joins(:option_types).where(spree_option_types: { id: option.id })
+        elsif option.is_a?(Integer)
+          joins(:option_types).where(spree_option_types: { id: option })
+        elsif OptionType.column_for_attribute('id').type == :uuid
+          joins(:option_types).where(spree_option_types: { name: option }).or(Product.joins(:option_types).where(spree_option_types: { id: option }))
+        else
+          joins(:option_types).where(spree_option_types: { name: option })
+        end
       end
 
       add_search_scope :with_option_value do |option, value|
-        option_values = OptionValue.table_name
         option_type_id = case option
-                         when String then OptionType.find_by(name: option) || option.to_i
                          when OptionType then option.id
-                         else option.to_i
+                         when Integer then option
+                         else
+                           if OptionType.column_for_attribute('id').type == :uuid
+                             OptionType.where(id: option).or(OptionType.where(name: option))&.first&.id
+                           else
+                             OptionType.where(name: option)&.first&.id
+                           end
                          end
 
-        conditions = "#{option_values}.name = ? AND #{option_values}.option_type_id = ?", value, option_type_id
-        group('spree_products.id').joins(variants_including_master: :option_values).where(conditions)
+        return Product.group("#{Spree::Product.table_name}.id").none if option_type_id.blank?
+
+        group("#{Spree::Product.table_name}.id").
+          joins(variants_including_master: :option_values).
+          where(Spree::OptionValue.table_name => { name: value, option_type_id: option_type_id })
       end
 
       # Finds all products which have either:
@@ -245,7 +258,7 @@ module Spree
         scope = not_discontinued.where("#{Product.quoted_table_name}.available_on <= ?", available_on)
 
         unless Spree::Config.show_products_without_price
-          currency ||= Spree::Config[:currency]
+          currency ||= Spree::Store.default.default_currency
           scope = scope.with_currency(currency)
         end
 
@@ -277,6 +290,26 @@ module Spree
         group('spree_products.id').joins(:taxons).where(Taxon.arel_table[:name].eq(name))
       end
 
+      # .search_by_name
+      if defined?(PgSearch)
+        include PgSearch::Model
+
+        if defined?(SpreeGlobalize)
+          pg_search_scope :search_by_name, associated_against: { translations: :name }, using: :tsearch
+        else
+          pg_search_scope :search_by_name, against: :name, using: :tsearch
+        end
+      else
+        def self.search_by_name(query)
+          if defined?(SpreeGlobalize)
+            joins(:translations).order(:name).where("LOWER(#{Product::Translation.table_name}.name) LIKE LOWER(:query)", query: "%#{query}%").distinct
+          else
+            where("LOWER(#{Product.table_name}.name) LIKE LOWER(:query)", query: "%#{query}%")
+          end
+        end
+      end
+      search_scopes << :search_by_name
+
       def self.price_table_name
         Price.quoted_table_name
       end
@@ -300,14 +333,11 @@ module Spree
       private_class_method :prepare_words
 
       def self.get_taxons(*ids_or_records_or_names)
-        taxons = Taxon.table_name
         ids_or_records_or_names.flatten.map do |t|
           case t
-          when Integer then Taxon.find_by(id: t)
           when ApplicationRecord then t
-          when String
-            Taxon.find_by(name: t) ||
-              Taxon.where("#{taxons}.permalink LIKE ? OR #{taxons}.permalink = ?", "%/#{t}/", "#{t}/").first
+          else
+            Taxon.where(name: t).or(Taxon.where(id: t)).or(Taxon.where("permalink LIKE ? OR permalink = ?", "%/#{t}/", "#{t}/")).first
           end
         end.compact.flatten.uniq
       end

data/app/models/concerns/spree/unique_name.rb

@@ -0,0 +1,10 @@
+module Spree
+  module UniqueName
+    extend ActiveSupport::Concern
+
+    included do
+      validates :name, presence: true,
+                       uniqueness: { case_sensitive: false, allow_blank: true, scope: spree_base_uniqueness_scope }
+    end
+  end
+end

data/app/models/concerns/spree/user_methods.rb

@@ -25,6 +25,8 @@ module Spree
       belongs_to :ship_address, class_name: 'Spree::Address', optional: true
       belongs_to :bill_address, class_name: 'Spree::Address', optional: true
 
+      has_many :wishlists, class_name: 'Spree::Wishlist', foreign_key: :user_id
+
       self.whitelisted_ransackable_associations = %w[bill_address ship_address addresses]
       self.whitelisted_ransackable_attributes = %w[id email]
 
@@ -66,6 +68,13 @@ module Spree
       end
     end
 
+    def default_wishlist_for_store(current_store)
+      wishlists.find_or_create_by(is_default: true, store_id: current_store.id) do |wishlist|
+        wishlist.name = Spree.t(:default_wishlist_name)
+        wishlist.save
+      end
+    end
+
     private
 
     def check_completed_orders

data/app/models/concerns/spree/user_reporting.rb

@@ -41,7 +41,7 @@ module Spree
     end
 
     def completed_orders(store)
-      orders.for_store(store).complete
+      orders.for_store(store).complete.order(currency: :desc)
     end
   end
 end

data/app/models/concerns/spree/user_roles.rb

@@ -6,18 +6,36 @@ module Spree
       has_many :role_users, class_name: 'Spree::RoleUser', foreign_key: :user_id, dependent: :destroy
       has_many :spree_roles, through: :role_users, class_name: 'Spree::Role', source: :role
 
-      scope :admin, -> { joins(:spree_roles).where(Spree::Role.table_name => { name: 'admin' }) }
+      scope :spree_admin, -> { joins(:spree_roles).where(Spree::Role.table_name => { name: 'admin' }) }
 
       # has_spree_role? simply needs to return true or false whether a user has a role or not.
       def has_spree_role?(role_name)
         spree_roles.exists?(name: role_name)
       end
 
+      def self.admin
+        ActiveSupport::Deprecation.warn('`User#admin` is deprecated and will be removed in Spree 5. Please use `User#spree_admin`')
+
+        spree_admin
+      end
+
       def self.admin_created?
-        admin.exists?
+        ActiveSupport::Deprecation.warn('`User#admin_created?` is deprecated and will be removed in Spree 5. Please use `User#spree_admin_created?`')
+
+        spree_admin_created?
       end
 
       def admin?
+        ActiveSupport::Deprecation.warn('`User#admin?` is deprecated and will be removed in Spree 5. Please use `User#spree_admin?`')
+
+        spree_admin?
+      end
+
+      def self.spree_admin_created?
+        spree_admin.exists?
+      end
+
+      def spree_admin?
         has_spree_role?('admin')
       end
     end

data/app/models/spree/ability.rb

@@ -1,8 +1,9 @@
-# Implementation class for Cancan gem.  Instead of overriding this class, consider adding new permissions
+# Implementation class for Cancan gem. Instead of overriding this class, consider adding new permissions
 # using the special +register_ability+ method which allows extensions to add their own abilities.
 #
-# See http://github.com/ryanb/cancan for more details on cancan.
+# See https://github.com/CanCanCommunity/cancancan for more details.
 require 'cancan'
+
 module Spree
   class Ability
     include CanCan::Ability
@@ -27,7 +28,7 @@ module Spree
 
       user ||= Spree.user_class.new
 
-      if user.respond_to?(:has_spree_role?) && user.has_spree_role?('admin')
+      if user.persisted? && user.try(:spree_admin?)
         apply_admin_permissions(user)
       else
         apply_user_permissions(user)
@@ -85,6 +86,13 @@ module Spree
       can :read, ::Spree::Taxonomy
       can :read, ::Spree::Variant
       can :read, ::Spree::Zone
+      can :manage, ::Spree::Wishlist, user_id: user.id
+      can :show, ::Spree::Wishlist do |wishlist|
+        wishlist.user == user || wishlist.is_private == false
+      end
+      can [:create, :update, :destroy], ::Spree::WishedItem do |wished_item|
+        wished_item.wishlist.user == user
+      end
     end
 
     def protect_admin_role

data/app/models/spree/address.rb

@@ -2,6 +2,8 @@ module Spree
   class Address < Spree::Base
     require 'validates_zipcode'
 
+    include Metadata
+
     if Rails::VERSION::STRING >= '6.1'
       serialize :preferences, Hash, default: {}
     end
@@ -23,7 +25,7 @@ module Spree
     # we're not freezing this on purpose so developers can extend and manage
     # those attributes depending of the logic of their applications
     ADDRESS_FIELDS = %w(firstname lastname company address1 address2 city state zipcode country phone)
-    EXCLUDED_KEYS_FOR_COMPARISION = %w(id updated_at created_at deleted_at label user_id)
+    EXCLUDED_KEYS_FOR_COMPARISON = %w(id updated_at created_at deleted_at label user_id)
 
     scope :not_deleted, -> { where(deleted_at: nil) }
 
@@ -117,7 +119,7 @@ module Spree
     end
 
     def value_attributes
-      attributes.except(*EXCLUDED_KEYS_FOR_COMPARISION)
+      attributes.except(*EXCLUDED_KEYS_FOR_COMPARISON)
     end
 
     def empty?

data/app/models/spree/adjustment.rb

@@ -42,6 +42,7 @@ module Spree
       end
     end
 
+    # FIXME: we should check if we also need to fire this action after update
     after_create :update_adjustable_adjustment_total
     after_destroy :update_adjustable_adjustment_total
 

data/app/models/spree/app_configuration.rb

@@ -22,49 +22,46 @@ module Spree
     # Alphabetized to more easily lookup particular preferences
     preference :address_requires_state, :boolean, default: true # should state/state_name be required
     preference :address_requires_phone, :boolean, default: true # Determines whether we require phone in address
-    preference :admin_interface_logo, :string, default: 'admin/logo.png'
-    preference :admin_path, :string, default: '/admin'
-    preference :admin_products_per_page, :integer, default: Kaminari.config.default_per_page
-    preference :admin_orders_per_page, :integer, default: Kaminari.config.default_per_page
-    preference :admin_properties_per_page, :integer, default: Kaminari.config.default_per_page
-    preference :admin_promotions_per_page, :integer, default: Kaminari.config.default_per_page
-    preference :admin_customer_returns_per_page, :integer, default: Kaminari.config.default_per_page
-    preference :admin_users_per_page, :integer, default: Kaminari.config.default_per_page
-    preference :admin_show_version, :boolean, default: true
+    preference :admin_path, :string, deprecated: true
+    preference :admin_products_per_page, :integer, deprecated: true
+    preference :admin_orders_per_page, :integer, deprecated: true
+    preference :admin_properties_per_page, :integer, deprecated: true
+    preference :admin_promotions_per_page, :integer, deprecated: true
+    preference :admin_customer_returns_per_page, :integer, deprecated: true
+    preference :admin_users_per_page, :integer, deprecated: true
+    preference :admin_show_version, :boolean, deprecated: true
     preference :allow_checkout_on_gateway_error, :boolean, default: false
     preference :allow_guest_checkout, :boolean, default: true
     preference :alternative_shipping_phone, :boolean, default: false # Request extra phone for ship addr
     preference :always_include_confirm_step, :boolean, default: false # Ensures confirmation step is always in checkout_progress bar, but does not force a confirm step if your payment methods do not support it.
-    preference :always_put_site_name_in_title, :boolean, default: true
-    preference :title_site_name_separator, :string, default: '-' # When always_put_site_name_in_title is true, insert a separator character before the site name in the title
+    preference :always_put_site_name_in_title, :boolean, deprecated: true
+    preference :title_site_name_separator, :string, deprecated: true
     preference :auto_capture, :boolean, default: false # automatically capture the credit card (as opposed to just authorize and capture later)
     preference :auto_capture_on_dispatch, :boolean, default: false # Captures payment for each shipment in Shipment#after_ship callback, and makes Shipment.ready when payment authorized.
     preference :binary_inventory_cache, :boolean, default: false # only invalidate product cache when a stock item changes whether it is in_stock
-    preference :checkout_zone, :string, default: nil # replace with the name of a zone if you would like to limit the countries
+    preference :checkout_zone, :string, default: nil, deprecated: true # replace with the name of a zone if you would like to limit the countries
     preference :company, :boolean, default: false # Request company field for billing and shipping addr
-    preference :currency, :string, default: 'USD'
-    preference :default_country_id, :integer
+    preference :currency, :string, default: 'USD', deprecated: true
+    preference :default_country_id, :integer, deprecated: true
     preference :disable_sku_validation, :boolean, default: false # when turned off disables the built-in SKU uniqueness validation
     preference :disable_store_presence_validation, :boolean, default: false # when turned off disables Store presence validation for Products and Payment Methods
     preference :expedited_exchanges, :boolean, default: false # NOTE this requires payment profiles to be supported on your gateway of choice as well as a delayed job handler to be configured with activejob. kicks off an exchange shipment upon return authorization save. charge customer if they do not return items within timely manner.
     preference :expedited_exchanges_days_window, :integer, default: 14 # the amount of days the customer has to return their item after the expedited exchange is shipped in order to avoid being charged
-    preference :layout, :string, default: 'spree/layouts/spree_application'
-    preference :logo, :string, default: 'logo/spree_50.png'
-    preference :mailer_logo, :string, default: 'logo/spree_50.png'
-    preference :max_level_in_taxons_menu, :integer, default: 1 # maximum nesting level in taxons menu
+    preference :layout, :string, deprecated: 'Please use Spree::Frontend::Config[:layout] instead'
+    preference :logo, :string, deprecated: true
+    preference :mailer_logo, :string, deprecated: true
+    preference :max_level_in_taxons_menu, :integer, deprecated: true
     preference :products_per_page, :integer, default: 12
-    preference :product_wysiwyg_editor_enabled, :boolean, default: true
     preference :require_master_price, :boolean, default: true
     preference :restock_inventory, :boolean, default: true # Determines if a return item is restocked automatically once it has been received
     preference :return_eligibility_number_of_days, :integer, default: 365
     preference :send_core_emails, :boolean, default: true # Default mail headers settings
-    preference :shipping_instructions, :boolean, default: false # Request instructions/info for shipping
-    preference :show_only_complete_orders_by_default, :boolean, default: true
+    preference :shipping_instructions, :boolean, deprecated: true
+    preference :show_only_complete_orders_by_default, :boolean, deprecated: true
     preference :show_variant_full_price, :boolean, default: false # Displays variant full price or difference with product price. Default false to be compatible with older behavior
     preference :show_products_without_price, :boolean, default: false
-    preference :show_raw_product_description, :boolean, default: false
+    preference :show_raw_product_description, :boolean, deprecated: true
     preference :tax_using_ship_address, :boolean, default: true
-    preference :taxon_wysiwyg_editor_enabled, :boolean, default: true
     preference :track_inventory_levels, :boolean, default: true # Determines whether to track on_hand values for variants / products.
 
     # Store credits configurations
@@ -72,7 +69,7 @@ module Spree
     preference :credit_to_new_allocation, :boolean, default: false
 
     # Multi store configurations
-    preference :show_store_selector, :boolean, default: false
+    preference :show_store_selector, :boolean, deprecated: true
 
     # searcher_class allows spree extension writers to provide their own Search class
     def searcher_class

data/app/models/spree/asset.rb

@@ -1,6 +1,7 @@
 module Spree
   class Asset < Spree::Base
     include Support::ActiveStorage
+    include Metadata
 
     belongs_to :viewable, polymorphic: true, touch: true
     acts_as_list scope: [:viewable_id, :viewable_type]

data/app/models/spree/base.rb

@@ -36,6 +36,10 @@ class Spree::Base < ApplicationRecord
     where(nil)
   end
 
+  def self.spree_base_uniqueness_scope
+    ApplicationRecord.try(:spree_base_uniqueness_scope) || []
+  end
+
   # FIXME: https://github.com/rails/rails/issues/40943
   def self.has_many_inversing
     false
@@ -45,6 +49,16 @@ class Spree::Base < ApplicationRecord
     column_names.reject { |c| c.match(/_id$|id|preferences|(.*)password|(.*)token|(.*)api_key/) }
   end
 
+  def self.json_api_permitted_attributes
+    skipped_attributes = %w[id]
+
+    if included_modules.include?(CollectiveIdea::Acts::NestedSet::Model)
+      skipped_attributes.push('lft', 'rgt', 'depth')
+    end
+
+    column_names.reject { |c| skipped_attributes.include?(c.to_s) }
+  end
+
   def self.json_api_type
     to_s.demodulize.underscore
   end

data/app/models/spree/calculator/flat_rate.rb

@@ -3,7 +3,7 @@ require_dependency 'spree/calculator'
 module Spree
   class Calculator::FlatRate < Calculator
     preference :amount, :decimal, default: 0
-    preference :currency, :string, default: -> { Spree::Config[:currency] }
+    preference :currency, :string, default: -> { Spree::Store.default.default_currency }
 
     def self.description
       Spree.t(:flat_rate_per_order)

data/app/models/spree/calculator/flexi_rate.rb

@@ -5,7 +5,7 @@ module Spree
     preference :first_item,      :decimal, default: 0.0
     preference :additional_item, :decimal, default: 0.0
     preference :max_items,       :integer, default: 0
-    preference :currency,        :string,  default: -> { Spree::Config[:currency] }
+    preference :currency,        :string,  default: -> { Spree::Store.default.default_currency }
 
     def self.description
       Spree.t(:flexible_rate)

data/app/models/spree/calculator/price_sack.rb

@@ -5,7 +5,7 @@ module Spree
     preference :minimal_amount, :decimal, default: 0
     preference :normal_amount, :decimal, default: 0
     preference :discount_amount, :decimal, default: 0
-    preference :currency, :string, default: -> { Spree::Config[:currency] }
+    preference :currency, :string, default: -> { Spree::Store.default.default_currency }
 
     def self.description
       Spree.t(:price_sack)