Parcourir la source

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

feature/export_comptable
Fab il y a 4 ans
Parent
révision
8cfd390859
4 fichiers modifiés avec 26 ajouts et 0 suppressions
  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 Voir le fichier

@@ -33,6 +33,10 @@ appOrder = new Vue({
{
name: 'address',
nameDisplay: 'Adresse'
},
{
name: 'maintenance',
nameDisplay: 'Maintenance'
}
]
}, window.addressValues);

+ 1
- 0
ShopBundle/Resources/translations/lcshop.fr.yaml Voir le fichier

@@ -75,6 +75,7 @@ group:
order: Commande
email: Email
delivery: Livraison
maintenance: Maintenance


None: Aucune valeur

+ 3
- 0
ShopBundle/Resources/views/backend/merchant/form.html.twig Voir le fichier

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

</div>


+ 18
- 0
ShopBundle/Resources/views/backend/merchant/panel_maintenance.html.twig Voir le fichier

@@ -0,0 +1,18 @@
{% 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>

Chargement…
Annuler
Enregistrer