Merge branch 'develop'

ShopBundle/Form/Frontend/TicketType.php

@@ -23,6 +23,7 @@ class TicketType extends AbstractType
         protected $security ;
         protected $em ;
         protected $priceUtils ;
+        protected $utils ;
 
         public function __construct(Security $security, EntityManagerInterface $em, UtilsManager $utilsManager)
         {
@@ -30,6 +31,7 @@ class TicketType extends AbstractType
                 $this->em = $em ;
                 $this->orderShopRepository = $this->em->getRepository(OrderShop::class) ;
                 $this->priceUtils = $utilsManager->getPriceUtils() ;
+                $this->utils = $utilsManager->getUtils() ;
         }
 
         public function buildForm(FormBuilderInterface $builder, array $options)
@@ -83,13 +85,11 @@ class TicketType extends AbstractType
                         ]) ;
                 }
                 else {
-                        // captcha (honey pot)
-                        $builder->add('body', TextType::class, [
-                                'label' => 'Body',
-                                'required' => false,
-                        ]) ;
+                        // captcha
+                        $this->utils->addCaptchaType($builder);
                 }
 
+
                 $builder->add('subject', TextType::class, [
                                 'label' => 'Sujet'
                         ])

ShopBundle/Resources/translations/lcshop.fr.yaml

@@ -78,6 +78,7 @@ group:
         orderStatusHistories: Historique de changement de statut
         waitingBankReturn: Commandes en attente de retour banque
         list: Liste des commandes
+        giftVoucher: Commandes de bons cadeaux
     Ticket:
         listMessages: Liste des messages
         list: Tickets ouverts

ShopBundle/Resources/views/backend/default/block/list_ordersgiftvoucher.html.twig

@@ -0,0 +1,27 @@
+<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>
+