spree_core 4.7.3 → 4.8.0

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

@@ -8,7 +8,18 @@ end %>
 <% db_username = ENV['DB_USERNAME'] %>
 <% db_host = ENV['DB_HOST'] %>
 <% case ENV['DB']
-  when 'mysql' %>
+  when 'sqlite' %>
+development:
+  adapter: sqlite3
+  database: db/spree_development.sqlite3
+test:
+  adapter: sqlite3
+  database: db/spree_test.sqlite3
+  timeout: 10000
+production:
+  adapter: sqlite3
+  database: db/spree_production.sqlite3
+<% when 'mysql' %>
 mysql: &mysql
   adapter: mysql2
   encoding: utf8
@@ -57,26 +68,13 @@ production:
   <<: *postgres
   database: <%= database_prefix %><%= lib_name %>_spree_production
 <% else %>
-postgres: &postgres
-  adapter: postgresql
-  <% unless db_username.blank? %>
-  username: <%= db_username || 'postgres' %>
-  <% end %>
-  <% unless db_password.blank? %>
-  password: <%= db_password %>
-  <% end %>
-  <% unless db_host.blank? %>
-  host: <%= db_host %>
-  <% end %>
-  min_messages: warning
-
 development:
-  <<: *postgres
-  database: <%= database_prefix %><%= lib_name %>_spree_development
+  adapter: sqlite3
+  database: db/spree_development.sqlite3
 test:
-  <<: *postgres
-  database: <%= database_prefix %><%= lib_name %>_spree_test
+  adapter: sqlite3
+  database: db/spree_test.sqlite3
 production:
-  <<: *postgres
-  database: <%= database_prefix %><%= lib_name %>_spree_production
-<% end %>
+  adapter: sqlite3
+  database: db/spree_production.sqlite3
+<% end %>

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

@@ -36,7 +36,7 @@ Dummy::Application.configure do
 
   config.active_job.queue_adapter = :test
 
-  config.cache_store = :redis_cache_store
+  config.cache_store = :memory_store # we need to use memory store for Spree preferences
 
   routes.default_url_options = { host: 'localhost', port: 3000 }
 end

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

@@ -9,17 +9,40 @@
 #
 # In order to initialize a setting do:
 # config.setting_name = 'new value'
+#
+# More on configuring Spree preferences can be found at:
+# https://docs.spreecommerce.org/developer/customization
 Spree.config do |config|
   # Example:
   # Uncomment to stop tracking inventory levels in the application
   # config.track_inventory_levels = false
 end
 
+# Use a CDN host for images, eg. Cloudfront
+# This is used in the frontend to generate absolute URLs to images
+# Default is nil and your application host will be used
+# Spree.cdn_host = 'cdn.example.com'
+
+# Use a different service for storage (S3, google, etc)
+# unless Rails.env.test?
+#   Spree.private_storage_service_name = :amazon_public # public assets, such as product images
+#   Spree.public_storage_service_name = :amazon_private # private assets, such as invoices, etc
+# end
+
+# Use a different search engine for products
+# You can check the default search class at:
+# https://github.com/spree/spree/blob/main/core/lib/spree/core/search/base.rb
+# and use it as base class for your custom searcher
+# eg. MySearcher < Spree::Core::Search::Base
+# Spree.searcher_class = 'MySearcher'
+
 # Configure Spree Dependencies
 #
 # Note: If a dependency is set here it will NOT be stored within the cache & database upon initialization.
 #       Just removing an entry from this initializer will make the dependency value go away.
 #
+# More on how to use Spree dependencies can be found at:
+# https://docs.spreecommerce.org/customization/dependencies
 Spree.dependencies do |dependencies|
   # Example:
   # Uncomment to change the default Service handling adding Items to Cart
@@ -29,3 +52,5 @@ end
 # Spree::Api::Dependencies.storefront_cart_serializer = 'MyRailsApp::CartSerializer'
 
 Spree.user_class = <%= (options[:user_class].blank? ? 'Spree::LegacyUser' : options[:user_class]).inspect %>
