Browse Source

Merge branch 'develop'

develop
Guillaume 3 years ago
parent
commit
d1709de372
3 changed files with 33 additions and 5 deletions
  1. +5
    -5
      ShopBundle/Form/Frontend/TicketType.php
  2. +1
    -0
      ShopBundle/Resources/translations/lcshop.fr.yaml
  3. +27
    -0
      ShopBundle/Resources/views/backend/default/block/list_ordersgiftvoucher.html.twig

+ 5
- 5
ShopBundle/Form/Frontend/TicketType.php View File

protected $security ; protected $security ;
protected $em ; protected $em ;
protected $priceUtils ; protected $priceUtils ;
protected $utils ;


public function __construct(Security $security, EntityManagerInterface $em, UtilsManager $utilsManager) public function __construct(Security $security, EntityManagerInterface $em, UtilsManager $utilsManager)
{ {
$this->em = $em ; $this->em = $em ;
$this->orderShopRepository = $this->em->getRepository(OrderShop::class) ; $this->orderShopRepository = $this->em->getRepository(OrderShop::class) ;
$this->priceUtils = $utilsManager->getPriceUtils() ; $this->priceUtils = $utilsManager->getPriceUtils() ;
$this->utils = $utilsManager->getUtils() ;
} }


public function buildForm(FormBuilderInterface $builder, array $options) public function buildForm(FormBuilderInterface $builder, array $options)
]) ; ]) ;
} }
else { else {
// captcha (honey pot)
$builder->add('body', TextType::class, [
'label' => 'Body',
'required' => false,
]) ;
// captcha
$this->utils->addCaptchaType($builder);
} }



$builder->add('subject', TextType::class, [ $builder->add('subject', TextType::class, [
'label' => 'Sujet' 'label' => 'Sujet'
]) ])

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

orderStatusHistories: Historique de changement de statut orderStatusHistories: Historique de changement de statut
waitingBankReturn: Commandes en attente de retour banque waitingBankReturn: Commandes en attente de retour banque
list: Liste des commandes list: Liste des commandes
giftVoucher: Commandes de bons cadeaux
Ticket: Ticket:
listMessages: Liste des messages listMessages: Liste des messages
list: Tickets ouverts list: Tickets ouverts

+ 27
- 0
ShopBundle/Resources/views/backend/default/block/list_ordersgiftvoucher.html.twig View File

<table class="table table-condensed" id="address-list">
<thead>
<tr>
<th>Id</th>
<th>Utilisateurs</th>
<th>Date</th>
<th></th>
</tr>
</thead>
<tbody>
{% for order in orderShopsWeekGiftVoucher %}
<tr>
<td>{{ order.id }}</td>
<td>{{ order.user }}</td>
<td>{{ order.updatedAt|date('d-m H:i') }}</td>
<td><a class="btn-sm btn-success"
href="{{ path('easyadmin', {id: order.id, entity: 'OrderShop', action: 'show'}) }}">
<i class="fas fa-eye"></i>
</a></td>
</tr>
{% else %}
<tr>
<td colspan="4"><i>Aucune commande de bons cadeaux</i></td>
{% endfor %}
</tbody>
</table>


Loading…
Cancel
Save