spree_core 5.4.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 063ec32e04e9cca4d9987ddc55b8bf72266d6f9aaf204f2e7da96ad57365495d
-  data.tar.gz: 9b13ad923ebcad513038a2bbe63d880c9b285e73e18e93a3f73983bec23cc6a1
+  metadata.gz: 3bed2ace5a7bcb6bc6b8c598cfb3ec19cb3dc0ea02854744543ae228ed9c636b
+  data.tar.gz: 81642ee18f7e01079090ec1c5d162dc25186aa5bd72ac2e799a5a3457ebd1a1a
 SHA512:
-  metadata.gz: a4cbe7e4ea5cab60434be37aed988f0c1b5d2276a43f94b31bf4150dbd933e8ddb64f0a4ddffb316c9e5d10449b6de0563c2ccaa4baf31bd1fb7b511a2b55ab8
-  data.tar.gz: 52d17f39e82f7db6155af88252181cfe0fc60362cc29a46233f9748c09b6cd6b0a4cd03b6e9f544d12c1e7c2f895bd75b91c8d6142794b326e30f16d9738e08f
+  metadata.gz: 5a68e9d3b365c52c811c9a81fa7e2b3968de8f52ddfd7ef829ee47232c809b43715297b09d60f7a0d765b4c30fde3b9a0dfe181d4cff6bd50cb7ddd8c724f590
+  data.tar.gz: 122681c279ef487105deb809c4701c318c9cf7e767e3b4e7c86b630b59246f46093e921ea51fb15f82cb72a888f07ae962420b79fd0521c0440253337e50f940

data/app/models/spree/order.rb

@@ -102,7 +102,6 @@ module Spree
       go_to_state :payment, if: ->(order) { order.payment? || order.payment_required? }
       go_to_state :confirm, if: ->(order) { order.confirmation_required? }
       go_to_state :complete
-      remove_transition from: :delivery, to: :confirm, unless: ->(order) { order.confirmation_required? }
     end
 
     self.whitelisted_ransackable_associations = %w[shipments user created_by approver canceler promotions bill_address ship_address line_items store]
@@ -1013,7 +1012,6 @@ module Spree
 
       update_with_updater!
       send_order_canceled_webhook
-      publish_order_canceled_event
     end
 
     def after_resume
@@ -1094,10 +1092,6 @@ module Spree
       publish_event('order.completed')
     end
 
-    def publish_order_canceled_event
-      publish_event('order.canceled')
-    end
-
     def publish_order_resumed_event
       publish_event('order.resumed')
     end

data/app/models/spree/promotion.rb

@@ -232,7 +232,7 @@ module Spree
 
     def adjusted_credits_count(promotable)
       adjustments = promotable.is_a?(Order) ? promotable.all_adjustments : promotable.adjustments
-      credits_count - adjustments.promotion.where(source_id: actions.pluck(:id)).size
+      credits_count - adjustments.eligible.promotion.where(source_id: actions.pluck(:id)).select(:order_id).distinct.count
     end
 
     def credits
@@ -240,7 +240,7 @@ module Spree
     end
 
     def credits_count
-      credits.count
+      credits.select(:order_id).distinct.count
     end
 
     def line_item_actionable?(order, line_item)

data/app/models/spree/shipment.rb

@@ -112,8 +112,10 @@ module Spree
     self.whitelisted_ransackable_attributes = ['number']
 
     extend DisplayMoney
-    money_methods :cost, :discounted_cost, :final_price, :item_cost, :additional_tax_total, :included_tax_total, :tax_total
+    money_methods :cost, :discounted_cost, :final_price, :item_cost, :additional_tax_total, :included_tax_total, :tax_total, :promo_total
     alias display_amount display_cost
+    alias_attribute :discount_total, :promo_total
+    alias display_discount_total display_promo_total
 
     normalizes :tracking, with: ->(value) { value&.to_s&.squish&.presence }
 
@@ -197,6 +199,8 @@ module Spree
     def final_price
       cost + adjustment_total
     end
+    alias total final_price
+    alias display_total display_final_price
 
     def final_price_with_items
       item_cost + final_price

data/app/models/spree/shipping_rate.rb

@@ -7,7 +7,7 @@ module Spree
     belongs_to :shipping_method, -> { with_deleted }, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates
     extend Spree::DisplayMoney
 
-    money_methods :base_price, :final_price, :tax_amount
+    money_methods :base_price, :final_price, :tax_amount, :additional_tax_total, :included_tax_total, :tax_total
 
     delegate :order, :currency, :with_free_shipping_promotion?, to: :shipment
     delegate :name, to: :shipping_method
@@ -29,14 +29,37 @@ module Spree
     alias display_cost display_price
     alias_attribute :base_price, :cost
 
