Role dans User Merchant

composer.lock

@@ -8,22 +8,22 @@
     "packages": [
         {
             "name": "artgris/filemanager-bundle",
-            "version": "2.2.4",
+            "version": "2.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/artgris/FileManagerBundle.git",
-                "reference": "93765f05943a008150cfd9764f6c0a8038e20699"
+                "reference": "3bd8655309532f6a3c07ca0ef0e0f7aecd01259b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/artgris/FileManagerBundle/zipball/93765f05943a008150cfd9764f6c0a8038e20699",
-                "reference": "93765f05943a008150cfd9764f6c0a8038e20699",
+                "url": "https://api.github.com/repos/artgris/FileManagerBundle/zipball/3bd8655309532f6a3c07ca0ef0e0f7aecd01259b",
+                "reference": "3bd8655309532f6a3c07ca0ef0e0f7aecd01259b",
                 "shasum": ""
             },
             "require": {
                 "oomphinc/composer-installers-extender": "^1.1|^2.0",
                 "php": "^7.1.3|^8.0.0",
-                "sensio/framework-extra-bundle": "^4.4|^5.0",
+                "sensio/framework-extra-bundle": "^4.4|^5.0|^6.0",
                 "symfony/asset": "^4.4|^5.0",
                 "symfony/event-dispatcher": "^4.4|^5.0",
                 "symfony/expression-language": "^4.4|^5.0",
@@ -70,9 +70,9 @@
             ],
             "support": {
                 "issues": "https://github.com/artgris/FileManagerBundle/issues",
-                "source": "https://github.com/artgris/FileManagerBundle/tree/2.2.4"
+                "source": "https://github.com/artgris/FileManagerBundle/tree/2.2.5"
             },
-            "time": "2021-05-25T12:52:51+00:00"
+            "time": "2021-06-07T09:29:38+00:00"
         },
         {
             "name": "behat/transliterator",
@@ -828,16 +828,16 @@
         },
         {
             "name": "doctrine/doctrine-bundle",
-            "version": "2.4.1",
+            "version": "2.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/DoctrineBundle.git",
-                "reference": "7f472cc85eba050a83fcf38cece87b868877d7e2"
+                "reference": "4202ce675d29e70a8b9ee763bec021b6f44caccb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/7f472cc85eba050a83fcf38cece87b868877d7e2",
-                "reference": "7f472cc85eba050a83fcf38cece87b868877d7e2",
+                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/4202ce675d29e70a8b9ee763bec021b6f44caccb",
+                "reference": "4202ce675d29e70a8b9ee763bec021b6f44caccb",
                 "shasum": ""
             },
             "require": {
@@ -920,7 +920,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/DoctrineBundle/issues",
-                "source": "https://github.com/doctrine/DoctrineBundle/tree/2.4.1"
+                "source": "https://github.com/doctrine/DoctrineBundle/tree/2.4.2"
             },
             "funding": [
                 {
@@ -936,7 +936,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-06-01T18:38:32+00:00"
+            "time": "2021-06-05T13:40:39+00:00"
         },
         {
             "name": "doctrine/doctrine-migrations-bundle",

config/packages/lc_sov.yaml

@@ -4,5 +4,4 @@ lc_sov:
     redirect_referer: true
     roles_redirection:
       - { role: "ROLE_ADMIN", redirect: "admin_dashboard" }
-      - { role: "ROLE_ANIMATOR", redirect: "admin_dashboard" }
       - { role: "ROLE_SUPER_ADMIN", redirect: "admin_dashboard" }

config/services.yaml

@@ -30,6 +30,12 @@ services:
         resource: '../src/Controller/'
         tags: ['controller.service_arguments']
 
+
+
+    carac.merchant.resolver:
+        alias: Lc\CaracoleBundle\Resolver\MerchantResolver
+        public: true
+
     Lc\CaracoleBundle\:
         resource: '../Lc/CaracoleBundle/'
         exclude:

migrations/Version20210604073921.php

@@ -1,51 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210604073921 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE merchant_config DROP FOREIGN KEY FK_3CA56895E511F091');
-        $this->addSql('ALTER TABLE merchant_config DROP FOREIGN KEY FK_3CA56895F5B7AF75');
-        $this->addSql('ALTER TABLE merchant_config DROP FOREIGN KEY FK_3CA56895FDD13F95');
-        $this->addSql('DROP INDEX UNIQ_3CA56895E511F091 ON merchant_config');
-        $this->addSql('DROP INDEX UNIQ_3CA56895F5B7AF75 ON merchant_config');
-        $this->addSql('DROP INDEX IDX_3CA56895FDD13F95 ON merchant_config');
-        $this->addSql('ALTER TABLE merchant_config ADD image_id INT DEFAULT NULL, ADD name VARCHAR(63) NOT NULL, ADD value LONGTEXT DEFAULT NULL, DROP credit_config_id, DROP address_id, DROP title, DROP description, DROP meta_title, DROP meta_description, DROP old_urls, DROP slug, DROP position, DROP status, CHANGE tax_rate_id merchant_id INT NOT NULL');
-        $this->addSql('ALTER TABLE merchant_config ADD CONSTRAINT FK_3CA568956796D554 FOREIGN KEY (merchant_id) REFERENCES merchant (id)');
-        $this->addSql('ALTER TABLE merchant_config ADD CONSTRAINT FK_3CA568953DA5256D FOREIGN KEY (image_id) REFERENCES file (id)');
-        $this->addSql('CREATE INDEX IDX_3CA568956796D554 ON merchant_config (merchant_id)');
-        $this->addSql('CREATE INDEX IDX_3CA568953DA5256D ON merchant_config (image_id)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE merchant_config DROP FOREIGN KEY FK_3CA568956796D554');
-        $this->addSql('ALTER TABLE merchant_config DROP FOREIGN KEY FK_3CA568953DA5256D');
-        $this->addSql('DROP INDEX IDX_3CA568956796D554 ON merchant_config');
-        $this->addSql('DROP INDEX IDX_3CA568953DA5256D ON merchant_config');
-        $this->addSql('ALTER TABLE merchant_config ADD address_id INT DEFAULT NULL, ADD title VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, ADD meta_title VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, ADD meta_description LONGTEXT CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, ADD old_urls LONGTEXT CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci` COMMENT \'(DC2Type:array)\', ADD slug VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, ADD position DOUBLE PRECISION NOT NULL, ADD status DOUBLE PRECISION NOT NULL, DROP name, CHANGE image_id credit_config_id INT DEFAULT NULL, CHANGE merchant_id tax_rate_id INT NOT NULL, CHANGE value description LONGTEXT CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`');
-        $this->addSql('ALTER TABLE merchant_config ADD CONSTRAINT FK_3CA56895E511F091 FOREIGN KEY (credit_config_id) REFERENCES credit_config (id)');
-        $this->addSql('ALTER TABLE merchant_config ADD CONSTRAINT FK_3CA56895F5B7AF75 FOREIGN KEY (address_id) REFERENCES address (id)');
-        $this->addSql('ALTER TABLE merchant_config ADD CONSTRAINT FK_3CA56895FDD13F95 FOREIGN KEY (tax_rate_id) REFERENCES tax_rate (id)');
-        $this->addSql('CREATE UNIQUE INDEX UNIQ_3CA56895E511F091 ON merchant_config (credit_config_id)');
-        $this->addSql('CREATE UNIQUE INDEX UNIQ_3CA56895F5B7AF75 ON merchant_config (address_id)');
-        $this->addSql('CREATE INDEX IDX_3CA56895FDD13F95 ON merchant_config (tax_rate_id)');
-    }
-}

