spree_core 5.0.2 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b48665b46a9dce64b6f759e3b403c2413c0987726477b894530102991e059887
-  data.tar.gz: 1ca8171bbfdd308a1a737b3693f704ba9065b917117b51add94a0330789cac21
+  metadata.gz: 8dad7a44435e17f7a0b717356dfe3f8f70cac0e9a18f38f505ded42f3908faf5
+  data.tar.gz: 109859dd8b1790ab9c0a22c1457e03e81708d79007664f0c8afae841573dd43e
 SHA512:
-  metadata.gz: f7f75d17b2b9c08bc6ce85adbec6b7b20252d02a302bfc8594650ee84d69bc72ebdd168f038513e4845ca195f60da241fb5292afce2620a848c08b8db5cf6bc6
-  data.tar.gz: 0c8d2488ec8d9446bec3041b3e2b135482a5e1de436baec805c257ab0f59210e59dbaf102733d382df9aff0023909d65a77453dea086bac2b5b79afcc05b7d4c
+  metadata.gz: f09637caac881e203c1ff4f1104c2035c89df6cf671d619b7b9e4786a82a4d65332e6537fa4932545e1782203c82f1b41bb6e4c416674df57de95ccbb014410f
+  data.tar.gz: 2e499043d9f6393d208ce6cdb823059e734748e79924612d408e6de48d5e36c89cb1799405dd62da06e53aa6b8df3693033a267948fb3e6a4fc2077d4efbce2d

data/app/models/spree/order.rb

@@ -443,6 +443,7 @@ module Spree
     # @return [Array<Spree::Variant>] the backordered variants for the order
     def backordered_variants
       variants.
+        where(track_inventory: true).
         joins(:stock_items, :product).
         where(Spree::StockItem.table_name => { count_on_hand: ..0, backorderable: true })
     end
@@ -814,6 +815,10 @@ module Spree
       csv_lines
     end
 
+    def all_line_items
+      line_items
+    end
+
     private
 
     def link_by_email

data/app/models/spree/page_blocks/products/buy_buttons.rb

@@ -6,6 +6,14 @@ module Spree
         BOTTOM_PADDING_DEFAULT = 20
 
         preference :text_color, :string
+
+        def icon_name
+          'shopping-cart-plus'
+        end
+
+        def display_name
+          Spree.t('page_blocks.products.buy_buttons.display_name')
+        end
       end
     end
   end

data/app/models/spree/page_blocks/products/quantity_selector.rb

@@ -6,6 +6,10 @@ module Spree
         BOTTOM_PADDING_DEFAULT = 20
 
         preference :text_color, :string
+
+        def icon_name
+          'selector'
+        end
       end
     end
   end

data/app/models/spree/page_blocks/products/variant_picker.rb

@@ -3,6 +3,10 @@ module Spree
     module Products
       class VariantPicker < Spree::PageBlock
         preference :text_color, :string
+
+        def icon_name
+          'select'
+        end
       end
     end
   end

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

@@ -41,6 +41,10 @@ module Spree
       def blocks_available?
         true
       end
+
+      def can_sort_blocks?
+        true
+      end
     end
   end
 end

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

@@ -26,10 +26,22 @@ module Spree
         ]
       end
 
+      def available_blocks_to_add
+        [
+          Spree::PageBlocks::Buttons,
+          Spree::PageBlocks::Heading,
+          Spree::PageBlocks::Text
+        ]
+      end
+
       def blocks_available?
         true
       end
 
+      def can_sort_blocks?
+        true
+      end
+
       def icon_name
         'slideshow'
       end

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

@@ -27,6 +27,14 @@ module Spree
         ]
       end
 
+      def available_blocks_to_add
+        [
+          Spree::PageBlocks::Buttons,
+          Spree::PageBlocks::Heading,
+          Spree::PageBlocks::Text
+        ]
+      end
+
       def default_links
         @default_links.presence || [
           Spree::PageLink.new(
@@ -40,6 +48,10 @@ module Spree
         true
       end
 
+      def can_sort_blocks?
+        true
+      end
+
       def icon_name
         'photo'
       end

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

@@ -32,7 +32,7 @@ module Spree
       end
 
       def available_blocks_to_add
-        [Spree::PageBlocks::Image]
+        [Spree::PageBlocks::Image, Spree::PageBlocks::Heading, Spree::PageBlocks::Text, Spree::PageBlocks::NewsletterForm]
       end
 
       def can_sort_blocks?

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

@@ -8,10 +8,21 @@ module Spree
         ]
       end
 
+      def available_blocks_to_add
+        [
+          Spree::PageBlocks::Heading,
+          Spree::PageBlocks::Text
+        ]
+      end
+
       def blocks_available?
         true
       end
 
+      def can_sort_blocks?
+        true
+      end
+
       def icon_name
         'text-caption'
       end

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

@@ -44,6 +44,10 @@ module Spree
         ]
       end
 
+      def available_blocks_to_add
+        [Spree::PageBlocks::Heading]
+      end
+
       def icon_name
         'movie'
       end
