solidus_core 4.7.0 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83a084afb161c2cb55167e455d6b84e305c50fe62403210a689e0aedd84e24dd
-  data.tar.gz: a19d4dc02d4f0aa3d55fe61dc04fe9676c95bc41c60080ba0976165aca6351c2
+  metadata.gz: 78c29ac128ed3b6ae1572035004a577b125403271d2d331f598a6fae3860003d
+  data.tar.gz: aecc835e960dc5b51f163f41ea9abc07dba2ff27717f24c8623a563b14d5e9ad
 SHA512:
-  metadata.gz: a46112878fad1da1501aa4f6a802cacf8b532df996057050c35749ba7cf9b299f80f0fc5094a5859c730602fbeddbeb98ec0463e6adcc3f1a0ed88272cde788d
-  data.tar.gz: 41f5daa52188b4c1bfcfa186bc6ebeb0ae55b05bbdb9d267b8cc09d4e5a741e62198879fd68000314a5054bf2fc4ed9105a0d515cf86260d0141d8c37a21aad6
+  metadata.gz: b9a161abf80858e4511684189d7f66f93e9a0774f091448702f174586ae10a1c13669d6c0efa6afd9f20470602dc95e55a06bad734913e482195915d053b56d6
+  data.tar.gz: ea34f9b2b35829c6888d11ceea67b3b056c1857ab9567fc941827d84c7b23789853ae1f9f2f6aec4381074208fd574742fa571ddbb0d72edee33fb90ccd0c535

data/app/models/spree/in_memory_order_updater.rb

@@ -53,10 +53,10 @@ module Spree
           end
         end
 
-        Spree::Bus.publish(:order_recalculated, order:)
-
         persist_totals if persist
       end
+
+      Spree::Bus.publish(:order_recalculated, order:) if persist
     end
     alias_method :update, :recalculate
     deprecate update: :recalculate, deprecator: Spree.deprecator
@@ -236,8 +236,6 @@ module Spree
     end
 
     def persist_totals
-      shipments.each(&:persist_amounts)
-      assign_item_totals
       log_state_change("payment")
       log_state_change("shipment")
       order.save!

data/app/models/spree/line_item.rb

@@ -62,7 +62,7 @@ module Spree
     # @return [BigDecimal] the amount of this item, taking into consideration
     #   all non-tax adjustments.
     def total_before_tax
-      amount + adjustments.reject(&:tax?).sum(&:amount)
+      amount + adjustments.reject { |adjustment| adjustment.tax? || adjustment.marked_for_destruction? }.sum(&:amount)
     end
 
     # @return [BigDecimal] the amount of this line item before VAT tax

data/app/models/spree/order_updater.rb

@@ -27,9 +27,9 @@ module Spree
           update_shipments
           recalculate_shipment_state
         end
-        Spree::Bus.publish(:order_recalculated, order:)
         persist_totals
       end
+      Spree::Bus.publish(:order_recalculated, order:)
     end
     alias_method :update, :recalculate
     deprecate update: :recalculate, deprecator: Spree.deprecator

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/shipment.rb

@@ -95,7 +95,7 @@ module Spree
     # @return [BigDecimal] the amount of this item, taking into consideration
     #   all non-tax adjustments.
     def total_before_tax
-      amount + adjustments.reject(&:tax?).sum(&:amount)
+      amount + adjustments.reject { |adjustment| adjustment.tax? || adjustment.marked_for_destruction? }.sum(&:amount)
     end
 
     # @return [BigDecimal] the amount of this shipment before VAT tax
@@ -178,7 +178,12 @@ module Spree
     end
 
     def manifest
-      @manifest ||= Spree::ShippingManifest.new(inventory_units:).items
+      @manifest ||= Spree::ShippingManifest.new(
+        inventory_units:,
+        # Only when it is already in memory — the manifest treats the order as an
+        # optimization and must not cause a query for it.
+        order: (order if association(:order).loaded?)
+      ).items
     end
 
     def selected_shipping_rate_id

data/app/models/spree/shipping_manifest.rb

@@ -3,28 +3,63 @@
 class Spree::ShippingManifest
   ManifestItem = Struct.new(:line_item, :variant, :quantity, :states)
 
-  def initialize(inventory_units:)
-    @inventory_units = inventory_units.to_a
+  attr_reader :inventory_units, :order
+
+  # @param inventory_units [Enumerable<Spree::InventoryUnit>]
+  # @param order [Spree::Order, nil] the order the units belong to. When
+  #   given and its line items are already loaded, the manifest reuses those
+  #   +Spree::LineItem+ instances rather than letting each inventory unit
+  #   load its own copy.
+  def initialize(inventory_units:, order: nil)
+    @inventory_units = inventory_units
+    @order = order
   end
 
   def for_order(order)
