spree_core 5.1.5 → 5.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 470b6197277a6eb437ae9844a0616136625b77b7902073032d08b86315b41dc5
-  data.tar.gz: 9795041b28ea8b1680df00d885128f58f8502ec7ddf279887900b87218f0e999
+  metadata.gz: 8b7ada6c326700f36766e181d422238f5fc9c8e345b92b37df8d5c2ed5e1b56c
+  data.tar.gz: 86b6aabcab0463033b6a8e045445b8b7b90109f9f8a7d5e3084ffad2d5093bab
 SHA512:
-  metadata.gz: a314d8e138aea8643c18b6f33ab3d993bc49149a64e17427a904909c77b4ca951e147c9f292dc85d902e5b608e2c51cfabf6429c1c396353ca869d38da737c18
-  data.tar.gz: c47e0a2eb39b6cf9acda5efc0c1a8e3994cb3a49106fe9b6ff3d342523e0eb3b9c9b2316049b3122e7f0acadf1c51406cf4f652d31bef937408d5855f71fbc75
+  metadata.gz: cc6d619e2582cc97f6444f55f49db531cc5adc7dcc9c5349e6401c8d15d26c23b2e46d25219135a2a73841c2ddf207e5ab76d3e6cebcf584128118636bc714a3
+  data.tar.gz: ce1337606b76a87689543518feb7dcac21d7ed3b62bfb3d14a1b703a0a90da357c8d9476228971c01a63b850152311ef68c2fdec3f4ee620b0631c9e845e6bf8

data/app/jobs/spree/products/touch_taxons_job.rb

@@ -6,6 +6,7 @@ module Spree
       def perform(taxon_ids, taxonomy_ids)
         Spree::Taxon.where(id: taxon_ids).update_all(updated_at: Time.current)
         Spree::Taxonomy.where(id: taxonomy_ids).update_all(updated_at: Time.current)
+        Spree::Taxons::TouchFeaturedSections.call(taxon_ids: taxon_ids)
       end
     end
   end

data/app/models/spree/order/digital.rb

@@ -1,6 +1,9 @@
 module Spree
   class Order < Spree.base_class
     module Digital
+      # Returns true if all order line items are digital
+      #
+      # @return [Boolean]
       def digital?
         if line_items.empty?
           false
@@ -9,18 +12,30 @@ module Spree
         end
       end
 
+      # Returns true if any order line item is digital
+      #
+      # @return [Boolean]
       def some_digital?
         line_items.any?(&:digital?)
       end
 
+      # Returns true if any order line item has digital assets
+      #
+      # @return [Boolean]
       def with_digital_assets?
         line_items.any?(&:with_digital_assets?)
       end
 
+      # Returns all line items with digital assets
+      #
+      # @return [Array<Spree::LineItem>]
       def digital_line_items
         line_items.with_digital_assets.distinct
       end
 
+      # Returns all digital links for the order
+      #
+      # @return [Array<Spree::DigitalLink>]
       def digital_links
         digital_line_items.map(&:digital_links).flatten
       end

data/app/models/spree/order_inventory.rb

@@ -84,7 +84,7 @@ module Spree
       end
 
       # adding to this shipment, and removing from stock_location
-      if order.completed?
+      if order.completed? && variant.should_track_inventory?
         shipment.stock_location.unstock(variant, quantity, shipment)
       end
 

data/app/models/spree/page_link.rb

@@ -30,7 +30,7 @@ module Spree
 
     def formatted_url
       return if url.blank?