+# Use a different class for admin users
+# Spree.admin_user_class = 'AdminUser'

data/lib/spree/core/configuration.rb

@@ -1,4 +1,4 @@
-# This is the primary location for defining spree preferences
+# This is the primary location for defining Spree Core preferences
 #
 # The expectation is that this is created once and stored in
 # the spree environment
@@ -22,29 +22,20 @@ module Spree
   module Core
     class Configuration < Preferences::Configuration
       # Alphabetized to more easily lookup particular preferences
-      preference :address_requires_state, :boolean, default: true # should state/state_name be required
+      preference :address_requires_state, :boolean, default: true, deprecated: true # should state/state_name be required
       preference :address_requires_phone, :boolean, default: true # Determines whether we require phone in address
-      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 :allow_guest_checkout, :boolean, default: true # this is only used in the rails frontend, and is not implemented in API
       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, 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 :binary_inventory_cache, :boolean, default: false, deprecated: true # only invalidate product cache when a stock item changes whether it is in_stock
       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', deprecated: true
-      preference :default_country_id, :integer, deprecated: true
+      preference :credit_to_new_allocation, :boolean, default: false
       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.
@@ -53,6 +44,7 @@ module Spree
       preference :logo, :string, deprecated: true
       preference :mailer_logo, :string, deprecated: true
       preference :max_level_in_taxons_menu, :integer, deprecated: true
+      preference :non_expiring_credit_types, :array, default: []
       preference :products_per_page, :integer, default: 12
       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
@@ -64,15 +56,14 @@ module Spree
       preference :show_products_without_price, :boolean, default: false
       preference :show_raw_product_description, :boolean, deprecated: true
       preference :tax_using_ship_address, :boolean, default: true
+      preference :title_site_name_separator, :string, deprecated: true
       preference :track_inventory_levels, :boolean, default: true # Determines whether to track on_hand values for variants / products.
       preference :use_user_locale, :boolean, default: true
 
-      # Store credits configurations
-      preference :non_expiring_credit_types, :array, default: []
-      preference :credit_to_new_allocation, :boolean, default: false
-
-      # Multi store configurations
-      preference :show_store_selector, :boolean, deprecated: true
+      # Sets the path used for products, taxons and pages.
+      preference :storefront_products_path, :string, default: 'products'
+      preference :storefront_taxons_path, :string, default: 't'
+      preference :storefront_pages_path, :string, default: 'pages'
 
       # searcher_class allows spree extension writers to provide their own Search class
       def searcher_class
@@ -80,11 +71,6 @@ module Spree
         @searcher_class ||= Spree.searcher_class
       end
 
-      # Sets the path used for products, taxons and pages.
-      preference :storefront_products_path, :string, default: 'products'
-      preference :storefront_taxons_path, :string, default: 't'
-      preference :storefront_pages_path, :string, default: 'pages'
-
       attr_writer :searcher_class
     end
   end

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

@@ -28,6 +28,10 @@ module Spree
           Spree::Locales::SetFallbackLocaleForStore.new.call(store: current_store)
         end
 
+        def default_locale
+          @default_locale ||= current_store&.default_locale || Rails.application.config.i18n.default_locale || I18n.default_locale
+        end
+
         def current_locale
           @current_locale ||= if user_locale?
                                 try_spree_current_user.selected_locale
@@ -36,7 +40,7 @@ module Spree
                               elsif config_locale?
                                 config_locale
                               else
-                                current_store&.default_locale || Rails.application.config.i18n.default_locale || I18n.default_locale
+                                default_locale
                               end
         end
 

data/lib/spree/core/engine.rb

@@ -1,11 +1,13 @@
 require_relative 'dependencies'
 require_relative 'configuration'
