spree_core 5.0.1 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a60d5a6d4ba0fd4d7e223de06835389a8c4c39572dabe07e29a4fb5312d2548
-  data.tar.gz: 1163cb99eaca807157669cc6ae77f3c2eae58c8b63de520b27c329244c870d22
+  metadata.gz: 61dc753fc9921cc827589519ccd19bdd4db91ff9ba052174e84e6681578b67a3
+  data.tar.gz: 9e992274856bc445de5a7b4041126721e992e1554aa0d677ff87c908a52c6cc9
 SHA512:
-  metadata.gz: d69a80bb1326c8f17f29c299701c20b372736a16002688a51cb0f9cef9f95a650ef3f2eb860e5d671e3fda54745fc2eace0b54a534e746d0b12e0337ea7cb547
-  data.tar.gz: 20864a616e90144196cf5b3d8a4b4d8ef35bed9bf85415a1ed07361b1c4451fd77716adfdfbb9a122ac0284eee6b2b00e2d9b24f5dddf825167eb7fe2f5e97c7
+  metadata.gz: 6a6b74d64d7be259de034cfc831f6eaf9877f9f801a3312adda2af3983060948e8434e2ef4d7ad4b3fdbeac7ff366ae6d87a210b27f7172769abbda9243e46b5
+  data.tar.gz: f31e47f912ee551e853fe190e1acd34009d3c191cc9666797db4986fbecbb445062e6533de35489998dbdea569d85fd9bf0fd54ee3e27047c5c373e6c2a62ad6

data/app/finders/spree/addresses/find.rb

@@ -1,6 +1,27 @@
 module Spree
   module Addresses
     class Find < ::Spree::BaseFinder
+      def initialize(scope:, params:)
+        super
+        @exclude_quick_checkout = params.dig(:filter, :exclude_quick_checkout)
+      end
+
+      def execute
+        addresses = scope
+        exclude_quick_checkout(addresses)
+      end
+
+      private
+
+      def exclude_quick_checkout?
+        @exclude_quick_checkout.present?
+      end
+
+      def exclude_quick_checkout(addresses)
+        return addresses unless exclude_quick_checkout?
+
+        addresses.not_quick_checkout
+      end
     end
   end
 end

data/app/finders/spree/products/find.rb

@@ -12,6 +12,7 @@ module Spree
         @taxons           = taxon_ids(params.dig(:filter, :taxons))
         @concat_taxons    = taxon_ids(params.dig(:filter, :concat_taxons))
         @name             = params.dig(:filter, :name)
+        @slug             = params.dig(:filter, :slug)
         @options          = params.dig(:filter, :options).try(:to_unsafe_hash)
         @option_value_ids = params.dig(:filter, :option_value_ids)
         @sort_by          = params.dig(:sort_by)
@@ -41,6 +42,7 @@ module Spree
         products = by_taxons(products)
         products = by_concat_taxons(products)
         products = by_name(products)
+        products = by_slug(products)
         products = by_options(products)
         products = by_option_value_ids(products)
         products = by_properties(products)
@@ -60,7 +62,7 @@ module Spree
 
       attr_reader :ids, :skus, :price, :currency, :taxons, :concat_taxons, :name, :options, :option_value_ids, :scope,
                   :sort_by, :deleted, :discontinued, :properties, :store, :in_stock, :backorderable, :purchasable, :tags,
-                  :query, :vendor_ids, :out_of_stock
+                  :query, :vendor_ids, :out_of_stock, :slug
 
       def query?
         query.present?
@@ -94,6 +96,10 @@ module Spree
         name.present?
       end
 
+      def slug?
+        slug.present?
+      end
+
       def options?
         options.present?
       end
@@ -172,6 +178,12 @@ module Spree
         products.i18n { name.matches("%#{product_name}%") }
       end
 
+      def by_slug(products)
+        return products unless slug.present?
+
+        products.i18n.where(slug: slug)
+      end
+
       def by_options(products)
         return products unless options?
 

data/app/models/spree/product.rb

@@ -512,6 +512,17 @@ module Spree
       where conditions.inject(:or)
     end
 
+    def self.slug_available?(slug, id)
+      !where(slug: slug).where.not(id: id).exists?
+    end
+
+    def ensure_slug_is_unique(candidate_slug)
+      return slug if candidate_slug.blank? || slug.blank?
+      return candidate_slug if self.class.slug_available?(candidate_slug, id)
+
+      normalize_friendly_id([candidate_slug, uuid_for_friendly_id])
+    end
+
     # Suitable for displaying only variants that has at least one option value.
     # There may be scenarios where an option type is removed and along with it
     # all option values. At that point all variants associated with only those

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/app/services/spree/locales/set_fallback_locale_for_store.rb

@@ -3,6 +3,8 @@ module Spree
     class SetFallbackLocaleForStore
       def call(store:)
         store_default_locale = store.default_locale
+        return unless store_default_locale.present?
+
         fallbacks = store.supported_locales_list.each_with_object({}) do |locale, object|
           object[locale] = [store_default_locale]
         end

data/config/locales/en.yml

@@ -527,7 +527,6 @@ en:
     account: Account
     account_info: Account info
     account_members: Team
-    account_updated: Account updated
     action: Action
     actions:
       approve: Approve
@@ -770,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
@@ -1043,6 +1041,8 @@ en:
     font_size_scale: Font size scale
     fonts: Fonts
     footer: Footer
+    forbidden: Access denied
+    forbidden_message: You are not authorized to access this page.
     forgot_password: Forgot password?
     free: Free
     free_shipping: Free Shipping
@@ -1519,7 +1519,6 @@ en:
     permalink: Permalink
     personal_details: Personal details
     phone: Phone
-    place_now: Place now
     place_order: Place Order
     please_check_back_soon: Please check back soon.
     please_define_payment_methods: Please define some payment methods first.

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.1'.freeze
+  VERSION = '5.0.3'.freeze
 
   def self.version
     VERSION

data/lib/spree/permitted_attributes.rb

@@ -94,6 +94,7 @@ module Spree
       :option_values_hash, :weight, :height, :width, :depth,
       :shipping_category_id, :tax_category_id,
       :cost_currency, :cost_price, :compare_at_price,
+      :slug,
       {
         tag_list: [],
         option_type_ids: [],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.3
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-09 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.1
+  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.1
+  source_code_uri: https://github.com/spree/spree/tree/v5.0.3
 post_install_message:
 rdoc_options: []
 require_paths: