Skip to content

K
kohinos
An error occurred while fetching merge requests data.
Commit cf595865 by Damien Moulard
Options

changement d'appelation des soldes et ajout du sole Monnaie en circulation

parent ab0b7962
master … dev
Showing with 15 additions and 6 deletions
templates/block/useradmin.html.twig
...@@ -65,10 +65,13 @@ ...@@ -65,10 +65,13 @@
{% set siege = getSiege() %} {% set siege = getSiege() %}
{% set compte = siege.getCompte() %} {% set compte = siege.getCompte() %}
{% set soldelabel = 'Solde du siège'|trans %} {% set compteNanti = siege.getCompteNantie() %}
{% set ecompteNanti = siege.getECompte() %}
{% set soldelabel = 'Billets au siège'|trans %}
{% include 'block/solde.html.twig' with {'compte': compte, 'soldelabel': soldelabel} %} {% include 'block/solde.html.twig' with {'compte': compte, 'soldelabel': soldelabel} %}
{% include 'block/solde.html.twig' with {'compte': siege.getECompte(), 'soldelabel': 'Solde de monnaie numérique distribuée'} %} {% include 'block/solde.html.twig' with {'compte': compteNanti, 'soldelabel': 'Billets nantis'} %}
{% include 'block/solde.html.twig' with {'compte': siege.getCompteNantie(), 'soldelabel': 'Monnaie nantie'} %} {% include 'block/solde.html.twig' with {'compte': ecompteNanti, 'soldelabel': 'Monnaie numérique distribuée'} %}
{% include 'block/solde.html.twig' with {'compte': compteNanti + ecompteNanti, 'soldelabel': 'Monnaie en circulation'} %}
{% include 'block/userinfos.html.twig' %} {% include 'block/userinfos.html.twig' %}
{% include 'block/userpassword.html.twig' %} {% include 'block/userpassword.html.twig' %}
{% include 'siege/block/solde_edit.html.twig' %} {% include 'siege/block/solde_edit.html.twig' %}
...@@ -84,14 +87,17 @@ ...@@ -84,14 +87,17 @@
{% set siege = getSiege() %} {% set siege = getSiege() %}
{% set compte = siege.getCompte() %} {% set compte = siege.getCompte() %}
{% set soldelabel = 'Solde du siège'|trans %} {% set soldelabel = 'Billets au siège'|trans %}
{% include 'block/solde.html.twig' with {'compte': compte, 'soldelabel': soldelabel} %} {% include 'block/solde.html.twig' with {'compte': compte, 'soldelabel': soldelabel} %}
{% include 'block/solde.html.twig' with {'compte': siege.getCompteNantie() + siege.getECompte(), 'soldelabel': 'Monnaie en circulation'} %}
{% include 'block/userinfos.html.twig' %} {% include 'block/userinfos.html.twig' %}
{% include 'block/userpassword.html.twig' %} {% include 'block/userpassword.html.twig' %}
{# {% include 'block/soldegroupes.html.twig' %} #} {# {% include 'block/soldegroupes.html.twig' %} #}
{% elseif app.user and is_granted('ROLE_CONTROLEUR') %} {% elseif app.user and is_granted('ROLE_CONTROLEUR') %}
{% set siege = getSiege() %}
{% include 'block/solde.html.twig' with {'compte': siege.getCompteNantie() + siege.getECompte(), 'soldelabel': 'Monnaie en circulation'} %}
{% include 'block/userinfos.html.twig' %} {% include 'block/userinfos.html.twig' %}
{% elseif app.user and is_granted('ROLE_GESTION_GROUPE') %} {% elseif app.user and is_granted('ROLE_GESTION_GROUPE') %}
...@@ -135,9 +141,12 @@ ...@@ -135,9 +141,12 @@
{% set siege = getSiege() %} {% set siege = getSiege() %}
{% set compte = siege.getCompte() %} {% set compte = siege.getCompte() %}
{% set soldelabel = 'Solde du siège'|trans %} {% set compteNanti = siege.getCompteNantie() %}
{% set ecompteNanti = siege.getECompte() %}
{% set soldelabel = 'Billets au siège'|trans %}
{% include 'block/solde.html.twig' with {'compte': compte, 'soldelabel': soldelabel} %} {% include 'block/solde.html.twig' with {'compte': compte, 'soldelabel': soldelabel} %}
{% include 'block/solde.html.twig' with {'compte': siege.getCompteNantie(), 'soldelabel': 'Monnaie nantie'} %} {% include 'block/solde.html.twig' with {'compte': compteNanti, 'soldelabel': 'Billets nantis'} %}
{% include 'block/solde.html.twig' with {'compte': compteNanti + ecompteNanti, 'soldelabel': 'Monnaie en circulation'} %}
{% include 'block/userinfos.html.twig' %} {% include 'block/userinfos.html.twig' %}
{% include 'block/userpassword.html.twig' %} {% include 'block/userpassword.html.twig' %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment