Merge branch 'master' into notification/completion

2025-08-20 14:43:49 +00:00 · 2022-01-10 16:11:06 +01:00
parent ae931b5869 01d51da7e1
commit 46ca74fc70
78 changed files with 1268 additions and 277 deletions
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -60,6 +60,8 @@ class Address
    /**
     * @var string|null
     *
+     * used for the CEDEX information
+     *
     * @ORM\Column(type="string", length=255, nullable=true)
     * @Groups({"write"})
     */
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
@@ -6,8 +6,9 @@
         v-model="value"
         :placeholder="$t('select_address')"
         :tag-placeholder="$t('create_address')"
-         :select-label="$t('press_enter_to_select')"
+         :select-label="$t('multiselect.select_label')"
         :deselect-label="$t('create_address')"
+         :selected-label="$t('multiselect.selected_label')"
         @search-change="listenInputSearch"
         ref="addressSelector"
         @select="selectAddress"
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
@@ -12,8 +12,9 @@
         label="value"
         :custom-label="transName"
         :placeholder="$t('select_city')"
-         :select-label="$t('press_enter_to_select')"
+         :select-label="$t('multiselect.select_label')"
         :deselect-label="$t('create_postal_code')"
+         :selected-label="$t('multiselect.selected_label')"
         :taggable="true"
         :multiple="false"
         @tag="addPostcode"
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
@@ -5,12 +5,13 @@
         id="countrySelect"
         label="name"
         track-by="id"
-         v-bind:custom-label="transName"
-         v-bind:placeholder="$t('select_country')"
-         v-bind:options="sortedCountries"
+         :custom-label="transName"
+         :placeholder="$t('select_country')"
+         :options="sortedCountries"
         v-model="value"
-         :select-label="$t('press_enter_to_select')"
-         :deselect-label="$t('press_enter_to_remove')"
+         :select-label="$t('multiselect.select_label')"
+         :deselect-label="$t('multiselect.deselect_label')"
+         :selected-label="$t('multiselect.selected_label')"
         @select="selectCountry">
      </VueMultiselect>
   </div>
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
@@ -10,7 +10,7 @@
   <h4 class="h3">{{ $t('address_suggestions') }}</h4>

   <div class="flex-table AddressSuggestionList">
