raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove master variant validation conditionals

Browse Source
This commit is contained in:
Matt-Yorkley
2023-05-23 15:24:32 +01:00
parent 8247dce2dc
commit 85059bfb26
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/spree/variant.rb
View File

@@ -55,17 +55,16 @@ module Spree
validate :check_currency
validates :price, numericality: { greater_than_or_equal_to: 0 },
presence: true,
if: proc { !is_master }
presence: true
validates :unit_value, presence: true, if: ->(variant) {
%w(weight volume).include?(variant.product&.variant_unit) && !variant.is_master
%w(weight volume).include?(variant.product&.variant_unit)
}
validates :unit_value, numericality: { greater_than: 0 }, if: proc { !is_master }
validates :unit_value, numericality: { greater_than: 0 }
validates :unit_description, presence: true, if: ->(variant) {
variant.product&.variant_unit.present? && variant.unit_value.nil? && !variant.is_master
variant.product&.variant_unit.present? && variant.unit_value.nil?
}
before_validation :set_cost_currency