Browse Source

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

packProduct
Fab 3 years ago
parent
commit
cec871a40f
18 changed files with 39 additions and 43 deletions
  1. +5
    -0
      Controller/ControllerTrait.php
  2. +12
    -0
      Controller/Product/ProductCategoryAdminController.php
  3. +0
    -1
      Definition/Field/FieldDefinitionTrait.php
  4. +2
    -2
      Definition/Field/Ticket/TicketFieldDefinition.php
  5. +0
    -30
      EventSubscriber/OpeningEventSubscriber.php
  6. +2
    -0
      Factory/Merchant/MerchantFactory.php
  7. +1
    -0
      Factory/Newsletter/NewsletterFactory.php
  8. +1
    -0
      Factory/PointSale/PointSaleFactory.php
  9. +2
    -2
      Factory/Product/ProductCategoryFactory.php
  10. +3
    -0
      Factory/Product/ProductFamilyFactory.php
  11. +1
    -0
      Factory/Reduction/ReductionCartFactory.php
  12. +1
    -0
      Factory/Reduction/ReductionCatalogFactory.php
  13. +4
    -1
      Factory/Site/PageFactory.php
  14. +1
    -1
      Model/Product/ProductCategoryInterface.php
  15. +1
    -1
      Model/Site/PageModel.php
  16. +1
    -2
      Repository/Section/OpeningStore.php
  17. +1
    -2
      Resolver/SectionResolver.php
  18. +1
    -1
      Solver/Ticket/TicketSolver.php

+ 5
- 0
Controller/ControllerTrait.php View File

return $this->get(SectionResolver::class)->getCurrent(); return $this->get(SectionResolver::class)->getCurrent();
} }


public function isOutOfSection()
{
return is_null($this->getSectionCurrent());
}

public function getSectionCurrentSlug(): string public function getSectionCurrentSlug(): string
{ {
return $this->getSectionCurrent()->getSlug(); return $this->getSectionCurrent()->getSlug();

+ 12
- 0
Controller/Product/ProductCategoryAdminController.php View File



namespace Lc\CaracoleBundle\Controller\Product; namespace Lc\CaracoleBundle\Controller\Product;


use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
use EasyCorp\Bundle\EasyAdminBundle\Field\AssociationField; use EasyCorp\Bundle\EasyAdminBundle\Field\AssociationField;
use EasyCorp\Bundle\EasyAdminBundle\Field\FormField; use EasyCorp\Bundle\EasyAdminBundle\Field\FormField;
use EasyCorp\Bundle\EasyAdminBundle\Field\IntegerField; use EasyCorp\Bundle\EasyAdminBundle\Field\IntegerField;
use EasyCorp\Bundle\EasyAdminBundle\Field\TextField; use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
use EasyCorp\Bundle\EasyAdminBundle\Field\DateTimeField; use EasyCorp\Bundle\EasyAdminBundle\Field\DateTimeField;
use Lc\CaracoleBundle\Controller\AbstractAdminController; use Lc\CaracoleBundle\Controller\AbstractAdminController;
use Lc\CaracoleBundle\Definition\ActionDefinition;
use Lc\SovBundle\Field\CKEditorField; use Lc\SovBundle\Field\CKEditorField;
use Lc\SovBundle\Field\StatusField; use Lc\SovBundle\Field\StatusField;
use Lc\SovBundle\Field\ToggleField; use Lc\SovBundle\Field\ToggleField;
->getFields($pageName); ->getFields($pageName);
} }


public function configureActions(Actions $actions): Actions
{
$actions = parent::configureActions($actions);

if(!$this->getSectionCurrent()) {
$actions->disable(ActionDefinition::NEW);
}

return $actions;
}
} }

+ 0
- 1
Definition/Field/FieldDefinitionTrait.php View File



return array_merge(parent::configureFieldsBase(), [ return array_merge(parent::configureFieldsBase(), [
'section' => AssociationField::new('section') 'section' => AssociationField::new('section')
->setRequired(true)
->setTemplatePath('@LcCaracole/admin/section/field/section.html.twig') ->setTemplatePath('@LcCaracole/admin/section/field/section.html.twig')
->setFormTypeOption('choices', $sectionArray) ->setFormTypeOption('choices', $sectionArray)
]); ]);

+ 2
- 2
Definition/Field/Ticket/TicketFieldDefinition.php View File



public function __construct( public function __construct(
TranslatorAdmin $translatorAdmin, TranslatorAdmin $translatorAdmin,
TicketSolver $ticketSolver,
SectionStore $sectionStore SectionStore $sectionStore
) { ) {
parent::__construct($translatorAdmin);
parent::__construct($translatorAdmin, $ticketSolver);
$this->sectionStore = $sectionStore; $this->sectionStore = $sectionStore;
} }



