spree_core 5.1.0.beta2 → 5.1.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8150046e1776256aacec11512b848d9cbd5074d17b7aacafd7b2736cfd934c3
-  data.tar.gz: 8a04db5d73b2abf21a587ea66313d4fb7ff7120ed46ef9d22f38ddf1b3c5f295
+  metadata.gz: 7dbf1c3a02958e3dcb370c47d5cd4e9c209924301fcf451e91cdce682e60ea74
+  data.tar.gz: 83d62b4be4aeeb60fda78de84dfe73bd5ebf9603b32b5b938274be67a54c25a0
 SHA512:
-  metadata.gz: 8024d8aa8b617d7be12713acf1787a7c4569dc708d74cbf34850ec6bc8fcea5630c15fdfe6efa4796c82825fc9724d637b219da887f888f909dd29d22582178f
-  data.tar.gz: 60db3009f9a9a30bfca2b8c6895b7777a35eaac8819ca06a112e2315e234137ee87e5fea3796335e53e8a8e5c562f22183d7d8c6c3c3b1f8e9466d76ba3bbde5
+  metadata.gz: fdfef29cde021604e1309c49fd2218ced2bbf37c66b4642a88979955e57d6744a1f6630b1e8937aa4633d626f8c509bf8a7c3fc1c5bf76f0c5ba3f8472bd7fe1
+  data.tar.gz: a2d843bd61853ce37850019f7d378a83cd7fe88b523f1be07354271350498e851625caa9a49f969cbf338a00c12bb289d55a449f8a212d1a8290bab75d720971

data/app/helpers/spree/mail_helper.rb

@@ -17,6 +17,8 @@ module Spree
     end
 
     def logo_path
+      Spree::Deprecation.warn('logo_path is deprecated and will be removed in Spree 6.0. Please use Active Storage URL helpers instead.')
+
       return main_app.cdn_image_url(store_logo.variant(resize_to_limit: [244, 104])) if store_logo&.variable?
 
       return main_app.cdn_image_url(store_logo) if store_logo&.image?

data/app/models/concerns/spree/product_scopes.rb

@@ -305,7 +305,12 @@ module Spree
       # .search_by_name
       if defined?(PgSearch)
         include PgSearch::Model
-        pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { tsearch: { any_word: true, prefix: true } }
+
+        if connected? && connection.extension_enabled?('pg_trgm')
+          pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { trigram: { threshold: 0.3, word_similarity: true } }
+        else
+          pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { tsearch: { any_word: true, prefix: true } }
+        end
       else
         def self.search_by_name(query)
           i18n { name.lower.matches("%#{query.downcase}%") }

data/app/models/spree/address.rb

@@ -189,7 +189,7 @@ module Spree
     end
 
     def show_company_address_field?
-      false
+      Spree::Store.current.prefers_company_field_enabled?
     end
 
     def editable?

data/app/models/spree/product.rb

@@ -50,8 +50,11 @@ module Spree
       if defined?(PgSearch)
         include PgSearch::Model
 
-        pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' },
-                                         using: { tsearch: { prefix: true, any_word: true } }
+        if connected? && connection.extension_enabled?('pg_trgm')
+          pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { trigram: { threshold: 0.3, word_similarity: true } }
+        else
+          pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { tsearch: { any_word: true, prefix: true } }
+        end
       end
 
       before_save :set_slug

data/app/models/spree/stock_location.rb

@@ -29,7 +29,6 @@ module Spree
     after_update :conditional_touch_records
 
     delegate :name, :iso3, :iso, :iso_name, to: :country, prefix: true
-    delegate :show_company_address_field?, to: :address
 
     def state_text
       state.try(:abbr) || state.try(:name) || state_name
