Browse Source

Merge branch 'develop' of https://gitea.laclic.fr/Laclic/LcShopBundle into develop

feature/export_comptable
Fab 4 years ago
parent
commit
8cfd390859
4 changed files with 26 additions and 0 deletions
  1. +4
    -0
      ShopBundle/Resources/public/js/backend/script/merchant/vuejs-merchant.js
  2. +1
    -0
      ShopBundle/Resources/translations/lcshop.fr.yaml
  3. +3
    -0
      ShopBundle/Resources/views/backend/merchant/form.html.twig
  4. +18
    -0
      ShopBundle/Resources/views/backend/merchant/panel_maintenance.html.twig

+ 4
- 0
ShopBundle/Resources/public/js/backend/script/merchant/vuejs-merchant.js View File

{ {
name: 'address', name: 'address',
nameDisplay: 'Adresse' nameDisplay: 'Adresse'
},
{
name: 'maintenance',
nameDisplay: 'Maintenance'
} }
] ]
}, window.addressValues); }, window.addressValues);

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

order: Commande order: Commande
email: Email email: Email
delivery: Livraison delivery: Livraison
maintenance: Maintenance




None: Aucune valeur None: Aucune valeur

+ 3
- 0
ShopBundle/Resources/views/backend/merchant/form.html.twig View File

<div v-show="currentSection == 'seo'" class="panel panel-default"> <div v-show="currentSection == 'seo'" class="panel panel-default">
{% include '@LcShop/backend/merchant/panel_seo.html.twig' %} {% include '@LcShop/backend/merchant/panel_seo.html.twig' %}
</div> </div>
<div v-show="currentSection == 'maintenance'" class="panel panel-default">
{% include '@LcShop/backend/merchant/panel_maintenance.html.twig' %}
</div>


</div> </div>



+ 18
- 0
ShopBundle/Resources/views/backend/merchant/panel_maintenance.html.twig View File

{% import '@LcShop/backend/default/block/macros.html.twig' as macros %}

<div class="row">
<div class="col-8">
{{ macros.card_start('Merchant.maintenance','light') }}
<div class="col-12">
{% if form.merchantConfigs['maintenance'] is defined %}
{{ form_row(form.merchantConfigs['maintenance']) }}
{% endif %}
</div>
<div class="col-12">
{% if form.merchantConfigs['maintenanceIpAuthorized'] is defined %}
{{ form_row(form.merchantConfigs['maintenanceIpAuthorized']) }}
{% endif %}
</div>
{{ macros.card_end() }}
</div>
</div>

Loading…
Cancel
Save