migrations/Version20210605195723.php

@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210605195723 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TABLE merchant_setting (id INT AUTO_INCREMENT NOT NULL, merchant_id INT NOT NULL, name VARCHAR(63) NOT NULL, value LONGTEXT DEFAULT NULL, INDEX IDX_464ACD036796D554 (merchant_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE section_setting (id INT AUTO_INCREMENT NOT NULL, section_id INT NOT NULL, name VARCHAR(63) NOT NULL, value LONGTEXT DEFAULT NULL, INDEX IDX_4D337597D823E37A (section_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
-        $this->addSql('ALTER TABLE merchant_setting ADD CONSTRAINT FK_464ACD036796D554 FOREIGN KEY (merchant_id) REFERENCES merchant (id)');
-        $this->addSql('ALTER TABLE section_setting ADD CONSTRAINT FK_4D337597D823E37A FOREIGN KEY (section_id) REFERENCES section (id)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('DROP TABLE merchant_setting');
-        $this->addSql('DROP TABLE section_setting');
-    }
-}

migrations/Version20210606143911.php

@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210606143911 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE merchant_setting ADD date DATETIME DEFAULT NULL, CHANGE value text LONGTEXT DEFAULT NULL');
-        $this->addSql('ALTER TABLE section_setting ADD date DATETIME DEFAULT NULL, CHANGE value text LONGTEXT DEFAULT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE merchant_setting DROP date, CHANGE text value LONGTEXT CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`');
-        $this->addSql('ALTER TABLE section_setting DROP date, CHANGE text value LONGTEXT CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`');
-    }
-}

migrations/Version20210606145644.php

@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210606145644 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE merchant_setting ADD file_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE merchant_setting ADD CONSTRAINT FK_464ACD0393CB796C FOREIGN KEY (file_id) REFERENCES file (id)');
-        $this->addSql('CREATE INDEX IDX_464ACD0393CB796C ON merchant_setting (file_id)');
-        $this->addSql('ALTER TABLE section_setting ADD file_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE section_setting ADD CONSTRAINT FK_4D33759793CB796C FOREIGN KEY (file_id) REFERENCES file (id)');
-        $this->addSql('CREATE INDEX IDX_4D33759793CB796C ON section_setting (file_id)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE merchant_setting DROP FOREIGN KEY FK_464ACD0393CB796C');
-        $this->addSql('DROP INDEX IDX_464ACD0393CB796C ON merchant_setting');
-        $this->addSql('ALTER TABLE merchant_setting DROP file_id');
-        $this->addSql('ALTER TABLE section_setting DROP FOREIGN KEY FK_4D33759793CB796C');
-        $this->addSql('DROP INDEX IDX_4D33759793CB796C ON section_setting');
-        $this->addSql('ALTER TABLE section_setting DROP file_id');
-    }
-}

migrations/Version20210607084117.php

@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210607084117 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('DROP TABLE merchant_config');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TABLE merchant_config (id INT AUTO_INCREMENT NOT NULL, merchant_id INT NOT NULL, created_by_id INT NOT NULL, updated_by_id INT NOT NULL, image_id INT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, dev_alias VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, name VARCHAR(63) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, value LONGTEXT CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, INDEX IDX_3CA56895896DBBDE (updated_by_id), INDEX IDX_3CA568956796D554 (merchant_id), INDEX IDX_3CA568953DA5256D (image_id), INDEX IDX_3CA56895B03A8386 (created_by_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB COMMENT = \'\' ');
-        $this->addSql('ALTER TABLE merchant_config ADD CONSTRAINT FK_3CA568953DA5256D FOREIGN KEY (image_id) REFERENCES file (id)');
-        $this->addSql('ALTER TABLE merchant_config ADD CONSTRAINT FK_3CA568956796D554 FOREIGN KEY (merchant_id) REFERENCES merchant (id)');
-        $this->addSql('ALTER TABLE merchant_config ADD CONSTRAINT FK_3CA56895896DBBDE FOREIGN KEY (updated_by_id) REFERENCES user (id)');
-        $this->addSql('ALTER TABLE merchant_config ADD CONSTRAINT FK_3CA56895B03A8386 FOREIGN KEY (created_by_id) REFERENCES user (id)');
-    }
-}

migrations/Version20210604092848.php → migrations/Version20210607124904.php

@@ -10,7 +10,7 @@ use Doctrine\Migrations\AbstractMigration;
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
-final class Version20210604092848 extends AbstractMigration
+final class Version20210607124904 extends AbstractMigration
 {
     public function getDescription(): string
     {
@@ -27,7 +27,7 @@ final class Version20210604092848 extends AbstractMigration
         $this->addSql('CREATE TABLE file (id INT AUTO_INCREMENT NOT NULL, created_by_id INT NOT NULL, updated_by_id INT NOT NULL, path VARCHAR(255) DEFAULT NULL, legend VARCHAR(255) DEFAULT NULL, dev_alias VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, locales_enabled LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', position DOUBLE PRECISION NOT NULL, INDEX IDX_8C9F3610B03A8386 (created_by_id), INDEX IDX_8C9F3610896DBBDE (updated_by_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('CREATE TABLE group_user (id INT AUTO_INCREMENT NOT NULL, merchant_id INT NOT NULL, created_by_id INT NOT NULL, updated_by_id INT NOT NULL, title VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, meta_title VARCHAR(255) DEFAULT NULL, meta_description LONGTEXT DEFAULT NULL, old_urls LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', slug VARCHAR(255) NOT NULL, position DOUBLE PRECISION NOT NULL, status DOUBLE PRECISION NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, dev_alias VARCHAR(255) DEFAULT NULL, INDEX IDX_A4C98D396796D554 (merchant_id), INDEX IDX_A4C98D39B03A8386 (created_by_id), INDEX IDX_A4C98D39896DBBDE (updated_by_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('CREATE TABLE merchant (id INT AUTO_INCREMENT NOT NULL, credit_config_id INT DEFAULT NULL, tax_rate_id INT NOT NULL, address_id INT DEFAULT NULL, created_by_id INT NOT NULL, updated_by_id INT NOT NULL, title VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, meta_title VARCHAR(255) DEFAULT NULL, meta_description LONGTEXT DEFAULT NULL, old_urls LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', slug VARCHAR(255) NOT NULL, position DOUBLE PRECISION NOT NULL, status DOUBLE PRECISION NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, dev_alias VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_74AB25E1E511F091 (credit_config_id), INDEX IDX_74AB25E1FDD13F95 (tax_rate_id), UNIQUE INDEX UNIQ_74AB25E1F5B7AF75 (address_id), INDEX IDX_74AB25E1B03A8386 (created_by_id), INDEX IDX_74AB25E1896DBBDE (updated_by_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE merchant_config (id INT AUTO_INCREMENT NOT NULL, credit_config_id INT DEFAULT NULL, tax_rate_id INT NOT NULL, address_id INT DEFAULT NULL, created_by_id INT NOT NULL, updated_by_id INT NOT NULL, title VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, meta_title VARCHAR(255) DEFAULT NULL, meta_description LONGTEXT DEFAULT NULL, old_urls LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', slug VARCHAR(255) NOT NULL, position DOUBLE PRECISION NOT NULL, status DOUBLE PRECISION NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, dev_alias VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_3CA56895E511F091 (credit_config_id), INDEX IDX_3CA56895FDD13F95 (tax_rate_id), UNIQUE INDEX UNIQ_3CA56895F5B7AF75 (address_id), INDEX IDX_3CA56895B03A8386 (created_by_id), INDEX IDX_3CA56895896DBBDE (updated_by_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE merchant_setting (id INT AUTO_INCREMENT NOT NULL, merchant_id INT NOT NULL, file_id INT DEFAULT NULL, name VARCHAR(63) NOT NULL, text LONGTEXT DEFAULT NULL, date DATETIME DEFAULT NULL, INDEX IDX_464ACD036796D554 (merchant_id), INDEX IDX_464ACD0393CB796C (file_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('CREATE TABLE news (id INT AUTO_INCREMENT NOT NULL, merchant_id INT NOT NULL, created_by_id INT NOT NULL, updated_by_id INT NOT NULL, date DATETIME NOT NULL, is_sent TINYINT(1) DEFAULT NULL, title VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, meta_title VARCHAR(255) DEFAULT NULL, meta_description LONGTEXT DEFAULT NULL, old_urls LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', slug VARCHAR(255) NOT NULL, position DOUBLE PRECISION NOT NULL, status DOUBLE PRECISION NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, dev_alias VARCHAR(255) DEFAULT NULL, INDEX IDX_1DD399506796D554 (merchant_id), INDEX IDX_1DD39950B03A8386 (created_by_id), INDEX IDX_1DD39950896DBBDE (updated_by_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('CREATE TABLE newsletter (id INT AUTO_INCREMENT NOT NULL, merchant_id INT DEFAULT NULL, created_by_id INT NOT NULL, updated_by_id INT NOT NULL, is_main TINYINT(1) DEFAULT NULL, title VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, meta_title VARCHAR(255) DEFAULT NULL, meta_description LONGTEXT DEFAULT NULL, old_urls LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', slug VARCHAR(255) NOT NULL, position DOUBLE PRECISION NOT NULL, status DOUBLE PRECISION NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, dev_alias VARCHAR(255) DEFAULT NULL, INDEX IDX_7E8585C86796D554 (merchant_id), INDEX IDX_7E8585C8B03A8386 (created_by_id), INDEX IDX_7E8585C8896DBBDE (updated_by_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('CREATE TABLE order_payment (id INT AUTO_INCREMENT NOT NULL, created_by_id INT NOT NULL, updated_by_id INT NOT NULL, order_shop_id INT NOT NULL, dev_alias VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, editable TINYINT(1) NOT NULL, mean_payment VARCHAR(255) DEFAULT NULL, reference LONGTEXT DEFAULT NULL, paid_at DATETIME DEFAULT NULL, amount DOUBLE PRECISION NOT NULL, comment LONGTEXT DEFAULT NULL, INDEX IDX_9B522D46B03A8386 (created_by_id), INDEX IDX_9B522D46896DBBDE (updated_by_id), INDEX IDX_9B522D46BB6C6D96 (order_shop_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
@@ -67,6 +67,7 @@ final class Version20210604092848 extends AbstractMigration
         $this->addSql('CREATE TABLE reminder (id INT AUTO_INCREMENT NOT NULL, merchant_id INT NOT NULL, created_by_id INT NOT NULL, updated_by_id INT NOT NULL, title VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, entity_name VARCHAR(255) DEFAULT NULL, entity_id INT DEFAULT NULL, entity_action VARCHAR(255) DEFAULT NULL, date_reminder DATE DEFAULT NULL, done TINYINT(1) NOT NULL, dev_alias VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, INDEX IDX_40374F406796D554 (merchant_id), INDEX IDX_40374F40B03A8386 (created_by_id), INDEX IDX_40374F40896DBBDE (updated_by_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('CREATE TABLE reminder_user_interface (reminder_id INT NOT NULL, user_interface_id INT NOT NULL, INDEX IDX_7FD2584BD987BE75 (reminder_id), INDEX IDX_7FD2584B2BC79580 (user_interface_id), PRIMARY KEY(reminder_id, user_interface_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('CREATE TABLE section (id INT AUTO_INCREMENT NOT NULL, merchant_id INT NOT NULL, created_by_id INT NOT NULL, updated_by_id INT NOT NULL, cycle VARCHAR(32) NOT NULL, is_default TINYINT(1) DEFAULT NULL, color VARCHAR(32) NOT NULL, title VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, meta_title VARCHAR(255) DEFAULT NULL, meta_description LONGTEXT DEFAULT NULL, old_urls LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', slug VARCHAR(255) NOT NULL, position DOUBLE PRECISION NOT NULL, status DOUBLE PRECISION NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, dev_alias VARCHAR(255) DEFAULT NULL, INDEX IDX_2D737AEF6796D554 (merchant_id), INDEX IDX_2D737AEFB03A8386 (created_by_id), INDEX IDX_2D737AEF896DBBDE (updated_by_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE section_setting (id INT AUTO_INCREMENT NOT NULL, section_id INT NOT NULL, file_id INT DEFAULT NULL, name VARCHAR(63) NOT NULL, text LONGTEXT DEFAULT NULL, date DATETIME DEFAULT NULL, INDEX IDX_4D337597D823E37A (section_id), INDEX IDX_4D33759793CB796C (file_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('CREATE TABLE tax_rate (id INT AUTO_INCREMENT NOT NULL, created_by_id INT NOT NULL, updated_by_id INT NOT NULL, title VARCHAR(255) NOT NULL, value DOUBLE PRECISION NOT NULL, dev_alias VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, INDEX IDX_C36330C1B03A8386 (created_by_id), INDEX IDX_C36330C1896DBBDE (updated_by_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('CREATE TABLE ticket (id INT AUTO_INCREMENT NOT NULL, created_by_id INT DEFAULT NULL, updated_by_id INT DEFAULT NULL, merchant_id INT NOT NULL, order_shop_id INT DEFAULT NULL, user_id INT DEFAULT NULL, type VARCHAR(32) NOT NULL, status VARCHAR(32) NOT NULL, subject VARCHAR(255) NOT NULL, tags LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', visitor_firstname VARCHAR(64) DEFAULT NULL, visitor_lastname VARCHAR(64) DEFAULT NULL, visitor_email VARCHAR(128) DEFAULT NULL, visitor_token VARCHAR(255) DEFAULT NULL, dev_alias VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, INDEX IDX_97A0ADA3B03A8386 (created_by_id), INDEX IDX_97A0ADA3896DBBDE (updated_by_id), INDEX IDX_97A0ADA36796D554 (merchant_id), INDEX IDX_97A0ADA3BB6C6D96 (order_shop_id), INDEX IDX_97A0ADA3A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('CREATE TABLE ticket_message (id INT AUTO_INCREMENT NOT NULL, created_by_id INT DEFAULT NULL, updated_by_id INT DEFAULT NULL, ticket_id INT NOT NULL, message LONGTEXT NOT NULL, answer_by_admin TINYINT(1) DEFAULT NULL, image_filename VARCHAR(255) DEFAULT NULL, dev_alias VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, status DOUBLE PRECISION NOT NULL, INDEX IDX_BA71692DB03A8386 (created_by_id), INDEX IDX_BA71692D896DBBDE (updated_by_id), INDEX IDX_BA71692D700047D2 (ticket_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
@@ -75,7 +76,7 @@ final class Version20210604092848 extends AbstractMigration
         $this->addSql('CREATE TABLE user_newsletter_interface (user_id INT NOT NULL, newsletter_interface_id INT NOT NULL, INDEX IDX_276FB522A76ED395 (user_id), INDEX IDX_276FB522A0E6D8FC (newsletter_interface_id), PRIMARY KEY(user_id, newsletter_interface_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('CREATE TABLE user_group_user_interface (user_id INT NOT NULL, group_user_interface_id INT NOT NULL, INDEX IDX_12B87B34A76ED395 (user_id), INDEX IDX_12B87B34F583BABC (group_user_interface_id), PRIMARY KEY(user_id, group_user_interface_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('CREATE TABLE user_product_family_interface (user_id INT NOT NULL, product_family_interface_id INT NOT NULL, INDEX IDX_6F63A287A76ED395 (user_id), INDEX IDX_6F63A2874537D78D (product_family_interface_id), PRIMARY KEY(user_id, product_family_interface_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE user_merchant (id INT AUTO_INCREMENT NOT NULL, user_id INT NOT NULL, merchant_id INT NOT NULL, current_admin_section_id INT DEFAULT NULL, credit DOUBLE PRECISION DEFAULT NULL, credit_active TINYINT(1) NOT NULL, active TINYINT(1) NOT NULL, INDEX IDX_9426C1E1A76ED395 (user_id), INDEX IDX_9426C1E16796D554 (merchant_id), INDEX IDX_9426C1E1FE54D809 (current_admin_section_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE user_merchant (id INT AUTO_INCREMENT NOT NULL, user_id INT NOT NULL, merchant_id INT NOT NULL, current_admin_section_id INT DEFAULT NULL, credit DOUBLE PRECISION DEFAULT NULL, credit_active TINYINT(1) NOT NULL, active TINYINT(1) NOT NULL, roles LONGTEXT NOT NULL COMMENT \'(DC2Type:json)\', INDEX IDX_9426C1E1A76ED395 (user_id), INDEX IDX_9426C1E16796D554 (merchant_id), INDEX IDX_9426C1E1FE54D809 (current_admin_section_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('CREATE TABLE user_point_sale (id INT AUTO_INCREMENT NOT NULL, user_id INT NOT NULL, point_sale_id INT NOT NULL, comment LONGTEXT DEFAULT NULL, INDEX IDX_CBACE18BA76ED395 (user_id), INDEX IDX_CBACE18BFDAAB1A4 (point_sale_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('CREATE TABLE visitor (id INT AUTO_INCREMENT NOT NULL, cookie VARCHAR(255) NOT NULL, last_access DATETIME NOT NULL, ip VARCHAR(255) NOT NULL, total_visit INT NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('ALTER TABLE address ADD CONSTRAINT FK_D4E6F81A76ED395 FOREIGN KEY (user_id) REFERENCES user (id)');
@@ -101,11 +102,8 @@ final class Version20210604092848 extends AbstractMigration
         $this->addSql('ALTER TABLE merchant ADD CONSTRAINT FK_74AB25E1F5B7AF75 FOREIGN KEY (address_id) REFERENCES address (id)');
         $this->addSql('ALTER TABLE merchant ADD CONSTRAINT FK_74AB25E1B03A8386 FOREIGN KEY (created_by_id) REFERENCES user (id)');
         $this->addSql('ALTER TABLE merchant ADD CONSTRAINT FK_74AB25E1896DBBDE FOREIGN KEY (updated_by_id) REFERENCES user (id)');
-        $this->addSql('ALTER TABLE merchant_config ADD CONSTRAINT FK_3CA56895E511F091 FOREIGN KEY (credit_config_id) REFERENCES credit_config (id)');
-        $this->addSql('ALTER TABLE merchant_config ADD CONSTRAINT FK_3CA56895FDD13F95 FOREIGN KEY (tax_rate_id) REFERENCES tax_rate (id)');
-        $this->addSql('ALTER TABLE merchant_config ADD CONSTRAINT FK_3CA56895F5B7AF75 FOREIGN KEY (address_id) REFERENCES address (id)');
-        $this->addSql('ALTER TABLE merchant_config ADD CONSTRAINT FK_3CA56895B03A8386 FOREIGN KEY (created_by_id) REFERENCES user (id)');
-        $this->addSql('ALTER TABLE merchant_config ADD CONSTRAINT FK_3CA56895896DBBDE FOREIGN KEY (updated_by_id) REFERENCES user (id)');
+        $this->addSql('ALTER TABLE merchant_setting ADD CONSTRAINT FK_464ACD036796D554 FOREIGN KEY (merchant_id) REFERENCES merchant (id)');
+        $this->addSql('ALTER TABLE merchant_setting ADD CONSTRAINT FK_464ACD0393CB796C FOREIGN KEY (file_id) REFERENCES file (id)');
         $this->addSql('ALTER TABLE news ADD CONSTRAINT FK_1DD399506796D554 FOREIGN KEY (merchant_id) REFERENCES merchant (id)');
         $this->addSql('ALTER TABLE news ADD CONSTRAINT FK_1DD39950B03A8386 FOREIGN KEY (created_by_id) REFERENCES user (id)');
         $this->addSql('ALTER TABLE news ADD CONSTRAINT FK_1DD39950896DBBDE FOREIGN KEY (updated_by_id) REFERENCES user (id)');
@@ -216,6 +214,8 @@ final class Version20210604092848 extends AbstractMigration
         $this->addSql('ALTER TABLE section ADD CONSTRAINT FK_2D737AEF6796D554 FOREIGN KEY (merchant_id) REFERENCES merchant (id)');
         $this->addSql('ALTER TABLE section ADD CONSTRAINT FK_2D737AEFB03A8386 FOREIGN KEY (created_by_id) REFERENCES user (id)');
         $this->addSql('ALTER TABLE section ADD CONSTRAINT FK_2D737AEF896DBBDE FOREIGN KEY (updated_by_id) REFERENCES user (id)');
+        $this->addSql('ALTER TABLE section_setting ADD CONSTRAINT FK_4D337597D823E37A FOREIGN KEY (section_id) REFERENCES section (id)');
+        $this->addSql('ALTER TABLE section_setting ADD CONSTRAINT FK_4D33759793CB796C FOREIGN KEY (file_id) REFERENCES file (id)');
         $this->addSql('ALTER TABLE tax_rate ADD CONSTRAINT FK_C36330C1B03A8386 FOREIGN KEY (created_by_id) REFERENCES user (id)');
         $this->addSql('ALTER TABLE tax_rate ADD CONSTRAINT FK_C36330C1896DBBDE FOREIGN KEY (updated_by_id) REFERENCES user (id)');
         $this->addSql('ALTER TABLE ticket ADD CONSTRAINT FK_97A0ADA3B03A8386 FOREIGN KEY (created_by_id) REFERENCES user (id)');
@@ -249,20 +249,21 @@ final class Version20210604092848 extends AbstractMigration
         $this->addSql('ALTER TABLE document DROP FOREIGN KEY FK_D8698A7697D868A5');
         $this->addSql('ALTER TABLE document DROP FOREIGN KEY FK_D8698A7656E5354');
         $this->addSql('ALTER TABLE merchant DROP FOREIGN KEY FK_74AB25E1F5B7AF75');
-        $this->addSql('ALTER TABLE merchant_config DROP FOREIGN KEY FK_3CA56895F5B7AF75');
         $this->addSql('ALTER TABLE order_shop DROP FOREIGN KEY FK_E19B76B5C6BDFEB');
         $this->addSql('ALTER TABLE point_sale DROP FOREIGN KEY FK_6CCB2767F5B7AF75');
         $this->addSql('ALTER TABLE merchant DROP FOREIGN KEY FK_74AB25E1E511F091');
-        $this->addSql('ALTER TABLE merchant_config DROP FOREIGN KEY FK_3CA56895E511F091');
         $this->addSql('ALTER TABLE order_refund DROP FOREIGN KEY FK_98A3048DC33F7837');
         $this->addSql('ALTER TABLE order_shop_document_interface DROP FOREIGN KEY FK_3C004E66EEC8F3');
+        $this->addSql('ALTER TABLE merchant_setting DROP FOREIGN KEY FK_464ACD0393CB796C');
         $this->addSql('ALTER TABLE page DROP FOREIGN KEY FK_140AB6203DA5256D');
         $this->addSql('ALTER TABLE page_file DROP FOREIGN KEY FK_B5B2ACA93CB796C');
+        $this->addSql('ALTER TABLE section_setting DROP FOREIGN KEY FK_4D33759793CB796C');
         $this->addSql('ALTER TABLE reduction_cart_group_user_interface DROP FOREIGN KEY FK_16258520F583BABC');
         $this->addSql('ALTER TABLE reduction_catalog_group_user_interface DROP FOREIGN KEY FK_32F80FA3F583BABC');
         $this->addSql('ALTER TABLE user_group_user_interface DROP FOREIGN KEY FK_12B87B34F583BABC');
         $this->addSql('ALTER TABLE document DROP FOREIGN KEY FK_D8698A766796D554');
         $this->addSql('ALTER TABLE group_user DROP FOREIGN KEY FK_A4C98D396796D554');
+        $this->addSql('ALTER TABLE merchant_setting DROP FOREIGN KEY FK_464ACD036796D554');
         $this->addSql('ALTER TABLE news DROP FOREIGN KEY FK_1DD399506796D554');
         $this->addSql('ALTER TABLE newsletter DROP FOREIGN KEY FK_7E8585C86796D554');
         $this->addSql('ALTER TABLE order_shop DROP FOREIGN KEY FK_E19B76B56796D554');
@@ -327,9 +328,9 @@ final class Version20210604092848 extends AbstractMigration
         $this->addSql('ALTER TABLE page DROP FOREIGN KEY FK_140AB620D823E37A');
         $this->addSql('ALTER TABLE product_category DROP FOREIGN KEY FK_CDFC7356D823E37A');
         $this->addSql('ALTER TABLE product_family_section_interface DROP FOREIGN KEY FK_2991468D6BA77450');
+        $this->addSql('ALTER TABLE section_setting DROP FOREIGN KEY FK_4D337597D823E37A');
         $this->addSql('ALTER TABLE user_merchant DROP FOREIGN KEY FK_9426C1E1FE54D809');
         $this->addSql('ALTER TABLE merchant DROP FOREIGN KEY FK_74AB25E1FDD13F95');
-        $this->addSql('ALTER TABLE merchant_config DROP FOREIGN KEY FK_3CA56895FDD13F95');
         $this->addSql('ALTER TABLE order_product DROP FOREIGN KEY FK_2530ADE6FDD13F95');
         $this->addSql('ALTER TABLE product DROP FOREIGN KEY FK_D34A04ADFDD13F95');
         $this->addSql('ALTER TABLE product_family DROP FOREIGN KEY FK_C79A60FFFDD13F95');
@@ -351,8 +352,6 @@ final class Version20210604092848 extends AbstractMigration
         $this->addSql('ALTER TABLE group_user DROP FOREIGN KEY FK_A4C98D39896DBBDE');
         $this->addSql('ALTER TABLE merchant DROP FOREIGN KEY FK_74AB25E1B03A8386');
         $this->addSql('ALTER TABLE merchant DROP FOREIGN KEY FK_74AB25E1896DBBDE');
-        $this->addSql('ALTER TABLE merchant_config DROP FOREIGN KEY FK_3CA56895B03A8386');
-        $this->addSql('ALTER TABLE merchant_config DROP FOREIGN KEY FK_3CA56895896DBBDE');
         $this->addSql('ALTER TABLE news DROP FOREIGN KEY FK_1DD39950B03A8386');
         $this->addSql('ALTER TABLE news DROP FOREIGN KEY FK_1DD39950896DBBDE');
         $this->addSql('ALTER TABLE newsletter DROP FOREIGN KEY FK_7E8585C8B03A8386');
@@ -416,7 +415,7 @@ final class Version20210604092848 extends AbstractMigration
         $this->addSql('DROP TABLE file');
         $this->addSql('DROP TABLE group_user');
         $this->addSql('DROP TABLE merchant');
-        $this->addSql('DROP TABLE merchant_config');
+        $this->addSql('DROP TABLE merchant_setting');
         $this->addSql('DROP TABLE news');
         $this->addSql('DROP TABLE newsletter');
         $this->addSql('DROP TABLE order_payment');
@@ -456,6 +455,7 @@ final class Version20210604092848 extends AbstractMigration
         $this->addSql('DROP TABLE reminder');
         $this->addSql('DROP TABLE reminder_user_interface');
         $this->addSql('DROP TABLE section');
+        $this->addSql('DROP TABLE section_setting');
         $this->addSql('DROP TABLE tax_rate');
         $this->addSql('DROP TABLE ticket');
         $this->addSql('DROP TABLE ticket_message');

src/Controller/User/UserAdminController.php

@@ -3,9 +3,9 @@
 namespace App\Controller\User;
 
 use App\Entity\User\User;
-use Lc\SovBundle\Controller\User\UserAdminController as SovUserAdminController;
+use Lc\CaracoleBundle\Controller\User\UserAdminController as CaracUserAdminController;
 
-class UserAdminController extends SovUserAdminController
+class UserAdminController extends CaracUserAdminController
 {
         public static function getEntityFqcn(): string
         {