diff --git a/lib/ProductOpener/Display.pm b/lib/ProductOpener/Display.pm index 2a2b0f2de021d..816f679576571 100644 --- a/lib/ProductOpener/Display.pm +++ b/lib/ProductOpener/Display.pm @@ -10830,7 +10830,10 @@ sub display_nested_list_of_ingredients ($ingredients_ref, $ingredients_text_ref, ${$ingredients_list_ref} .= "
  • " . "" . $ingredient_ref->{text} . "" . " -> " . $ingredient_ref->{id}; - foreach my $property (qw(origin labels vegan vegetarian from_palm_oil percent_min percent percent_max)) { + foreach my $property ( + qw(origin labels vegan vegetarian from_palm_oil ciqual_food_code ciqual_proxy_food_code percent_min percent percent_max) + ) + { if (defined $ingredient_ref->{$property}) { ${$ingredients_list_ref} .= " - " . $property . ": " . $ingredient_ref->{$property}; } diff --git a/tests/integration/expected_test_results/api_v2_product_read/get-fields-all-knowledge-panels.json b/tests/integration/expected_test_results/api_v2_product_read/get-fields-all-knowledge-panels.json index 2a9d10b61c6b7..91bf421ff2575 100644 --- a/tests/integration/expected_test_results/api_v2_product_read/get-fields-all-knowledge-panels.json +++ b/tests/integration/expected_test_results/api_v2_product_read/get-fields-all-knowledge-panels.json @@ -1391,7 +1391,7 @@ { "element_type" : "text", "text_element" : { - "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - percent_min: 0 - percent_max: 25
    8. \n
    \n" + "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - ciqual_food_code: 13050 - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - ciqual_proxy_food_code: 19051 - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - ciqual_food_code: 22000 - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - ciqual_food_code: 16129 - percent_min: 0 - percent_max: 25
    8. \n
    \n" } }, { diff --git a/tests/integration/expected_test_results/api_v2_product_read/get-fields-attribute-groups-all-knowledge-panels.json b/tests/integration/expected_test_results/api_v2_product_read/get-fields-attribute-groups-all-knowledge-panels.json index 11f292e163cec..7f7a13f763f64 100644 --- a/tests/integration/expected_test_results/api_v2_product_read/get-fields-attribute-groups-all-knowledge-panels.json +++ b/tests/integration/expected_test_results/api_v2_product_read/get-fields-attribute-groups-all-knowledge-panels.json @@ -2039,7 +2039,7 @@ { "element_type" : "text", "text_element" : { - "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - percent_min: 0 - percent_max: 25
    8. \n
    \n" + "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - ciqual_food_code: 13050 - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - ciqual_proxy_food_code: 19051 - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - ciqual_food_code: 22000 - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - ciqual_food_code: 16129 - percent_min: 0 - percent_max: 25
    8. \n
    \n" } }, { diff --git a/tests/integration/expected_test_results/api_v2_product_read/get-knowledge-panels-fr.json b/tests/integration/expected_test_results/api_v2_product_read/get-knowledge-panels-fr.json index 842247d35fd80..965a9fb3ab45c 100644 --- a/tests/integration/expected_test_results/api_v2_product_read/get-knowledge-panels-fr.json +++ b/tests/integration/expected_test_results/api_v2_product_read/get-knowledge-panels-fr.json @@ -705,7 +705,7 @@ { "element_type" : "text", "text_element" : { - "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - percent_min: 0 - percent_max: 25
    8. \n
    \n" + "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - ciqual_food_code: 13050 - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - ciqual_proxy_food_code: 19051 - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - ciqual_food_code: 22000 - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - ciqual_food_code: 16129 - percent_min: 0 - percent_max: 25
    8. \n
    \n" } }, { diff --git a/tests/integration/expected_test_results/api_v2_product_read/get-knowledge-panels.json b/tests/integration/expected_test_results/api_v2_product_read/get-knowledge-panels.json index 27f6b9c624434..66d0ea58d5f20 100644 --- a/tests/integration/expected_test_results/api_v2_product_read/get-knowledge-panels.json +++ b/tests/integration/expected_test_results/api_v2_product_read/get-knowledge-panels.json @@ -705,7 +705,7 @@ { "element_type" : "text", "text_element" : { - "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - percent_min: 0 - percent_max: 25
    8. \n
    \n" + "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - ciqual_food_code: 13050 - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - ciqual_proxy_food_code: 19051 - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - ciqual_food_code: 22000 - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - ciqual_food_code: 16129 - percent_min: 0 - percent_max: 25
    8. \n
    \n" } }, { diff --git a/tests/integration/expected_test_results/api_v3_product_read/get-fields-all-knowledge-panels.json b/tests/integration/expected_test_results/api_v3_product_read/get-fields-all-knowledge-panels.json index 3f653179bf306..819eaf1dde919 100644 --- a/tests/integration/expected_test_results/api_v3_product_read/get-fields-all-knowledge-panels.json +++ b/tests/integration/expected_test_results/api_v3_product_read/get-fields-all-knowledge-panels.json @@ -1393,7 +1393,7 @@ { "element_type" : "text", "text_element" : { - "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - percent_min: 0 - percent_max: 25
    8. \n
    \n" + "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - ciqual_food_code: 13050 - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - ciqual_proxy_food_code: 19051 - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - ciqual_food_code: 22000 - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - ciqual_food_code: 16129 - percent_min: 0 - percent_max: 25
    8. \n
    \n" } }, { diff --git a/tests/integration/expected_test_results/api_v3_product_read/get-fields-attribute-groups-all-knowledge-panels.json b/tests/integration/expected_test_results/api_v3_product_read/get-fields-attribute-groups-all-knowledge-panels.json index dd0dcd86578ed..c64fc37593c20 100644 --- a/tests/integration/expected_test_results/api_v3_product_read/get-fields-attribute-groups-all-knowledge-panels.json +++ b/tests/integration/expected_test_results/api_v3_product_read/get-fields-attribute-groups-all-knowledge-panels.json @@ -2041,7 +2041,7 @@ { "element_type" : "text", "text_element" : { - "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - percent_min: 0 - percent_max: 25
    8. \n
    \n" + "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - ciqual_food_code: 13050 - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - ciqual_proxy_food_code: 19051 - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - ciqual_food_code: 22000 - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - ciqual_food_code: 16129 - percent_min: 0 - percent_max: 25
    8. \n
    \n" } }, { diff --git a/tests/integration/expected_test_results/api_v3_product_read/get-knowledge-panels-fr.json b/tests/integration/expected_test_results/api_v3_product_read/get-knowledge-panels-fr.json index a4ce3f5990730..54966d8f3f6bd 100644 --- a/tests/integration/expected_test_results/api_v3_product_read/get-knowledge-panels-fr.json +++ b/tests/integration/expected_test_results/api_v3_product_read/get-knowledge-panels-fr.json @@ -706,7 +706,7 @@ { "element_type" : "text", "text_element" : { - "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - percent_min: 0 - percent_max: 25
    8. \n
    \n" + "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - ciqual_food_code: 13050 - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - ciqual_proxy_food_code: 19051 - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - ciqual_food_code: 22000 - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - ciqual_food_code: 16129 - percent_min: 0 - percent_max: 25
    8. \n
    \n" } }, { diff --git a/tests/integration/expected_test_results/api_v3_product_read/get-knowledge-panels.json b/tests/integration/expected_test_results/api_v3_product_read/get-knowledge-panels.json index dbb9c2b70d976..e0777e948f0e8 100644 --- a/tests/integration/expected_test_results/api_v3_product_read/get-knowledge-panels.json +++ b/tests/integration/expected_test_results/api_v3_product_read/get-knowledge-panels.json @@ -706,7 +706,7 @@ { "element_type" : "text", "text_element" : { - "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - percent_min: 0 - percent_max: 25
    8. \n
    \n" + "html" : "
      \n
    1. apple -> en:apple - vegan: yes - vegetarian: yes - ciqual_food_code: 13050 - percent_min: 25 - percent_max: 100
    2. \n
    3. milk -> en:milk - vegan: no - vegetarian: yes - ciqual_proxy_food_code: 19051 - percent_min: 0 - percent_max: 50
    4. \n
    5. eggs -> en:egg - vegan: no - vegetarian: yes - ciqual_food_code: 22000 - percent_min: 0 - percent_max: 33.3333333333333
    6. \n
    7. palm oil -> en:palm-oil - vegan: yes - vegetarian: yes - from_palm_oil: yes - ciqual_food_code: 16129 - percent_min: 0 - percent_max: 25
    8. \n
    \n" } }, { diff --git a/tests/integration/expected_test_results/data_quality_knowledge_panel/data-quality.json b/tests/integration/expected_test_results/data_quality_knowledge_panel/data-quality.json index 321e0f3d81437..156ec02bc6052 100644 --- a/tests/integration/expected_test_results/data_quality_knowledge_panel/data-quality.json +++ b/tests/integration/expected_test_results/data_quality_knowledge_panel/data-quality.json @@ -376,7 +376,7 @@ { "element_type" : "text", "text_element" : { - "html" : "
      \n
    1. water -> en:water - vegan: yes - vegetarian: yes - percent_min: 50 - percent_max: 100
    2. \n
    3. test_ingredient -> en:test-ingredient - percent_min: 0 - percent_max: 50
    4. \n
    \n" + "html" : "
      \n
    1. water -> en:water - vegan: yes - vegetarian: yes - ciqual_food_code: 18066 - percent_min: 50 - percent_max: 100
    2. \n
    3. test_ingredient -> en:test-ingredient - percent_min: 0 - percent_max: 50
    4. \n
    \n" } }, { diff --git a/tests/integration/expected_test_results/data_quality_knowledge_panel/no-data-quality.json b/tests/integration/expected_test_results/data_quality_knowledge_panel/no-data-quality.json index 7a10651184cfe..d13f4dd71cccb 100644 --- a/tests/integration/expected_test_results/data_quality_knowledge_panel/no-data-quality.json +++ b/tests/integration/expected_test_results/data_quality_knowledge_panel/no-data-quality.json @@ -338,7 +338,7 @@ { "element_type" : "text", "text_element" : { - "html" : "
      \n
    1. water -> en:water - vegan: yes - vegetarian: yes - percent_min: 50 - percent_max: 100
    2. \n
    3. test_ingredient -> en:test-ingredient - percent_min: 0 - percent_max: 50
    4. \n
    \n" + "html" : "
      \n
    1. water -> en:water - vegan: yes - vegetarian: yes - ciqual_food_code: 18066 - percent_min: 50 - percent_max: 100
    2. \n
    3. test_ingredient -> en:test-ingredient - percent_min: 0 - percent_max: 50
    4. \n
    \n" } }, {