diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig index 4102f8a21..71755cc11 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig @@ -49,7 +49,10 @@ {{ 'Merge'|trans }} + class="btn btn-misc"> + + {{ 'Merge'|trans }} + {% endblock %} {% block content_view_actions_edit_link %} diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig index 4c56dfa54..0883f0a91 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig +++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig @@ -161,7 +161,13 @@ - {% else %} + {% elseif is_granted('CHILL_3PARTY_3PARTY_UPDATE', thirdparty) %} +
  • + +
  • {% endif %} {% if options['customButtons']['after'] is defined %} diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig index 4e7fd159d..9496f3c2c 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig +++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig @@ -116,7 +116,7 @@
    {% for tp in thirdParty.activeChildren %}
    - {{ tp|chill_entity_render_box({'render': 'bloc', 'addLink': false, 'isConfidential': tp.contactDataAnonymous ? true : false }) }} + {{ tp|chill_entity_render_box({'render': 'bloc', 'addLink': false, 'isConfidential': tp.contactDataAnonymous ? true : false, 'showFusion': true }) }}
    {% endfor %}
    diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyDuplicate/_details.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyDuplicate/_details.html.twig index ae751b8c9..e4b47b909 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyDuplicate/_details.html.twig +++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyDuplicate/_details.html.twig @@ -17,11 +17,18 @@ {% if thirdparty.telephone %}{{ thirdparty.telephone }}{% endif %}
  • {{ 'email'|trans }}: {% if thirdparty.email is not null %}{{ thirdparty.email }}{% endif %}
  • -
  • {{ 'address'|trans }}: +
  • {{ 'Address'|trans }}: {%- if thirdparty.getAddress is not empty -%} {{ thirdparty.getAddress|chill_entity_render_box }} {% endif %}
  • {{ 'thirdparty.Contact data are confidential'|trans }}: {{ thirdparty.contactDataAnonymous }}
  • +
  • {{ 'Contacts'|trans }}: + +
  • {% endmacro %} diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyDuplicate/confirm.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyDuplicate/confirm.html.twig index 4baa4552e..540b10ca7 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyDuplicate/confirm.html.twig +++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyDuplicate/confirm.html.twig @@ -21,7 +21,7 @@
    -

    {{ 'thirdparty_duplicate.Merge duplicate thirdparties'|trans }}

    +

    {{ 'thirdparty_duplicate.title'|trans }}

    {{ 'thirdparty_duplicate.Thirdparty to delete'|trans }}: @@ -41,9 +41,9 @@

    -
    +

    {{ 'thirdparty_duplicate.Thirdparty to keep'|trans }}: - {{ 'thirdparty_duplicate.Thirdparty to delete explanation'|trans }} + {{ 'thirdparty_duplicate.Thirdparty to keep explanation'|trans }}

    @@ -51,7 +51,7 @@ {{ thirdparty }} -

    {{ 'thirdparty_duplicate.data to keep'|trans ~ ':' }}

    +

    {{ 'thirdparty_duplicate.Data to keep'|trans ~ ':' }}

    {{ details.details(thirdparty) }} {#

    {{ 'thirdparty_duplicate.links to keep'|trans ~ ':' }}

    #} diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyDuplicate/find_duplicate.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyDuplicate/find_duplicate.html.twig index 53f7ddc5d..a5d463a39 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyDuplicate/find_duplicate.html.twig +++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyDuplicate/find_duplicate.html.twig @@ -8,7 +8,7 @@ {% block content %}
    -

    {{ 'find_thirdparty_duplicate'|trans }}

    +

    {{ 'thirdparty_duplicate.find'|trans }}

    {{ form_start(form) }} {{ form_rest(form) }} diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml index 908e045e3..b4340bde1 100644 --- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml @@ -133,4 +133,11 @@ is thirdparty: Le demandeur est un tiers Filter by person's who have a residential address located at a thirdparty of type: Filtrer les usagers qui ont une addresse de résidence chez un tiers "Filtered by person's who have a residential address located at a thirdparty of type %thirdparty_type% and valid on %date_calc%": "Uniquement les usagers qui ont une addresse de résidence chez un tiers de catégorie %thirdparty_type% et valide sur la date %date_calc%" -find_thirdparty_duplicate: 'Désigner un tiers doublon' +thirdparty_duplicate: + title: Fusionner les tiers doublons + find: Désigner un tiers doublon + Thirdparty to keep: Tiers à conserver + Thirdparty to delete: Tiers à supprimer + Thirdparty to delete explanation: Ce tiers sera supprimé. Seuls les contacts de ce tiers, énumérés ci-dessous, seront transférés. + Thirdparty to keep explanation: Ce tiers sera conserver + Data to keep: Données conservées