-      return url if url.start_with?("mailto:")
+      return url if %w[mailto: tel:].any? { |protocol| url.start_with?(protocol) }
 
       @formatted_url ||= url.match(/http:\/\/|https:\/\//) ? url : "http://#{url}"
     end

data/app/models/spree/page_section.rb

@@ -23,11 +23,18 @@ module Spree
     has_one_attached :asset, service: Spree.public_storage_service_name
     alias image asset
 
+    #
+    # Rich Text
+    #
+    has_rich_text :text
+    has_rich_text :description
+
     #
     # Validations
     #
     validates :name, :pageable, presence: true
     validates :asset, content_type: Rails.application.config.active_storage.web_image_content_types
+
     #
     # Callbacks
     #

data/app/models/spree/page_sections/announcement_bar.rb

@@ -1,8 +1,6 @@
 module Spree
   module PageSections
     class AnnouncementBar < Spree::PageSection
-      has_rich_text :text
-
       before_validation :set_default_text, on: :create
 
       BACKGROUND_COLOR_DEFAULT = '#F5F5F4'

data/app/models/spree/page_sections/featured_posts.rb

@@ -1,8 +1,6 @@
 module Spree
   module PageSections
     class FeaturedPosts < Spree::PageSection
-      has_rich_text :description
-
       before_validation :make_heading_size_valid
       before_validation :make_max_posts_to_show_valid
       before_validation :make_alignment_valid

data/app/models/spree/page_sections/featured_taxon.rb

@@ -9,8 +9,6 @@ module Spree
         queries.reduce(:or)
       }
 
-      has_rich_text :description
-
       before_validation :make_heading_size_valid
       before_validation :make_alignment_valid
       before_validation :make_taxon_id_valid
@@ -50,6 +48,11 @@ module Spree
       end
 
       def products(currency)