+require_relative 'runtime_configuration'
 
 module Spree
   module Core
     class Engine < ::Rails::Engine
       Environment = Struct.new(:calculators,
                                :preferences,
+                               :runtime_preferences,
                                :dependencies,
                                :payment_methods,
                                :adjusters,
@@ -23,9 +25,10 @@ module Spree
       end
 
       initializer 'spree.environment', before: :load_config_initializers do |app|
-        app.config.spree = Environment.new(SpreeCalculators.new, Spree::Core::Configuration.new, Spree::Core::Dependencies.new)
+        app.config.spree = Environment.new(SpreeCalculators.new, Spree::Core::Configuration.new, Spree::Core::RuntimeConfiguration.new, Spree::Core::Dependencies.new)
         app.config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal]
         Spree::Config = app.config.spree.preferences
+        Spree::RuntimeConfig = app.config.spree.runtime_preferences
         Spree::Dependencies = app.config.spree.dependencies
         Spree::Deprecation = ActiveSupport::Deprecation.new
       end

data/lib/spree/core/preferences/runtime_configuration.rb

@@ -0,0 +1,43 @@
+module Spree
+  module Preferences
+    class RuntimeConfiguration
+      def initialize
+        self.class.defaults.each do |key, value|
+          self[key] = value
+        end
+      end
+
+      def configure
+        yield(self) if block_given?
+      end
+
+      def get(preference)
+        send(preference)
+      end
+
+      alias [] get
+
+      def set(preference, value)
+        send("#{preference}=", value)
+      end
+
+      alias []= set
+
+      class << self
+        def preference(name, _type, default: nil, deprecated: false)
+          defaults[name] = default
+          deprecations[name] = deprecated
+          attr_accessor name
+        end
+
+        def defaults
+          @defaults ||= {}
+        end
+
+        def deprecations
+          @deprecations ||= {}
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/product_duplicator.rb

@@ -30,6 +30,8 @@ module Spree
           t.name = "COPY OF #{t.name}"
           t.slug = nil
         end
+
+        new_product.name = "COPY OF #{product.name}"
         new_product.taxons = product.taxons
         new_product.stores = product.stores
         new_product.created_at = nil

data/lib/spree/core/product_filters.rb

@@ -98,7 +98,12 @@ module Spree
         conds.each do |new_scope|
           scope = scope.or(new_scope)
         end
-        Product.with_property('brand').join_translation_table(ProductProperty).where(scope)
+
+        if Spree.use_translations?
+          Product.with_property('brand').join_translation_table(ProductProperty).where(scope)
+        else
+          Product.with_property('brand').where(scope)
+        end
       end
 
       def self.brand_filter
@@ -106,7 +111,9 @@ module Spree
         brands = brand_property ? Spree::ProductProperty.where(property_id: brand_property.id).pluck(:value).uniq.map(&:to_s) : []
 
         conditions = brands.map do |brand|
