Browse Source

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

develop
Guillaume 2 years ago
parent
commit
5b1ee19b1c
2 changed files with 10 additions and 9 deletions
  1. +8
    -7
      Controller/AdminControllerTrait.php
  2. +2
    -2
      EventSubscriber/Address/DuplicateAddressEventSubscriber.php

+ 8
- 7
Controller/AdminControllerTrait.php View File



if ($duplicateOtherMerchantForm->isSubmitted() && $duplicateOtherMerchantForm->isValid()) { if ($duplicateOtherMerchantForm->isSubmitted() && $duplicateOtherMerchantForm->isValid()) {
$newEntity = $entityComponent->duplicateEntity($context->getEntity()->getInstance()); $newEntity = $entityComponent->duplicateEntity($context->getEntity()->getInstance());
$entityManager->create($newEntity);
$merchant = $duplicateOtherMerchantForm->get('merchants')->getData();


$merchant = $duplicateOtherMerchantForm->get('merchants')->getData();
//
if($this->isInstanceOf(ProductFamilyInterface::class)) { if($this->isInstanceOf(ProductFamilyInterface::class)) {
$sectionStore = $this->getSectionContainer()->getStore()->setMerchant($merchant); $sectionStore = $this->getSectionContainer()->getStore()->setMerchant($merchant);


} }


$newEntity->initProductCategories(); $newEntity->initProductCategories();
}
}
else { else {
$newEntity->setMerchant($merchant); $newEntity->setMerchant($merchant);
} }

$entityManager->update($newEntity);
//
//
$entityManager->create($newEntity, false);
$entityManager->flush(); $entityManager->flush();


$url = $this->get(AdminUrlGenerator::class) $url = $this->get(AdminUrlGenerator::class)


if ($duplicateOtherSectionForm->isSubmitted() && $duplicateOtherSectionForm->isValid()) { if ($duplicateOtherSectionForm->isSubmitted() && $duplicateOtherSectionForm->isValid()) {
$newEntity = $entityComponent->duplicateEntity($context->getEntity()->getInstance()); $newEntity = $entityComponent->duplicateEntity($context->getEntity()->getInstance());
$em->create($newEntity);
$em->create($newEntity, false);
$section = $duplicateOtherSectionForm->get('sections')->getData(); $section = $duplicateOtherSectionForm->get('sections')->getData();
$newEntity->setSection($section); $newEntity->setSection($section);
$em->update($newEntity);
$em->update($newEntity, false);
$em->flush(); $em->flush();


$url = $this->get(AdminUrlGenerator::class) $url = $this->get(AdminUrlGenerator::class)

+ 2
- 2
EventSubscriber/Address/DuplicateAddressEventSubscriber.php View File

if(method_exists($entity, $methodGet) && method_exists($entity, $methodSet)){ if(method_exists($entity, $methodGet) && method_exists($entity, $methodSet)){
$newAddress = clone $entity->$methodGet(); $newAddress = clone $entity->$methodGet();
$entity->$methodSet($newAddress); $entity->$methodSet($newAddress);
$this->em->persist($newAddress);
$this->em->create($newAddress, false);
} }
} }


} }




}
}

Loading…
Cancel
Save