spree_core 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b48665b46a9dce64b6f759e3b403c2413c0987726477b894530102991e059887
-  data.tar.gz: 1ca8171bbfdd308a1a737b3693f704ba9065b917117b51add94a0330789cac21
+  metadata.gz: 61dc753fc9921cc827589519ccd19bdd4db91ff9ba052174e84e6681578b67a3
+  data.tar.gz: 9e992274856bc445de5a7b4041126721e992e1554aa0d677ff87c908a52c6cc9
 SHA512:
-  metadata.gz: f7f75d17b2b9c08bc6ce85adbec6b7b20252d02a302bfc8594650ee84d69bc72ebdd168f038513e4845ca195f60da241fb5292afce2620a848c08b8db5cf6bc6
-  data.tar.gz: 0c8d2488ec8d9446bec3041b3e2b135482a5e1de436baec805c257ab0f59210e59dbaf102733d382df9aff0023909d65a77453dea086bac2b5b79afcc05b7d4c
+  metadata.gz: 6a6b74d64d7be259de034cfc831f6eaf9877f9f801a3312adda2af3983060948e8434e2ef4d7ad4b3fdbeac7ff366ae6d87a210b27f7172769abbda9243e46b5
+  data.tar.gz: f31e47f912ee551e853fe190e1acd34009d3c191cc9666797db4986fbecbb445062e6533de35489998dbdea569d85fd9bf0fd54ee3e27047c5c373e6c2a62ad6

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

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/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

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/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.3'.freeze
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 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-06 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.3
   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.3
 post_install_message:
 rdoc_options: []
 require_paths: