Merge branch 'develop' of https://gitea.laclic.fr/Laclic/CaracoleSkeleton into develop

config/services.yaml

@@ -30,8 +30,6 @@ services:
         resource: '../src/Controller/'
         tags: ['controller.service_arguments']
 
-
-
     carac.merchant.resolver:
         alias: Lc\CaracoleBundle\Resolver\MerchantResolver
         public: true
@@ -51,3 +49,5 @@ services:
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
 
+    Lc\CaracoleBundle\Definition\MerchantSettingDefinition:
+        class: App\Definition\MerchantSettingDefinition

src/Definition/MerchantSettingDefinition.php

@@ -2,12 +2,11 @@
 
 namespace App\Definition;
 
-use Lc\CaracoleBundle\Definition\AbstractSettingDefinition;
-use Lc\CaracoleBundle\Definition\MerchantSettingDefinitionInterface;
+use Lc\CaracoleBundle\Definition\MerchantSettingDefinition as CaracMerchantSettingDefinition;
+use Lc\CaracoleBundle\Model\Setting\MerchantSettingInterface;
 
-class MerchantSettingDefinition extends AbstractSettingDefinition implements MerchantSettingDefinitionInterface
+class MerchantSettingDefinition extends CaracMerchantSettingDefinition implements MerchantSettingInterface
 {
-    const CATEGORY_GENERAL = 'general';
     const CATEGORY_EMAIL = 'email';
 
     const SETTING_EXAMPLE_TEXT = 'exampleText';
@@ -21,9 +20,11 @@ class MerchantSettingDefinition extends AbstractSettingDefinition implements Mer
     const SETTING_EXAMPLE_FILE = 'exampleFile';
     const SETTING_EXAMPLE_IMAGE = 'exampleImage';
 
-
     public function __construct()
     {
+
+        parent::__construct() ;
+
         // général
         $this
                 ->addSettingText(
@@ -103,10 +104,9 @@ class MerchantSettingDefinition extends AbstractSettingDefinition implements Mer
 
     public function getCategories()
     {
-        return [
-                self::CATEGORY_GENERAL,
+        return array_merge(parent::getCategories(), [
                 self::CATEGORY_EMAIL,
-        ];
+        ]);
     }
 
 }

translations/admin.fr.yaml

@@ -1,7 +1,6 @@
 setting_definition:
   merchant:
     categories:
-      general: Général
       email: Email
     settings:
       exampleText: Texte