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.

Adds more flexibility for Product validation

Damian Legawiecb73003145ce9
diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rb
index 0c820701cc..6442228221 100644
--- a/core/app/models/spree/product.rb
+++ b/core/app/models/spree/product.rb
@@ -102,8 +102,9 @@ module Spree
validates :meta_title
end
with_options presence: true do
- validates :name, :shipping_category
- validates :price, if: proc { Spree::Config[:require_master_price] }
+ validates :name
+ validates :shipping_category, if: :requires_shipping_category?
+ validates :price, if: :requires_price?
end
validates :slug, presence: true, uniqueness: { allow_blank: true, case_sensitive: false }
@@ -485,5 +486,13 @@ module Spree
instance_variable_set(:"@#{v}", nil)
end
end
+
+ def requires_price?
+ Spree::Config[:require_master_price]
+ end
+
+ def requires_shipping_category?
+ true
+ end
end
end
diff --git a/core/spec/models/spree/product_spec.rb b/core/spec/models/spree/product_spec.rb
index c50e8fbf45..56b1032589 100644
--- a/core/spec/models/spree/product_spec.rb
+++ b/core/spec/models/spree/product_spec.rb
@@ -744,4 +744,10 @@ describe '#default_variant_cache_key' do
expect(key).to eq("spree/default-variant/#{product.cache_key_with_version}/false")
end
end
+
+ describe '#requires_shipping_category?' do
+ let(:product) { build(:product, shipping_category: nil) }
+
+ it { expect(product.save).to eq(false) }
+ end
end