-    Spree::ShippingManifest.new(
-      inventory_units: @inventory_units.select { |iu| iu.order_id == order.id }
+    self.class.new(
+      inventory_units: inventory_units.select { |unit| unit.order_id == order.id },
+      order: order
     )
   end
 
   def items
     # Grouping by the ID means that we don't have to call out to the association accessor
     # This makes the grouping by faster because it results in less SQL cache hits.
-    @inventory_units.group_by(&:variant_id).flat_map do |_variant_id, variant_units|
-      variant_units.group_by(&:line_item_id).map do |_line_item_id, units|
+    inventory_units.group_by(&:variant_id).flat_map do |_variant_id, variant_units|
+      variant_units.group_by(&:line_item_id).map do |line_item_id, line_item_units|
         states = {}
-        units.group_by(&:state).each { |state, iu| states[state] = iu.count }
+        line_item_units.group_by(&:state).each { |state, iu| states[state] = iu.count }
 
-        first_unit = units.first
+        first_unit = line_item_units.first
 
-        ManifestItem.new(first_unit.line_item, first_unit.variant, units.length, states)
+        ManifestItem.new(
+          line_item_for(line_item_id, first_unit),
+          first_unit.variant,
+          line_item_units.length,
+          states
+        )
       end
     end
   end
+
+  private
+
+  # Prefer the instance the order already holds in memory. Rails has no identity
+  # map, so +unit.line_item+ returns a second instance of the same row: it does
+  # not reflect adjustments that have been recalculated on the order's own line
+  # items but not yet persisted, and it costs a query per line item on top.
+  def line_item_for(line_item_id, unit)
+    order_line_items.fetch(line_item_id) { unit.line_item }
+  end
+
+  # Empty unless the order's line items are already loaded. This is an
+  # optimization for callers that have them, never a reason to run a query.
+  def order_line_items
+    @order_line_items ||=
+      if order&.association(:line_items)&.loaded?
+        order.line_items.index_by(&:id)
+      else
+        {}
+      end
+  end
 end

data/app/models/spree/stock/estimator.rb

@@ -64,7 +64,7 @@ module Spree
             calculator.available?(package) &&
               (calculator.preferences[:currency].blank? ||
                calculator.preferences[:currency] == package.shipment.order.currency)
-        end
+          end
       end
     end
   end

data/app/models/spree/store.rb

@@ -47,7 +47,7 @@ module Spree
       if locales.empty?
         super(nil)
       else
-        super(locales.map(&:to_s).join(","))
+        super(locales.join(","))
       end
     end
 

data/app/models/spree/variant/pricing_options.rb

@@ -101,7 +101,7 @@ module Spree
       # @return [String] cache key to be used in views
       #
       def cache_key
-        desired_attributes.values.select(&:present?).map(&:to_s).join("/")
+        desired_attributes.values.select(&:present?).join("/")
       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/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "4.7.0"
+  VERSION = "4.7.1"
 
   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/capybara_ext.rb

@@ -4,7 +4,15 @@ module Spree
   module TestingSupport
     module CapybaraExt
       def click_icon(type)
-        find(".fa-#{type}").click
+        el = find(".fa-#{type}", visible: :all)
+        begin
+          el.click
+        rescue Selenium::WebDriver::Error::ElementClickInterceptedError
+          # When a floating element (eg. tooltips/overlays) intercepts the click,
+          # scroll the target into view and dispatch a click via JS to keep tests stable.
+          page.execute_script('arguments[0].scrollIntoView({block: "center"});', el.native)
+          page.execute_script("arguments[0].click();", el.native)
+        end
       end
 
       def eventually_fill_in(field, options = {})

data/lib/spree/testing_support/dummy_app.rb

@@ -3,6 +3,18 @@
 ENV["RAILS_ENV"] = "test"
 ENV["DISABLE_DATABASE_ENVIRONMENT_CHECK"] = "1"
 
+# Speed up the sqlite runs: `fast_sqlite` patches SQLite3::Database#initialize to
+# set `PRAGMA synchronous = OFF` and `journal_mode = MEMORY`, trading durability we
+# don't need for a database the suite recreates anyway.
+#
+# NOTE: The gem is declared `require: false`, and only when DB is sqlite, so it is
+# genuinely absent for the mysql and postgres runs.
+begin
+  require "fast_sqlite"
+rescue LoadError
+  # Not running against sqlite, nothing to speed up.
+end
+
 require "rails"
 require "active_record/railtie"
 require "action_controller/railtie"
@@ -106,7 +118,10 @@ module DummyApp
 
     # Set the preview path within the dummy app:
     if ActionMailer::Base.respond_to? :preview_paths # Rails 7.1+
-      config.action_mailer.preview_paths << File.expand_path("dummy_app/mailer_previews", __dir__)
+      # Some Rails versions return a frozen array here; assign a new array
+      # to avoid FrozenError when augmenting the paths.
+      existing = Array(config.action_mailer.preview_paths)
+      config.action_mailer.preview_paths = existing + [File.expand_path("dummy_app/mailer_previews", __dir__)]
     else
       config.action_mailer.preview_path = File.expand_path("dummy_app/mailer_previews", __dir__)
     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,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.7.1
 platform: ruby
 authors:
 - Solidus Team
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -771,6 +770,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
@@ -1075,7 +1075,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:
@@ -1119,8 +1121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.
 test_files: []