Merge branch 'develop' of https://forge.laclic.fr/Laclic/CaracoleBundle into develop

Controller/User/UserMerchantAdminController.php

@@ -29,6 +29,7 @@ use Lc\CaracoleBundle\Form\User\UserMerchantFormType;
 use Lc\CaracoleBundle\Model\Credit\CreditHistoryInterface;
 use Lc\SovBundle\Controller\AbstractAdminController;
 use Lc\SovBundle\Field\BooleanField;
+use Lc\SovBundle\Field\ToggleField;
 use Lc\SovBundle\Model\User\UserInterface;
 use Lc\SovBundle\Translation\TranslatorAdmin;
 use Symfony\Component\HttpFoundation\Response;

Doctrine/Extension/FilterSectionInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Lc\CaracoleBundle\Doctrine\Extension ;
+namespace Lc\CaracoleBundle\Doctrine\Extension;
 
 interface FilterSectionInterface
 {

Model/Order/OrderStatusModel.php

@@ -5,11 +5,12 @@ namespace Lc\CaracoleBundle\Model\Order;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Lc\SovBundle\Doctrine\EntityInterface;
 
 /**
  * @ORM\MappedSuperclass()
  */
-abstract class OrderStatusModel
+abstract class OrderStatusModel implements EntityInterface
 {
     const ALIAS_CART = 'cart';
     const ALIAS_CART_CANCELED = 'cart-canceled';

Resources/assets/app/admin/switchmerchant/switchmerchant_admin.scss

@@ -6,7 +6,7 @@
 
   .fa {
     position: relative;
-    top: -4px;
+    top: 3px;
     right: 7px;
   }
 

Resources/translations/admin.fr.yaml

@@ -3,8 +3,8 @@ menu:
   pointsale: Points de vente
   product_category: Catégories
   setting: Paramètres
-  setting_merchant: Marchand
-  setting_section: Section
+  setting_merchant: Marchands
+  setting_section: Sections
   section_openings: Ouvertures
   admin: Administration
   admin_merchant: Marchands