solidus_core 4.6.1 → 4.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ab07c75d9886b9eda75453847a2a2ec936e5aabd8bff99854a10381c4bd1dc0
-  data.tar.gz: 58e45a9450049e9efbd8c768875a42eeabcf8529f3c23b2fb087ceaa4bd95099
+  metadata.gz: 03c5f9ed344221d9efde0c16e7d40604521c067f36abbf3e09b050fbc9efd3de
+  data.tar.gz: 920e1ac4c8266d2110c1eed180d5ffe32e8d16bab3a92ff02eab5446ecba6a2c
 SHA512:
-  metadata.gz: 41b675b7a0df269e5ff38496b42eac3b22379192961da29717ed9a8f72b922d478d530cdbc457e6620badb5d9ccc4c006264be968c796a6495774322eabd905e
-  data.tar.gz: ad1547dd2d1f7f6dcb024200910f59ba1d7f48845b9ae90feccbe1da1dff2da9c215d8a811ad7bd24bfc40b4bbc2be917388917d96285bf64cf67629b81079dc
+  metadata.gz: 3f81fd0110e433d54dc81e4f73f9f3c0e3dfc37a81c30a443ea2e9c72d0e9882362e917f121b917bfac36300cd2aae7495eec86b40c624873c4cfc5d070d6bf8
+  data.tar.gz: 3cedf567b53ad2a9ddee3b4da7f863787092c9d72daccc7fbd02fa4244d9447a1a8a5e3a84c9eeec080b759e57656c8a56dd3ae173f982283cb531169e715aed

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

@@ -5,21 +5,25 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      after_update :enqueue_state_change_tracking, if: :saved_change_to_state?
+      after_update :enqueue_state_change_tracking, if: :track_state_change?
     end
 
     private
 
+    def track_state_change?
+      saved_change_to_state?
+    end
+
     # Enqueue background job to track state changes asynchronously
     def enqueue_state_change_tracking
       previous_state, current_state = saved_changes['state']
 
       # Enqueue the job to track this state change
