Merge branch 'develop'

ShopBundle/Controller/CitiesController.php

 
                         $return[] = [
                                 'label' => '<span class="city">'.$city->nom.'</span> <span class="zip">'.$codesPostaux[0].'</span>',
+                                'city' => $city->nom,
                                 'value' => $city->code
                         ] ;
                 }

ShopBundle/Resources/translations/lcshop.fr.yaml

         account: Mon compte
         logout: Me déconnecter
         address: Adresse utilisateur
+        switch: Prendre la main
     order:
         addOrderProduct: Ajouter un produit
         addReductionCart: Ajouter une réduction

ShopBundle/Resources/views/backend/user/block/user-switch.html.twig

+
+{% if is_granted('ROLE_SUPER_ADMIN') %}
+{% if is_dropdown %}
+    <a class="btn dropdown-item {{ action.css_class|default('btn-default') }}" href="{{ merchantUtils.merchantCurrent.getMerchantConfig('url') }}?_switch_user={{ item.username }}" target="_blank">
+        {%- if action.icon %}<i class="fa fa-fw fa-{{ action.icon }}"></i> {% endif -%}
+        {{ action.label|trans(arguments = trans_parameters|merge({ '%entity_id%': item_id }), domain = translation_domain) }}
+    </a>
+{% else %}
+    <a class="btn {{ action.css_class|default('btn-default') }}" data-toggle="tooltip"
+       title="{{ action.label|trans(arguments = trans_parameters|merge({ '%entity_id%': item_id }), domain = translation_domain) }}"
+       href="{{ merchant.getMerchantConfig('url') }}?_switch_user={{ val }}" target="_blank">
+        {%- if action.icon %}<i class="fa fa-fw fa-{{ action.icon }}"></i> {% endif -%}
+    </a>
+{% endif %}
+{% endif %}