Adds more flexibility for Product validation

core/app/models/spree/product.rb

@@ -102,8 +102,9 @@ class Product < Spree::Base
       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 @@ def reset_memoized_data
         instance_variable_set(:"@#{v}", nil)
       end
     end
+
+    def requires_price?
+      Spree::Config[:require_master_price]
+    end
+
+    def requires_shipping_category?
+      true
+    end
   end
 end

core/spec/models/spree/product_spec.rb

@@ -744,4 +744,10 @@ def build_option_type_with_values(name, values)
       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