Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Ability to set nullable integer/decimal preferences

Damian Legawiec4c12d15037fb
diff --git a/core/lib/spree/core/preferences/preferable.rb b/core/lib/spree/core/preferences/preferable.rb
index 95a9e1c377..c96578a536 100644
--- a/core/lib/spree/core/preferences/preferable.rb
+++ b/core/lib/spree/core/preferences/preferable.rb
@@ -131,7 +131,9 @@ module Spree::Preferences::Preferable
decimal_value ||= 0 unless nullable
decimal_value.present? ? decimal_value.to_s.to_d : decimal_value
when :integer
- value.to_i
+ int_value = value.presence
+ int_value ||= 0 unless nullable
+ int_value.present? ? int_value.to_i : int_value
when :boolean
if value.is_a?(FalseClass) ||
value.nil? ||
diff --git a/core/spec/models/spree/preferences/preferable_spec.rb b/core/spec/models/spree/preferences/preferable_spec.rb
index 6d2a3e4d9f..ea0e39c91a 100644
--- a/core/spec/models/spree/preferences/preferable_spec.rb
+++ b/core/spec/models/spree/preferences/preferable_spec.rb
@@ -135,6 +135,32 @@ describe Spree::Preferences::Preferable, type: :model do
end
end
+ context 'converts nullable integer preferences' do
+ before do
+ A.preference :nullable_integer, :integer, nullable: true
+ end
+
+ it 'stores nil when set to empty string' do
+ @a.set_preference(:nullable_integer, '')
+ expect(@a.preferences[:nullable_integer]).to be_nil
+ end
+
+ it 'stores nil when set to nil' do
+ @a.set_preference(:nullable_integer, nil)
+ expect(@a.preferences[:nullable_integer]).to be_nil
+ end
+
+ it 'converts string to integer when present' do
+ @a.set_preference(:nullable_integer, '42')
+ expect(@a.preferences[:nullable_integer]).to eq(42)
+ end
+
+ it 'preserves integer values' do
+ @a.set_preference(:nullable_integer, 100)
+ expect(@a.preferences[:nullable_integer]).to eq(100)
+ end
+ end
+
context 'converts decimal preferences to BigDecimal values' do
before do
A.preference :if_decimal, :decimal
@@ -154,6 +180,33 @@ describe Spree::Preferences::Preferable, type: :model do
end
end
+ context 'converts nullable decimal preferences' do
+ before do
+ A.preference :nullable_decimal, :decimal, nullable: true
+ end
+
+ it 'stores nil when set to empty string' do
+ @a.set_preference(:nullable_decimal, '')
+ expect(@a.preferences[:nullable_decimal]).to be_nil
+ end
+
+ it 'stores nil when set to nil' do
+ @a.set_preference(:nullable_decimal, nil)
+ expect(@a.preferences[:nullable_decimal]).to be_nil
+ end
+
+ it 'converts string to BigDecimal when present' do
+ @a.set_preference(:nullable_decimal, '3.14')
+ expect(@a.preferences[:nullable_decimal]).to eq(BigDecimal('3.14'))
+ expect(@a.preferences[:nullable_decimal].class).to eq(BigDecimal)
+ end
+
+ it 'preserves decimal values' do
+ @a.set_preference(:nullable_decimal, 9.99)
+ expect(@a.preferences[:nullable_decimal]).to eq(BigDecimal('9.99'))
+ end
+ end
+
context 'converts boolean preferences to boolean values' do
before do
A.preference :is_boolean, :boolean, default: true