Merge branch '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
     }
 
 
-}
+}

Repository/Product/ProductFamilyStore.php

@@ -52,23 +52,6 @@ class ProductFamilyStore extends AbstractStore
         return $query;
     }
 
-    public function isReductionCatalogDisplayed(ProductFamilyInterface $productFamily): bool
-    {
-        //TODO à discuter
-//        $reductionCatalog = $this->reductionCatalogStore->setMerchant($this->merchant)
-//                ->getByProductFamily($productFamily);
-
-        return $this->hasReductionCatalog($productFamily) && $productFamily->getReductionCatalog()->isDisplayed();
-    }
-
-    public function hasReductionCatalog(ProductFamilyInterface $productFamily): bool
-    {
-        $reductionCatalog = $this->reductionCatalogStore->setMerchant($this->merchant)
-                ->getByProductFamily($productFamily);
-
-        return (bool)$productFamily->getReductionCatalog();
-    }
-
     public function getByParentCategory(
             ProductCategoryInterface $parentCategory,
             $user = null,

Solver/Order/OrderShopSolver.php

@@ -100,7 +100,7 @@ class OrderShopSolver
             OrderShopInterface $orderShop,
             ProductInterface $product,
             $byWeight = false
-    ): int {
+    ): float {
         $quantity = 0;
         $productFamily = $product->getProductFamily();
         $behaviorCountStock = $productFamily->getBehaviorCountStock();

Solver/Product/ProductFamilySolver.php

@@ -506,5 +506,15 @@ class ProductFamilySolver
 
         return $title;
     }
+
+    public function isReductionCatalogDisplayed(ProductFamilyInterface $productFamily): bool
+    {
+        return $this->hasReductionCatalog($productFamily) && $productFamily->getReductionCatalog()->isDisplayed();
+    }
+
+    public function hasReductionCatalog(ProductFamilyInterface $productFamily): bool
+    {
+        return (bool)$productFamily->getReductionCatalog();
+    }
 }