Skip to content

K
kohinos
Commit bc174dd5 by Julien Jorry
Options

Add transfert manquant + translation + debugs

parent 87c82434
Showing with 240 additions and 146 deletions
config/packages/sonata_admin.yaml
......@@ -45,8 +45,8 @@ sonata_admin:
assets:
stylesheets:
# The default stylesheet list:
# - build/app.css
- bundles/sonatacore/vendor/bootstrap/dist/css/bootstrap.min.css
# - bundles/sonatacore/vendor/components-font-awesome/css/font-awesome.min.css
- fontawesome/css/fontawesome.min.css
- fontawesome/css/solid.css
- fontawesome/css/brands.css
......
src/Admin/FluxAdmin.php
......@@ -98,7 +98,7 @@ class FluxAdmin extends AbstractAdmin
public function getTotalLabel()
{
return $this->translator->trans('Total :');
return $this->translator->trans('Total des flux :');
}
public function getTotal()
......@@ -106,27 +106,15 @@ class FluxAdmin extends AbstractAdmin
$datagrid = $this->getDatagrid();
$datagrid->buildPager();
$query2 = clone $datagrid->getQuery();
$query2
->select('SUM( ' . $query2->getRootAlias() . '.montant) as total')
->setFirstResult(null)
->setMaxResults(null);
$result2 = $query2->execute(array(), \Doctrine\ORM\Query::HYDRATE_SINGLE_SCALAR);
$query = clone $datagrid->getQuery();
$query
->select('SUM( ' . $query->getRootAlias() . '.montant) as total')
->andWhere($query->getRootAlias().".parenttype = :type")
->setParameter('type', 'transaction')
->setFirstResult(null)
->setMaxResults(null);
$result = $query->execute(array(), \Doctrine\ORM\Query::HYDRATE_SINGLE_SCALAR);
return $result2.' (Transactions: '.$result.')';
return $result;
}
/**
......
src/Admin/GroupeprestataireAdmin.php
......@@ -74,7 +74,7 @@ class GroupeprestataireAdmin extends AbstractAdmin
protected function configureFormFields(FormMapper $formMapper)
{
$user = $this->security->getUser();
$prestataires = $this->getConfigurationPool()->getContainer()->get('doctrine')->getRepository(Prestataire::class)->findBy(array('enabled' => true));
$prestataires = $this->getConfigurationPool()->getContainer()->get('doctrine')->getRepository(Prestataire::class)->findBy(array('enabled' => true), array('raison'=> 'ASC'));
$groupepresta = $this->getSubject();
if ($this->isCurrentRoute('create') && $user->getGroupesgere() != null) {
$groupepresta->setGroupe($user->getGroupesgere());
......@@ -94,7 +94,7 @@ class GroupeprestataireAdmin extends AbstractAdmin
))
;
if (($user->isGranted('ROLE_GESTION_GROUPE') || $user->isGranted('ROLE_CONTACT')) && $this->security->getUser()->getGroupesgere() != null) {
$prestataires = $this->getConfigurationPool()->getContainer()->get('doctrine')->getRepository(Prestataire::class)->findBy(array('enabled' => true, 'groupe' => $this->security->getUser()->getGroupesgere()));
$prestataires = $this->getConfigurationPool()->getContainer()->get('doctrine')->getRepository(Prestataire::class)->findBy(array('enabled' => true, 'groupe' => $this->security->getUser()->getGroupesgere()), array('raison'=> 'ASC'));
}
if ($user->isGranted('ROLE_SUPER_ADMIN') || $user->isGranted('ROLE_ADMIN_SIEGE')) {
$formMapper
......
src/Admin/RubriqueAdmin.php
......@@ -48,9 +48,9 @@ class RubriqueAdmin extends AbstractAdmin
protected function configureFormFields(FormMapper $formMapper)
{
$user = $this->security->getUser();
$prestataires = $this->getConfigurationPool()->getContainer()->get('doctrine')->getRepository(Prestataire::class)->findBy(array('enabled' => true));
$prestataires = $this->getConfigurationPool()->getContainer()->get('doctrine')->getRepository(Prestataire::class)->findBy(array('enabled' => true), array('raison'=> 'ASC'));
// if (($user->isGranted('ROLE_GESTION_GROUPE') || $user->isGranted('ROLE_CONTACT')) && $this->security->getUser()->getGroupesgere() != null) {
// $prestataires = $this->getConfigurationPool()->getContainer()->get('doctrine')->getRepository(Prestataire::class)->findBy(array('enabled' => true, 'groupe' => $this->security->getUser()->getGroupesgere()));
// $prestataires = $this->getConfigurationPool()->getContainer()->get('doctrine')->getRepository(Prestataire::class)->findBy(array('enabled' => true, 'groupe' => $this->security->getUser()->getGroupesgere()), array('raison'=> 'ASC'));
// }
$groupe = $this->getSubject();
$formMapper
......
src/Admin/TransactionAdmin.php
......@@ -31,6 +31,29 @@ class TransactionAdmin extends FluxAdmin
return $query;
}
public function getTotalLabel()
{
return $this->translator->trans('Total des transactions :');
}
public function getTotal()
{
$datagrid = $this->getDatagrid();
$datagrid->buildPager();
$query = clone $datagrid->getQuery();
$query
->select('SUM( ' . $query->getRootAlias() . '.montant) as total')
->andWhere($query->getRootAlias().".parenttype = :type")
->setParameter('type', 'transaction')
->setFirstResult(null)
->setMaxResults(null);
$result = $query->execute(array(), \Doctrine\ORM\Query::HYDRATE_SINGLE_SCALAR);
return $result;
}
/**
* {@inheritdoc}
*/
......
src/Admin/TransfertAdmin.php
......@@ -78,6 +78,29 @@ class TransfertAdmin extends FluxAdmin
return $query;
}
public function getTotalLabel()
{
return $this->translator->trans('Total des transferts :');
}
public function getTotal()
{
$datagrid = $this->getDatagrid();
$datagrid->buildPager();
$query = clone $datagrid->getQuery();
$query
->select('SUM( ' . $query->getRootAlias() . '.montant) as total')
->andWhere($query->getRootAlias().".parenttype = :type")
->setParameter('type', 'transfert')
->setFirstResult(null)
->setMaxResults(null);
$result = $query->execute(array(), \Doctrine\ORM\Query::HYDRATE_SINGLE_SCALAR);
return $result;
}
/**
* {@inheritdoc}
*/
......
src/Controller/GroupePrestaController.php
......@@ -38,7 +38,7 @@ class GroupePrestaController extends AbstractController
*/
public function listeGroupePrestaAction($type, Request $request)
{
$groupe = $this->em->getRepository(Groupeprestataire::class)->findBy(array('type' => $type, 'enabled' => true));
$groupe = $this->em->getRepository(Groupeprestataire::class)->findBy(array('type' => $type, 'enabled' => true), array('name'=> 'ASC'));
return $this->render('groupepresta/liste.html.twig', array(
'groupes' => $groupes,
......
src/Controller/UserGestionnaireGroupeController.php
......@@ -7,12 +7,14 @@ use App\Entity\Cotisation;
use App\Entity\Geoloc;
use App\Entity\Groupe;
use App\Entity\TransactionAdherentPrestataire;
use App\Entity\TransfertComptoirGroupe;
use App\Entity\TransfertGroupeComptoir;
use App\Entity\Usergroup;
use App\Form\Type\AdherentInfosFormType;
use App\Form\Type\AdhererFormType;
use App\Form\Type\GroupeInfosFormType;
use App\Form\Type\TransactionAdherentPrestataireFormType;
use App\Form\Type\TransfertComptoirGroupeFormType;
use App\Form\Type\TransfertGroupeComptoirFormType;
use Doctrine\ORM\EntityManagerInterface;
use FOS\UserBundle\Model\UserManagerInterface;
......@@ -55,7 +57,7 @@ class UserGestionnaireGroupeController extends FluxController
}
/**
* @Route("/groupe/transfert/comptoir/", name="transfertGroupeComptoir")
* @Route("/user/groupe/transfert/comptoir/", name="transfertGroupeComptoir")
* @IsGranted("ROLE_GESTION_GROUPE")
*/
public function transfertGroupeComptoirAction(Request $request)
......@@ -71,4 +73,23 @@ class UserGestionnaireGroupeController extends FluxController
$this->translator->trans('Transfert à un comptoir')
);
}
/**
* @Route("/user/groupe/retour/comptoir/", name="transfertComptoirGroupe")
* @IsGranted("ROLE_GESTION_GROUPE")
*/
public function transfertComptoirGroupeAction(Request $request)
{
$entity = new TransfertComptoirGroupe();
$entity->setOperateur($this->getUser());
$form = $this->createForm(TransfertComptoirGroupeFormType::class, $entity);
return $this->manageFluxForm(
$request,
$form,
$this->getUser()->getGroupesgere()->getCompte(),
$this->translator->trans('Retour bien effectuée !'),
$this->translator->trans('Retour au groupe')
);
}
}
src/Entity/Groupe.php
......@@ -306,6 +306,6 @@ class Groupe
public function __toString(): string
{
return (!empty($this->getName())?$this->getName():'Groupe');
return !empty($this->getName())?$this->getName():'Groupe';
}
}
src/Events/MLCEvents 0 → 100644
<?php
namespace FOS\UserBundle;
/**
* Tous les évènements
*
* LOCO : Outil de gestion de Monnaie Locale Complémentaire
* @author Julien Jorry <julien.jorry@gmail.com>
*/
final class FOSUserEvents
{
/* FLUX */
const TRANSACTION_ADHERENT_ADHERENT = 'mlc.flux.transaction.adherent.adherent';
const TRANSACTION_ADHERENT_PRESTATAIRE = 'mlc.flux.transaction.adherent.prestataire';
const TRANSACTION_PRESTATAIRE_ADHERENT = 'mlc.flux.transaction.prestataire.adherent';
const TRANSACTION_PRESTATAIRE_PRESTATAIRE = 'mlc.flux.transaction.prestataire.prestataire';
const TRANSFERT_COMPTOIR_ADHERENT = 'mlc.flux.transfert.comptoir.adherent';
const TRANSFERT_COMPTOIR_PRESTATAIRE = 'mlc.flux.transfert.comptoir.prestataire';
const TRANSFERT_GROUPE_COMPTOIR = 'mlc.flux.transfert.groupe.comptoir';
const TRANSFERT_GROUPE_SIEGE = 'mlc.flux.transfert.groupe.siege';
const TRANSFERT_PRESTATAIRE_COMPTOIR = 'mlc.flux.transfert.prestataire.comptoir';
const TRANSFERT_PRESTATAIRE_SIEGE = 'mlc.flux.transfert.prestataire.siege';
const TRANSFERT_SIEGE_GROUPE = 'mlc.flux.transfert.siege.groupe';
const TRANSFERT_SIEGE_GROUPE = 'mlc.flux.transfert.siege.groupe';
}
\ No newline at end of file
src/Factory/FormFactory.php
......@@ -9,6 +9,7 @@ use App\Entity\TransactionComptoirGroupe;
use App\Entity\TransactionComptoirPrestataire;
use App\Entity\TransactionPrestataireAdherent;
use App\Entity\TransactionPrestatairePrestataire;
use App\Entity\TransfertComptoirGroupe;
use App\Entity\TransfertGroupeComptoir;
use App\Entity\TransfertGroupeSiege;
use App\Entity\TransfertPrestataireComptoir;
......@@ -26,6 +27,7 @@ use App\Form\Type\TransactionAdherentAdherentFormType;
use App\Form\Type\TransactionAdherentPrestataireFormType;
use App\Form\Type\TransactionPrestataireAdherentFormType;
use App\Form\Type\TransactionPrestatairePrestataireFormType;
use App\Form\Type\TransfertComptoirGroupeFormType;
use App\Form\Type\TransfertGroupeComptoirFormType;
use App\Form\Type\TransfertGroupeSiegeFormType;
use App\Form\Type\TransfertPrestataireComptoirFormType;
......@@ -208,6 +210,19 @@ class FormFactory
return $form->createView();
}
public function getTransfertComptoirGroupeForm(User $user)
{
if (empty($user) || empty($user->getGroupesgere())) {
throw new \Exception("[FORM 12] Opération impossible !");
}
$entity = new TransfertComptoirGroupe();
$entity->setOperateur($user);
$entity->setDestinataire($user->getGroupesgere());
$form = $this->ff->create(TransfertComptoirGroupeFormType::class, $entity, array('action' => $this->router->generate('transfertComptoirGroupe')));
return $form->createView();
}
public function getTransfertGroupeComptoirForm(User $user)
{
if (empty($user) || empty($user->getGroupesgere())) {
......
src/Form/Type/GroupePrestataireInscriptionFormType.php
......@@ -27,48 +27,20 @@ class GroupePrestataireInscriptionFormType extends AbstractType
{
$presta = $options['data'];
$builder
// ->add('groupeprestataires', CollectionType::class, array(
// 'label' => 'AMAP / Marchés',
// 'entry_type' => EntityType::class,
// 'entry_options' => array(
// 'class' => Groupeprestataire::class,
// 'choices' => $this->em->getRepository(Groupeprestataire::class)->findBy(array('enabled' => true)),
// 'choice_label' => 'name',
// 'placeholder' => 'Faites votre choix',
// 'required' => false,
// 'label' => false),
// 'by_reference' => false,
// 'allow_add' => true,
// 'allow_delete' => true
// ))
->add('groupeprestataires', CollectionType::class, array(
'label' => 'AMAP / Marchés',
'entry_type' => EntityType::class,
'entry_options' => array(
'class' => Groupeprestataire::class,
'choices' => $this->em->getRepository(Groupeprestataire::class)->findBy(array('enabled' => true)),
'choices' => $this->em->getRepository(Groupeprestataire::class)->findBy(array('enabled' => true), array('name'=> 'ASC')),
'choice_label' => 'name',
'placeholder' => 'groupe',
'required' => false,
'label' => false),
'by_reference' => false,
'allow_add' => true,
'allow_delete' => true,
// 'data' => $presta->getGroupeprestataires()
'allow_delete' => true
))
// ->add('groupeprestataires', EntityType::class, array(
// 'label' => 'AMAP / Marchés',
// // 'entry_type' => EntityType::class,
// 'class' => Groupeprestataire::class,
// 'choices' => $this->em->getRepository(Groupeprestataire::class)->findBy(array('enabled' => true)),
// 'choice_label' => 'name',
// 'placeholder' => 'Faites votre choix',
// 'required' => false,
// 'expanded' => true,
// 'multiple' => true,
// // 'mapped' => false,
// // 'data' => $presta->getGroupeprestataires()
// ))
->add('save', SubmitType::class, ['label' => "Valider"])
;
}
......
src/Form/Type/PrestataireInfosFormType.php
......@@ -83,7 +83,7 @@ class PrestataireInfosFormType extends AbstractType
'entry_type' => EntityType::class,
'entry_options' => array(
'class' => Rubrique::class,
'choices' => $this->container->get('doctrine')->getRepository(Rubrique::class)->findByEnabled(true),
'choices' => $this->container->get('doctrine')->getRepository(Rubrique::class)->findBy(array('enabled' => true), array('name'=> 'ASC')),
'choice_label' => 'name',
'placeholder' => 'Rubrique',
'required' => false,
......
src/Form/Type/TransfertComptoirGroupeFormType.php
......@@ -15,19 +15,19 @@ class TransfertComptoirGroupeFormType extends TransfertFormType
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
->add('expediteur', HiddenType::class, array(
'data' => $this->security->getUser()->getComptoirsgere()->getId(),
->add('expediteur', EntityType::class, array(
'choices' => $this->em->getRepository(Comptoir::class)->findBy(array('enabled' => true, 'groupe' => $this->security->getUser()->getGroupesgere()), array('name'=> 'ASC')),
'class' => Comptoir::class,
'placeholder' => 'Comptoir',
'required' => true,
'label' => 'Comptoir :',
))
->add('destinataire', HiddenType::class, array(
'entity_class' => Groupe::class,
'data' => $this->security->getUser()->getGroupesgere()->getId(),
'data_class' => null,
'entity_class' => Comptoir::class,
'em' => $this->em
))
->add('destinataire', EntityType::class, array(
'class' => Groupe::class,
'choices' => $this->em->getRepository(Groupe::class)->findBy(array('enabled' => true)),
'placeholder' => 'Groupe',
'required' => true,
'label' => 'Groupe :',
))
;
}
......
src/Form/Type/TransfertComptoirPrestataireFormType.php
......@@ -23,7 +23,7 @@ class TransfertComptoirPrestataireFormType extends TransfertFormType
))
->add('destinataire', EntityType::class, array(
'class' => Prestataire::class,
'choices' => $this->em->getRepository(Prestataire::class)->findBy(array('enabled' => true)),
'choices' => $this->em->getRepository(Prestataire::class)->findBy(array('enabled' => true), array('raison'=> 'ASC')),
'placeholder' => 'Prestataire',
'required' => true,
'label' => 'Prestataire :',
......
src/Form/Type/TransfertGroupeSiegeFormType.php
......@@ -18,7 +18,7 @@ class TransfertGroupeSiegeFormType extends TransfertFormType
$builder
->add('expediteur', EntityType::class, array(
'class' => Groupe::class,
'choices' => $this->em->getRepository(Groupe::class)->findBy(array('enabled' => true)),
'choices' => $this->em->getRepository(Groupe::class)->findBy(array('enabled' => true), array('name'=> 'ASC')),
'choice_label' => function ($choice) {
return ((!empty($choice->getName())?$choice->getName():'Groupe').' ('.$choice->getCompte().')');
},
......
src/Form/Type/TransfertSiegeGroupeFormType.php
......@@ -24,7 +24,7 @@ class TransfertSiegeGroupeFormType extends TransfertFormType
))
->add('destinataire', EntityType::class, array(
'class' => Groupe::class,
'choices' => $this->em->getRepository(Groupe::class)->findBy(array('enabled' => true)),
'choices' => $this->em->getRepository(Groupe::class)->findBy(array('enabled' => true), array('name'=> 'ASC')),
'choice_label' => function ($choice) {
return ((!empty($choice->getName())?$choice->getName():'Groupe').' ('.$choice->getCompte().')');
},
......
src/Twig/AppExtension.php
......@@ -59,7 +59,7 @@ class AppExtension extends AbstractExtension
public function getAllPrestataires()
{
return $this->container->get('doctrine')->getRepository(Prestataire::class)->findBy(array('enabled' => true));
return $this->container->get('doctrine')->getRepository(Prestataire::class)->findBy(array('enabled' => true), array('raison'=> 'ASC'));
}
public function getAllGroupePrestataires($type = '')
......@@ -69,13 +69,14 @@ class AppExtension extends AbstractExtension
public function getAllComptoirs()
{
return $this->container->get('doctrine')->getRepository(Comptoir::class)->findBy(array('enabled' => true));
return $this->container->get('doctrine')->getRepository(Comptoir::class)->findBy(array('enabled' => true), array('name'=> 'ASC'));
}
public function getAllRubriques()
{
return $this->container->get('doctrine')->getRepository(Rubrique::class)->findBy(array('enabled' => true));
return $this->container->get('doctrine')->getRepository(Rubrique::class)->findBy(array('enabled' => true), array('name'=> 'ASC'));
}
/**
* Return a list of all filters.
*
......@@ -114,7 +115,7 @@ class AppExtension extends AbstractExtension
public function getAllGroupes()
{
return $this->container->get('doctrine')->getRepository(Groupe::class)->findBy(array('enabled' => true));
return $this->container->get('doctrine')->getRepository(Groupe::class)->findBy(array('enabled' => true), array('name'=> 'ASC'));
}
public function mediaurl($media, $format)
......
src/Twig/FormExtension.php
......@@ -37,6 +37,7 @@ class FormExtension extends AbstractExtension
new \Twig_SimpleFunction('getTransfertPrestataireSiegeForm', array($this, 'getTransfertPrestataireSiegeForm')),
new \Twig_SimpleFunction('getTransfertPrestataireComptoirForm', array($this, 'getTransfertPrestataireComptoirForm')),
new \Twig_SimpleFunction('getTransfertComptoirToXForm', array($this, 'getTransfertComptoirToXForm')),
new \Twig_SimpleFunction('getTransfertComptoirGroupeForm', array($this, 'getTransfertComptoirGroupeForm')),
new \Twig_SimpleFunction('getTransfertGroupeComptoirForm', array($this, 'getTransfertGroupeComptoirForm')),
new \Twig_SimpleFunction('getTransfertSiegeGroupeForm', array($this, 'getTransfertSiegeGroupeForm')),
new \Twig_SimpleFunction('getTransfertGroupeSiegeForm', array($this, 'getTransfertGroupeSiegeForm')),
......@@ -99,6 +100,10 @@ class FormExtension extends AbstractExtension
{
return $this->container->get('app.formfactory')->getTransfertComptoirToXForm($user, $destinataire);
}
public function getTransfertComptoirGroupeForm(User $user)
{
return $this->container->get('app.formfactory')->getTransfertComptoirGroupeForm($user);
}
public function getTransfertGroupeComptoirForm(User $user)
{
return $this->container->get('app.formfactory')->getTransfertGroupeComptoirForm($user);
......
templates/adherent/Adherer.html.twig
......@@ -2,7 +2,7 @@
{% block content %}
<div class='container'>
<h4 class='mt-3'>Adhérer :</h4>
<h4 class='mt-3'>{{'Adhérer'|trans }} :</h4>
<p>
{{form_start(form)}}
{{ form_row(form.user) }}
......
templates/adherent/block/solde.html.twig
<div class="card mb-3 {% if app.user.adherent.ecompte > 0 %}border-success{% else %}border-error{% endif %}">
<div class="card-header"><i class="fa fa-coins mr-4"></i> Solde de mon compte : <b>{{app.user.adherent.ecompte}}</b></div>
<div class="card-header"><i class="fa fa-coins mr-4"></i> {{ 'Solde de mon compte'|trans }} : <b>{{app.user.adherent.ecompte}}</b></div>
</div>
\ No newline at end of file
templates/adherent/block/transaction_adherent.html.twig
{% extends 'block/onetransaction.html.twig' %}
{% block blocktitle %}
<i class="fa fa-exchange-alt mr-4"></i> Virement vers un adhérent
<i class="fa fa-exchange-alt mr-4"></i> {{'Virement vers un adhérent'|trans }}
{% endblock blocktitle %}
{% block blockcontent %}
{% set form = getTransactionAdherentAdherentForm(app.user) %}
......
templates/adherent/block/transaction_presta.html.twig
{% extends 'block/onetransaction.html.twig' %}
{% block blocktitle %}
<i class="fa fa-exchange-alt mr-4"></i> Virement vers un prestataire
<i class="fa fa-exchange-alt mr-4"></i> {{'Virement vers un prestataire'|trans }}
{% endblock blocktitle %}
{% block blockcontent %}
{% set form = getTransactionAdherentPrestataireForm(app.user) %}
......
templates/adherent/index.html.twig deleted 100644 → 0
{% extends 'common/layout.html.twig' %}
{% block content %}
adherent index
{% endblock %}
templates/adherent/infos.html.twig
......@@ -30,7 +30,7 @@
<h4>{{ "Mes cotisations"|trans }} :</h4>
<ul class='list-group'>
{% for cotisation in app.user.cotisations %}
<li class="list-group-item">{{cotisation.annee|upper}} : {{cotisation.montant}}&euro; (payée le {{cotisation.createdAt|date('d-m-Y')}})</li>
<li class="list-group-item">{{cotisation.annee|upper}} : {{cotisation.montant}}&euro; ({{ 'payée le'|trans }} {{cotisation.createdAt|date('d-m-Y')}})</li>
{% endfor %}
</ul>
</div>
......@@ -40,7 +40,7 @@
<h4>{{ "Mes transactions"|trans }} :</h4>
<ul class='list-group'>
{% for flux in app.user.flux %}
<li class="list-group-item">{{flux.parenttype|capitalize}} à {{flux.destinataire}} {{flux.montant}}&euro; (payée le {{flux.createdAt|date('d-m-Y')}})</li>
<li class="list-group-item">{{flux.parenttype|capitalize}} à {{flux.destinataire}} {{flux.montant}}&euro; ({{ 'payée le'|trans }} {{flux.createdAt|date('d-m-Y')}})</li>
{% endfor %}
</ul>
</div>
......
templates/block/base_list_with_total.html.twig
......@@ -2,7 +2,7 @@
{% block list_header %}
{% if admin.total is defined %}
<div class="pull-left" style="margin: 10px 5px;">
<label for="{{ admin.uniqid }}_sum_of_orders" class="control-label">{{ admin.totalLabel is defined ? admin.totalLabel : 'Total : '}}</label>
<label for="{{ admin.uniqid }}_sum_of_orders" class="control-label">{{ admin.totalLabel is defined ? admin.totalLabel : (('Total'|trans)~' : ')}}</label>
<label class="control-label">{{ admin.total }}</label>
</div>
{% endif %}
......
templates/block/block_collapse.html.twig
{% set idcard = idcard|default(random(500)) %}
{% set collapse = collapse is defined ? collapse : 'collapse' %}
<div class="card mb-3">
<div class="card-header" style='cursor:pointer;' onmouseover="$(this).addClass('border-primary');" onmouseout="$(this).removeClass('border-primary');" data-toggle="collapse" data-target="#collapse{{idcard}}" aria-expanded="false" aria-controls="collapse{{idcard}}">{% block blocktitle %}TITLE with blocktitle{% endblock blocktitle %}</div>
<div class="card-header" style='cursor:pointer;' onmouseover="$(this).addClass('border-primary');" onmouseout="$(this).removeClass('border-primary');" data-toggle="collapse" data-target="#collapse{{idcard}}" aria-expanded="false" aria-controls="collapse{{idcard}}">{% block blocktitle %}{% endblock blocktitle %}</div>
<div class="card-body {{collapse}}" id="collapse{{idcard}}" data-parent="#accordion">
<h4 class="card-title">{% block blocksubtitle %}SUBTITLE with blocksubtitle{% endblock blocksubtitle %}</h4>
<h4 class="card-title">{% block blocksubtitle %}{% endblock blocksubtitle %}</h4>
<div class="card-text">
{% block blockcontent %}CONTENT with blockcontent{% endblock blockcontent %}
{% block blockcontent %}
{% endblock blockcontent %}
</div>
</div>
</div>
templates/block/cotisations.html.twig
......@@ -3,14 +3,14 @@
{% extends 'block/block_collapse.html.twig' %}
{% block blocktitle %}
<i class="fa fa-clipboard-list mr-4"></i> Mes cotisations
<i class="fa fa-clipboard-list mr-4"></i> {{ 'Mes cotisations'|trans }}
{% endblock blocktitle %}
{% block blocksubtitle %}
{% endblock blocksubtitle %}
{% block blockcontent %}
<ul class='list-group'>
{% for cotisation in app.user.cotisations %}
<li class="list-group-item">{{cotisation.annee|upper}} : {{cotisation.montant}}&euro; (payée le {{cotisation.createdAt|date('d-m-Y')}})</li>
<li class="list-group-item">{{cotisation.annee|upper}} : {{cotisation.montant}}&euro; ({{ 'payée le'|trans }} {{cotisation.createdAt|date('d-m-Y')}})</li>
{% endfor %}
</ul>
{% endblock blockcontent %}
......
templates/block/flux_entity.html.twig
......@@ -27,8 +27,7 @@
{% set routea = '' %}
{% endif %}
{% if routea != ''
%}
{% if routea != '' %}
<a class="sonata-link-identifier" href="{{ path(routea, {'id': object.expediteur.id}) }}">
{%- block field %}
{% spaceless %}
......
templates/block/transactions.html.twig
......@@ -4,7 +4,7 @@
{% extends 'block/block_collapse.html.twig' %}
{% block blocktitle %}
<i class="fa fa-list-alt mr-4"></i> Opérations
<i class="fa fa-list-alt mr-4"></i> {{ 'Opérations'|trans }}
{% endblock blocktitle %}
{% block blocksubtitle %}
{% endblock blocksubtitle %}
......
templates/block/useradmin.html.twig
......@@ -8,7 +8,7 @@
</a>
</div>
{% else %}
<div class='mb-2'>
<div class='mb-2 group'>
<a class='btn btn-xs m-1 btn-primary' href='{{path('index', [], true)}}?_switch_user=user_prestataire'>
{{ 'PRESTATAIRE'|trans }}
</a>
......@@ -24,6 +24,18 @@
<a class='btn btn-xs m-1 btn-primary' href='{{path(routeName, [], true)}}?_switch_user=user_gestiongroupe'>
{{ 'GESTION GROUPE'|trans }}
</a>
{# <span class="dropdown">
<a href="#" class='btn btn-xs m-1 btn-primary dropdown-toggle' id="dropdownMenuButton" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
{{ 'GESTION GROUPE'|trans }}
</a>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
{% for groupe in getAllGroupes() %}
{% for user in groupe.gestionnaires %}
<a class="dropdown-item" href="{{path(routeName, [], true)}}?_switch_user='{{user.username}}">{{groupe}} ({{user}})</a>
{% endfor %}
{% endfor %}
</div>
</span> #}
<a class='btn btn-xs m-1 btn-primary' href='{{path(routeName, [], true)}}?_switch_user=user_contact'>
{{ 'CONTACT'|trans }}
</a>
......@@ -84,6 +96,7 @@
{% include 'block/userpassword.html.twig' %}
{% include 'block/transactions.html.twig' %}
{% include 'groupe/block/transaction_comptoir.html.twig' %}
{% include 'groupe/block/retourgroupe.html.twig' %}
{% elseif is_granted('ROLE_COMPTOIR') %}
......
templates/block/userinfos.html.twig
{% extends 'block/block_collapse.html.twig' %}
{% block blocktitle %}
<i class="fa fa-user-cog mr-4"></i> {{'Compte utilisateur'|trans}}
<i class="fa fa-user-cog mr-4"></i> {{ 'Compte utilisateur'|trans }}
{% endblock blocktitle %}
{% block blocksubtitle %}
{% endblock blocksubtitle %}
......
templates/block/userpassword.html.twig
{% extends 'block/block_collapse.html.twig' %}
{% block blocktitle %}
<i class="fa fa-user-cog mr-4"></i> {{'Changer votre mot de passe'|trans}}
<i class="fa fa-user-cog mr-4"></i> {{ 'Changer votre mot de passe'|trans }}
{% endblock blocktitle %}
{% block blocksubtitle %}
{% endblock blocksubtitle %}
......
templates/bundles/SonataAdminBundle/dashboard.html.twig
......@@ -18,7 +18,7 @@ file that was distributed with this source code.
{# AJOUT POUR LA MLC #}
<div class="box">
<div class="box-header text-center">
<h3 class="box-title">{{'ADMINISTRATION'|trans }}</h3>
<h3 class="box-title">{{ 'ADMINISTRATION'|trans }}</h3>
</div>
<div class="box-body">
{% include 'block/useradmin.html.twig' with {'routeName': 'sonata_admin_dashboard'}%}
......
templates/common/flux.html.twig
{% if getAllFlux(app.user, app.request).getTotalItemCount > 0 %}
<div class='flux mt-4'>
<h4>Mes transactions :</h4>
<h4>{{ 'Mes transactions :'|trans }}</h4>
<h5>({{getAllFlux(app.user, app.request).getTotalItemCount}})</h5>
<ul class='list-group'>
{% for flux in getAllFlux(app.user, app.request) %}
<li class="list-group-item">{{flux.parenttype|capitalize}} à {{flux.destinataire}} {{flux.montant}}&euro; (payée le {{flux.createdAt|date('d-m-Y')}})</li>
<li class="list-group-item">{{flux.parenttype|capitalize}} à {{flux.destinataire}} {{flux.montant}}&euro; ({{ 'payée le'|trans }} {{flux.createdAt|date('d-m-Y')}})</li>
{% endfor %}
</ul>
</div>
......
templates/common/groupes.html.twig
<div class="rubriques">
<h4> <i class="fa fa-paperclip"></i> Groupes Locaux</h4>
<h4> <i class="fa fa-paperclip"></i> {{ 'Groupes Locaux'|trans }}</h4>
<p>
{% for groupe in getAllGroupes() %}
<a class='groupe' href='{{ path('show_groupe', {'slug': groupe.slug}) }}'>{{groupe.name}}</a>{% if not loop.last %} • {% endif %}
......
templates/common/login.html.twig
......@@ -25,7 +25,7 @@
</div>
<div class='row'>
<div class='col-12 text-center'>
<a href="{{ path("fos_user_resetting_request") }}" class='mr-2'>Mot de passe oublié ?</a>
<a href="{{ path("fos_user_resetting_request") }}" class='mr-2'>{{ 'Mot de passe oublié ?'|trans }}</a>
<input type="checkbox" id="remember_me" name="_remember_me" value="on" />
<label class='ml-2' for="remember_me">{{ 'security.login.remember_me'|trans }}</label>
</div>
......
templates/common/menu.html.twig
......@@ -19,9 +19,9 @@
<ul class="navbar-nav ml-auto">
{% if app.user is null %}
<li class="nav-item dropdownmenu-item has-child dropdown" role="menu-item">
<a href="#" id="navbarDropdown1" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link parent dropdown-toggle ">Adhérer</a>
<a href="#" id="navbarDropdown1" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link parent dropdown-toggle ">{{ 'Adhérer'|trans }}</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown1">
<a href="/adherer" class="dropdown-item ">Adhérer à la MLC</a>
<a href="/adherer" class="dropdown-item ">{{ 'Adhérer à la MLC'|trans }}</a>
</div>
</li>
{% endif %}
......
templates/common/news.html.twig
<div class="lastnewslist">
<h4> <i class="fa fa-newspaper"></i> Actualités</h4>
<h4> <i class="fa fa-newspaper"></i> {{ 'Actualités'|trans }}</h4>
<p>
{% for news in getLastNews(3) %}
<div class="card mb-2">
......
templates/common/rubriques.html.twig
<div class="rubriques">
<h4> <i class="fa fa-flag"></i> {{'Rubriques'|trans}}</h4>
<h4> <i class="fa fa-flag"></i> {{ 'Rubriques'|trans }}</h4>
<p>
{% for rubrique in getAllRubriques() %}
<a class='rubrique' href='{{ path('show_rubrique', {'slug': rubrique.slug}) }}'>{{rubrique.name}}</a>{% if not loop.last %} • {% endif %}
......
templates/common/stats.html.twig
<div class="stats">
<h4 class='mb-3'> <i class="fa fa-bars"></i> {{'À ce jour'|trans}}</h4>
<h4 class='mb-3'> <i class="fa fa-bars"></i> {{ 'À ce jour'|trans }}</h4>
<p>
<i class="fas fa-check"> </i> {{ showMlcStats('user') }} {{'utilisateurs'|trans}}<br>
<i class="fas fa-check"> </i> {{ showMlcStats('user') }} {{ 'utilisateurs'|trans }}<br>
</p>
<p>
<i class="fa fa-check"> </i> {{ showMlcStats('prestataire') }} <a href="{{ path('liste_prestataire') }}" title="{{'Les prestataires de la doume'|trans}}">{{'prestataires'|trans}}</a> {{'et'|trans}} {{ showMlcStats('partenaire') }} <a href="{{ path('liste_partenaire') }}" title="{{'Les partenaires de la doume'|trans}}">{{'partenaires'|trans}}</a>
<i class="fa fa-check"> </i> {{ showMlcStats('prestataire') }} <a href="{{ path('liste_prestataire') }}" title="{{ 'Les prestataires de la doume'|trans }}">{{'prestataires'|trans}}</a> {{'et'|trans}} {{ showMlcStats('partenaire') }} <a href="{{ path('liste_partenaire') }}" title="{{'Les partenaires de la doume'|trans}}">{{ 'partenaires'|trans }}</a>
</p>
<p>
<i class="fa fa-check"> </i> {{ showMlcStats('groupe') }} <a href="{#{ path('groupe_liste') }#}" title="{{'Les groupes locaux de la doume'|trans}}">{{'groupes locaux'|trans}}</a>
<i class="fa fa-check"> </i> {{ showMlcStats('groupe') }} <a href="{#{ path('groupe_liste') }#}" title="{{ 'Les groupes locaux de la doume'|trans }}">{{ 'groupes locaux'|trans }}</a>
</p>
<p>
<i class="fa fa-check"> </i> {{ showMlcStats('comptoir') }} <a href="{{ path('comptoirs_liste') }}" title="{{'Les comptoirs de la doume'|trans}}">{{'comptoirs'|trans}}</a>
<i class="fa fa-check"> </i> {{ showMlcStats('comptoir') }} <a href="{{ path('comptoirs_liste') }}" title="{{ 'Les comptoirs de la doume'|trans }}">{{ 'comptoirs'|trans }}</a>
</p>
{# <p>
<i class="fa fa-check"> </i> 527029 Doumes émises
......
templates/comptoir/block/infos.html.twig
{% extends 'block/block_collapse.html.twig' %}
{% block blocktitle %}
<i class="fa fa-cogs mr-4"></i> {{'Configuration du Comptoir'|trans}}
<i class="fa fa-cogs mr-4"></i> {{ 'Configuration du Comptoir'|trans }}
{% endblock blocktitle %}
{% block blocksubtitle %}
{% endblock blocksubtitle %}
......
templates/comptoir/block/reconversion.html.twig
{% extends 'block/onetransaction.html.twig' %}
{% block blocktitle %}
<i class="fa fa-external-link-alt mr-4"></i> Reconversion
<i class="fa fa-external-link-alt mr-4"></i> {{ 'Décharger prestataire'|trans }}
{% endblock blocktitle %}
{% block blockcontent %}
{% set form = getTransfertPrestataireComptoirForm(app.user) %}
......
templates/comptoir/block/transaction_adherent.html.twig
{% extends 'block/onetransaction.html.twig' %}
{% block blocktitle %}
<i class="fa fa-exchange-alt mr-4"></i> Virement vers un adhérent
<i class="fa fa-exchange-alt mr-4"></i> {{ 'Vente à un adhérent'|trans }}
{% endblock blocktitle %}
{% block blockcontent %}
{% set form = getTransfertComptoirToXForm(app.user, 'adherent') %}
......
templates/comptoir/block/transaction_prestataire.html.twig
{% extends 'block/onetransaction.html.twig' %}
{% block blocktitle %}
<i class="fa fa-exchange-alt mr-4"></i> {{'Virement vers un prestataire'|trans}}
<i class="fa fa-exchange-alt mr-4"></i> {{ 'Vente à un prestataire'|trans }}
{% endblock blocktitle %}
{% block blockcontent %}
{% set form = getTransfertComptoirToXForm(app.user, 'prestataire') %}
......
templates/comptoir/carte.html.twig
......@@ -3,10 +3,10 @@
{% block content %}
<div class='container prestalist mt-2'>
<div class='card'>
<div class="card-header"><h3>{{'Carte des comptoirs :'|trans}}</h3></div>
<div class="card-header"><h3>{{ 'Carte des comptoirs :'|trans }}</h3></div>
<div class="card-body">
<div class="card-text">
{% include 'presta/block/carte.html.twig' with {title: 'Situer les comptoirs', id: 'comptoirid', style:"height: 400px;"} %}
{% include 'presta/block/carte.html.twig' with {title: 'Situer les comptoirs'|trans, id: 'comptoirid', style:"height: 400px;"} %}
</div>
</div>
</div>
......
templates/comptoir/liste.html.twig
......@@ -2,7 +2,7 @@
{% block content %}
<div class='container comptoirslist mt-5'>
<h1 class='pagetitle'>{{'Liste des comptoirs'|trans}}</h1>
<h1 class='pagetitle'>{{ 'Liste des comptoirs'|trans }}</h1>
<div class="row">
{% for comptoir in comptoirs %}
<div class='col-6'>
......
templates/comptoir/onecomptoir.html.twig
......@@ -9,10 +9,10 @@
<h4 class="card-subtitle mb-3">{{'Groupe local'|trans}} : <a href='{{ path('show_groupe', {'slug': comptoir.groupe.slug}) }}'>{{comptoir.groupe.__toString()}}</a></h4>
{% endif %}
{% if comptoir.tel != null %}
<h5 class="card-subtitle mb-3">{{'Téléphone'|trans}} : {{comptoir.tel}}</h5>
<h5 class="card-subtitle mb-3">{{ 'Téléphone'|trans }} : {{comptoir.tel}}</h5>
{% endif %}
{% if comptoir.email != null %}
<h6 class="card-subtitle mb-3">{{'Email'|trans}} : {{ comptoir.email|safe_email|raw }}</h6>
<h6 class="card-subtitle mb-3">{{ 'Email'|trans }} : {{ comptoir.email|safe_email|raw }}</h6>
{% endif %}
{% if comptoir.getFullAddresse() != null %}
<h6 class="card-title text-muted mb-3">{{comptoir.getFullAddresse()}}</h6>
......
templates/comptoir/show.html.twig
......@@ -8,13 +8,13 @@
<div class="card-header"><h1>{{comptoir.name}}</h1></div>
<div class="card-body">
{% if comptoir.groupe != null %}
<h4 class="card-subtitle mb-3">{{'Groupe local'|trans}} : <a href='{{ path('show_groupe', {'slug': comptoir.groupe.slug}) }}'>{{comptoir.groupe.__toString()}}</a></h4>
<h4 class="card-subtitle mb-3">{{ 'Groupe local'|trans }} : <a href='{{ path('show_groupe', {'slug': comptoir.groupe.slug}) }}'>{{comptoir.groupe.__toString()}}</a></h4>
{% endif %}
{% if comptoir.tel != null %}
<h5 class="card-subtitle mb-3">{{'Téléphone'|trans}} : {{comptoir.tel}}</h5>
<h5 class="card-subtitle mb-3">{{ 'Téléphone'|trans }} : {{comptoir.tel}}</h5>
{% endif %}
{% if comptoir.email != null %}
<h6 class="card-subtitle mb-3">{{'Email'|trans}} : {{ comptoir.email|safe_email|raw }}</h6>
<h6 class="card-subtitle mb-3">{{ 'Email'|trans }} : {{ comptoir.email|safe_email|raw }}</h6>
{% endif %}
{% if comptoir.getFullAddresse() != null %}
<h6 class="card-title text-muted mb-3">{{comptoir.getFullAddresse()}}</h6>
......@@ -23,7 +23,7 @@
{{comptoir.content|raw}}
</div>
</div>
<div class="card-header"><h2>{{ comptoir.groupe.prestataires|length }} {{'prestataires'|trans}} :</h2></div>
<div class="card-header"><h2>{{ comptoir.groupe.prestataires|length }} {{ 'prestataires'|trans }} :</h2></div>
<ul class="list-group list-group-flush">
{% for presta in comptoir.groupe.prestataires %}
<li class="list-group-item">
......
templates/contact.html.twig
......@@ -3,7 +3,7 @@
{% block content %}
<div class='container homepage'>
<div class="card mx-auto mt-5" style="max-width:600px;">
<div class="card-header">Nous contacter</div>
<div class="card-header">{{ 'Nous contacter'|trans }}</div>
<div class="card-body">
<div class="card-text">
{{form_start(form)}}
......
templates/faq/liste.html.twig
......@@ -2,7 +2,7 @@
{% block content %}
<div class='container faqlist mt-5'>
<h1 class='pagetitle'>{{'Foire Aux Questions'|trans}}</h1>
<h1 class='pagetitle'>{{ 'Foire Aux Questions'|trans }}</h1>
<div class="row">
{% for faq in faqs %}
<div class='col-12 col-md-6'>
......
templates/faq/show.html.twig
......@@ -9,7 +9,7 @@
{{faq.content|raw}}
</p>
{% if faq.fichier is not null %}
<a href="{% path faq.fichier, 'reference' %}">Voir le fichier</a>
<a href="{% path faq.fichier, 'reference' %}">{{ 'Voir le fichier'|trans }}</a>
{% endif %}
{% if faq.image is not null %}
{% thumbnail faq.image, 'small' with {'class': 'myclass'} %}
......
templates/flux/transaction.html.twig
......@@ -3,7 +3,7 @@
{% block content %}
<div class='container groupeshow mt-5'>
<h4>{{ title }} :</h4>
<h5>Mon compte : {{compte}}</h5>
<h5>{{ 'Mon compte'|trans }} : {{compte}}</h5>
{{form_start(form)}}
{{ form_row(form.expediteur) }}
{{ form_row(form.destinataire) }}
......
templates/groupe/block/infos.html.twig
{% extends 'block/block_collapse.html.twig' %}
{% block blocktitle %}
<i class="fa fa-cogs mr-4"></i> {{'Configuration du Groupe local'|trans}}
<i class="fa fa-cogs mr-4"></i> {{ 'Configuration du Groupe local'|trans }}
{% endblock blocktitle %}
{% block blocksubtitle %}
{% endblock blocksubtitle %}
......
templates/groupe/block/retourgroupe.html.twig 0 → 100644
{% extends 'block/onetransaction.html.twig' %}
{% block blocktitle %}
<i class="fa fa-external-link-alt mr-4"></i> {{ 'Retour au groupe'|trans }}
{% endblock blocktitle %}
{% block blockcontent %}
{% set form = getTransfertComptoirGroupeForm(app.user) %}
{{ parent() }}
{% endblock blockcontent %}
\ No newline at end of file
templates/groupe/block/transaction_comptoir.html.twig
{% extends 'block/onetransaction.html.twig' %}
{% block blocktitle %}
<i class="fa fa-exchange-alt mr-4"></i> Transfert vers un comptoir
<i class="fa fa-exchange-alt mr-4"></i> {{ 'Transfert au comptoir'|trans }}
{% endblock blocktitle %}
{% block blockcontent %}
{% set form = getTransfertGroupeComptoirForm(app.user) %}
......
templates/groupe/liste.html.twig
......@@ -2,7 +2,7 @@
{% block content %}
<div class='container groupeslist mt-5'>
<h1>Groupes locaux</h1>
<h1>{{ 'Groupes locaux'|trans }}</h1>
{% for groupe in groupes %}
<div class="my-3 p-3 bg-white rounded box-shadow">
<h2><a href="{{ path('groupe_show', {'slug': groupe.slug}) }}">{{groupe.name}}</a></h2>
......
templates/groupepresta/block/inscription.html.twig
{% extends 'block/block_collapse.html.twig' %}
{% block blocktitle %}
<i class="fa fa-apple-alt mr-4"></i> {{'Inscription AMAP/Marchés'|trans}}
<i class="fa fa-apple-alt mr-4"></i> {{ 'Inscription AMAP/Marchés'|trans }}
{% endblock blocktitle %}
{% block blocksubtitle %}
{% endblock blocksubtitle %}
......
templates/groupepresta/carte.html.twig
......@@ -3,7 +3,7 @@
{% block content %}
<div class='container prestalist mt-2'>
<div class='card'>
<div class="card-header"><h3>{{'Carte des'|trans}} {{groupetype|upper}} :</h3></div>
<div class="card-header"><h3>{{ 'Carte des'|trans }} {{groupetype|upper}} :</h3></div>
<div class="card-body">
<div class="card-text">
{% include 'presta/block/carte.html.twig' with {title: 'Situer les '~groupetype|upper, id: 'groupeid', style:"height: 400px;"} %}
......
templates/groupepresta/show.html.twig
......@@ -8,16 +8,16 @@
<div class="card-header"><h1>{{groupepresta.name}}</h1></div>
<div class="card-body">
{% if groupepresta.groupe != null %}
<h4 class="card-subtitle mb-3">{{'Groupe local'|trans}} : <a href='{{ path('show_groupe', {'slug': groupepresta.groupe.slug}) }}'>{{groupepresta.groupe.__toString()}}</a></h4>
<h4 class="card-subtitle mb-3">{{ 'Groupe local'|trans }} : <a href='{{ path('show_groupe', {'slug': groupepresta.groupe.slug}) }}'>{{groupepresta.groupe.__toString()}}</a></h4>
{% endif %}
{% if groupepresta.horaires != null %}
<h5 class="card-subtitle mb-3">{{'Horaires'|trans}} : {{groupepresta.horaires}}</h5>
<h5 class="card-subtitle mb-3">{{ 'Horaires'|trans }} : {{groupepresta.horaires}}</h5>
{% endif %}
{% if groupepresta.tel != null %}
<h5 class="card-subtitle mb-3">{{'Téléphone'|trans}} : {{groupepresta.tel}}</h5>
<h5 class="card-subtitle mb-3">{{ 'Téléphone'|trans }} : {{groupepresta.tel}}</h5>
{% endif %}
{% if groupepresta.email != null %}
<h6 class="card-subtitle mb-3">{{'Email'|trans}} : {{ groupepresta.email|safe_email|raw }}</h6>
<h6 class="card-subtitle mb-3">{{ 'Email'|trans }} : {{ groupepresta.email|safe_email|raw }}</h6>
{% endif %}
{% if groupepresta.getFullAddresse() != null %}
<h6 class="card-title text-muted mb-3">{{groupepresta.getFullAddresse()}}</h6>
......
templates/index.html.twig
......@@ -24,7 +24,7 @@
{% include 'common/login.html.twig' %}
{% endset %}
{% include 'block/modal.html.twig' %}
<a class='btn btn-primary w-100 mb-4' data-toggle="modal" data-target="#{{ modal_id }}" title='{{'Se connecter'|trans}}' href="{{path('fos_user_security_login')}}">{{'Se connecter'|trans}}</a>
<a class='btn btn-primary w-100 mb-4' data-toggle="modal" data-target="#{{ modal_id }}" title='{{ 'Se connecter'|trans }}' href="{{path('fos_user_security_login')}}">{{ 'Se connecter'|trans }}</a>
{% endif %}
{% include 'common/news.html.twig' %}
{% endblock colonne_droite %}
......
templates/installation.html.twig
......@@ -3,7 +3,7 @@
{% block content %}
<div class='container homepage'>
<div class="card mx-auto mt-5" style="max-width:600px;">
<div class="card-header">PREMIERE INSTALLATION</div>
<div class="card-header">{{ 'PREMIERE INSTALLATION'|trans }}</div>
<div class="card-body">
<div class="card-text">
{{form_start(form)}}
......
templates/news/liste.html.twig
......@@ -2,7 +2,7 @@
{% block content %}
<div class='container newslist mt-5'>
<h1><i class="fa fa-newspaper"></i> {{'Actualités'|trans}}</h1>
<h1><i class="fa fa-newspaper"></i> {{ 'Actualités'|trans }}</h1>
{% for new in news %}
<div class="card mb-4">
<div class="card-header" style='cursor:pointer;'><h2><a href='{{path('show_news', {'slug': new.slug})}}'>{{ new.title|capitalize }}</a></h2></div>
......@@ -13,7 +13,7 @@
{% if pathMedia ends with '.jpg' or pathMedia ends with '.png' or pathMedia ends with '.bmp' or pathMedia ends with '.gif' %}
<img src="{% path new.media, 'reference' %}" style="max-width: 100%;"/>
{% else %}
<a href="{% path new.media, 'reference' %}">{{'Télécharger'|trans}}</a>
<a href="{% path new.media, 'reference' %}">{{ 'Télécharger'|trans }}</a>
{% endif %}
{% endif %}
......@@ -21,7 +21,7 @@
</div>
</div>
<div class="card-footer text-muted">
{{'Crée le'|trans}} {{new.createdAt|date('d/m/Y')}}
{{ 'Crée le'|trans }} {{new.createdAt|date('d/m/Y')}}
</div>
</div>
{% endfor %}
......
templates/news/show.html.twig
......@@ -19,7 +19,7 @@
</div>
</div>
<div class="card-footer text-muted">
{{'Crée le'|trans}} {{news.createdAt|date('d/m/Y')}}
{{ 'Crée le'|trans }} {{news.createdAt|date('d/m/Y')}}
</div>
</div>
</div>
......
templates/presta/block/reconversion.html.twig
{% extends 'block/onetransaction.html.twig' %}
{% block blocktitle %}
<i class="fa fa-external-link-alt mr-4"></i> Reconversion
<i class="fa fa-external-link-alt mr-4"></i> {{ 'Reconversion'|trans }}
{% endblock blocktitle %}
{% block blockcontent %}
{% set form = getTransfertPrestataireSiegeForm(app.user) %}
......
templates/presta/carte.html.twig
......@@ -3,7 +3,7 @@
{% block content %}
<div class='container prestalist mt-2'>
<div class='card'>
<div class="card-header"><h3>{{'Carte des prestataires :'|trans}}</h3></div>
<div class="card-header"><h3>{{ 'Carte des prestataires :'|trans }}</h3></div>
<div class="card-body">
<div class="card-text">
{% include 'presta/block/carte.html.twig' with {style:"height: 400px;"} %}
......
templates/presta/liste_prestataires.html.twig
......@@ -10,7 +10,7 @@
<div class="card-header"><h2>{{presta.raison}}</h2></div>
<div class="card-body">
<h4 class="card-title">{{presta.statut}} - {{presta.siret}}</h4>
<h6 class="card-title">Responsable : {{presta.responsable}} ({{presta.metier}})</h6>
<h6 class="card-title">{{ 'Responsable'|trans }} : {{presta.responsable}} ({{presta.metier}})</h6>
<div class="card-text">
{% if presta.media %}
<p class='mb-4'>
......@@ -29,12 +29,12 @@
{% endif %}
{% if presta.horaires != null %}
<em class='mb-4'>
{{presta.horaires|raw}}
{{ 'Horaires'|trans }} : {{presta.horaires|raw}}
</em>
{% endif %}
{% if presta.web != null %}
<p>
<a href='{{presta.web}}'>Site web</a>
<a href='{{presta.web}}'>{{ 'Site web'|trans }}</a>
</p>
{% endif %}
</div>
......
templates/presta/rubriques.html.twig
......@@ -2,7 +2,7 @@
{% block content %}
<div class='container rubriquelist mt-5'>
<h1>Rubriques</h1>
<h1>{{ 'Rubriques'|trans }}</h1>
{# <div class="card-columns"> #}
<div class="row">
{% for rubrique in rubriques %}
......
templates/presta/show_rubrique.html.twig
......@@ -5,7 +5,7 @@
<h1>{{rubrique.name}}</h1>
<div class="my-3 p-3 bg-white rounded box-shadow">
<p>{{rubrique.content|raw}}</p>
<h3>Prestataires : </h3>
<h3>{{ 'Prestataires'|trans }} : </h3>
{% for prestataire in rubrique.prestataires %}
<div class="my-3 p-3 bg-grey rounded box-shadow">
<span><a href="{{ path('show_prestataire', {'slug': prestataire.slug}) }}">{{prestataire.raison}}</a></span>
......
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