Browse Source

[Backend] Statistiques commandes parinterval

feature/tableau_edition_avancee
Fab 4 years ago
parent
commit
f891cc9b67
4 changed files with 33 additions and 6 deletions
  1. +18
    -1
      ShopBundle/Resources/public/css/backend/custom.css
  2. +4
    -1
      ShopBundle/Resources/public/sass/backend/custom.scss
  3. +6
    -1
      ShopBundle/Resources/translations/lcshop.fr.yaml
  4. +5
    -3
      ShopBundle/Resources/views/backend/form/custom_bootstrap_4.html.twig

+ 18
- 1
ShopBundle/Resources/public/css/backend/custom.css View File

@@ -834,8 +834,25 @@ table.products-collection-table tr.disabled {
display: block;
}

/* line 292, ../../sass/backend/custom.scss */
#dashboard #range_date_interval {
margin-bottom: 20px;
}

/* line 293, ../../sass/backend/custom.scss */
#dashboard #range_date_interval label {
float: left;
margin-right: 20px;
}

/* line 294, ../../sass/backend/custom.scss */
#dashboard #range_date_interval .form-check {
float: left;
margin-right: 10px;
}

/* Tickets */
/* line 296, ../../sass/backend/custom.scss */
/* line 300, ../../sass/backend/custom.scss */
#ticket-list .btn-sm {
display: block;
}

+ 4
- 1
ShopBundle/Resources/public/sass/backend/custom.scss View File

@@ -288,7 +288,10 @@ table.products-collection-table tr.disabled{opacity: 0.5}
#dashboard .btn-statistic{ width: 120px; height: 70px; text-align: center; border: 1px solid black; line-height: 1rem; }
#dashboard .btn-statistic small{margin-bottom: 10px; display: block;}
#dashboard .btn-statistic .value{display: block;}
#dashboard .btn-statistic.active{display: block;}

#dashboard #range_date_interval {margin-bottom: 20px;}
#dashboard #range_date_interval label{float: left; margin-right: 20px;}
#dashboard #range_date_interval .form-check{float: left; margin-right: 10px;}


/* Tickets */

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

@@ -467,7 +467,12 @@ field:
quotation: Devis
purchase-order: Bon de commande
delivery-note: Bon de livraison

Statistic:
interval: Affichage des résultats
intervalOptions:
days: Par jour
week: Par semaine
month: Par mois

action:
apply: Appliquer

+ 5
- 3
ShopBundle/Resources/views/backend/form/custom_bootstrap_4.html.twig View File

@@ -66,12 +66,12 @@
</div>
{% endif %}#}

{% set labelHelp = 'field.'~easyadmin['entity']['name']~'.'~name~'Help' %}
{# {% set labelHelp = 'field.'~easyadmin['entity']['name']~'.'~name~'Help' %}
{% if labelHelp|trans({}, 'lcshop') == labelHelp %}{% set labelHelp = 'form.field.default.'~name~'Help' %}{% endif %}
{% if labelHelp|trans({}, 'lcshop') != labelHelp %}
<small class="form-text text-muted">{{ labelHelp|trans({}, 'lcshop')|raw }}</small>
{% endif %}
#}
{{- form_errors(form) -}}
</div>
</div>
@@ -127,8 +127,10 @@
{% if 'field.MerchantConfig.' in label %}
{% set name_trad = label|replace({'field.MerchantConfig.': ''}) %}
{% set trad = name_trad|lc_trad(easyadmin['entity']['name'], 'field') %}
{% else %}
{% elseif easyadmin['entity']['name'] is defined %}
{% set trad = name|lc_trad(easyadmin['entity']['name'], 'field') %}
{% else %}
{% set trad = label %}
{% endif %}

{%- endif -%}

Loading…
Cancel
Save