-      <div v-for="a in context.suggestions" class="item-bloc">
+      <div v-for="(a, i) in context.suggestions" class="item-bloc" :key="`suggestions-${i}`">
         <div class="float-button bottom">
            <div class="box">
               <div class="action">
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -1,7 +1,7 @@
+import { multiSelectMessages } from 'ChillMainAssets/vuejs/_js/i18n'
+
 const addressMessages = {
    fr: {
-        press_enter_to_select: 'Appuyer sur Entrée pour sélectionner',
-        press_enter_to_remove: 'Appuyer sur Entrée pour désélectionner',
        add_an_address_title: 'Créer une adresse',
        edit_an_address_title: 'Modifier une adresse',
        create_a_new_address: 'Créer une nouvelle adresse',
@@ -48,6 +48,8 @@ const addressMessages = {
    }
 };

+Object.assign(addressMessages.fr, multiSelectMessages.fr);
+
 export {
    addressMessages
 };
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
@@ -2,21 +2,28 @@
   <component :is="component" class="chill-entity entity-address my-3">

      <component :is="component" class="address" :class="multiline">
-         <p v-if="address.text"
-            class="street">
-            {{ address.text }},
-         </p>
-         <p v-if="address.postcode"
-            class="postcode">
-            {{ address.postcode.code }} {{ address.postcode.name }}
-         </p>
-         <p v-if="address.country"
-            class="country">
-            {{ address.country.name.fr }}
-         </p>
+         <div v-if="isMultiline === true">
+            <p v-for="(l, i) in address.lines" :key="`line-${i}`">
+               {{ l }}
+            </p>
+         </div>
+         <div v-else>
+            <p v-if="address.text"
+               class="street">
+               {{ address.text }}
+            </p>
+            <p v-if="address.postcode"
+               class="postcode">
+               {{ address.postcode.code }} {{ address.postcode.name }}
+            </p>
+            <p v-if="address.country"
+               class="country">
+               {{ address.country.name.fr }}
+            </p>
+         </div>
      </component>

-      <div v-if="isMultiline === true" class="address-more">
+      <!-- <div v-if="isMultiline === true" class="address-more">
         <div v-if="address.floor">
            <span class="floor">
               <b>{{ $t('floor') }}</b>: {{ address.floor }}
@@ -52,7 +59,7 @@
                  <b>{{ $t('distribution') }}</b>: {{ address.distribution }}
               </span>
         </div>
-      </div>
+      </div> -->

      <div v-if="useDatePane === true" class="address-more">
         <div v-if="address.validFrom">
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -84,3 +84,17 @@ const _createI18n = (appMessages) => {
 };

 export { _createI18n }
+
+export const multiSelectMessages = {
+  fr: {
+    multiselect: {
+      placeholder: 'Choisir',
+      tag_placeholder: 'Créer un nouvel élément',
+      select_label: 'Appuyer sur "Entrée" pour sélectionner',
+      deselect_label: 'Appuyer sur "Entrée" pour désélectionner',
+      select_group_label: 'Appuyer sur "Entrée" pour sélectionner ce groupe',
+      deselect_group_label: 'Appuyer sur "Entrée" pour désélectionner ce groupe',
+      selected_label: 'Sélectionné'
+    }
+  }
+};
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -9,57 +9,23 @@
    * with_delimiter    bool    add a delimiter between fragments
    * has_no_address    bool
    * multiline         bool    multiline display
-    * extended_infos    bool    add extra informations (step, floor, etc.)
+    * extended_infos    bool    add extra informations (step, floor, etc.) DEPRECATED

 #}

-{% macro raw(address, options, streetLine) %}
-
-    {% if address.street is not empty %}
-        <p>{{ streetLine }}</p>
-    {% endif %}
-    {% if options['extended_infos'] %}
-        {{ _self.extended(address, options) }}
-    {% endif %}
-    {% if address.postCode is not empty %}
-        <p class="postcode">
-            <span class="code">{{ address.postCode.code }}</span>
-            <span class="name">{{ address.postCode.name }}</span>
-        </p>
-        <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
-    {% endif %}
+{% macro raw(lines) %}
+    {% for l in lines %}
+        <p>{{ l }}</p>
+    {% endfor %}
 {% endmacro %}

-{% macro extended(address, options) %}
-    {% if address.floor is not empty %}
-        <span class="floor">{{ 'address more.floor'|trans }} {{ address.floor }}</span>
-    {% endif %}
-    {% if address.corridor is not empty %}
-        <span class="corridor">{{ 'address more.corridor'|trans }} {{ address.corridor }}</span>
-    {% endif %}
-    {% if address.steps is not empty %}
-        <span class="steps">{{ 'address more.steps'|trans }} {{ address.steps }}</span>
-    {% endif %}
-    {% if address.buildingName is not empty %}
-        <span class="buildingName">{{ 'address more.buildingName'|trans }} {{ address.buildingName }}</span>
-    {% endif %}
-    {% if address.flat is not empty %}
-        <span class="flat">{{ 'address more.flat'|trans }} {{ address.flat }}</span>
-    {% endif %}
-    {% if address.extra is not empty %}
-        <span class="extra">{{ 'address more.extra'|trans }} {{ address.extra }}</span>
-    {% endif %}
-    {% if address.distribution is not empty %}
-        <span class="distribution">{{ 'address more.distribution'|trans }} {{ address.distribution }}</span>
-    {% endif %}
-{% endmacro %}
-
-{% macro inline(address, options, streetLine) %}
+{% macro inline(address, options, streetLine, lines) %}
    {% if options['has_no_address'] == true and address.isNoAddress == true %}
        {% if address.postCode is not empty %}
            <p class="postcode">
                <span class="code">{{ address.postCode.code }}</span>
                <span class="name">{{ address.postCode.name }}</span>
+                <span class="name">{{ address.distribution }}</span>
            </p>
            <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
        {% endif %}
@@ -68,7 +34,7 @@
        </span>
    {% else %}
        <span class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
-            {{ _self.raw(address, options, streetLine) }}
+            {{ _self.raw(lines) }}
        </span>
    {% endif %}
    {{ _self.validity(address, options) }}
@@ -97,7 +63,7 @@
        {% if options['with_picto'] %}
            <i class="fa fa-li fa-map-marker"></i>
        {% endif %}
-        {{ _self.inline(address, options, streetLine) }}
+        {{ _self.inline(address, options, streetLine, lines) }}
    </li>
 {%- endif -%}

@@ -106,7 +72,7 @@
        {% if options['with_picto'] %}
            <i class="fa fa-fw fa-map-marker"></i>
        {% endif %}
-        {{ _self.inline(address, options, streetLine) }}
+        {{ _self.inline(address, options, streetLine, lines) }}
    </span>
 {%- endif -%}

@@ -118,20 +84,21 @@
                <p class="postcode">
                    <span class="code">{{ address.postCode.code }}</span>
                    <span class="name">{{ address.postCode.name }}</span>
+                    <span class="name">{{ address.distribution }}</span>
                </p>
                <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
-            </div>    
+            </div>
            {% endif %}
            <div class="noaddress">
                {{ 'address.consider homeless'|trans }}
            </div>
-        
+
        {% else %}
            <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
                {% if options['with_picto'] %}
                    <i class="fa fa-fw fa-map-marker"></i>
                {% endif %}
-                {{ _self.raw(address, options, streetLine) }}
+                {{ _self.raw(lines) }}
            </div>
        {% endif %}
        {{ _self.validity(address, options) }}
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
@@ -13,6 +13,7 @@ namespace Chill\MainBundle\Serializer\Normalizer;

 use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
 use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Templating\Entity\AddressRender;
 use DateTimeInterface;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
@@ -46,6 +47,13 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
        'validTo' => DateTimeInterface::class,
    ];