+        Spree::Deprecation.warn(
+          'FeaturedTaxon#products is deprecated and will be removed in Spree 6.0. ' \
+          'Please use taxon_products(featured_taxon.taxon) helper method in views instead'
+        )
+
         @products ||= begin
           finder_params = {
             store: store,

data/app/models/spree/page_sections/related_products.rb

@@ -1,8 +1,6 @@
 module Spree
   module PageSections
     class RelatedProducts < Spree::PageSection
-      has_rich_text :description
-
       before_validation :make_heading_size_valid
       before_validation :make_alignment_valid
 

data/app/models/spree/product.rb

@@ -38,7 +38,7 @@ module Spree
     MEMOIZED_METHODS = %w[total_on_hand taxonomy_ids taxon_and_ancestors category
                           default_variant_id tax_category default_variant
                           default_image secondary_image
-                          purchasable? in_stock? backorderable? has_variants?]
+                          purchasable? in_stock? backorderable? has_variants? digital?]
 
     STATUS_TO_WEBHOOK_EVENT = {
       'active' => 'activated',
@@ -81,6 +81,7 @@ module Spree
 
     belongs_to :tax_category, class_name: 'Spree::TaxCategory'
     belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :products
+    has_many :shipping_methods, through: :shipping_category, class_name: 'Spree::ShippingMethod'
 
     has_one :master,
             -> { where is_master: true },
@@ -345,11 +346,11 @@ module Spree
     # Returns default Image for Product
     # @return [Spree::Image]
     def default_image
-      @default_image ||= if images.size.positive?
+      @default_image ||= if images.any?
                            images.first
-                         elsif default_variant.images.size.positive?
+                         elsif default_variant.images.any?
                            default_variant.default_image
-                         elsif variant_images.size.positive?
+                         elsif variant_images.any?
                            variant_images.first
                          end
     end
@@ -376,7 +377,7 @@ module Spree
     end
 
     # Returns tax category for Product
-    # @return [Spree::TaxCategory]
+    # @return [Spree::TaxCategory, nil]
     def tax_category
       @tax_category ||= super || TaxCategory.default
     end
@@ -602,7 +603,7 @@ module Spree
     #
     # @return [Boolean]
     def digital?
-      shipping_category&.shipping_methods&.any? { |method| method.calculator.is_a?(Spree::Calculator::Shipping::DigitalDelivery) }
+      @digital ||= shipping_methods&.digital&.exists?
     end
 
     def auto_match_taxons

data/app/models/spree/shipment.rb

@@ -124,6 +124,10 @@ module Spree
       cost
     end
 
+    def digital?
+      shipping_method&.digital? || false
+    end
+
     def add_shipping_method(shipping_method, selected = false)
       shipping_rates.create(shipping_method: shipping_method, selected: selected, cost: cost)
     end
@@ -200,8 +204,11 @@ module Spree
       with_free_shipping_promotion?
     end
 
+    # Returns true if the shipment has a free shipping promotion applied
+    #
+    # @return [Boolean]
     def with_free_shipping_promotion?
-      adjustments.promotion.any? { |p| p.source.type == 'Spree::Promotion::Actions::FreeShipping' }
+      adjustments.promotion.includes(:source).any? { |p| p.source.respond_to?(:free_shipping?) && p.source.free_shipping? }
     end
 
     def finalize!
@@ -251,10 +258,6 @@ module Spree
       inventory_units.includes(:line_item).map(&:line_item).uniq
     end
 
-    def digital?
-      shipping_method&.calculator&.is_a?(Spree::Calculator::Shipping::DigitalDelivery)
-    end
-
     ManifestItem = Struct.new(:line_item, :variant, :quantity, :states)
 
     def manifest
@@ -358,14 +361,27 @@ module Spree
       self.shipped_at = Time.current
     end
 
+    # Returns the shipping method of the selected shipping rate
+    #
+    # @return [Spree::ShippingMethod]
     def shipping_method
       selected_shipping_rate&.shipping_method || shipping_rates.first&.shipping_method
     end
 
+    # Returns the tax category of the selected shipping rate
+    #
+    # @return [Spree::TaxCategory]
     def tax_category
       selected_shipping_rate.try(:tax_rate).try(:tax_category)
     end
 
+    # Returns the tax category ID of the selected shipping rate
+    #
+    # @return [Integer]
+    def tax_category_id
+      selected_shipping_rate.try(:tax_rate).try(:tax_category_id)
+    end
+
     # Only one of either included_tax_total or additional_tax_total is set
     # This method returns the total of the two. Saves having to check if
     # tax is included or additional.

data/app/models/spree/shipping_method.rb

@@ -10,9 +10,12 @@ module Spree
     if defined?(Spree::VendorConcern)
       include Spree::VendorConcern
     end
+    include Spree::MemoizedData
 
     extend Spree::DisplayMoney
 
+    MEMOIZED_METHODS = %w[display_estimated_price digital?]
+
     # Used for #refresh_rates
     DISPLAY_ON_FRONT_END = 1
     DISPLAY_ON_BACK_END = 2
@@ -118,6 +121,13 @@ module Spree
       end
     end
 
+    # Returns true if the shipping method is digital
+    #
+    # @return [Boolean]
+    def digital?
+      @digital ||= calculator.is_a?(Spree::Calculator::Shipping::DigitalDelivery)
+    end
+
     private
 
     # Some shipping methods are only meant to be set via backend

data/app/models/spree/store.rb

@@ -339,7 +339,7 @@ module Spree
     end
 
     def supported_shipping_zones
-      @supported_shipping_zones ||= if checkout_zone_id.present?
+      @supported_shipping_zones ||= if checkout_zone.present?
                                       [checkout_zone]
                                     else
                                       Spree::Zone.includes(zone_members: :zoneable).all

data/app/models/spree/tax_rate.rb

@@ -72,18 +72,18 @@ module Spree
     # to relevant items.
     def self.adjust(order, items)
       rates = match(order.tax_zone)
-      tax_categories = rates.map(&:tax_category)
+      tax_category_ids = rates.map(&:tax_category_id)
 
       # using destroy_all to ensure adjustment destroy callback fires.
       Spree::Adjustment.where(adjustable: items).tax.destroy_all
 
       relevant_items = items.select do |item|
-        tax_categories.include?(item.tax_category)
+        tax_category_ids.include?(item.tax_category_id)
       end
 
       relevant_items.each do |item|
         relevant_rates = rates.select do |rate|
-          rate.tax_category == item.tax_category
+          rate.tax_category_id == item.tax_category_id
         end
         store_pre_tax_amount(item, relevant_rates)
         relevant_rates.each do |rate|

data/app/models/spree/variant.rb

@@ -223,6 +223,8 @@ module Spree
       self.class.in_stock_or_backorderable.exists?(id: id)
     end
 
+    # Returns tax category for Variant
+    # @return [Spree::TaxCategory]
     def tax_category
       @tax_category ||= if self[:tax_category_id].nil?
                           product.tax_category
@@ -231,6 +233,16 @@ module Spree
                         end
     end
 
+    # Returns tax category ID for Variant
+    # @return [Integer]
+    def tax_category_id
+      @tax_category_id ||= if self[:tax_category_id].nil?
+                             product.tax_category_id
+                           else
+                             self[:tax_category_id]
+                           end
+    end
+
     def options_text
       @options_text ||= Spree::Variants::OptionsPresenter.new(self).to_sentence
     end
@@ -254,7 +266,7 @@ module Spree
     # Returns default Image for Variant
     # @return [Spree::Image]
     def default_image
-      @default_image ||= if images.size.positive?
+      @default_image ||= if images.any?
                            images.first
                          else
                            product.default_image
@@ -480,6 +492,8 @@ module Spree
     end
 
     # Is this variant purely digital? (no physical product)
+    #
+    # @return [Boolean]
     def digital?
       product.digital?
     end

data/app/models/spree/zone.rb

@@ -21,6 +21,7 @@ module Spree
 
     after_save :remove_defunct_members
     after_save :remove_previous_default, if: %i[default_tax? saved_change_to_default_tax?]
+    before_destroy :nullify_checkout_zone
 
     alias members zone_members
     accepts_nested_attributes_for :zone_members, allow_destroy: true, reject_if: proc { |a| a['zoneable_id'].blank? }
@@ -205,5 +206,11 @@ module Spree
         members << member
       end
     end
+
+    def nullify_checkout_zone
+      if id == Spree::Store.current.checkout_zone_id
+        Spree::Store.current.update(checkout_zone_id: nil)
+      end
+    end
   end
 end

data/app/services/spree/products/prepare_nested_attributes.rb

@@ -45,8 +45,6 @@ module Spree
           end
         end
 
-        params.delete(:variants_attributes) if params[:variants_attributes].blank?
-
         # mark resource properties to be removed
         # when value is left blank
         if params[:product_properties_attributes].present?
@@ -62,6 +60,18 @@ module Spree
         # ensure there is at least one store
         params[:store_ids] = [store.id] if params[:store_ids].blank?
 
+        # Add empty list for option_type_ids and mark variants as removed if there are no variants and options
+        if params[:variants_attributes].blank? && variants_to_remove.any? && !params.key?(:option_type_ids)
+          params[:option_type_ids] = []
+          params[:variants_attributes] = {}
+
+          variants_to_remove.each_with_index do |variant_id, index|
+            params[:variants_attributes][index.to_s] = { id: variant_id, _destroy: '1' }
+          end
+
+          params[:variants_attributes].permit!
+        end
+
         params
       end
 

data/app/services/spree/taxons/add_products.rb

@@ -30,7 +30,10 @@ module Spree
 
         # clearing cache
         Spree::Product.where(id: products.pluck(:id)).touch_all
-        Spree::Taxon.where(id: taxons.pluck(:id)).touch_all
+
+        taxon_ids = taxons.pluck(:id)
+        Spree::Taxon.where(id: taxon_ids).touch_all
+        Spree::Taxons::TouchFeaturedSections.call(taxon_ids: taxon_ids)
 
         success(true)
       end

data/app/services/spree/taxons/remove_products.rb

@@ -44,7 +44,10 @@ module Spree
 
         # clear cache
         Spree::Product.where(id: products.pluck(:id)).touch_all
-        Spree::Taxon.where(id: taxons.pluck(:id)).touch_all
+
+        taxon_ids = taxons.pluck(:id)
+        Spree::Taxon.where(id: taxon_ids).touch_all
+        Spree::Taxons::TouchFeaturedSections.call(taxon_ids: taxon_ids)
 
         success(true)
       end

data/config/importmap.rb

@@ -3,6 +3,7 @@ pin '@rails/request.js', to: '@rails--request.js.js', preload: ['application-spr
 pin 'tailwindcss-stimulus-components', preload: ['application-spree-storefront', 'application-spree-admin'] # @3.0.4
 pin 'stimulus-reveal-controller', preload: ['application-spree-admin'] # @4.1.0
 pin '@stimulus-components/auto-submit', to: '@stimulus-components--auto-submit.js', preload: ['application-spree-admin'] # @6.0.0
+pin 'stimulus-textarea-autogrow', preload: ['application-spree-admin'] # @4.1.0
 
 pin_all_from Spree::Core::Engine.root.join('app/javascript/spree/core/controllers'),
              under: 'spree/core/controllers',

data/config/locales/en.yml

@@ -181,6 +181,7 @@ en:
         name: Name
         permalink: Permalink
         position: Position
+        sort_order: Sort Order
       spree/taxonomy:
         name: Name
       spree/user:
@@ -590,6 +591,7 @@ en:
     add_country: Add Country
     add_coupon_code: Add Coupon Code
     add_gift_card: Add Gift Card
+    add_link: Add link
     add_new_address: Add new address
     add_new_credit_card: Add a new card
     add_new_header: Add New Header

data/db/migrate/20250304115943_add_performed_by_to_spree_reimbursements.rb

@@ -1,5 +1,5 @@
 class AddPerformedByToSpreeReimbursements < ActiveRecord::Migration[6.1]
   def change
-    add_column :spree_reimbursements, :performed_by_id, :bigint, index: true, null: true, if_not_exists: true
+    add_reference :spree_reimbursements, :performed_by, index: true, null: true unless column_exists?(:spree_reimbursements, :performed_by_id)
   end
 end

data/lib/spree/core/version.rb

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

data/vendor/javascript/stimulus-textarea-autogrow.js

@@ -0,0 +1,4 @@
+// stimulus-textarea-autogrow@4.1.0 downloaded from https://ga.jspm.io/npm:stimulus-textarea-autogrow@4.1.0/dist/stimulus-textarea-autogrow.mjs
+
+import{Controller as e}from"@hotwired/stimulus";function r(e,t){let i;return(...s)=>{const o=this;clearTimeout(i),i=setTimeout((()=>e.apply(o,s)),t)}}class l extends e{initialize(){this.autogrow=this.autogrow.bind(this)}connect(){this.element.style.overflow="hidden";const e=this.resizeDebounceDelayValue;this.onResize=e>0?r(this.autogrow,e):this.autogrow,this.autogrow(),this.element.addEventListener("input",this.autogrow),window.addEventListener("resize",this.onResize)}disconnect(){window.removeEventListener("resize",this.onResize)}autogrow(){this.element.style.height="auto",this.element.style.height=`${this.element.scrollHeight}px`}}l.values={resizeDebounceDelay:{type:Number,default:100}};export{l as default};
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.1.5
+  version: 5.1.6
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-06 00:00:00.000000000 Z
+date: 2025-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -1375,6 +1375,7 @@ files:
 - vendor/javascript/@rails--request.js.js
 - vendor/javascript/@stimulus-components--auto-submit.js
 - vendor/javascript/stimulus-reveal-controller.js
+- vendor/javascript/stimulus-textarea-autogrow.js
 - vendor/javascript/tailwindcss-stimulus-components.js
 homepage: https://spreecommerce.org
 licenses:
@@ -1382,9 +1383,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.1.5
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.6
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.5
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.6
 post_install_message:
 rdoc_options: []
 require_paths: