From 7b8ccccdc35bdb9e2c2c22694d5e374e92056926 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Thu, 2 Mar 2023 17:15:57 +0100 Subject: [PATCH] `display_name` can actually be `null` or `empty`: consider them as equal --- app/models/product_import/entry_validator.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/product_import/entry_validator.rb b/app/models/product_import/entry_validator.rb index 06c1311d3a..5ae5c61b30 100644 --- a/app/models/product_import/entry_validator.rb +++ b/app/models/product_import/entry_validator.rb @@ -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