Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Make storefront_access preference nullable to inherit store default (#14360)
Damian Legawiec1af6901dbe69
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/channels_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/channels_controller_spec.rbindex d738598c89..c6ca0beca6 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/channels_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/channels_controller_spec.rb@@ -271,7 +271,7 @@ RSpec.describe Spree::Api::V3::Admin::ChannelsController, type: :controller doexpect(response).to have_http_status(:ok)channel.reload- expect(channel.preferred_storefront_access).to be_blank+ expect(channel.preferred_storefront_access).to be_nilexpect(channel.preferred_guest_checkout).to be_nilenddiff --git a/spree/core/app/models/concerns/spree/stores/setup.rb b/spree/core/app/models/concerns/spree/stores/setup.rbindex 649b2790a2..6dc2dd03f2 100644--- a/spree/core/app/models/concerns/spree/stores/setup.rb+++ b/spree/core/app/models/concerns/spree/stores/setup.rb@@ -55,6 +55,8 @@ module Spree# Payments count as set up only once customers can actually pay at# storefront checkout: admin-only (back_end) methods and store credit# don't complete the task.+ #+ # @return [Boolean]def payment_method_setup?payment_methods.active.storefront_visible.where.not(type: Spree::PaymentMethod::StoreCredit.to_s).any?enddiff --git a/spree/core/app/models/spree/channel/gating.rb b/spree/core/app/models/spree/channel/gating.rbindex 4219e97dd4..31982b89eb 100644--- a/spree/core/app/models/spree/channel/gating.rb+++ b/spree/core/app/models/spree/channel/gating.rb@@ -14,10 +14,10 @@ module SpreeSTOREFRONT_ACCESS = %w[public prices_hidden login_required].freezeincluded do- # Empty -> falls back to the Store-level preference. `guest_checkout` is- # `nullable` so a blank write stays nil (inherit) rather than coercing to- # false, while an explicit true/false remains a channel override.- preference :storefront_access, :string, default: nil+ # Empty -> falls back to the Store-level preference. Both are `nullable`+ # so a blank write stays nil (inherit) rather than coercing to "" or+ # false, while an explicit value remains a channel override.+ preference :storefront_access, :string, default: nil, nullable: truepreference :guest_checkout, :boolean, default: nil, nullable: truevalidate :storefront_access_must_be_validdiff --git a/spree/core/lib/spree/core/preferences/preferable.rb b/spree/core/lib/spree/core/preferences/preferable.rbindex fcdf1278ab..461b7972a7 100644--- a/spree/core/lib/spree/core/preferences/preferable.rb+++ b/spree/core/lib/spree/core/preferences/preferable.rb@@ -123,7 +123,13 @@ module Spree::Preferences::Preferabledef convert_preference_value(value, type, nullable: false)case typewhen :string, :text- value.to_s+ # A nullable string keeps "unset" (nil / empty string) as nil so it can+ # fall back to another value, instead of collapsing it to "".+ if nullable && (value.nil? || (value.respond_to?(:empty?) && value.empty?))+ nil+ else+ value.to_s+ endwhen :passwordvalue.to_swhen :decimaldiff --git a/spree/core/spec/models/spree/channel/gating_spec.rb b/spree/core/spec/models/spree/channel/gating_spec.rbindex 09e37033de..dd9bf5f79f 100644--- a/spree/core/spec/models/spree/channel/gating_spec.rb+++ b/spree/core/spec/models/spree/channel/gating_spec.rb@@ -24,6 +24,19 @@ RSpec.describe Spree::Channel::Gating, type: :model dochannel.update!(preferred_storefront_access: 'public')expect(channel.resolved_storefront_access).to eq('public')end++ it 'clears the override (restores inheritance) when written blank' do+ store.update!(preferred_storefront_access: 'login_required')+ channel.update!(preferred_storefront_access: 'public')+ expect(channel.resolved_storefront_access).to eq('public')++ # A plain string preference would coerce this to "", which is not a+ # valid posture; the override must instead stay nil so the store value+ # applies again.+ channel.update!(preferred_storefront_access: '')+ expect(channel.preferred_storefront_access).to be_nil+ expect(channel.resolved_storefront_access).to eq('login_required')+ endenddescribe '#resolved_guest_checkout' do