+    # Returns true if the shipping rate is free
+    #
+    # @return [Boolean]
     def free?
       final_price.zero?
     end
 
+    # Returns the tax amount for the shipping rate
+    #
+    # @return [BigDecimal]
     def tax_amount
       @tax_amount ||= tax_rate&.calculator&.compute_shipping_rate(self) || BigDecimal(0)
     end
 
+    # Returns the additional tax total for the shipping rate
+    #
+    # @return [BigDecimal]
+    def additional_tax_total
+      tax_rate&.included_in_price? ? BigDecimal(0) : tax_amount
+    end
+
+    # Returns the included tax total for the shipping rate
+    #
+    # @return [BigDecimal]
+    def included_tax_total
+      tax_rate&.included_in_price? ? tax_amount : BigDecimal(0)
+    end
+
+    alias tax_total tax_amount
+    alias display_tax_total display_tax_amount
+
     # returns base price - any available discounts for this Shipment
     # useful when you want to present a list of available shipping rates
     def final_price
@@ -46,6 +69,8 @@ module Spree
         cost + discount_amount
       end
     end
+    alias total final_price
+    alias display_total display_final_price
 
     # Returns the delivery range for the shipping method
     #

data/app/models/spree/taxon.rb

@@ -72,10 +72,9 @@ module Spree
     #
     # Callbacks
     #
-    before_validation :set_permalink, on: :create, if: :name
+    before_validation :set_permalink, if: :name
     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

data/app/models/spree/variant.rb

@@ -470,14 +470,17 @@ module Spree
     # @param backorderable [Boolean] the backorderable flag
     # @param stock_location [Spree::StockLocation] the stock location to set the stock for
     # @return [void]
-    def set_stock(count_on_hand, backorderable = nil, stock_location = nil)
-      stock_location ||= Spree::Store.current.default_stock_location
-      stock_item = stock_items.find_or_initialize_by(stock_location: stock_location)
+    def set_stock(count_on_hand, backorderable = nil)
+      stock_item = stock_items.find_or_initialize_by(stock_location: default_stock_location)
       stock_item.count_on_hand = count_on_hand
       stock_item.backorderable = backorderable if backorderable.present?
       stock_item.save!
     end
 
+    def default_stock_location
+      Spree::Store.current.default_stock_location
+    end
+
     def price_modifier_amount_in(currency, options = {})
       return 0 unless options.present?
 

data/app/services/spree/imports/row_processors/product_variant.rb

@@ -47,7 +47,7 @@ module Spree
           end
 
           if attributes['inventory_count'].present?
-            variant.set_stock(attributes['inventory_count'].to_i, attributes['inventory_backorderable']&.to_b, store.default_stock_location)
+            variant.set_stock(attributes['inventory_count'].to_i, attributes['inventory_backorderable']&.to_b)
           end
 
           handle_images(variant)

data/app/services/spree/seeds/zones.rb

@@ -7,17 +7,23 @@ module Spree
         eu_vat = Spree::Zone.where(name: 'EU_VAT', description: 'Countries that make up the EU VAT zone.', kind: 'country').first_or_create!
         uk_vat = Spree::Zone.where(name: 'UK_VAT', kind: 'country').first_or_create!
         north_america = Spree::Zone.where(name: 'North America', description: 'USA + Canada', kind: 'country').first_or_create!
-        Spree::Zone.where(name: 'South America', description: 'South America', kind: 'country').first_or_create!
+        central_america_and_caribbean = Spree::Zone.where(name: 'Central America and Caribbean', description: 'Central America and Caribbean', kind: 'country').first_or_create!
+        south_america = Spree::Zone.where(name: 'South America', description: 'South America', kind: 'country').first_or_create!
         middle_east = Spree::Zone.where(name: 'Middle East', description: 'Middle East', kind: 'country').first_or_create!
+        africa = Spree::Zone.where(name: 'Africa', description: 'Africa', kind: 'country').first_or_create!
         asia = Spree::Zone.where(name: 'Asia', description: 'Asia', kind: 'country').first_or_create!
         australia_and_oceania = Spree::Zone.where(name: 'Australia and Oceania', description: 'Australia and Oceania', kind: 'country').first_or_create!
 
         create_zone_members(eu_vat, %w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG LT CY LU MT DK NL EE HR CZ GR))
         create_zone_members(north_america, %w(US CA))
+        create_zone_members(central_america_and_caribbean, %w(MX GT BZ SV HN NI CR PA CU DO HT JM BS BB TT PR AG DM GD KN LC VC AI AW BM KY CW GP MQ MS BL MF SX TC VG VI))
+        create_zone_members(south_america, %w(AR BO BR CL CO EC FK GF GY PY PE SR UY VE))
         create_zone_members(middle_east, %w(BH CY EG IR IQ IL JO KW LB OM QA SA SY TR AE YE))
+        create_zone_members(africa, %w(DZ AO BJ BW BF BI CV CM CF TD KM CG CD CI DJ EG GQ ER SZ ET GA GM GH GN GW KE LS LR LY
+                                       MG MW ML MR MU YT MA MZ NA NE NG RE RW SH ST SN SC SL SO ZA SS SD TZ TG TN UG ZM ZW))
         create_zone_members(asia, %w(AF AM AZ BH BD BT BN KH CN CX CC GE HK IN ID IR IQ IL JP JO KZ KW KG LA LB MO MY MV MN MM NP
                                      KP OM PK PS PH QA SA SG KR LK SY TW TJ TH TR TM AE UZ VN YE))
-        create_zone_members(australia_and_oceania, %w(AU NZ))
+        create_zone_members(australia_and_oceania, %w(AU NZ PG FJ SB VU NC PF WS AS GU KI MH FM NR NU NF MP PW PN TK TO TV WF CK))
         uk_vat.zone_members.where(zoneable: Spree::Country.find_by(iso: 'GB')).first_or_create!
       end
 

data/db/sample_data/markets.rb

@@ -28,3 +28,37 @@ if eu_zone
     eu_market.save!
   end
 end
+
+# Additional sample markets for the remaining continents. Each market pulls
+# its countries from the matching shipping zone so it only includes countries
+# with shipping coverage (and therefore valid market countries). Countries
+# already assigned to another market in the store are skipped, because
+# Spree::MarketCountry requires each country to belong to at most one market
+# per store.
+[
+  { name: 'South America', zone: 'South America', currency: 'USD', default_locale: 'es', supported_locales: 'es,pt' },
+  { name: 'Middle East', zone: 'Middle East', currency: 'USD', default_locale: 'en', supported_locales: 'en,ar' },
+  { name: 'Africa', zone: 'Africa', currency: 'USD', default_locale: 'en', supported_locales: 'en,fr,ar' },
+  { name: 'Asia', zone: 'Asia', currency: 'USD', default_locale: 'en', supported_locales: 'en' },
+  { name: 'Oceania', zone: 'Australia and Oceania', currency: 'AUD', default_locale: 'en', supported_locales: 'en' }
+].each do |attrs|
+  zone = Spree::Zone.find_by(name: attrs[:zone])
+  next unless zone
+
+  market = store.markets.find_or_initialize_by(name: attrs[:name])
+
+  assigned_scope = Spree::MarketCountry.joins(:market).
+    where(spree_markets: { store_id: store.id, deleted_at: nil })
+  assigned_scope = assigned_scope.where.not(market_id: market.id) if market.persisted?
+  assigned_country_ids = assigned_scope.pluck(:country_id).to_set
+
+  countries = zone.zone_members.where(zoneable_type: 'Spree::Country').map(&:zoneable).uniq.compact
+  countries = countries.reject { |c| assigned_country_ids.include?(c.id) }
+  next if countries.empty?
+
+  market.currency = attrs[:currency]
+  market.default_locale = attrs[:default_locale]
+  market.supported_locales = attrs[:supported_locales]
+  market.countries = countries
+  market.save!
+end

data/db/sample_data/shipping_methods.rb

@@ -6,6 +6,12 @@ rescue ActiveRecord::RecordNotFound
 end
 
 europe_vat = Spree::Zone.find_by!(name: 'EU_VAT')
+central_america_and_caribbean = Spree::Zone.find_by(name: 'Central America and Caribbean')
+south_america = Spree::Zone.find_by(name: 'South America')
+middle_east = Spree::Zone.find_by(name: 'Middle East')
+africa = Spree::Zone.find_by(name: 'Africa')
+asia = Spree::Zone.find_by(name: 'Asia')
+australia_and_oceania = Spree::Zone.find_by(name: 'Australia and Oceania')
 shipping_category = Spree::ShippingCategory.find_or_create_by!(name: 'Default')
 
 shipping_methods = [
@@ -13,10 +19,18 @@ shipping_methods = [
   { name: 'UPS Two Day (USD)', zones: [north_america], display_on: 'both', shipping_categories: [shipping_category] },
   { name: 'UPS One Day (USD)', zones: [north_america], display_on: 'both', shipping_categories: [shipping_category] },
   { name: 'UPS Ground (EU)', zones: [europe_vat], display_on: 'both', shipping_categories: [shipping_category] },
-  { name: 'UPS Ground (EUR)', zones: [europe_vat], display_on: 'both', shipping_categories: [shipping_category] }
+  { name: 'UPS Ground (EUR)', zones: [europe_vat], display_on: 'both', shipping_categories: [shipping_category] },
+  { name: 'DHL Standard (Central America and Caribbean)', zones: [central_america_and_caribbean].compact, display_on: 'both', shipping_categories: [shipping_category] },
+  { name: 'DHL Standard (South America)', zones: [south_america].compact, display_on: 'both', shipping_categories: [shipping_category] },
+  { name: 'DHL Standard (Middle East)', zones: [middle_east].compact, display_on: 'both', shipping_categories: [shipping_category] },
+  { name: 'DHL Standard (Africa)', zones: [africa].compact, display_on: 'both', shipping_categories: [shipping_category] },
+  { name: 'DHL Standard (Asia)', zones: [asia].compact, display_on: 'both', shipping_categories: [shipping_category] },
+  { name: 'DHL Standard (Australia and Oceania)', zones: [australia_and_oceania].compact, display_on: 'both', shipping_categories: [shipping_category] }
 ]
 
 shipping_methods.each do |attributes|
+  next if attributes[:zones].empty?
+
   Spree::ShippingMethod.where(name: attributes[:name]).first_or_create! do |shipping_method|
     shipping_method.calculator = Spree::Calculator::Shipping::FlatRate.create!
     shipping_method.zones = attributes[:zones]
@@ -30,9 +44,17 @@ end
   'UPS Ground (EU)' => [5, 'USD'],
   'UPS One Day (USD)' => [15, 'USD'],
   'UPS Two Day (USD)' => [10, 'USD'],
-  'UPS Ground (EUR)' => [8, 'EUR']
+  'UPS Ground (EUR)' => [8, 'EUR'],
+  'DHL Standard (Central America and Caribbean)' => [15, 'USD'],
+  'DHL Standard (South America)' => [20, 'USD'],
+  'DHL Standard (Middle East)' => [20, 'USD'],
+  'DHL Standard (Africa)' => [25, 'USD'],
+  'DHL Standard (Asia)' => [20, 'USD'],
+  'DHL Standard (Australia and Oceania)' => [25, 'USD']
 }.each do |shipping_method_name, (price, currency)|
-  shipping_method = Spree::ShippingMethod.find_by!(name: shipping_method_name)
+  shipping_method = Spree::ShippingMethod.find_by(name: shipping_method_name)
+  next unless shipping_method
+
   shipping_method.calculator.preferences = { amount: price, currency: currency }
   shipping_method.calculator.save!
   shipping_method.save!

data/lib/spree/core/version.rb

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

data/lib/spree/permitted_attributes.rb

@@ -115,7 +115,7 @@ module Spree
 
     @@customer_return_attributes = [:stock_location_id, {
       return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount,
-                                :acceptance_status, :exchange_variant_id, :resellable]
+                                :acceptance_status, :exchange_variant_id, :resellable, :return_quantity]
     }]
 
     @@digital_attributes = [:attachment, :variant_id]
@@ -222,14 +222,14 @@ module Spree
           :id, :inventory_unit_id,
           :preferred_reimbursement_type_id,
           :return_authorization_id, :returned, :pre_tax_amount,
-          :acceptance_status, :exchange_variant_id, :resellable
+          :acceptance_status, :exchange_variant_id, :resellable, :return_quantity
         ]
       }
     ]
 
     @@return_authorization_reason_attributes = [:name, :active]
 
-    @@return_item_attributes = [:inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :acceptance_status, :exchange_variant_id, :resellable]
+    @@return_item_attributes = [:inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :acceptance_status, :exchange_variant_id, :resellable, :return_quantity]
 
     @@role_attributes = [:name]
 

data/lib/tasks/markets.rake

@@ -27,13 +27,10 @@ namespace :spree do
           name: primary_country&.name || 'Default',
           currency: iso_country&.currency_code || store.read_attribute(:default_currency) || 'USD',
           default_locale: iso_country&.languages_official&.first || store.read_attribute(:default_locale) || 'en',
-          default: true
+          default: true,
+          country_ids: countries.map(&:id)
         )
 
-        countries.each do |country|
-          market.market_countries.build(country: country).save!(validate: false)
-        end
-
         store.update_column(:checkout_zone_id, nil) if checkout_zone_id
 
         puts "  Created market '#{market.name}' with #{countries.size} countries for store '#{store.name}' (#{store.code})"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.1
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-08 00:00:00.000000000 Z
+date: 2026-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -404,16 +404,22 @@ dependencies:
   name: active_storage_validations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: mobility
   requirement: !ruby/object:Gem::Requirement
@@ -1733,9 +1739,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.1
 post_install_message:
 rdoc_options: []
 require_paths: