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

Controller/AdminControllerTrait.php

@@ -128,9 +128,9 @@ trait AdminControllerTrait
 
         if ($duplicateOtherMerchantForm->isSubmitted() && $duplicateOtherMerchantForm->isValid()) {
             $newEntity = $entityComponent->duplicateEntity($context->getEntity()->getInstance());
-            $entityManager->create($newEntity);
-            $merchant = $duplicateOtherMerchantForm->get('merchants')->getData();
 
+            $merchant = $duplicateOtherMerchantForm->get('merchants')->getData();
+//
             if($this->isInstanceOf(ProductFamilyInterface::class)) {
                 $sectionStore = $this->getSectionContainer()->getStore()->setMerchant($merchant);
 
@@ -158,12 +158,13 @@ trait AdminControllerTrait
                 }
 
                 $newEntity->initProductCategories();
-            }
+                }
             else {
                 $newEntity->setMerchant($merchant);
             }
-
-            $entityManager->update($newEntity);
+//
+//
+            $entityManager->create($newEntity, false);
             $entityManager->flush();
 
             $url = $this->get(AdminUrlGenerator::class)
@@ -230,10 +231,10 @@ trait AdminControllerTrait
 
         if ($duplicateOtherSectionForm->isSubmitted() && $duplicateOtherSectionForm->isValid()) {
             $newEntity = $entityComponent->duplicateEntity($context->getEntity()->getInstance());
-            $em->create($newEntity);
+            $em->create($newEntity, false);
             $section = $duplicateOtherSectionForm->get('sections')->getData();
             $newEntity->setSection($section);
-            $em->update($newEntity);
+            $em->update($newEntity, false);
             $em->flush();
 
             $url = $this->get(AdminUrlGenerator::class)

EventSubscriber/Address/DuplicateAddressEventSubscriber.php

@@ -45,7 +45,7 @@ class DuplicateAddressEventSubscriber implements EventSubscriberInterface
                 if(method_exists($entity, $methodGet) && method_exists($entity, $methodSet)){
                     $newAddress = clone $entity->$methodGet();
                     $entity->$methodSet($newAddress);
-                    $this->em->persist($newAddress);
+                    $this->em->create($newAddress, false);
                 }
             }
 
@@ -53,4 +53,4 @@ class DuplicateAddressEventSubscriber implements EventSubscriberInterface
     }
 
 
-}
+}