Browse Source

Correctif switch merchant

master
Fabien Normand 3 years ago
parent
commit
9c49e07509
3 changed files with 10 additions and 3 deletions
  1. +1
    -1
      Resources/assets/app/admin/switchmerchant/switchmerchant.js
  2. +7
    -2
      Resources/views/admin/merchant/modal/switch_merchant.html.twig
  3. +2
    -0
      Resources/views/adminlte/layout.html.twig

+ 1
- 1
Resources/assets/app/admin/switchmerchant/switchmerchant.js View File

}) ; }) ;


function initSwitchMerchant() { function initSwitchMerchant() {
let $form = $('form.switch-merchant') ;
let $form = $('.nav-switch-merchant form.switch-merchant') ;
$form.find('select').change(function() { $form.find('select').change(function() {
$form.submit() ; $form.submit() ;
}) ; }) ;

+ 7
- 2
Resources/views/admin/merchant/modal/switch_merchant.html.twig View File

{% set form_switch_merchant = carac_form_switch_merchant('admin', 'carac_merchant_favorite') %} {% set form_switch_merchant = carac_form_switch_merchant('admin', 'carac_merchant_favorite') %}
{% form_theme form_switch_merchant '@LcSov/adminlte/crud/form_theme.html.twig' %} {% form_theme form_switch_merchant '@LcSov/adminlte/crud/form_theme.html.twig' %}
{{ form_start(form_switch_merchant) }} {{ form_start(form_switch_merchant) }}
{{ form(form_switch_merchant) }}
<div class="hidden">
{{ form_widget(form_switch_merchant.merchant, {attr:{'class': 'disable-select2'}}) }}
</div>
{{ form_rest(form_switch_merchant) }}

{{ form_end(form_switch_merchant) }} {{ form_end(form_switch_merchant) }}
<button id="carac-button-visit-merchant" type="button" class="btn btn-default" <button id="carac-button-visit-merchant" type="button" class="btn btn-default"
data-dismiss="modal">Visiter</button>
data-dismiss="modal">Visiter
</button>
{% endblock %} {% endblock %}
{% endembed %} {% endembed %}

+ 2
- 0
Resources/views/adminlte/layout.html.twig View File

{% set user = app.user %} {% set user = app.user %}
{% set merchant_current = merchant_current() %} {% set merchant_current = merchant_current() %}


{{ dump( merchant_current)}}
{{ dump( user.favoriteMerchant )}}
{% if(user.favoriteMerchant != merchant_current) %} {% if(user.favoriteMerchant != merchant_current) %}
{# modal affichée uniquement si la sessionStorage.visit_merchant n'est pas défini (js) #} {# modal affichée uniquement si la sessionStorage.visit_merchant n'est pas défini (js) #}
{% include '@LcCaracole/admin/merchant/modal/switch_merchant.html.twig' %} {% include '@LcCaracole/admin/merchant/modal/switch_merchant.html.twig' %}

Loading…
Cancel
Save