+    private AddressRender $addressRender;
+
+    public function __construct(AddressRender $addressRender)
+    {
+        $this->addressRender = $addressRender;
+    }
+
    /**
     * @param Address $address
     * @param string|null $format
@@ -53,19 +61,9 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
    public function normalize($address, $format = null, array $context = [])
    {
        if ($address instanceof Address) {
-            $text = $address->isNoAddress() ? '' : $address->getStreet() . ', ' . $address->getStreetNumber();
-
-            if (null !== $address->getPostCode()->getCountry()->getCountryCode()) {
-                if ($address->getPostCode()->getCountry()->getCountryCode() === 'FR') {
-                    $text = $address->isNoAddress() ? '' : $address->getStreetNumber() . ', ' . $address->getStreet();
-                } else {
-                    $text = $address->isNoAddress() ? '' : $address->getStreetNumber() . ', ' . $address->getStreet();
-                }
-            }
-
            $data = [
                'address_id' => $address->getId(),
-                'text' => $text,
+                'text' => $address->isNoAddress() ? null : $this->addressRender->renderStreetLine($address, []),
                'street' => $address->getStreet(),
                'streetNumber' => $address->getStreetNumber(),
                'postcode' => [
@@ -85,6 +83,7 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
                'buildingName' => $address->getBuildingName(),
                'distribution' => $address->getDistribution(),
                'extra' => $address->getExtra(),
+                'lines' => $this->addressRender->renderLines($address),
            ];

            if ('json' === $format) {
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Serializer\Normalizer;

 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserJob;
@@ -55,16 +56,21 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
            $context,
            ['docgen:expects' => Center::class, 'groups' => 'docgen:read']
        );
+        $locationContext = array_merge(
+            $context,
+            ['docgen:expects' => Location::class, 'groups' => 'dogen:read']
+        );

        if (null === $user && 'docgen' === $format) {
            return array_merge(self::NULL_USER, [
                'user_job' => $this->normalizer->normalize(null, $format, $userJobContext),
                'main_center' => $this->normalizer->normalize(null, $format, $centerContext),
                'main_scope' => $this->normalizer->normalize(null, $format, $scopeContext),
+                'current_location' => $this->normalizer->normalize(null, $format, $locationContext),
            ]);
        }

-        return [
+        $data = [
            'type' => 'user',
            'id' => $user->getId(),
            'username' => $user->getUsername(),
@@ -75,6 +81,12 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
            'main_center' => $this->normalizer->normalize($user->getMainCenter(), $format, $centerContext),
            'main_scope' => $this->normalizer->normalize($user->getMainScope(), $format, $scopeContext),
        ];
+
+        if ('docgen' === $format) {
+            $data['current_location'] = $this->normalizer->normalize($user->getCurrentLocation(), $format, $locationContext);
+        }
+
+        return $data;
    }

    public function supportsNormalization($data, $format = null, array $context = []): bool
--- a/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Templating\Entity;

 use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Component\Templating\EngineInterface;

 use function array_merge;
@@ -26,14 +27,18 @@ class AddressRender implements ChillEntityRenderInterface
        'with_delimiter' => false,
        'has_no_address' => false,
        'multiline' => true,
+        /* deprecated */
        'extended_infos' => false,
    ];

    private EngineInterface $templating;

