fix: small changes in product files sent by Carrefour (#7376)

* new import test files from carrefour
* carrefour now sends UTF-16 files
* support filenames with valnut in addition to valNut

lib/ProductOpener/ImportConvertCarrefourFrance.pm

@@ -266,7 +266,7 @@ sub convert_carrefour_france_files($file_handle, $files_ref) {
         }
 
 
-        elsif ($file =~ /_valNut/) {
+        elsif ($file =~ /_valNut/i) {
             # Nutrition facts
 
             my @xml_rules = (

tests/unit/expected_test_results/import_convert_carrefour_france/3184830063651.json

@@ -0,0 +1,88 @@
+{
+   "allergens" : "Œufs, Gluten",
+   "brands" : "Carrefour",
+   "carbohydrates_unit" : "g",
+   "carbohydrates_value" : "68",
+   "categories" : "",
+   "code" : "3184830063651",
+   "conservation_conditions_en" : "",
+   "conservation_conditions_es" : "",
+   "conservation_conditions_fr" : "Avant ouverture : à conserver à l'abri de la chaleur et de l'humidité. \nAprès ouverture : fermer dans un sac ou une boîte plastique hermétique. Conserver à température ambiante à l'abri de la chaleur et de l'humidité et consommer dans le mois qui suit.",
+   "conservation_conditions_it" : "",
+   "conservation_conditions_nl" : "",
+   "conservation_conditions_pl" : "",
+   "conservation_conditions_ro" : "",
+   "countries" : "France",
+   "customer_service_en" : "",
+   "customer_service_es" : "",
+   "customer_service_fr" : "Interdis - TSA 91431 - 91343 MASSY Cedex - France",
+   "customer_service_it" : "",
+   "customer_service_nl" : "",
+   "customer_service_pl" : "",
+   "customer_service_ro" : "",
+   "data_sources" : "",
+   "emb_codes" : "EMB 01072D",
+   "energy-kcal_unit" : "kcal",
+   "energy-kcal_value" : "349",
+   "energy-kj_unit" : "kJ",
+   "energy-kj_value" : "1476",
+   "energy_unit" : "kJ",
+   "energy_value" : "1476",
+   "fat_unit" : "g",
+   "fat_value" : "4.3",
+   "fiber_unit" : "g",
+   "fiber_value" : "1.6",
+   "generic_name_en" : "",
+   "generic_name_es" : "",
+   "generic_name_fr" : "Assemblage de biscuits cuillers aux oeufs pour charlotte",
+   "generic_name_it" : "",
+   "generic_name_nl" : "",
+   "generic_name_pl" : "",
+   "generic_name_ro" : "",
+   "ingredients_text_en" : "",
+   "ingredients_text_es" : "",
+   "ingredients_text_fr" : "Sucre, farine de _blé_, _œufs_ frais 37%, stabilisant : glycérol, jaune d'_œufs_ frais 1%, sirop de sucre inverti, sel, arôme, conservateur : propionate de calcium, acidifiant : tartrates de potassium, blanc d'_œufs_ en poudre, agent moussant : citrate de triéthyle, épaississant : gomme xanthane. \nPeut contenir des traces de lait",
+   "ingredients_text_it" : "",
+   "ingredients_text_nl" : "",
+   "ingredients_text_pl" : "",
+   "ingredients_text_ro" : "",
+   "labels" : "",
+   "lc" : "fr",
+   "nutrition_data_per" : "100g",
+   "nutrition_data_prepared_per" : "100g",
+   "obsolete" : "0",
+   "preparation_en" : "",
+   "preparation_es" : "",
+   "preparation_fr" : "",
+   "preparation_it" : "",
+   "preparation_nl" : "",
+   "preparation_pl" : "",
+   "preparation_ro" : "",
+   "producer_fr" : "Fabriqué en France par EMB 01072D pour Interdis",
+   "producer_nl" : "",
+   "producer_product_id" : "1459",
+   "product_name_en" : "",
+   "product_name_es" : "",
+   "product_name_fr" : "3 kits charlotte ronds",
+   "product_name_it" : "",
+   "product_name_nl" : "",
+   "product_name_pl" : "",
+   "product_name_ro" : "",
+   "proteins_unit" : "g",
+   "proteins_value" : "8.3",
+   "quantity" : "840 g (3 x 280 g)",
+   "salt_unit" : "g",
+   "salt_value" : "0.6",
+   "saturated-fat_unit" : "g",
+   "saturated-fat_value" : "1.7",
+   "sodium_unit" : "g",
+   "sodium_value" : "0.24",
+   "stores" : "Carrefour",
+   "sugars_unit" : "g",
+   "sugars_value" : "42",
+   "traces" : "Lait",
+   "warning_es" : "",
+   "warning_fr" : "",
+   "warning_it" : "",
+   "warning_nl" : ""
+}

tests/unit/expected_test_results/import_convert_carrefour_france/3560071083557.json

@@ -0,0 +1,88 @@
+{
+   "allergens" : "",
+   "brands" : "Carrefour",
+   "carbohydrates_unit" : "",
+   "carbohydrates_value" : "",
+   "categories" : "Aliments et boissons à base de végétaux, Aliments d'origine végétale, Fruits à coques et dérivés, Fruits à coques, Pistaches",
+   "code" : "3560071083557",
+   "conservation_conditions_en" : "",
+   "conservation_conditions_es" : "",
+   "conservation_conditions_fr" : "",
+   "conservation_conditions_it" : "",
+   "conservation_conditions_nl" : "",
+   "conservation_conditions_pl" : "",
+   "conservation_conditions_ro" : "",
+   "countries" : "France",
+   "customer_service_en" : "",
+   "customer_service_es" : "",
+   "customer_service_fr" : "",
+   "customer_service_it" : "",
+   "customer_service_nl" : "",
+   "customer_service_pl" : "",
+   "customer_service_ro" : "",
+   "data_sources" : "",
+   "emb_codes" : "",
+   "energy-kcal_unit" : "",
+   "energy-kcal_value" : "",
+   "energy-kj_unit" : "",
+   "energy-kj_value" : "",
+   "energy_unit" : "",
+   "energy_value" : "",
+   "fat_unit" : "",
+   "fat_value" : "",
+   "fiber_unit" : "",
+   "fiber_value" : "",
+   "generic_name_en" : "",
+   "generic_name_es" : "",
+   "generic_name_fr" : "",
+   "generic_name_it" : "",
+   "generic_name_nl" : "",
+   "generic_name_pl" : "",
+   "generic_name_ro" : "",
+   "ingredients_text_en" : "",
+   "ingredients_text_es" : "",
+   "ingredients_text_fr" : "",
+   "ingredients_text_it" : "",
+   "ingredients_text_nl" : "",
+   "ingredients_text_pl" : "",
+   "ingredients_text_ro" : "",
+   "labels" : "Peu ou pas de sel, Peu de sel",
+   "lc" : "fr",
+   "nutrition_data_per" : "100g",
+   "nutrition_data_prepared_per" : "100g",
+   "obsolete" : "0",
+   "preparation_en" : "",
+   "preparation_es" : "",
+   "preparation_fr" : "",
+   "preparation_it" : "",
+   "preparation_nl" : "",
+   "preparation_pl" : "",
+   "preparation_ro" : "",
+   "producer_fr" : "",
+   "producer_nl" : "",
+   "producer_product_id" : "1485",
+   "product_name_en" : "",
+   "product_name_es" : "",
+   "product_name_fr" : "Pistaches",
+   "product_name_it" : "",
+   "product_name_nl" : "",
+   "product_name_pl" : "",
+   "product_name_ro" : "",
+   "proteins_unit" : "",
+   "proteins_value" : "",
+   "quantity" : "",
+   "salt_unit" : "",
+   "salt_value" : "",
+   "saturated-fat_unit" : "",
+   "saturated-fat_value" : "",
+   "sodium_unit" : "",
+   "sodium_value" : "",
+   "stores" : "Carrefour",
+   "sugars_unit" : "",
+   "sugars_value" : "",
+   "traces" : "",
+   "warning_es" : "",
+   "warning_fr" : "",
+   "warning_it" : "",
+   "warning_nl" : ""
+}

tests/unit/expected_test_results/import_convert_carrefour_france/3560071083564.json

@@ -0,0 +1,88 @@
+{
+   "allergens" : "Œufs, Gluten, Lait, Avoine",
+   "brands" : "Carrefour",
+   "carbohydrates_unit" : "g",
+   "carbohydrates_value" : "59",
+   "categories" : "",
+   "code" : "3560071083564",
+   "conservation_conditions_en" : "",
+   "conservation_conditions_es" : "",
+   "conservation_conditions_fr" : "A conserver à l'abri de la chaleur et de l'humidité.\nA consommer de préférence avant le : voir dessus du paquet.",
+   "conservation_conditions_it" : "",
+   "conservation_conditions_nl" : "",
+   "conservation_conditions_pl" : "",
+   "conservation_conditions_ro" : "",
+   "countries" : "France",
+   "customer_service_en" : "",
+   "customer_service_es" : "",
+   "customer_service_fr" : "Interdis - TSA 91431 - 91343 MASSY Cedex - France",
+   "customer_service_it" : "",
+   "customer_service_nl" : "",
+   "customer_service_pl" : "",
+   "customer_service_ro" : "",
+   "data_sources" : "",
+   "emb_codes" : "",
+   "energy-kcal_unit" : "kcal",
+   "energy-kcal_value" : "498",
+   "energy-kj_unit" : "kJ",
+   "energy-kj_value" : "2083",
+   "energy_unit" : "kJ",
+   "energy_value" : "2083",
+   "fat_unit" : "g",
+   "fat_value" : "26",
+   "fiber_unit" : "g",
+   "fiber_value" : "3.4",
+   "generic_name_en" : "",
+   "generic_name_es" : "",
+   "generic_name_fr" : "Biscuits aux deux chocolats.",
+   "generic_name_it" : "",
+   "generic_name_nl" : "",
+   "generic_name_pl" : "",
+   "generic_name_ro" : "",
+   "ingredients_text_en" : "",
+   "ingredients_text_es" : "",
+   "ingredients_text_fr" : "Farine de _blé_, chocolat au lait 18,7% [sucre, poudre de _lait_ entier, beurre de cacao, pâte de cacao, sirop de glucose, poudre de _lait_ écrémé, émulsifiant: lécithines (tournesol), arôme naturel], chocolat noir 18,5 % [pâte de cacao, sucre, sirop de glucose, émulsifiant: lécithines (tournesol)], sucre, préparation au caramel (sirop de glucose, sucre, graisse de palme, poudre de _lait_ entier, blanc d'_œufs_en poudre, arôme naturel, colorant: caramel ordinaire), graisse de palme, _beurre_, farine d'_avoine_, huile de tournesol, _œufs_ entier en poudre, sirop de glucose-fructose, poudre à lever: carbonates de sodium et diphosphates, sel, arôme naturel, colorant: caramel ordinaire. \nPeut contenir des traces de fruits à coque.",
+   "ingredients_text_it" : "",
+   "ingredients_text_nl" : "",
+   "ingredients_text_pl" : "",
+   "ingredients_text_ro" : "",
+   "labels" : "",
+   "lc" : "fr",
+   "nutrition_data_per" : "100g",
+   "nutrition_data_prepared_per" : "100g",
+   "obsolete" : "0",
+   "preparation_en" : "",
+   "preparation_es" : "",
+   "preparation_fr" : "",
+   "preparation_it" : "",
+   "preparation_nl" : "",
+   "preparation_pl" : "",
+   "preparation_ro" : "",
+   "producer_fr" : "Fabriqué au Pays-Bas par Banketbakkerij Merba B.V. pour Interdis.",
+   "producer_nl" : "",
+   "producer_product_id" : "1486",
+   "product_name_en" : "",
+   "product_name_es" : "",
+   "product_name_fr" : "Cookies 2 Chocolats",
+   "product_name_it" : "",
+   "product_name_nl" : "",
+   "product_name_pl" : "",
+   "product_name_ro" : "",
+   "proteins_unit" : "g",
+   "proteins_value" : "6.2",
+   "quantity" : "200 g",
+   "salt_unit" : "g",
+   "salt_value" : "0.59",
+   "saturated-fat_unit" : "g",
+   "saturated-fat_value" : "14",
+   "sodium_unit" : "g",
+   "sodium_value" : "0.236",
+   "stores" : "Carrefour",
+   "sugars_unit" : "g",
+   "sugars_value" : "38",
+   "traces" : "Fruits à coque",
+   "warning_es" : "",
+   "warning_fr" : "",
+   "warning_it" : "",
+   "warning_nl" : ""
+}