@@ -136,6 +135,7 @@ module Spree
       Spree::Address.new(
         address1: address1,
         address2: address2,
+        company: company,
         city: city,
         state: state,
         state_name: state_name,
@@ -159,6 +159,10 @@ module Spree
       false
     end
 
+    def show_company_address_field?
+      true
+    end
+
     def display_name
       @display_name ||= [admin_name, name].delete_if(&:blank?).join(' / ')
     end

data/app/models/spree/store.rb

@@ -48,6 +48,9 @@ module Spree
     preference :password_protected, :boolean, default: false
     # Checkout preferences
     preference :guest_checkout, :boolean, default: true
+    preference :special_instructions_enabled, :boolean, default: false
+    # Address preferences
+    preference :company_field_enabled, :boolean, default: false
     # digital assets preferences
     preference :limit_digital_download_count, :boolean, default: true
     preference :limit_digital_download_days, :boolean, default: true

data/config/locales/en.yml

@@ -567,6 +567,7 @@ en:
       receive: Mark as received
       refund: Refund
       reject: Reject
+      remove: Remove
       resend: Resend
       resolve: Mark as resolved
       save: Save
@@ -630,6 +631,7 @@ en:
       successfully_updated: Updated successfully
       unsuccessfully_saved: There was an error while trying to save your address.
       unsuccessfully_updated: There was an update while trying to update your address.
+    address_settings: Address settings
     addresses: Addresses
     adjustable: Adjustable
     adjustment: Adjustment

data/db/migrate/20250527134027_add_company_to_spree_stock_locations.rb

@@ -0,0 +1,5 @@
+class AddCompanyToSpreeStockLocations < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_stock_locations, :company, :string, if_not_exists: true
+  end
+end

data/lib/spree/core/configuration.rb

@@ -37,7 +37,7 @@ module Spree
       preference :auto_capture_on_dispatch, :boolean, default: false # Captures payment for each shipment in Shipment#after_ship callback, and makes Shipment.ready when payment authorized.
       preference :binary_inventory_cache, :boolean, default: false, deprecated: true # only invalidate product cache when a stock item changes whether it is in_stock
       preference :checkout_zone, :string, default: nil, deprecated: true # replace with the name of a zone if you would like to limit the countries
-      preference :company, :boolean, default: false # Request company field for billing and shipping addr
+      preference :company, :boolean, default: false, deprecated: 'Use the company_field_enabled preference in the Spree::Store model' # Request company field for billing and shipping addr
       preference :currency, :string, default: 'USD', deprecated: true
       preference :credit_to_new_allocation, :boolean, default: false
       preference :disable_sku_validation, :boolean, default: false # when turned off disables the built-in SKU uniqueness validation

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.1.0.beta2'.freeze
+  VERSION = '5.1.0.beta3'.freeze
 
   def self.version
     VERSION

data/lib/spree/permitted_attributes.rb

@@ -27,6 +27,8 @@ module Spree
       :page_section_attributes,
       :payment_attributes,
       :payment_method_attributes,
+      :post_attributes,
+      :post_category_attributes,
       :product_attributes,
       :promotion_attributes,
       :promotion_rule_attributes,
@@ -101,7 +103,7 @@ module Spree
 
     @@digital_link_attributes = [:access_counter]
 
-    @@export_attributes = [:type, :format, :record_selection, search_params: {}]
+    @@export_attributes = [:type, :format, :record_selection, :search_params]
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
@@ -125,16 +127,20 @@ module Spree
 
     @@page_attributes = [:name, :slug, :meta_title, :meta_description, :meta_keywords]
 
-    @@page_block_attributes = [:type, :name, :position]
+    @@page_block_attributes = [:type, :name, :text, :position]
 
-    @@page_link_attributes = [:linkable_id, :linkable_type, :position, :label, :url]
+    @@page_link_attributes = [:linkable_id, :linkable_type, :position, :label, :url, :open_in_new_tab]
 
-    @@page_section_attributes = [:type, :name, :position, :asset]
+    @@page_section_attributes = [:type, :name, :position, :asset, :text, :description]
 
     @@payment_attributes = [:amount, :payment_method_id, :payment_method]
 
     @@payment_method_attributes = [:name, :type, :description, :active, :display_on, :auto_capture, :position]
 
+    @@post_attributes = [:title, :meta_title, :meta_description, :slug, :author_id, :post_category_id, :published_at, :content, :excerpt, :image, tag_list: []]
+
+    @@post_category_attributes = [:title, :slug, :description]
+
     @@product_properties_attributes = [:property_name, :property_id, :value, :position, :_destroy]
 
     @@product_attributes = [
@@ -207,7 +213,7 @@ module Spree
     @@stock_item_attributes = [:variant_id, :stock_location_id, :backorderable, :count_on_hand]
 
     @@stock_location_attributes = [
-      :name, :active, :address1, :address2, :city, :zipcode,
+      :name, :active, :address1, :address2, :city, :zipcode, :company,
       :backorderable_default, :state_name, :state_id, :country_id, :phone,
       :propagate_all_variants
     ]

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

@@ -20,5 +20,7 @@ FactoryBot.define do
     factory :newsletter_page_section, class: Spree::PageSections::Newsletter
 
     factory :video_page_section, class: Spree::PageSections::Video
+
+    factory :image_with_text_page_section, class: Spree::PageSections::ImageWithText
   end
 end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :post, class: Spree::Post do
-    post_category { create(:post_category) }
+    post_category { create(:post_category, store: Spree::Store.default || create(:store)) }
     title { FFaker::Lorem.sentence }
     content { FFaker::Lorem.paragraph }
     published_at { Time.current }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.1.0.beta2
+  version: 5.1.0.beta3
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -1158,6 +1158,7 @@ files:
 - db/migrate/20250418174652_add_resource_to_spree_role_users.rb
 - db/migrate/20250508060800_add_selected_locale_to_spree_admin_users.rb
 - db/migrate/20250509143831_add_session_id_to_spree_assets.rb
+- db/migrate/20250527134027_add_company_to_spree_stock_locations.rb
 - db/seeds.rb
 - lib/friendly_id/paranoia.rb
 - lib/generators/spree/authentication/custom/custom_generator.rb
@@ -1344,9 +1345,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.0.beta2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.beta3
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta2
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta3
 post_install_message:
 rdoc_options: []
 require_paths: