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

migrations/Version20210616070418.php

@@ -1,47 +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 Version20210616070418 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 news DROP is_sent');
-        $this->addSql('ALTER TABLE reminder ADD section_id INT DEFAULT NULL, ADD crud_action VARCHAR(64) DEFAULT NULL, ADD crud_controller_fqcn VARCHAR(255) DEFAULT NULL, DROP entity_name, DROP entity_action');
-        $this->addSql('ALTER TABLE reminder ADD CONSTRAINT FK_40374F40D823E37A FOREIGN KEY (section_id) REFERENCES section (id)');
-        $this->addSql('CREATE INDEX IDX_40374F40D823E37A ON reminder (section_id)');
-        $this->addSql('ALTER TABLE ticket DROP FOREIGN KEY FK_97A0ADA36796D554');
-        $this->addSql('ALTER TABLE ticket DROP FOREIGN KEY FK_97A0ADA3BB6C6D96');
-        $this->addSql('DROP INDEX IDX_97A0ADA36796D554 ON ticket');
-        $this->addSql('DROP INDEX IDX_97A0ADA3BB6C6D96 ON ticket');
-        $this->addSql('ALTER TABLE ticket DROP merchant_id, DROP order_shop_id');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE news ADD is_sent TINYINT(1) DEFAULT NULL');
-        $this->addSql('ALTER TABLE reminder DROP FOREIGN KEY FK_40374F40D823E37A');
-        $this->addSql('DROP INDEX IDX_40374F40D823E37A ON reminder');
-        $this->addSql('ALTER TABLE reminder ADD entity_action VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, DROP section_id, DROP crud_action, CHANGE crud_controller_fqcn entity_name VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`');
-        $this->addSql('ALTER TABLE ticket ADD merchant_id INT NOT NULL, ADD order_shop_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE ticket ADD CONSTRAINT FK_97A0ADA36796D554 FOREIGN KEY (merchant_id) REFERENCES merchant (id)');
-        $this->addSql('ALTER TABLE ticket ADD CONSTRAINT FK_97A0ADA3BB6C6D96 FOREIGN KEY (order_shop_id) REFERENCES order_shop (id)');
-        $this->addSql('CREATE INDEX IDX_97A0ADA36796D554 ON ticket (merchant_id)');
-        $this->addSql('CREATE INDEX IDX_97A0ADA3BB6C6D96 ON ticket (order_shop_id)');
-    }
-}

migrations/Version20210616151017.php

@@ -1,39 +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 Version20210616151017 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 ticket ADD merchant_id INT NOT NULL, ADD order_shop_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE ticket ADD CONSTRAINT FK_97A0ADA36796D554 FOREIGN KEY (merchant_id) REFERENCES merchant (id)');
-        $this->addSql('ALTER TABLE ticket ADD CONSTRAINT FK_97A0ADA3BB6C6D96 FOREIGN KEY (order_shop_id) REFERENCES order_shop (id)');
-        $this->addSql('CREATE INDEX IDX_97A0ADA36796D554 ON ticket (merchant_id)');
-        $this->addSql('CREATE INDEX IDX_97A0ADA3BB6C6D96 ON ticket (order_shop_id)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE ticket DROP FOREIGN KEY FK_97A0ADA36796D554');
-        $this->addSql('ALTER TABLE ticket DROP FOREIGN KEY FK_97A0ADA3BB6C6D96');
-        $this->addSql('DROP INDEX IDX_97A0ADA36796D554 ON ticket');
-        $this->addSql('DROP INDEX IDX_97A0ADA3BB6C6D96 ON ticket');
-        $this->addSql('ALTER TABLE ticket DROP merchant_id, DROP order_shop_id');
-    }
-}

src/Controller/Credit/CreditHistoryAdminController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Controller\Credit;
+
+use App\Entity\Credit\CreditHistory;
+use App\Entity\Newsletter\Newsletter;
+use Lc\CaracoleBundle\Controller\Credit\CreditHistoryAdminController as CaracCreditHistoryAdminController;
+
+class CreditHistoryAdminController extends CaracCreditHistoryAdminController
+{
+    public static function getEntityFqcn(): string
+    {
+        return CreditHistory::class;
+    }
+}