-    public function __construct(EngineInterface $templating)
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(EngineInterface $templating, TranslatableStringHelper $translatableStringHelper)
    {
        $this->templating = $templating;
+        $this->translatableStringHelper = $translatableStringHelper;
    }

    /**
@@ -50,43 +55,49 @@ class AddressRender implements ChillEntityRenderInterface
                'streetLine' => $this->renderStreetLine($addr),
                'render' => $options['render'] ?? 'bloc',
                'options' => $options,
+                'lines' => $this->renderLines($addr),
            ]);
    }

    /**
     * @param Address addr
     * @param mixed $addr
+     *
+     * @return string[]
     */
-    public function renderString($addr, array $options): string
+    public function renderLines($addr): array
    {
        $lines = [];

-        $lines[0] = $this->renderStreetLine($addr);
-
-        if (!empty($addr->getPostcode())) {
-            $lines[1] = strtr('{postcode} {label}', [
-                '{postcode}' => $addr->getPostcode()->getCode(),
-                '{label}' => $addr->getPostcode()->getName(),
-            ]);
+        if (null !== $addr->getPostCode()) {
+            if ($addr->getPostCode()->getCountry()->getCountryCode() === 'FR') {
+                $lines[] = $this->renderIntraBuildingLine($addr);
+                $lines[] = $this->renderBuildingLine($addr);
+                $lines[] = $this->renderStreetLine($addr);
+                $lines[] = $this->renderDeliveryLine($addr);
+                $lines[] = $this->renderCityLine($addr);
+                $lines[] = $this->renderCountryLine($addr);
+            } else {
+                $lines[] = $this->renderBuildingLine($addr);
+                $lines[] = $this->renderDeliveryLine($addr);
+                $lines[] = $this->renderStreetLine($addr);
+                $lines[] = $this->renderCityLine($addr);
+                $lines[] = $this->renderCountryLine($addr);
+            }
        }

-        return implode(' - ', $lines);
+        return array_values(array_filter($lines, static fn ($l) => null !== $l));
    }

-    public function supports($entity, array $options): bool
+    public function renderStreetLine(Address $addr): ?string
    {
-        return $entity instanceof Address;
-    }
-
-    private function renderStreetLine($addr): string
-    {
-        if (!empty($addr->getStreet())) {
+        if (null !== $addr->getStreet() && $addr->getStreet() !== '') {
            $street = $addr->getStreet();
        } else {
            $street = '';
        }

-        if (!empty($addr->getStreetNumber())) {
+        if (null !== $addr->getStreetNumber() && $addr->getStreetNumber() !== '') {
            $streetNumber = $addr->getStreetNumber();
        } else {
            $streetNumber = '';
@@ -100,8 +111,111 @@ class AddressRender implements ChillEntityRenderInterface
            }
        }

-        if (',' === $res) {
-            $res = '';
+        if ((',' === $res) || ('' === $res)) {
+            $res = null;
+        }
+
+        return $res;
+    }
+
+    /**
+     * @param Address addr
+     * @param mixed $addr
+     */
+    public function renderString($addr, array $options): string
+    {
+        return implode(' - ', $this->renderLines($addr));
+    }
+
+    public function supports($entity, array $options): bool
+    {
+        return $entity instanceof Address;
+    }
+
+    private function renderBuildingLine(Address $addr): ?string
+    {
+        if (null !== $addr->getBuildingName() && $addr->getBuildingName() !== '') {
+            $building = $addr->getBuildingName();
+        } else {
+            $building = '';
+        }
+        $intraBuilding = $this->renderIntraBuildingLine($addr);
+
+        if (null === $intraBuilding) {
+            $intraBuilding = '';
+        }
+
+        $res = trim($building . ' - ' . $intraBuilding, ' - ');
+
+        if ('' === $res) {
+            $res = null;
+        }
+
+        if (null !== $addr->getPostCode()->getCountry()->getCountryCode()) {
+            if ($addr->getPostCode()->getCountry()->getCountryCode() === 'FR') {
+                $res = $addr->getBuildingName();
+            }
+        }
+
+        return $res;
+    }
+
+    private function renderCityLine($addr): string
+    {
+        if (null !== $addr->getPostcode()) {
+            $res = strtr('{postcode} {label}', [
+                '{postcode}' => $addr->getPostcode()->getCode(),
+                '{label}' => $addr->getPostcode()->getName(),
+            ]);
+
+            if (null !== $addr->getPostCode()->getCountry()->getCountryCode()) {
+                if ($addr->getPostCode()->getCountry()->getCountryCode() === 'FR') {
+                    if ($addr->getDistribution()) {
+                        $res = $res . ' ' . $addr->getDistribution();
+                    }
+                }
+            }
+        }
+
+        return $res ?? '';
+    }
+
+    private function renderCountryLine($addr): ?string
+    {
+        return $this->translatableStringHelper->localize(
+            $addr->getPostCode()->getCountry()->getName()
+        );
+    }
+
+    private function renderDeliveryLine($addr): ?string
+    {
+        return $addr->getExtra();
+    }
+
+    private function renderIntraBuildingLine($addr): ?string
+    {
+        $arr = [];
+
+        if ($addr->getFlat()) {
+            $arr[] = 'appart ' . $addr->getFlat();
+        }
+
+        if ($addr->getFloor()) {
+            $arr[] = 'ét ' . $addr->getFloor();
+        }
+
+        if ($addr->getCorridor()) {
+            $arr[] = 'coul ' . $addr->getCorridor();
+        }
+
+        if ($addr->getSteps()) {
+            $arr[] = 'esc ' . $addr->getSteps();
+        }
+
+        $res = implode(' - ', $arr);
+
+        if ('' === $res) {
+            $res = null;
        }

        return $res;
--- a/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Templating\Entity\AddressRender;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Iterator;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Templating\EngineInterface;
@@ -30,11 +31,11 @@ final class AddressRenderTest extends KernelTestCase
        self::bootKernel();
    }

-    public function addressDataProvider(): Iterator
+    public function addressDataProviderBEWithBuilding(): Iterator
    {
        $addr = new Address();
        $country = (new Country())
-            ->setName(['fr' => 'Pays'])
+            ->setName(['fr' => 'Belgium'])
            ->setCountryCode('BE');
        $postCode = new PostalCode();
        $postCode->setName('Locality')
@@ -45,20 +46,279 @@ final class AddressRenderTest extends KernelTestCase
            ->setStreetNumber('5')
            ->setPostcode($postCode);

-        yield [$addr, 'Rue ABC, 5 - 012345 Locality'];
+        $addr->setBuildingName('Résidence "Les Bleuets"');
+
+        yield [$addr, 'Résidence "Les Bleuets" - Rue ABC, 5 - 012345 Locality - Belgium'];
+    }
+
+    public function addressDataProviderBEWithSteps(): Iterator
+    {
+        $addr = new Address();
+        $country = (new Country())
+            ->setName(['fr' => 'Belgium'])
+            ->setCountryCode('BE');
+        $postCode = new PostalCode();
+        $postCode->setName('Locality')
+            ->setCode('012345')
+            ->setCountry($country);
+
+        $addr->setStreet('Rue ABC')
+            ->setStreetNumber('5')
+            ->setPostcode($postCode);
+
+        $addr->setSteps('4');
+
+        yield [$addr, 'esc 4 - Rue ABC, 5 - 012345 Locality - Belgium'];
+    }
+
+    public function addressDataProviderFRWithBuilding(): Iterator
+    {
+        $addr = new Address();
+        $country = (new Country())
+            ->setName(['fr' => 'France'])
+            ->setCountryCode('FR');
+        $postCode = new PostalCode();
+        $postCode->setName('Locality')
+            ->setCode('012345')
+            ->setCountry($country);
+
+        $addr->setStreet('Rue ABC')
+            ->setStreetNumber('5')
+            ->setPostcode($postCode);
+
+        $addr->setBuildingName('Résidence "Les Bleuets"');
+
+        yield [$addr, 'Résidence "Les Bleuets" - 5, Rue ABC - 012345 Locality - France'];
+    }
+
+    public function addressDataProviderFRWithSteps(): Iterator
+    {
+        $addr = new Address();
+        $country = (new Country())
+            ->setName(['fr' => 'France'])
+            ->setCountryCode('FR');
+        $postCode = new PostalCode();
+        $postCode->setName('Locality')
+            ->setCode('012345')
+            ->setCountry($country);
+
+        $addr->setStreet('Rue ABC')
+            ->setStreetNumber('5')
+            ->setPostcode($postCode);
+
+        $addr->setSteps('4');
+
+        yield [$addr, 'esc 4 - 5, Rue ABC - 012345 Locality - France'];
+    }
+
+    public function complexAddressDataProviderBE(): Iterator
+    {
+        $addr = new Address();
+        $country = (new Country())
+            ->setName(['fr' => 'Belgium'])
+            ->setCountryCode('BE');
+        $postCode = new PostalCode();
+        $postCode->setName('Locality')
+            ->setCode('012345')
+            ->setCountry($country);
+
+        $addr->setStreet('Rue ABC')
+            ->setStreetNumber('5')
+            ->setPostcode($postCode);
+
+        $addr->setBuildingName('Résidence "Les Bleuets"');
+        $addr->setFlat('1');
+        $addr->setFloor('2');
+        $addr->setCorridor('3');
+        $addr->setSteps('4');
+
+        yield [$addr, 'Résidence "Les Bleuets" - appart 1 - ét 2 - coul 3 - esc 4 - Rue ABC, 5 - 012345 Locality - Belgium'];
+    }
+
+    public function complexAddressDataProviderFR(): Iterator
+    {
+        $addr = new Address();
+        $country = (new Country())
+            ->setName(['fr' => 'France'])
+            ->setCountryCode('FR');
+        $postCode = new PostalCode();
+        $postCode->setName('Locality')
+            ->setCode('012345')
+            ->setCountry($country);
+
+        $addr->setStreet('Rue ABC')
+            ->setStreetNumber('5')
+            ->setPostcode($postCode);
+
+        $addr->setBuildingName('Résidence "Les Bleuets"');
+        $addr->setFlat('1');
+        $addr->setFloor('2');
+        $addr->setCorridor('3');
+        $addr->setSteps('4');
+        $addr->setExtra('A droite de la porte');
+        $addr->setDistribution('CEDEX');
+
+        yield [$addr, 'appart 1 - ét 2 - coul 3 - esc 4 - Résidence "Les Bleuets" - 5, Rue ABC - A droite de la porte - 012345 Locality CEDEX - France'];
+    }
+
+    public function noFullAddressDataProviderBE(): Iterator
+    {
+        $addr = new Address();
+        $country = (new Country())
+            ->setName(['fr' => 'Belgium'])
+            ->setCountryCode('BE');
+        $postCode = new PostalCode();
+        $postCode->setName('Locality')
+            ->setCode('012345')
+            ->setCountry($country);
+
+        $addr->setPostcode($postCode)
+            ->setIsNoAddress(true);
+
+        yield [$addr, '012345 Locality - Belgium'];
+    }
+
+    public function simpleAddressDataProviderBE(): Iterator
+    {
+        $addr = new Address();
+        $country = (new Country())
+            ->setName(['fr' => 'Belgium'])
+            ->setCountryCode('BE');
+        $postCode = new PostalCode();
+        $postCode->setName('Locality')
+            ->setCode('012345')
+            ->setCountry($country);
+
+        $addr->setStreet('Rue ABC')
+            ->setStreetNumber('5')
+            ->setPostcode($postCode);
+
+        yield [$addr, 'Rue ABC, 5 - 012345 Locality - Belgium'];
+    }
+
+    public function simpleAddressDataProviderFR(): Iterator
+    {
+        $addr = new Address();
+        $country = (new Country())
+            ->setName(['fr' => 'France'])
+            ->setCountryCode('FR');
+        $postCode = new PostalCode();
+        $postCode->setName('Locality')
+            ->setCode('012345')
+            ->setCountry($country);
+
+        $addr->setStreet('Rue ABC')
+            ->setStreetNumber('5')
+            ->setPostcode($postCode);
+
+        yield [$addr, '5, Rue ABC - 012345 Locality - France'];
    }

    /**
-     * @dataProvider addressDataProvider
+     * @dataProvider complexAddressDataProviderBE
     */
-    public function testRenderString(Address $addr, string $expectedString): void
+    public function testRenderComplexAddressBE(Address $addr, string $expectedString): void
    {
        $engine = self::$container->get(EngineInterface::class);
-        $renderer = new AddressRender($engine);
+        $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
+        $renderer = new AddressRender($engine, $translatableStringHelper);

        $this->assertEquals($expectedString, $renderer->renderString($addr, []));
+    }

-        return;
-        $this->assertIsString($renderer->renderBox($addr, []));
+    /**
+     * @dataProvider complexAddressDataProviderFR
+     */
+    public function testRenderComplexAddressFR(Address $addr, string $expectedString): void
+    {
+        $engine = self::$container->get(EngineInterface::class);
+        $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
+        $renderer = new AddressRender($engine, $translatableStringHelper);
+
+        $this->assertEquals($expectedString, $renderer->renderString($addr, []));
+    }
+
+    /**
+     * @dataProvider noFullAddressDataProviderBE
+     */
+    public function testRenderNoFullAddressBE(Address $addr, string $expectedString): void
+    {
+        $engine = self::$container->get(EngineInterface::class);
+        $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
+        $renderer = new AddressRender($engine, $translatableStringHelper);
+
+        $this->assertEquals($expectedString, $renderer->renderString($addr, []));
+    }
+
+    /**
+     * @dataProvider simpleAddressDataProviderBE
+     */
+    public function testRenderStringSimpleAddressBE(Address $addr, string $expectedString): void
+    {
+        $engine = self::$container->get(EngineInterface::class);
+        $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
+        $renderer = new AddressRender($engine, $translatableStringHelper);
+
+        $this->assertEquals($expectedString, $renderer->renderString($addr, []));
+    }
+
+    /**
+     * @dataProvider simpleAddressDataProviderFR
+     */
+    public function testRenderStringSimpleAddressFR(Address $addr, string $expectedString): void
+    {
+        $engine = self::$container->get(EngineInterface::class);
+        $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
+        $renderer = new AddressRender($engine, $translatableStringHelper);
+
+        $this->assertEquals($expectedString, $renderer->renderString($addr, []));
+    }
+
+    /**
+     * @dataProvider addressDataProviderBEWithBuilding
+     */
+    public function testRenderWithBuildingAddressBE(Address $addr, string $expectedString): void
+    {
+        $engine = self::$container->get(EngineInterface::class);
+        $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
+        $renderer = new AddressRender($engine, $translatableStringHelper);
+
+        $this->assertEquals($expectedString, $renderer->renderString($addr, []));
+    }
+
+    /**
+     * @dataProvider addressDataProviderFRWithBuilding
+     */
+    public function testRenderWithBuildingAddressFR(Address $addr, string $expectedString): void
+    {
+        $engine = self::$container->get(EngineInterface::class);
+        $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
+        $renderer = new AddressRender($engine, $translatableStringHelper);
+
+        $this->assertEquals($expectedString, $renderer->renderString($addr, []));
+    }
+
+    /**
+     * @dataProvider addressDataProviderBEWithSteps
+     */
+    public function testRenderWithStepsAddressBE(Address $addr, string $expectedString): void
+    {
+        $engine = self::$container->get(EngineInterface::class);
+        $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
+        $renderer = new AddressRender($engine, $translatableStringHelper);
+
+        $this->assertEquals($expectedString, $renderer->renderString($addr, []));
+    }
+
+    /**
+     * @dataProvider addressDataProviderFRWithSteps
+     */
+    public function testRenderWithStepsAddressFR(Address $addr, string $expectedString): void
+    {
+        $engine = self::$container->get(EngineInterface::class);
+        $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
+        $renderer = new AddressRender($engine, $translatableStringHelper);
+
+        $this->assertEquals($expectedString, $renderer->renderString($addr, []));
    }
 }