spree_core 4.9.0 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3966d98b01b3e3ac7e23384c37933bfd0cd961d05a112b6b538e3973bf62e0df
-  data.tar.gz: d1305f1376e401557ae786799c862ab927c4aa26986cb444bdd8db4230d92cd8
+  metadata.gz: ef1a05dcfe29482a9f538a00cbf53f30fb26b25cc789e6935b1c502fa7d670ba
+  data.tar.gz: 0b685feeca4b4de334ef20c454edf4b83476d7275dca33617780b03df659023e
 SHA512:
-  metadata.gz: 768f2fb6195ca9528398233360ab1f4b7be974e7fa5999ba32a5aa53b89d52bcce93ef252dd45ba7bd627ea329e5ebb9e11200dea6fecdb494c45078b2a97e88
-  data.tar.gz: 1a3c031451d48a9fd021eb0529e942db6adcd732a9e558c7fdefd7574c749192982cece0854678a198489512d421e22aa466bdd958f240d8bc5af23a4de9d240
+  metadata.gz: d18e35dc1286e0053e044ae360e0b626ccab034e356a8ca6396303a8c90c18041c22ee94fdfdcb7e08ed8856f56416a81efed9e864088b351a68684d972b95c0
+  data.tar.gz: e9338463f6da5a8b40353001e24285c0cf5b0fea045a66ff536531022c7ea1ab82c9507ce456652e5afcee6d8a8166d577645b083f79371a95d3d0c30be7eeca

data/LICENSE.md