public function configureFields(): array public function configureFields(): array
{ {
return array_merge(parent::configureFields(), [ return array_merge(parent::configureFields(), [

+ 0
- 30
EventSubscriber/OpeningEventSubscriber.php View File

<?php

namespace Lc\CaracoleBundle\EventSubscriber;

use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpKernel\KernelEvents;

class OpeningEventSubscriber implements EventSubscriberInterface
{
protected EntityManagerInterface $entityManager;

public function __construct(
EntityManagerInterface $entityManager
) {
$this->entityManager = $entityManager;
}

public static function getSubscribedEvents()
{
return [
KernelEvents::CONTROLLER => ['initOpenings']
];
}

public function initOpenings()
{
}

}

+ 2
- 0
Factory/Merchant/MerchantFactory.php View File

{ {
$merchant = new Merchant(); $merchant = new Merchant();


$merchant->setStatus(1);

return $merchant; return $merchant;
} }



+ 1
- 0
Factory/Newsletter/NewsletterFactory.php View File

$newsletter = parent::create(); $newsletter = parent::create();


$newsletter->setSection($this->section); $newsletter->setSection($this->section);
$newsletter->setStatus(1);


return $newsletter; return $newsletter;
} }

+ 1
- 0
Factory/PointSale/PointSaleFactory.php View File

$pointSale = new PointSale(); $pointSale = new PointSale();


$pointSale->addMerchant($merchant); $pointSale->addMerchant($merchant);
$pointSale->setStatus(1);


return $pointSale; return $pointSale;
} }

+ 2
- 2
Factory/Product/ProductCategoryFactory.php View File



class ProductCategoryFactory extends AbstractFactory class ProductCategoryFactory extends AbstractFactory
{ {

public function create(SectionInterface $section): ProductCategoryInterface public function create(SectionInterface $section): ProductCategoryInterface
{ {
$productCategory = new ProductCategory(); $productCategory = new ProductCategory();


$productCategory->setSection($section); $productCategory->setSection($section);
$productCategory->setSaleStatus(true);
$productCategory->setStatus(1);


return $productCategory; return $productCategory;
} }

} }

+ 3
- 0
Factory/Product/ProductFamilyFactory.php View File

{ {
$productFamily = new ProductFamily(); $productFamily = new ProductFamily();


$productFamily->setSaleStatus(true);
$productFamily->setStatus(1);

$productFamilySectionPropertyFactory = new ProductFamilySectionPropertyFactory(); $productFamilySectionPropertyFactory = new ProductFamilySectionPropertyFactory();


foreach($merchant->getSections() as $section) { foreach($merchant->getSections() as $section) {

+ 1
- 0
Factory/Reduction/ReductionCartFactory.php View File

$reductionCart = new ReductionCart(); $reductionCart = new ReductionCart();


$reductionCart->setSection($section); $reductionCart->setSection($section);
$reductionCart->setStatus(1);


return $reductionCart; return $reductionCart;
} }

+ 1
- 0
Factory/Reduction/ReductionCatalogFactory.php View File

$reductionCatalog = new ReductionCatalog(); $reductionCatalog = new ReductionCatalog();


$reductionCatalog->setSection($section); $reductionCatalog->setSection($section);
$reductionCatalog->setStatus(1);


return $reductionCatalog; return $reductionCatalog;
} }

+ 4
- 1
Factory/Site/PageFactory.php View File

$page = parent::create(); $page = parent::create();


$page->setMerchant($this->merchant); $page->setMerchant($this->merchant);
$page->setSection($this->section);

if(!is_null($this->section)) {
$page->setSection($this->section);
}


return $page; return $page;
} }

+ 1
- 1
Model/Product/ProductCategoryInterface.php View File



interface ProductCategoryInterface interface ProductCategoryInterface
{ {
public function getSection(): SectionInterface;
public function getSection(): ?SectionInterface;


public function setSection(SectionInterface $section): ProductCategoryModel; public function setSection(SectionInterface $section): ProductCategoryModel;



+ 1
- 1
Model/Site/PageModel.php View File

return $this; return $this;
} }


public function getSection(): SectionInterface
public function getSection(): ?SectionInterface
{ {
return $this->section; return $this->section;
} }

+ 1
- 2
Repository/Section/OpeningStore.php View File



public function filtersDefault(RepositoryQueryInterface $query): RepositoryQueryInterface public function filtersDefault(RepositoryQueryInterface $query): RepositoryQueryInterface
{ {
$query->filterBySection($this->section);
$this->addFilterBySectionOptionnal($query);
return $query; return $query;
} }


{ {
return $query; return $query;
} }

} }

+ 1
- 2
Resolver/SectionResolver.php View File

} }
} // front } // front
else { else {
dump('front');
dump($requestAttributesArray);

if($this->section === null) { if($this->section === null) {
$merchantCurrent = $this->merchantResolver->getCurrent(); $merchantCurrent = $this->merchantResolver->getCurrent();
$sectionStore = $this->sectionStore->setMerchant($merchantCurrent); $sectionStore = $this->sectionStore->setMerchant($merchantCurrent);

+ 1
- 1
Solver/Ticket/TicketSolver.php View File



class TicketSolver extends SovTicketSolver class TicketSolver extends SovTicketSolver
{ {
public static function getTypeChoices(): array
public function getTypeChoices(): array
{ {
$choices = parent::getTypeChoices(); $choices = parent::getTypeChoices();
$choicesProduct = [ $choicesProduct = [

Loading…
Cancel
Save