raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-26 01:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

display_name can actually be null or empty: consider them as equal

Browse Source
This commit is contained in:
Jean-Baptiste Bellet
2023-03-02 17:15:57 +01:00
parent f88689e45f
commit 7b8ccccdc3
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/product_import/entry_validator.rb
View File

@@ -271,10 +271,16 @@ module ProductImport
end
def entry_matches_existing_variant?(entry, existing_variant)
existing_variant.display_name == entry.display_name &&
display_name_are_the_same?(entry, existing_variant) &&
existing_variant.unit_value == entry.unit_value.to_f
end
def display_name_are_the_same?(entry, existing_variant)
return true if entry.display_name.blank? && existing_variant.display_name.blank?
existing_variant.display_name == entry.display_name
end
def category_validation(entry)
category_name = entry.category