@@ -0,0 +1,57 @@
+# License
+
+Copyright © 2024-present, Vendo Connect Inc.
+
+Copyright © 2015-2024, Spark Solutions Sp. z o.o.
+
+Copyright © 2007-2015, Spree Commerce Inc.
+
+Spree Commerce is a free, open-source eCommerce framework giving you full control and customizability.
+
+For **Spree Commerce versions 4.10** and later in the [spree/spree](https://github.com/spree/spree) repository two licenses apply simultaneously and users are required to comply with the terms of these two licenses at the same time:
+
+* [AGPL-3.0](https://opensource.org/license/agpl-v3) - for all contributions from version 4.10 onwards
+
+* [BSD-3-Clause](https://opensource.org/license/bsd-3-clause) - for all other contributions predating version 4.10
+Effectively, for versions 4.10 and upwards **AGPL-3.0** license applies.
+
+**Spree Commerce versions 4.9** and earlier in the [spree/spree](https://github.com/spree/spree) repository are available under the **BSD-3-Clause** license and users are required to comply with its terms.
+
+If you’d like to use Spree Commerce without the AGPL-3.0 restrictions e.g. for a **SaaS** business, please talk to us about obtaining a [Commercial License](#commercial-license).
+
+All third party components incorporated into this software are licensed under the original license provided by the owner of the applicable component.
+
+Please refer to our [Licensing FAQ](https://spreecommerce.org/why-spree-is-changing-its-open-source-license-to-agpl-3-0-and-introducing-a-commercial-license/) in case of questions.
+
+## AGPL-3.0 License - Spree 4.10 upwards
+
+If you decide to accept the AGPL-3.0 license by using Spree Commerce version 4.10 or later, you must comply with the following terms:
+
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see [https://www.gnu.org/licenses/](https://www.gnu.org/licenses/).
+
+## BSD 3-Clause License
+
+If you decide to accept the BSD-3-Clause license by using Spree Commerce, you must comply with the following terms:
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of Spree Commerce Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,     THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR                CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,              PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF         LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## Commercial License
+
+Should you decide to use Spree Commerce version 4.10 or later for commercial redistribution (eg. SaaS) - also known as Commercial Distribution - you must do so in accordance with the terms and conditions contained in a separate written agreement between you and [Vendo Connect Inc.](https://www.getvendo.com/).
+
+For more information about the Commercial License (CL) please contact [sales@getvendo.com](mailto:sales@getvendo.com).
+
+Please refer to our [Licensing FAQ](https://spreecommerce.org/why-spree-is-changing-its-open-source-license-to-agpl-3-0-and-introducing-a-commercial-license/) in case of questions.

data/app/finders/spree/orders/find_complete.rb

@@ -1,6 +1,8 @@
 module Spree
   module Orders
     class FindComplete
+      include Spree::Orders::FinderHelper
+
       attr_reader :user, :number, :token, :store
 
       def initialize(user: nil, number: nil, token: nil, store: nil)
@@ -22,7 +24,7 @@ module Spree
       private
 
       def scope
-        user? ? user.orders.complete.includes(scope_includes) : Spree::Order.complete.includes(scope_includes)
+        user? ? user.orders.complete.includes(order_includes) : Spree::Order.complete.includes(order_includes)
       end
 
       def user?
@@ -64,18 +66,6 @@ module Spree
 
         orders.where(store: store)
       end
-
-      def scope_includes
-        {
-          line_items: [
-            variant: [
-              :images,
-              option_values: :option_type,
-              product: :product_properties,
-            ]
-          ]
-        }
-      end
     end
   end
 end

data/app/finders/spree/orders/find_current.rb

@@ -1,6 +1,8 @@
 module Spree
   module Orders
     class FindCurrent
+      include Spree::Orders::FinderHelper
+
       def execute(user:, store:, **params)
         params = params.merge(store_id: store.id)
 
@@ -15,7 +17,7 @@ module Spree
       private
 
       def incomplete_orders
-        Spree::Order.incomplete.not_canceled
+        Spree::Order.incomplete.not_canceled.includes(order_includes)
       end
     end
   end

data/app/finders/spree/orders/finder_helper.rb

@@ -0,0 +1,17 @@
+module Spree
+  module Orders
+    module FinderHelper
+      def order_includes
+        {
+          line_items: [
+            variant: [
+              :product,
+              :images,
+              { option_values: :option_type }
+            ]
+          ]
+        }
+      end
+    end
+  end
+end

data/app/models/spree/fulfilment_changer.rb

@@ -109,6 +109,7 @@ module Spree
       end
 
       desired_shipment.refresh_rates
+      desired_shipment.update_amounts
 
       desired_shipment.order.reload
       desired_shipment.order.update_with_updater!

data/app/models/spree/line_item.rb

@@ -5,6 +5,8 @@ module Spree
       include Spree::Webhooks::HasWebhooks
     end
 
+    attribute :quantity, :integer, default: 1
+
     before_validation :ensure_valid_quantity
 
     with_options inverse_of: :line_items do
@@ -27,7 +29,7 @@ module Spree
     # numericality: :less_than_or_equal_to validation is due to the restriction at the database level
     #   https://github.com/spree/spree/issues/2695#issuecomment-143314161
     validates :quantity, numericality: {
-      less_than_or_equal_to: DatabaseTypeUtilities.maximum_value_for(:integer),
+      in: 0..DatabaseTypeUtilities.maximum_value_for(:integer),
       only_integer: true, message: Spree.t('validation.must_be_int')
     }
 

data/app/models/spree/price.rb

@@ -14,10 +14,17 @@ module Spree
     before_validation :ensure_currency
     before_save :remove_compare_at_amount_if_equals_amount
 
+    # legacy behavior
     validates :amount, allow_nil: true, numericality: {
       greater_than_or_equal_to: 0,
       less_than_or_equal_to: MAXIMUM_AMOUNT
-    }
+    }, if: -> { Spree::RuntimeConfig.allow_empty_price_amount }
+
+    # new behavior
+    validates :amount, allow_nil: false, numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: MAXIMUM_AMOUNT
+    }, unless: -> { Spree::RuntimeConfig.allow_empty_price_amount }
 
     validates :compare_at_amount, allow_nil: true, numericality: {
       greater_than_or_equal_to: 0,

data/app/models/spree/shipment.rb

@@ -109,6 +109,8 @@ module Spree
     money_methods :cost, :discounted_cost, :final_price, :item_cost, :additional_tax_total, :included_tax_total, :tax_total
     alias display_amount display_cost
 
+    auto_strip_attributes :tracking
+
     # Returns the shipment number and shipping method name
     #
     # @return [String]

data/app/models/spree/shipping_method.rb

@@ -48,9 +48,25 @@ module Spree
     end
 
     def build_tracking_url(tracking)
-      return if tracking.blank? || tracking_url.blank?
+      return if tracking.blank?
+
+      tracking = tracking.upcase
+
+      # build tracking url automatically
+      if tracking_url.blank?
+        # use tracking number gem to build tracking url
+        # we need to upcase the tracking number
+        # https://github.com/jkeen/tracking_number/pull/85
+        tracking_number_service(tracking).tracking_url if tracking_number_service(tracking).valid?
+      else
+        # build tracking url manually
+        tracking_url.gsub(/:tracking/, ERB::Util.url_encode(tracking)) # :url_encode exists in 1.8.7 through 2.1.0
+      end
+    end
 
-      tracking_url.gsub(/:tracking/, ERB::Util.url_encode(tracking)) # :url_encode exists in 1.8.7 through 2.1.0
+    # your shipping method subclasses can override this method to provide a custom tracking number service
+    def tracking_number_service(tracking)
+      @tracking_number_service ||= Spree::Dependencies.tracking_number_service.constantize.new(tracking)
     end
 
     def self.calculators

data/app/models/spree/store.rb

@@ -127,9 +127,7 @@ module Spree
     end
 
     def self.available_locales
-      Rails.cache.fetch('stores_available_locales') do
-        Spree::Store.all.map(&:supported_locales_list).flatten.uniq
-      end
+      Spree::Store.all.map(&:supported_locales_list).flatten.uniq
     end
 
     def default_menu(location)
@@ -245,7 +243,6 @@ module Spree
 
     def clear_cache
       Rails.cache.delete('default_store')
-      Rails.cache.delete('stores_available_locales')
     end
 
     def ensure_default_country

data/app/models/spree/taxon.rb

@@ -13,7 +13,6 @@ module Spree
     extend FriendlyId
     friendly_id :permalink, slug_column: :permalink, use: :history
     before_validation :set_permalink, on: :create, if: :name
-    alias_attribute :slug, :permalink
 
     acts_as_nested_set dependent: :destroy
 
@@ -21,6 +20,8 @@ module Spree
     has_many :classifications, -> { order(:position) }, dependent: :delete_all, inverse_of: :taxon
     has_many :products, through: :classifications
 
+    delegate :store, to: :taxonomy
+
     has_many :menu_items, as: :linked_resource
     has_many :cms_sections, as: :linked_resource
 
@@ -44,9 +45,13 @@ module Spree
     end
 
     before_validation :copy_taxonomy_from_parent
+    before_save :set_pretty_name
+    before_save :set_permalink
     after_save :touch_ancestors_and_taxonomy
     after_update :sync_taxonomy_name
     after_touch :touch_ancestors_and_taxonomy
+    after_commit :regenerate_pretty_name_and_permalink, on: :update, if: :should_regenerate_pretty_name_and_permalink?
+    after_move :regenerate_pretty_name_and_permalink
 
     has_one :store, through: :taxonomy
 
@@ -59,17 +64,45 @@ module Spree
 
     scope :for_stores, ->(stores) { joins(:taxonomy).where(spree_taxonomies: { store_id: stores.ids }) }
 
-    TRANSLATABLE_FIELDS = %i[name description permalink].freeze
+    TRANSLATABLE_FIELDS = %i[name pretty_name description permalink].freeze
     translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)
 
+    def slug
+      permalink
+    end
+
+    def slug=(value)
+      self.permalink = value
+    end
+
     self::Translation.class_eval do
-      alias_attribute :slug, :permalink
       before_save :set_permalink
+      before_save :set_pretty_name
+
+      def slug
+        permalink
+      end
+
+      def slug=(value)
+        self.permalink = value
+      end
 
       def set_permalink
         self.permalink = generate_slug
       end
 
+      def set_pretty_name
+        self[:pretty_name] = generate_pretty_name
+      end
+
+      def name_with_fallback
+        name.blank? ? translated_model.name : name
+      end
+
+      def pretty_name_with_fallback
+        pretty_name.blank? ? translated_model.pretty_name : pretty_name
+      end
+
       private
 
       def generate_slug
@@ -82,12 +115,22 @@ module Spree
         end
       end
 
+      def generate_pretty_name
+        if parent.present?
+          generate_pretty_name_including_parent
+        elsif pretty_name.blank?
+          pretty_name_with_fallback
+        else
+          pretty_name
+        end
+      end
+
       def generate_permalink_including_parent
         [parent_permalink_with_fallback, (permalink.blank? ? name_with_fallback.to_url : permalink.split('/').last.to_url)].join('/')
       end
 
-      def name_with_fallback
-        name.blank? ? translated_model.name : name
+      def generate_pretty_name_including_parent
+        [parent_pretty_name_with_fallback, (pretty_name.blank? ? name_with_fallback : pretty_name)].compact.join(' -> ')
       end
 
       def parent
@@ -98,6 +141,11 @@ module Spree
         localized_parent = parent.translations.find_by(locale: locale)
         localized_parent.present? ? localized_parent.permalink : parent.permalink
       end
+
+      def parent_pretty_name_with_fallback
+        localized_parent = parent.translations.find_by(locale: locale)
+        localized_parent.present? ? localized_parent.pretty_name : parent.pretty_name
+      end
     end
 
     # indicate which filters should be used for a taxon
@@ -117,13 +165,12 @@ module Spree
       meta_title.blank? ? name : meta_title
     end
 
-    # Creates permalink base for friendly_id
-    def set_permalink
-      if Spree.use_translations?
-        translations.each(&:set_permalink)
-      else
-        self.permalink = generate_slug
-      end
+    def set_pretty_name
+      self[:pretty_name] = generate_pretty_name
+    end
+
+    def generate_pretty_name
+      [parent&.pretty_name, name].compact.join(' -> ')
     end
 
     def generate_slug
@@ -136,15 +183,30 @@ module Spree
       end
     end
 
+    def set_permalink
+      if Spree.use_translations?
+        translations.each(&:set_permalink)
+      else
+        self.permalink = generate_slug
+      end
+    end
+
     def active_products
       products.active
     end
 
-    def pretty_name
-      ancestor_chain = ancestors.inject('') do |name, ancestor|
-        name += "#{ancestor.name} -> "
-      end
-      ancestor_chain + name.to_s
+    def regenerate_pretty_name_and_permalink
+      set_permalink
+      update_columns(pretty_name: generate_pretty_name, updated_at: Time.current)
+
+      children.reload.each(&:regenerate_pretty_name_and_permalink_as_child)
+    end
+
+    def regenerate_pretty_name_and_permalink_as_child
+      set_permalink
+      update_columns(pretty_name: generate_pretty_name, updated_at: Time.current)
+
+      children.reload.each(&:regenerate_pretty_name_and_permalink_as_child)
     end
 
     def cached_self_and_descendants_ids
@@ -165,6 +227,10 @@ module Spree
 
     private
 
+    def should_regenerate_pretty_name_and_permalink?
+      saved_changes.key?(:name) || saved_changes.key?(:permalink)
+    end
+
     def sync_taxonomy_name
       if saved_changes.key?(:name) && root?
         return if taxonomy.name.to_s == name.to_s

data/app/models/spree/taxonomy.rb

@@ -2,6 +2,7 @@ module Spree
   class Taxonomy < Spree::Base
     include Spree::TranslatableResource
     include Spree::Metadata
+    include Spree::SingleStoreResource
     if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/variant.rb

@@ -128,13 +128,18 @@ module Spree
     self.whitelisted_ransackable_scopes = %i(product_name_or_sku_cont search_by_product_name_or_sku)
 
     def self.product_name_or_sku_cont(query)
+      sanitized_query = ActiveRecord::Base.sanitize_sql_like(query.to_s.downcase.strip)
+      query_pattern = "%#{sanitized_query}%"
+      sku_condition = arel_table[:sku].lower.matches(query_pattern)
+
       if Spree.use_translations?
+        product_name_condition = Product.translation_table[:name].lower.matches(query_pattern)
         joins(:product).
           join_translation_table(Product).
-          where("LOWER(#{Product.translation_table_alias}.name) LIKE LOWER(:query)
-                 OR LOWER(sku) LIKE LOWER(:query)", query: "%#{query}%")
+          where(product_name_condition.or(sku_condition))
       else
-        joins(:product).where("LOWER(#{Product.table_name}.name) LIKE LOWER(:query) OR LOWER(sku) LIKE LOWER(:query)", query: "%#{query}%")
+        product_name_condition = Product.arel_table[:name].lower.matches(query_pattern)
+        joins(:product).where(product_name_condition.or(sku_condition))
       end
     end
 

data/app/services/spree/tracking_numbers/base_service.rb

@@ -0,0 +1,19 @@
+require 'tracking_number'
+
+# This is a very basic service that can be used to track packages.
+# It uses the tracking_number gem to validate and build tracking urls.
+# https://github.com/jkeen/tracking_number
+# You can create your own service by subclassing this one and using 3rd party services, eg. AfterShip or Shippo
+module Spree
+  module TrackingNumbers
+    class BaseService
+      def initialize(tracking_number)
+        @tracking = TrackingNumber.new(tracking_number)
+      end
+
+      attr_reader :tracking
+
+      delegate :valid?, :tracking_url, to: :tracking
+    end
+  end
+end

data/db/migrate/20240822163534_add_pretty_name_to_spree_taxons.rb

@@ -0,0 +1,9 @@
+class AddPrettyNameToSpreeTaxons < ActiveRecord::Migration[6.1]
+  def change
+    add_column :spree_taxons, :pretty_name, :string, null: true, if_not_exists: true
+    add_index :spree_taxons, :pretty_name, if_not_exists: true
+
+    add_column :spree_taxon_translations, :pretty_name, :string, null: true, if_not_exists: true
+    add_index :spree_taxon_translations, :pretty_name, if_not_exists: true
+  end
+end

data/lib/spree/core/components.rb

@@ -5,10 +5,16 @@ module Spree
         @@api_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('Spree::Api::Engine')
       end
 
+      # old, legacy admin
       def self.backend_available?
         @@backend_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('Spree::Backend::Engine')
       end
 
+      # new shiny admin
+      def self.admin_available?
+        @@admin_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('Spree::Admin::Engine')
+      end
+
       def self.frontend_available?
         @@frontend_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('Spree::Frontend::Engine')
       end

data/lib/spree/core/dependencies.rb

@@ -43,6 +43,9 @@ module Spree
         shipment_add_item_service: 'Spree::Shipments::AddItem',
         shipment_remove_item_service: 'Spree::Shipments::RemoveItem',
 
+        # tracking numbers
+        tracking_number_service: 'Spree::TrackingNumbers::BaseService',
+
         # sorter
         collection_sorter: 'Spree::BaseSorter',
         order_sorter: 'Spree::BaseSorter',

data/lib/spree/core/engine.rb

@@ -26,7 +26,7 @@ module Spree
 
       initializer 'spree.environment', before: :load_config_initializers do |app|
         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]
+        app.config.active_record.yaml_column_permitted_classes << [Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess]
         Spree::Config = app.config.spree.preferences
         Spree::RuntimeConfig = app.config.spree.runtime_preferences
         Spree::Dependencies = app.config.spree.dependencies

data/lib/spree/core/runtime_configuration.rb

@@ -4,6 +4,7 @@ module Spree
   module Core
     class RuntimeConfiguration < Preferences::RuntimeConfiguration
       preference :always_use_translations, :boolean, default: false
+      preference :allow_empty_price_amount, :boolean, default: false
     end
   end
 end

data/lib/spree/core/version.rb

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

data/lib/spree/permitted_attributes.rb

@@ -154,6 +154,7 @@ module Spree
       :position, :track_inventory,
       :product_id, :product, :option_values_attributes, :price, :compare_at_price,
       :weight, :height, :width, :depth, :sku, :barcode, :cost_currency,
+      :weight_unit, :dimensions_unit, 
       { options: [:name, :value], option_value_ids: [] }
     ]
 

data/lib/spree/testing_support/capybara_config.rb

@@ -16,8 +16,12 @@ if ENV['WEBDRIVER'] == 'accessible'
   Capybara.javascript_driver = :accessible
 end
 
-RSpec.configure do |config|
-  config.before(:each, js: true) do
-    Capybara.page.driver.browser.manage.window.resize_to(1400, 900)
-  end
+Capybara.register_driver :selenium_chrome_headless do |app|
+  options = ::Selenium::WebDriver::Chrome::Options.new
+  options.add_argument '--headless'
+  options.add_argument '--disable-gpu'
+  options.add_argument '--window-size=1400,900'
+  options.add_argument '--disable-search-engine-choice-screen'
+
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
 end

data/spree_core.gemspec

@@ -6,12 +6,12 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_core'
   s.version     = Spree.version
-  s.authors     = ['Sean Schofield', 'Spark Solutions']
+  s.authors     = ['Sean Schofield', 'Spark Solutions Sp. z o.o.', 'Vendo Connect Inc.']
   s.email       = 'hello@spreecommerce.org'
   s.summary     = 'The bare bones necessary for Spree'
   s.description = 'Spree Models, Helpers, Services and core libraries'
   s.homepage    = 'https://spreecommerce.org'
-  s.license     = 'BSD-3-Clause'
+  s.licenses    = ['AGPL-3.0-or-later', 'BSD-3-Clause']
 
   s.metadata = {
     "bug_tracker_uri"   => "https://github.com/spree/spree/issues",
@@ -44,12 +44,13 @@ Gem::Specification.new do |s|
   s.add_dependency 'kaminari', '~> 1.2'
   s.add_dependency 'money', '~> 6.13'
   s.add_dependency 'monetize', '~> 1.9'
-  s.add_dependency 'paranoia', '~> 2.4'
+  s.add_dependency 'paranoia', '>= 2.4'
   s.add_dependency 'ransack', '>= 4.1'
   s.add_dependency 'rexml'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
   s.add_dependency 'state_machines-activemodel', '~> 0.7'
   s.add_dependency 'stringex'
+  s.add_dependency 'tracking_number'
   s.add_dependency 'validates_zipcode'
   s.add_dependency 'image_processing', '~> 1.2'
   s.add_dependency 'active_storage_validations', '~> 1.1'

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.10.0
 platform: ruby
 authors:
 - Sean Schofield
-- Spark Solutions
+- Spark Solutions Sp. z o.o.
+- Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -347,14 +348,14 @@ dependencies:
   name: paranoia
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
@@ -427,6 +428,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tracking_number
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: validates_zipcode
   requirement: !ruby/object:Gem::Requirement
@@ -546,7 +561,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- LICENSE
+- LICENSE.md
 - Rakefile
 - app/controllers/spree/base_controller.rb
 - app/finders/concerns/spree/product_filterable.rb
@@ -560,6 +575,7 @@ files:
 - app/finders/spree/option_values/find_available.rb
 - app/finders/spree/orders/find_complete.rb
 - app/finders/spree/orders/find_current.rb
+- app/finders/spree/orders/finder_helper.rb
 - app/finders/spree/product_properties/find_available.rb
 - app/finders/spree/products/find.rb
 - app/finders/spree/stores/find_current.rb
@@ -890,6 +906,7 @@ files:
 - app/services/spree/shipments/remove_item.rb
 - app/services/spree/shipments/update.rb
 - app/services/spree/stock_locations/stock_items/create.rb
+- app/services/spree/tracking_numbers/base_service.rb
 - app/services/spree/variants/remove_line_items.rb
 - app/services/spree/wallet/create_payment_source.rb
 - app/sorters/spree/base_sorter.rb
@@ -966,6 +983,7 @@ files:
 - db/migrate/20240514105216_add_weight_and_dimension_units_to_spree_variants.rb
 - db/migrate/20240623172111_add_deleted_at_to_spree_stock_locations.rb
 - db/migrate/20240725124530_add_refunder_to_spree_refunds.rb
+- db/migrate/20240822163534_add_pretty_name_to_spree_taxons.rb
 - db/seeds.rb
 - lib/friendly_id/paranoia.rb
 - lib/generators/spree/custom_authentication/custom_authentication_generator.rb
@@ -1143,12 +1161,13 @@ files:
 - spree_core.gemspec
 homepage: https://spreecommerce.org
 licenses:
+- AGPL-3.0-or-later
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.9.0
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.10.0
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.9.0
+  source_code_uri: https://github.com/spree/spree/tree/v4.10.0
 post_install_message:
 rdoc_options: []
 require_paths:

data/LICENSE

@@ -1,26 +0,0 @@
-Copyright (c) 2007-2024, Spree Commerce, Inc., Spark Solutuons Sp. z o.o. and other contributors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name Spree nor the names of its contributors may be used to
-      endorse or promote products derived from this software without specific
-      prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.