-      StateChangeTrackingJob.perform_later(
-        self,
-        previous_state,
-        current_state,
-        Time.current
+      Spree::Config.state_change_tracking_class.call(
+        stateful: self,
+        previous_state:,
+        current_state:,
+        transition_timestamp: Time.current
       )
     end
   end

data/app/models/spree/payment.rb

@@ -83,7 +83,7 @@ module Spree
         when String
           separator = I18n.t('number.currency.format.separator')
           number    = amount.delete("^0-9-#{separator}\.").tr(separator, '.')
-          number.to_d if number.present?
+          number.presence&.to_d
         end || amount
     end
 

data/app/models/spree/permission_sets/default_customer.rb

@@ -63,18 +63,18 @@ module Spree
         can :create, ReturnAuthorization do |return_authorization|
           return_authorization.order.user == user
         end
-        can [:read, :update], CreditCard, user_id: user.id
+        can [:read, :update], CreditCard, user_id: user.id if user.persisted?
         can :read, Product
         can :read, ProductProperty
         can :read, Property
         can :create, Spree.user_class
-        can [:show, :update, :update_email], Spree.user_class, id: user.id
+        can [:show, :update, :update_email], Spree.user_class, id: user.id if user.persisted?
         can :read, State
         can :read, StockItem, stock_location: { active: true }
         can :read, StockLocation, active: true
         can :read, Taxon
         can :read, Taxonomy
-        can [:save_in_address_book, :remove_from_address_book], Spree.user_class, id: user.id
+        can [:save_in_address_book, :remove_from_address_book], Spree.user_class, id: user.id if user.persisted?
         can [:read, :view_out_of_stock], Variant
         can :read, Zone
       end

data/app/models/spree/product.rb

@@ -147,6 +147,11 @@ module Spree
       super || Spree::TaxCategory.find_by(is_default: true)
     end
 
+    # @return [Integer] tax category id for this product, or the default tax category id
+    def tax_category_id
+      super || tax_category&.id
+    end
+
     # Ensures option_types and product_option_types exist for keys in
     # option_values_hash.
     #

data/app/models/spree/return_item.rb

@@ -177,16 +177,16 @@ module Spree
       exchange_requested? || sibling_intended_for_exchange('unexchanged')
     end
 
+    def currency
+      return_authorization.try(:currency) || Spree::Config[:currency]
+    end
+
     private
 
     def persist_acceptance_status_errors
       update(acceptance_status_errors: validator.errors)
     end
 
-    def currency
-      return_authorization.try(:currency) || Spree::Config[:currency]
-    end
-
     def process_inventory_unit!
       inventory_unit.return!
 

data/app/models/spree/state_change_tracker.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Spree
+  # Configurable class to enqueue state change tracking jobs
+  # Configure your custom logic by setting Spree::Config.state_change_tracking_class
+  # @example Spree::Config.state_change_tracking_class = MyCustomTracker
+  class StateChangeTracker
+    # @param stateful [Object] The stateful object to track changes for
+    # @param previous_state [String] The previous state of the order
+    # @param current_state [String] The current state of the order
+    # @param transition_timestamp [Time] When the state transition occurred
+    # @param stateful_name [String] The element name of the state transition being
+    #   tracked. It defaults to the `stateful` model element name.
+    def self.call(
+      stateful:,
+      previous_state:,
+      current_state:,
+      transition_timestamp:,
+      stateful_name: stateful.class.model_name.element
+    )
+      # Enqueue a background job to track this state change
+      StateChangeTrackingJob.perform_later(
+        stateful,
+        previous_state,
+        current_state,
+        transition_timestamp,
+        stateful_name
+      )
+    end
+  end
+end

data/app/views/layouts/spree/base_mailer.html.erb

@@ -3,6 +3,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<meta name="viewport" content="width=device-width">
+	<%# The Ink CSS below is MIT licensed; see ink.license.txt in this directory. %>
 	<style>
 /**********************************************
 * Ink v1.0.5 - Copyright 2013 ZURB Inc        *

data/app/views/layouts/spree/ink.license.txt

@@ -0,0 +1,28 @@
+The mailer layout in this directory (base_mailer.html.erb) inlines the
+CSS of Ink v1.0.5, ZURB's responsive email framework, from
+https://github.com/foundation/foundation-emails (formerly zurb/ink).
+
+--------------------------------------------------------------------------------
+
+Copyright (c) 2013 ZURB, inc.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/db/migrate/20250605105424_add_shipping_category_foreign_keys.rb

@@ -7,7 +7,7 @@ class AddShippingCategoryForeignKeys < ActiveRecord::Migration[7.0]
     # Uncomment the following code to remove orphaned records if the following code fails
     #
     # say_with_time "Removing orphaned products (no corresponding shipping category)" do
-    #   Spree::Product.left_joins(:shipping_category).where(spree_shipping_category: { id: nil }).delete_all
+    #   Spree::Product.left_joins(:shipping_category).where(spree_shipping_categories: { id: nil }).delete_all
     # end
     begin
       add_foreign_key :spree_products, :spree_shipping_categories, column: :shipping_category_id, null: false
@@ -27,7 +27,7 @@ class AddShippingCategoryForeignKeys < ActiveRecord::Migration[7.0]
     # Uncomment the following code to remove orphaned records if the following code fails
     #
     # say_with_time "Removing orphaned shipping method categories (no corresponding shipping category)" do
-    #   Spree::ShippingMethodCategory.left_joins(:shipping_category).where(spree_shipping_category: { id: nil }).delete_all
+    #   Spree::ShippingMethodCategory.left_joins(:shipping_category).where(spree_shipping_categories: { id: nil }).delete_all
     # end
     begin
       add_foreign_key :spree_shipping_method_categories, :spree_shipping_methods, column: :shipping_method_id, null: false
@@ -47,7 +47,7 @@ class AddShippingCategoryForeignKeys < ActiveRecord::Migration[7.0]
     # Uncomment the following code to remove orphaned records if the following code fails
     #
     # say_with_time "Removing orphaned shipping method categories (no corresponding shipping method)" do
-    #   Spree::ShippingMethodCategory.left_joins(:shipping_method).where(spree_shipping_method: { id: nil }).delete_all
+    #   Spree::ShippingMethodCategory.left_joins(:shipping_method).where(spree_shipping_methods: { id: nil }).delete_all
     # end
     begin
       add_foreign_key :spree_shipping_method_categories, :spree_shipping_categories, column: :shipping_category_id, null: false

data/lib/generators/solidus/install/app_templates/authentication/existing.rb

@@ -4,7 +4,9 @@ begin
   user_class.classify.constantize
 rescue NameError
   say_status :error, "Can't find an existing user class named #{user_class.classify}, plese set up one before using this authentication option.", :red
+  # rubocop:disable Rails/Exit
   abort
+  # rubocop:enable Rails/Exit
 end
 
 generate "spree:custom_user #{user_class.shellescape}"

data/lib/spree/app_configuration.rb

@@ -549,6 +549,13 @@ module Spree
                                                           product: '680x680>',
                                                           large: '1200x1200>' }
 
+    # Allows to provide your own class for tracking state changes of stateful models
+    #
+    # @!attribute [rw] state_change_tracking_class
+    # @return [Class] a class with the same public interfaces as
+    #   Spree::StateChangeTracker.
+    class_name_attribute :state_change_tracking_class, default: "Spree::StateChangeTracker"
+
     # Allows providing your own class for prioritizing store credit application
     # to an order.
     #

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "4.6.1"
+  VERSION = "4.6.3"
 
   def self.solidus_version = VERSION
 

data/lib/spree/permitted_attributes.rb

@@ -73,7 +73,7 @@ module Spree
 
     @@option_type_attributes = [:name, :presentation, option_values_attributes: option_value_attributes]
 
-    @@payment_attributes = [:amount, :payment_method_id, :payment_method, customer_metadata: {}]
+    @@payment_attributes = [:payment_method_id, :payment_method, customer_metadata: {}]
 
     @@product_properties_attributes = [:property_name, :value, :position]
 
@@ -165,6 +165,7 @@ module Spree
 
     @@checkout_payment_attributes = [
       payments_attributes: payment_attributes + [
+        :amount,
         source_attributes:
       ]
     ]

data/lib/spree/testing_support/order_walkthrough.rb

@@ -10,7 +10,7 @@ module Spree
       def up_to(state, user: nil)
         # Need to create a valid zone too...
         @zone = ::FactoryBot.create(:zone)
-        @country = ::FactoryBot.create(:country)
+        @country = Spree::Country.find_by(iso: "US") || ::FactoryBot.create(:country)
         @state = ::FactoryBot.create(:state, country: @country)
 
         @zone.members << Spree::ZoneMember.create(zoneable: @country)

data/lib/spree/testing_support/shared_examples/state_change_tracking.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples "tracking state changes" do
+  context "with track_state_change? true" do
+    before do
+      expect(stateful).to receive(:track_state_change?).and_return(true)
+    end
+
+    it "enqueues state change tracking job" do
+      expect { stateful.update!(state:) }
+        .to enqueue_job(Spree::StateChangeTrackingJob)
+    end
+  end
+
+  context "with track_state_change? false" do
+    before do
+      expect(stateful).to receive(:track_state_change?).and_return(false)
+    end
+
+    it "does not enqueue state change tracking job" do
+      expect { stateful.update!(state:) }
+        .not_to enqueue_job(Spree::StateChangeTrackingJob)
+    end
+  end
+end

data/vendor/assets/javascripts/jquery.payment.license.txt

@@ -0,0 +1,25 @@
+This license covers the vendored jQuery.payment v1.3.2 (jquery.payment.js
+in this directory), from https://github.com/stripe-archive/jquery.payment.
+
+--------------------------------------------------------------------------------
+
+Copyright (c) 2014 Stripe
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/vendor/assets/javascripts/jsuri.license.txt

@@ -0,0 +1,12 @@
+This license covers the vendored jsUri v1.1.1 (jsuri.js in this
+directory), from https://github.com/derek-watson/jsUri.
+
+--------------------------------------------------------------------------------
+
+Copyright (c) 2014, Derek Watson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 4.6.1
+  version: 4.6.3
 platform: ruby
 authors:
 - Solidus Team
@@ -684,6 +684,7 @@ files:
 - app/models/spree/simple_order_contents.rb
 - app/models/spree/state.rb
 - app/models/spree/state_change.rb
+- app/models/spree/state_change_tracker.rb
 - app/models/spree/stock/allocator/base.rb
 - app/models/spree/stock/allocator/on_hand_first.rb
 - app/models/spree/stock/availability.rb
@@ -767,6 +768,7 @@ files:
 - app/subscribers/spree/order_mailer_subscriber.rb
 - app/subscribers/spree/reimbursement_mailer_subscriber.rb
 - app/views/layouts/spree/base_mailer.html.erb
+- app/views/layouts/spree/ink.license.txt
 - app/views/spree/carton_mailer/shipped_email.html.erb
 - app/views/spree/carton_mailer/shipped_email.text.erb
 - app/views/spree/order_mailer/cancel_email.html.erb
@@ -1056,6 +1058,7 @@ files:
 - lib/spree/testing_support/shared_examples/calculator.rb
 - lib/spree/testing_support/shared_examples/gallery.rb
 - lib/spree/testing_support/shared_examples/order_factory.rb
+- lib/spree/testing_support/shared_examples/state_change_tracking.rb
 - lib/spree/testing_support/shared_examples/working_factory.rb
 - lib/spree/testing_support/silence_deprecations.rb
 - lib/spree/testing_support/translations.rb
@@ -1068,7 +1071,9 @@ files:
 - lib/tasks/solidus/delete_prices_with_nil_amount.rake
 - solidus_core.gemspec
 - vendor/assets/javascripts/jquery.payment.js
+- vendor/assets/javascripts/jquery.payment.license.txt
 - vendor/assets/javascripts/jsuri.js
+- vendor/assets/javascripts/jsuri.license.txt
 - vendor/assets/stylesheets/normalize.css
 homepage: http://solidus.io
 licenses:
@@ -1112,7 +1117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.
 test_files: []