Merge branch 'develop' of https://gitea.laclic.fr/Laclic/LcShopBundle into 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/Model/OrderShop.php

@@ -23,7 +23,7 @@ abstract class OrderShop extends AbstractEntity implements FilterMerchantInterfa
         protected $merchant;
 
         /**
-         * @ORM\ManyToOne(targetEntity="Lc\ShopBundle\Context\UserInterface", inversedBy="orders")
+         * @ORM\ManyToOne(targetEntity="Lc\ShopBundle\Context\UserInterface", inversedBy="orders", fetch="EAGER")
          */
         protected $user;
 

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>
+

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

@@ -331,7 +331,8 @@
 
 
 
-{% macro list_reduction_credits(reductionCredits) %}
+{% macro list_reduction_credits(reductionCredits, user) %}
+    {% set merchant_current = merchantUtils.getMerchantCurrent() %}
     <table class="table table-condensed">
         <thead>
         <tr>
@@ -344,24 +345,26 @@
         </thead>
         <tbody>
         {% for reductionCredit in reductionCredits %}
-            {% set isUsed = orderUtils.isReductionCreditUsed(reductionCredit) %}
-            <tr>
-                <td>{{ reductionCredit.title }}</td>
-                <td>
-                    {{ reductionCredit.value|format_price(false) }}
-                </td>
-                <td>
-                    {% include '@EasyAdmin/default/field_boolean.html.twig' with {value: reductionCredit.status} %}
-                </td>
-                <td>
-                    {% include '@EasyAdmin/default/field_boolean.html.twig' with {value: isUsed} %}
-                </td>
-                <td>
-                    {% if isUsed == false %}
-                        {{ _self.button('ReductionCredit', 'edit',  reductionCredit.id, 'primary') }}
-                    {% endif %}
-                </td>
-            </tr>
+            {% if reductionCredit.getMerchant() == merchant_current %}
+                {% set isUsed = orderUtils.isReductionCreditUsed(reductionCredit, user) %}
+                <tr>
+                    <td>{{ reductionCredit.title }}</td>
+                    <td>
+                        {{ reductionCredit.value|format_price(false) }}
+                    </td>
+                    <td>
+                        {% include '@EasyAdmin/default/field_boolean.html.twig' with {value: reductionCredit.status} %}
+                    </td>
+                    <td>
+                        {% include '@EasyAdmin/default/field_boolean.html.twig' with {value: isUsed} %}
+                    </td>
+                    <td>
+                        {% if isUsed == false %}
+                            {{ _self.button('ReductionCredit', 'edit',  reductionCredit.id, 'primary') }}
+                        {% endif %}
+                    </td>
+                </tr>
+            {% endif %}
         {% endfor %}
         </tbody>
     </table>

ShopBundle/Resources/views/backend/user/show.html.twig

@@ -53,7 +53,7 @@
 
                 {% if entity.reductionCredits|length %}
                     {{ macros.card_start('ReductionCredit.list', 'warning card-outline', false) }}
-                    {{ macros.list_reduction_credits(entity.reductionCredits) }}
+                    {{ macros.list_reduction_credits(entity.reductionCredits, entity) }}
                     {{ macros.card_end() }}
                 {% endif %}
 

ShopBundle/Services/Order/OrderUtilsReductionTrait.php

@@ -200,8 +200,8 @@ trait OrderUtilsReductionTrait
                 }
         }
 
-        public function isReductionCreditUsed($reductionCredit){
-                if($this->orderShopRepo->countValidOrderWithReductionCredit($reductionCredit)) {
+        public function isReductionCreditUsed($reductionCredit, $user = false){
+                if($this->orderShopRepo->countValidOrderWithReductionCredit($reductionCredit, $user)) {
                         return true;
                 }else{
                         return false;