Browse Source

Merge branch 'develop'

master
Guillaume 4 years ago
parent
commit
1b9ba1c5e9
2 changed files with 16 additions and 0 deletions
  1. +1
    -0
      ShopBundle/Resources/translations/lcshop.fr.yaml
  2. +15
    -0
      ShopBundle/Resources/views/backend/user/block/user-switch.html.twig

+ 1
- 0
ShopBundle/Resources/translations/lcshop.fr.yaml View File

@@ -474,6 +474,7 @@ action:
account: Mon compte
logout: Me déconnecter
address: Adresse utilisateur
switch: Prendre la main
order:
addOrderProduct: Ajouter un produit
addReductionCart: Ajouter une réduction

+ 15
- 0
ShopBundle/Resources/views/backend/user/block/user-switch.html.twig View File

@@ -0,0 +1,15 @@

{% 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 %}

Loading…
Cancel
Save