@@ -52,6 +56,10 @@ module Spree
         true
       end
 
+      def can_sort_blocks?
+        true
+      end
+
       def video_embed
         @video_embed ||= ::ActionText::VideoEmbed.find_by(id: preferred_youtube_video_embed_id) if preferred_youtube_video_embed_id.present?
       end

data/app/models/spree/product.rb

@@ -595,7 +595,11 @@ module Spree
                      join_translation_table(Taxonomy).
                      find_by(Taxonomy.translation_table_alias => { name: Spree.t(:taxonomy_brands_name) })
                  else
-                   taxons.joins(:taxonomy).find_by(Taxonomy.table_name => { name: Spree.t(:taxonomy_brands_name) })
+                   if taxons.loaded?
+                     taxons.find { |taxon| taxon.taxonomy.name == Spree.t(:taxonomy_brands_name) }
+                   else
+                     taxons.joins(:taxonomy).find_by(Taxonomy.table_name => { name: Spree.t(:taxonomy_brands_name) })
+                   end
                  end
     end
 
@@ -606,7 +610,11 @@ module Spree
                         order(depth: :desc).
                         find_by(Taxonomy.translation_table_alias => { name: Spree.t(:taxonomy_categories_name) })
                     else
-                      taxons.joins(:taxonomy).order(depth: :desc).find_by(Taxonomy.table_name => { name: Spree.t(:taxonomy_categories_name) })
+                      if taxons.loaded?
+                        taxons.find { |taxon| taxon.taxonomy.name == Spree.t(:taxonomy_categories_name) }
+                      else
+                        taxons.joins(:taxonomy).order(depth: :desc).find_by(Taxonomy.table_name => { name: Spree.t(:taxonomy_categories_name) })
+                      end
                     end
     end
 

data/app/models/spree/shipment.rb

@@ -430,7 +430,7 @@ module Spree
     end
 
     def manifest_unstock(item)
-      stock_location.unstock item.variant, item.quantity, self
+      stock_location.unstock(item.variant, item.quantity, self) if item.variant.track_inventory?
     end
 
     def recalculate_adjustments

data/app/models/spree/store.rb

@@ -187,7 +187,7 @@ module Spree
     #
     default_scope { order(created_at: :asc) }
     scope :by_custom_domain, ->(url) { left_joins(:custom_domains).where("#{Spree::CustomDomain.table_name}.url" => url) }
-    scope :by_url, ->(url) { where("#{table_name}.url like ?", "%#{url}%") }
+    scope :by_url, ->(url) { where(url: url).or(where("#{table_name}.url like ?", "%#{url}%")) }
 
     #
     # Delegations
@@ -338,6 +338,8 @@ module Spree
                                     end
     end
 
+    # Returns the default stock location for the store or creates a new one if it doesn't exist
+    # @return [Spree::StockLocation]
     def default_stock_location
       @default_stock_location ||= begin
         stock_location_scope = Spree::StockLocation.order_default

data/app/models/spree/theme.rb

@@ -113,6 +113,9 @@ module Spree
       end
     end
 
+    # Creates a new preview for the theme
+    #
+    # @return [Spree::Theme]
     def create_preview
       ActiveRecord::Base.connected_to(role: :writing) do
         ApplicationRecord.transaction do
@@ -152,16 +155,46 @@ module Spree
       end
     end
 
+    # Returns an array of available layout section classes for the theme
+    #
+    # @return [Array<Class>]
     def available_layout_sections
-      Rails.application.config.spree.theme_layout_sections
+      [
+        *Rails.application.config.spree.theme_layout_sections,
+        *custom_layout_sections
+      ]
+    end
+
+    # Returns an array of custom layout section classes for the theme
+    #
+    # @return [Array<Class>]
+    def custom_layout_sections
+      # you can override this method in your theme to return a list of custom layout sections for your theme
+      # [Spree::PageSections::Custom, Spree::PageSections::Custom2]
+      []
     end
 
+    # Returns an array of available page section classes for the theme
+    #
+    # @return [Array<Class>]
     def available_page_sections
       return @available_page_sections if @available_page_sections
 
-      @available_page_sections ||= Rails.application.config.spree.page_sections.find_all do |section_class|
-        section_class.role == 'content'
-      end.sort_by(&:name)
+      @available_page_sections ||= [
+        *Rails.application.config.spree.page_sections.find_all do |section_class|
+          section_class.role == 'content'
+        end,
+        *custom_page_sections
+      ].sort_by(&:name)
+    end
+
+    # Returns an array of custom page section classes for the theme
+    #
+    # @return [Array<Class>]
+    def custom_page_sections
+      # you can override this method in your theme to return a list of custom page sections for your theme
+      # [Spree::PageSections::Custom, Spree::PageSections::Custom2]
+      []
     end
 
     def restore_defaults!

data/app/models/spree/variant.rb

@@ -73,6 +73,8 @@ module Spree
     after_create :create_stock_items
     after_create :set_master_out_of_stock, unless: :is_master?
     after_commit :clear_line_items_cache, on: :update
