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

config/packages/doctrine.yaml

@@ -18,7 +18,6 @@ doctrine:
             Lc\SovBundle\Model\File\FileInterface: App\Entity\File\File
             Lc\SovBundle\Model\User\GroupUserInterface: App\Entity\User\GroupUser
             Lc\SovBundle\Model\Reminder\ReminderInterface: App\Entity\Reminder\Reminder
-
             Lc\CaracoleBundle\Model\Address\AddressInterface: App\Entity\Address\Address
             Lc\CaracoleBundle\Model\Config\TaxRateInterface: App\Entity\Config\TaxRate
             Lc\CaracoleBundle\Model\Config\UnitInterface: App\Entity\Config\Unit

config/services.yaml

@@ -56,4 +56,7 @@ services:
         class: App\Definition\SiteSettingDefinition
 
     Lc\SovBundle\Factory\Reminder\ReminderFactoryInterface:
-        class: Lc\CaracoleBundle\Factory\Reminder\ReminderFactory
+        class: Lc\CaracoleBundle\Factory\Reminder\ReminderFactory
+
+    Lc\SovBundle\Factory\Ticket\TicketFactoryInterface:
+        class: Lc\CaracoleBundle\Factory\Ticket\TicketFactory

migrations/Version20210616135128.php

@@ -0,0 +1,37 @@
+<?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 Version20210616135128 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 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');
+    }
+}

src/Entity/Ticket/Ticket.php

@@ -2,15 +2,15 @@
 
 namespace App\Entity\Ticket;
 
+use Lc\CaracoleBundle\Model\Ticket\TicketModel;
 use Lc\SovBundle\Repository\Ticket\TicketRepository;
 use Doctrine\ORM\Mapping as ORM;
-use Lc\SovBundle\Model\Ticket\TicketInterface;
-use Lc\SovBundle\Model\Ticket\TicketModel;
+
 
 /**
  * @ORM\Entity(repositoryClass=TicketRepository::class)
  */
-class Ticket extends TicketModel implements TicketInterface
+class Ticket extends TicketModel
 {
     /**
      * @ORM\Id

src/Entity/Ticket/TicketMessage.php

@@ -2,15 +2,14 @@
 
 namespace App\Entity\Ticket;
 
+use Lc\SovBundle\Model\Ticket\TicketMessageModel;
 use Lc\SovBundle\Repository\Ticket\TicketMessageRepository;
 use Doctrine\ORM\Mapping as ORM;
-use Lc\SovBundle\Model\Ticket\TicketMessageInterface;
-use Lc\SovBundle\Model\Ticket\TicketMessageModel;
 
 /**
  * @ORM\Entity(repositoryClass=TicketMessageRepository::class)
  */
-class TicketMessage extends TicketMessageModel implements TicketMessageInterface
+class TicketMessage extends TicketMessageModel
 {
     /**
      * @ORM\Id

webpack.config.js

@@ -48,6 +48,7 @@ Encore
     .addEntry('adminlte-sort', './Lc/SovBundle/Resources/assets/app/adminlte/sort/app.sort.js')
     .addEntry('adminlte-field-filemanager', './Lc/SovBundle/Resources/assets/app/adminlte/field/filemanager/app.filemanager.js')
     .addEntry('adminlte-field-collection', './Lc/SovBundle/Resources/assets/app/adminlte/field/collection/app.collection.js')
+    .addEntry('adminlte-ticket', './Lc/SovBundle/Resources/assets/app/adminlte/ticket/app.ticket.js')
     .addEntry('adminlte-reminder', './Lc/SovBundle/Resources/assets/app/adminlte/reminder/app.reminder.js')
     .addEntry('carac-switch-merchant', './Lc/CaracoleBundle/Resources/assets/app/switchmerchant/app.switchmerchant.js')
     .addEntry('carac-common', './Lc/CaracoleBundle/Resources/assets/app/adminlte/common/app.common.js')