diff --git a/lib/ProductOpener/KnowledgePanels.pm b/lib/ProductOpener/KnowledgePanels.pm index 75a6549af04d2..8b827b62f2bda 100644 --- a/lib/ProductOpener/KnowledgePanels.pm +++ b/lib/ProductOpener/KnowledgePanels.pm @@ -698,7 +698,8 @@ sub create_environment_card_panel ($product_ref, $target_lc, $target_cc, $option $panel_data_ref, $product_ref, $target_lc, $target_cc, $options_ref); # Create the environment_card panel - create_panel_from_json_template("environment_card", "api/knowledge-panels/environment/environment_card.tt.json", + $panel_data_ref->{packaging_image} = data_to_display_image($product_ref, "packaging", $target_lc), + create_panel_from_json_template("environment_card", "api/knowledge-panels/environment/environment_card.tt.json", $panel_data_ref, $product_ref, $target_lc, $target_cc, $options_ref); return; } diff --git a/templates/api/knowledge-panels/environment/environment_card.tt.json b/templates/api/knowledge-panels/environment/environment_card.tt.json index a2ec4e882abea..29a5406b34a54 100644 --- a/templates/api/knowledge-panels/environment/environment_card.tt.json +++ b/templates/api/knowledge-panels/environment/environment_card.tt.json @@ -30,7 +30,7 @@ "panel_ids": ["carbon_footprint"], }, }, - [% END %] + [% END %] [% IF panels.packaging_recycling.defined %] { "element_type": "panel_group", @@ -40,6 +40,9 @@ "panel_ids": [ "packaging_recycling" ], + [% IF panel.packaging_image.defined %] + "image": [% encode_json(panel.packaging_image) %], + [% END %] }, }, [% END %] diff --git a/templates/api/knowledge-panels/environment/packaging_recycling.tt.json b/templates/api/knowledge-panels/environment/packaging_recycling.tt.json index 53ae9541b26a8..0c29179bc7d02 100644 --- a/templates/api/knowledge-panels/environment/packaging_recycling.tt.json +++ b/templates/api/knowledge-panels/environment/packaging_recycling.tt.json @@ -92,7 +92,7 @@ [% IF packaging.quantity_per_unit %][% packaging.quantity_per_unit %] [% END %] [% IF packaging.material %] - ([% display_taxonomy_tag_name('packaging_materials',packaging.material) %][% IF packaging.weight_per_unit %] [% packaging.weight_per_unit %] g[% END %]) + ([% display_taxonomy_tag_name('packaging_materials',packaging.material) %][% IF packaging.weight_measured %][% sep %]: [% packaging.weight_measured %] g[% END %]) [% END %]
[% END %] diff --git a/templates/web/panels/image.tt.html b/templates/web/panels/image.tt.html index 40117585bd649..9c1038aa1f33b 100644 --- a/templates/web/panels/image.tt.html +++ b/templates/web/panels/image.tt.html @@ -4,7 +4,9 @@
- [% image.alt %] + + [% image.alt %] +