+
+    after_create :create_default_stock_item, unless: :track_inventory?
     after_update_commit :handle_track_inventory_change
 
     after_commit :remove_prices_from_master_variant, on: [:create, :update], unless: :is_master?
@@ -553,11 +555,17 @@ module Spree
       line_items.update_all(updated_at: Time.current)
     end
 
+    def create_default_stock_item
+      return if stock_items.any?
+
+      Spree::Store.current.default_stock_location.set_up_stock_item(self)
+    end
+
     def handle_track_inventory_change
       return unless track_inventory_previously_changed?
       return if track_inventory
 
-      stock_items.update_all(backorderable: true, count_on_hand: 0, updated_at: Time.current)
+      stock_items.update_all(count_on_hand: 0, updated_at: Time.current)
     end
 
     def remove_prices_from_master_variant

data/config/locales/en.yml

@@ -769,7 +769,6 @@ en:
     compare_at_amount: Compare at amount
     compare_at_price: Compare at price
     complete: complete
-    conditions: Conditions
     configuration: Configuration
     configurations: Configurations
     confirm: Confirm
@@ -1430,6 +1429,9 @@ en:
       newsletter_form:
         button_text_default: Submit
         placeholder_default: Enter your email
+      products:
+        buy_buttons:
+          display_name: Add To Cart
     page_not_found: Sorry! Page you are looking can’t be found.
     page_sections:
       announcement_bar:
@@ -2120,6 +2122,7 @@ en:
     translations_for: "%{resource_name} translations"
     tree: Tree
     true_label: 'TRUE'
+    try_removing_filters: Try removing some filters to see more products
     twitter: Twitter
     type: Type
     type_to_search: Type to search
@@ -2141,6 +2144,7 @@ en:
     update_contact_information: Update contact information
     update_shipping_address: Update shipping address
     updated: Updated
+    updated_at: Updated at
     updating: Updating
     upload_image: Upload image
     url: URL

data/db/migrate/20230110142344_backfill_friendly_id_slug_locale.rb

@@ -1,6 +1,8 @@
 class BackfillFriendlyIdSlugLocale < ActiveRecord::Migration[6.1]
   def up
-    FriendlyId::Slug.unscoped.update_all(locale: Spree::Store.default.default_locale)
+    if Spree::Store.default.present? && Spree::Store.default.default_locale.present?
+      FriendlyId::Slug.unscoped.update_all(locale: Spree::Store.default.default_locale)
+    end
   end
 
   def down

data/lib/spree/core/controller_helpers/auth.rb

@@ -26,6 +26,7 @@ module Spree
         end
 
         def set_token
+          Spree::Deprecation.warn('set_token is deprecated and will be removed in Spree 5.2. Please use create_token_cookie(token) instead.')
           cookies.permanent.signed[:token] ||= cookies.signed[:guest_token]
           cookies.permanent.signed[:token] ||= {
             value: generate_token,

data/lib/spree/core/controller_helpers/order.rb

@@ -118,7 +118,8 @@ module Spree
             value: token,
             expires: 90.days.from_now,
             secure: Rails.configuration.force_ssl || Rails.application.config.ssl_options[:secure_cookies],
-            domain: current_store.url_or_custom_domain
+            domain: current_store.url_or_custom_domain,
+            httponly: true
           }
         end
 

data/lib/spree/core/engine.rb

@@ -257,14 +257,7 @@ module Spree
           checkout_email_entered: 'Checkout Email Entered',
           checkout_step_viewed: 'Checkout Step Viewed',
           checkout_step_completed: 'Checkout Step Completed',
-
-          order_completed: 'Order Completed',
-          order_cancelled: 'Order Cancelled',
-          order_refunded: 'Order Refunded',
-          package_shipped: 'Package Shipped',
-          order_fulfilled: 'Order Fulfilled',
-
-          gift_card_issued: 'Gift Card Issued'
+          order_completed: 'Order Completed'
         }
         Rails.application.config.spree.analytics_event_handlers = []
       end

data/lib/spree/core/version.rb

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

data/lib/spree/testing_support/capybara_config.rb

@@ -20,7 +20,7 @@ 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 '--window-size=1440,900'
   options.add_argument '--disable-search-engine-choice-screen'
 
   # Disable timers being throttled in background pages/tabs. Useful for parallel test runs.

data/lib/spree/testing_support/factories/stock_item_factory.rb

@@ -11,6 +11,10 @@ FactoryBot.define do
       )&.destroy
     end
 
-    after(:create) { |object| object.adjust_count_on_hand(10) }
+    transient do
+      adjust_count_on_hand { true }
+    end
+
+    after(:create) { |object, evaluator| object.adjust_count_on_hand(10) if evaluator.adjust_count_on_hand }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.4
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-22 00:00:00.000000000 Z
+date: 2025-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -1308,9 +1308,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.0.2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.4
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.0.2
+  source_code_uri: https://github.com/spree/spree/tree/v5.0.4
 post_install_message:
 rdoc_options: []
 require_paths: