From 42455b7d661947f1e247cb69fbaf5628a2534c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 14 Mar 2016 14:58:35 +0100 Subject: [PATCH] improve address rendering macro --- Resources/views/Address/macro.html.twig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/views/Address/macro.html.twig b/Resources/views/Address/macro.html.twig index 3471f0152..a526070b1 100644 --- a/Resources/views/Address/macro.html.twig +++ b/Resources/views/Address/macro.html.twig @@ -1,7 +1,10 @@ -{%- macro _render(address) -%} +{%- macro _render(address, options) -%} + {% set options = { 'with_valid_from' : true }|merge(options|default({})) %} {% if address.streetAddress1 is not empty %}{{ address.streetAddress1 }}
{% endif %} {% if address.streetAddress2 is not empty %}{{ address.streetAddress2 }}
{% endif %} {{ address.postCode.code }} {{ address.postCode.name }}
{{ address.postCode.country.name|localize_translatable_string }}
+ {%- if options['with_valid_from'] == true -%} {{ 'Since %date%'|trans( { '%date%' : address.validFrom|localizeddate('long', 'none') } ) }} + {%- endif -%} {%- endmacro -%}