-          [brand, { ProductProperty.translation_table_alias => { value: brand } }]
+          table_name = Spree.use_translations? ? ProductProperty.translation_table_alias : ProductProperty.table_name
+
+          [brand, { table_name.to_s => { value: brand } }]
         end.to_h
 
         {

data/lib/spree/core/runtime_configuration.rb

@@ -0,0 +1,9 @@
+require 'spree/core/preferences/runtime_configuration'
+
+module Spree
+  module Core
+    class RuntimeConfiguration < Preferences::RuntimeConfiguration
+      preference :always_use_translations, :boolean, default: false
+    end
+  end
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.7.3'.freeze
+  VERSION = '4.8.0'.freeze
 
   def self.version
     VERSION

data/lib/spree/core/webhooks.rb

@@ -0,0 +1,13 @@
+module Spree
+  module Webhooks
+    def self.disable_webhooks
+      webhooks_disabled_previously = ENV['DISABLE_SPREE_WEBHOOKS']
+      begin
+        ENV['DISABLE_SPREE_WEBHOOKS'] = 'true'
+        yield
+      ensure
+        ENV['DISABLE_SPREE_WEBHOOKS'] = webhooks_disabled_previously
+      end
+    end
+  end
+end

data/lib/spree/core.rb

@@ -76,6 +76,10 @@ module Spree
     end
   end
 
+  def self.use_translations?
+    Spree::RuntimeConfig.always_use_translations || I18n.default_locale != I18n.locale
+  end
+
   # Used to configure Spree.
   #
   # Example:
@@ -141,3 +145,6 @@ require 'spree/core/controller_helpers/currency'
 
 require 'spree/core/preferences/store'
 require 'spree/core/preferences/scoped_store'
+require 'spree/core/preferences/runtime_configuration'
+
+require "spree/core/webhooks"

data/lib/spree/money.rb

@@ -5,8 +5,15 @@ Money.rounding_mode = BigDecimal::ROUND_HALF_UP
 
 module Spree
   class Money
+    include Comparable
+
     class << self
       attr_accessor :default_formatting_rules
+
+      def from_cents(amount_in_cents, options = {})
+        money = ::Money.from_cents(amount_in_cents, options[:currency])
+        new(money.to_d, options)
+      end
     end
 
     self.default_formatting_rules = {
@@ -17,10 +24,10 @@ module Spree
 
     attr_reader :money
 
-    delegate    :cents, :currency, to: :money
+    delegate    :cents, :currency, :to_d, :positive?, :zero?, to: :money
 
     def initialize(amount, options = {})
-      use_default_currency
+      ::Money.default_currency ||= Spree::Store.default.default_currency || 'USD'
       @money   = Monetize.parse([amount, (options[:currency] || Spree::Store.default.default_currency)].join)
       @options = Spree::Money.default_formatting_rules.merge(options)
     end
@@ -29,10 +36,18 @@ module Spree
       (cents / currency.subunit_to_unit.to_f * 100).round
     end
 
+    def abs
+      self.class.new(money.abs, options)
+    end
+
     def to_s
       money&.format(options)
     end
 
+    def inspect
+      "#{self.class}(cents: #{cents}, currency: #{currency})"
+    end
+
     # 1) prevent blank, breaking spaces
     # 2) prevent escaping of HTML character entities
     def to_html(opts = { html: true })
@@ -65,9 +80,27 @@ module Spree
       money == obj.money
     end
 
-    def use_default_currency
-      currency = Spree::Store.default.default_currency
-      ::Money.default_currency = currency
+    def +(other)
+      result_money = money + other.money
+      self.class.new(result_money.to_s, options)
+    end
+
+    def -(other)
+      result_money = money - other.money
+      self.class.new(result_money.to_s, options)
+    end
+
+    def *(value)
+      result_money = money * value
+      self.class.new(result_money.to_s, options)
+    end
+
+    def <=>(other)
+      money <=> other.money
+    end
+
+    def -@
+      self.class.new((-money).to_s, options)
     end
 
     private

data/lib/spree/testing_support/authorization_helpers.rb

@@ -37,12 +37,14 @@ module Spree
             ability_class.register_ability(ability)
           end
 
+          let(:user) { Spree.user_class.new }
           let(:admin_app) { Spree::OauthApplication.create!(name: 'Admin Panel', scopes: 'admin') }
           let(:admin_token) { Spree::OauthAccessToken.create!(application: admin_app, scopes: 'admin').token }
 
           before do
-            allow(Spree.user_class).to receive(:find_by).and_return(Spree.user_class.new)
+            allow(Spree.user_class).to receive(:find_by).and_return(user)
             if defined?(Spree::Admin)
+              allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(user)
               allow_any_instance_of(Spree::Admin::BaseController).to receive(:admin_oauth_application).and_return(admin_app)
               allow_any_instance_of(Spree::Admin::BaseController).to receive(:admin_oauth_token).and_return(admin_token)
             end

data/lib/spree/testing_support/common_rake.rb

@@ -14,21 +14,21 @@ namespace :common do
     ENV['RAILS_ENV'] = 'test'
     Rails.env = 'test'
 
-    if ENV['LIB_NAME'] == 'spree/backend'
-      puts 'Preparing NPM package...'
-      system('yarn install')
-      system('yarn build')
-      system('yarn link')
+    Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}"]
+
+    # install frontend libraries
+    unless ['spree/api', 'spree/core', 'spree/sample'].include?(ENV['LIB_NAME'])
+      system('bin/rails importmap:install')
+      system('bin/rails turbo:install')
+      system('bin/rails stimulus:install')
     end
 
-    Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--quiet']
     Spree::InstallGenerator.start [
       "--lib_name=#{ENV['LIB_NAME']}",
       '--auto-accept',
       '--migrate=false',
       '--seed=false',
       '--sample=false',
-      '--quiet',
       '--copy_storefront=false',
       "--install_storefront=#{args[:install_storefront]}",
       "--install_admin=#{args[:install_admin]}",
@@ -41,12 +41,6 @@ namespace :common do
     Spree::DummyModelGenerator.start
     system('bundle exec rake db:migrate')
 
-    unless ['spree/api', 'spree/core', 'spree/sample', 'spree/emails'].include?(ENV['LIB_NAME'])
-      puts 'Setting up node environment'
-      system('bin/rails javascript:install:esbuild')
-      system('bin/rails turbo:install')
-    end
-
     begin
       require "generators/#{ENV['LIB_NAME']}/install/install_generator"
       puts 'Running extension installation generator...'
@@ -56,11 +50,6 @@ namespace :common do
     end
 
     unless ['spree/api', 'spree/core', 'spree/sample'].include?(ENV['LIB_NAME'])
-      if ENV['LIB_NAME'] == 'spree/backend'
-        puts 'Installing node dependencies...'
-        system('yarn link @spree/dashboard')
-        system('yarn install')
-      end
       puts 'Precompiling assets...'
       system('bundle exec rake assets:precompile')
     end

data/spree_core.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.metadata = {
     "bug_tracker_uri"   => "https://github.com/spree/spree/issues",
     "changelog_uri"     => "https://github.com/spree/spree/releases/tag/v#{s.version}",
-    "documentation_uri" => "https://dev-docs.spreecommerce.org/",
+    "documentation_uri" => "https://docs.spreecommerce.org/",
     "source_code_uri"   => "https://github.com/spree/spree/tree/v#{s.version}",
   }
 
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
     actionpack actionview activejob activemodel activerecord
     activestorage activesupport railties
   ].each do |rails_gem|
-    s.add_dependency rails_gem, '>= 6.1', '< 7.2'
+    s.add_dependency rails_gem, '>= 6.1', '< 8.0'
   end
 
   s.add_dependency 'activemerchant', '~> 1.67'
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'carmen', '>= 1.0'
   s.add_dependency 'cancancan', '~> 3.2'
   s.add_dependency 'friendly_id', '~> 5.2', '>= 5.2.1'
-  s.add_dependency 'highline', '~> 2.0' # Necessary for the install generator
+  s.add_dependency 'highline', '>= 2', '< 4' # Necessary for the install generator
   s.add_dependency 'kaminari', '~> 1.2'
   s.add_dependency 'money', '~> 6.13'
   s.add_dependency 'monetize', '~> 1.9'
@@ -52,9 +52,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'stringex'
   s.add_dependency 'validates_zipcode'
   s.add_dependency 'image_processing', '~> 1.2'
-  s.add_dependency 'active_storage_validations', '~> 0.9', '<= 0.9.5'
+  s.add_dependency 'active_storage_validations', '~> 1.1'
   s.add_dependency 'activerecord-typedstore'
-  s.add_dependency 'mobility', '~> 1.2.9'
-  s.add_dependency 'mobility-ransack', '~> 1.2.1'
-  s.add_dependency 'friendly_id-mobility', '~> 1.0.4'
+  s.add_dependency 'mobility', '~> 1.2'
+  s.add_dependency 'mobility-ransack', '~> 1.2'
+  s.add_dependency 'friendly_id-mobility', '~> 1.0'
 end