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

Builder/Product/ProductFamilySectionPropertyBuilder.php

@@ -25,6 +25,7 @@ class ProductFamilySectionPropertyBuilder
         $this->productFamilySectionPropertySolver = $productFamilySectionPropertySolver;
     }
 
+
     public function enable(ProductFamilyInterface $productFamily, SectionInterface $section, bool $flush = true): void
     {
         $productFamilySectionProperty = $this->productFamilySectionPropertySolver->getProductFamilySectionProperty($productFamily, $section);
@@ -47,4 +48,18 @@ class ProductFamilySectionPropertyBuilder
         }
     }
 
+
+    public function disable(ProductFamilyInterface $productFamily, SectionInterface $section, bool $flush = true): void
+    {
+        $productFamilySectionProperty = $this->productFamilySectionPropertySolver->getProductFamilySectionProperty($productFamily, $section);
+
+        if ($productFamilySectionProperty) {
+            $productFamilySectionProperty->setStatus(0);
+            $this->entityManager->update($productFamilySectionProperty);
+        }
+        if($flush) {
+            $this->entityManager->flush();
+        }
+    }
+
 }

Definition/Field/Product/ProductCategoryFieldDefinition.php

@@ -61,6 +61,7 @@ class ProductCategoryFieldDefinition extends AbstractFieldDefinition
             'title',
             'description',
             'image',
+            'status',
             'saleStatus',
             'isEligibleTicketRestaurant',
         ];

Repository/Product/ProductFamilyRepositoryQuery.php

@@ -25,6 +25,15 @@ class ProductFamilyRepositoryQuery extends AbstractRepositoryQuery
         parent::__construct($repository, 'productFamily', $paginator);
     }
 
+    public function resetRelationsJoin(): void
+    {
+        $this->isJoinSections = false;
+        $this->isJoinProductCategories = false;
+        $this->isJoinProductFamilySectionProperties = false;
+        $this->isJoinProducts = false;
+        $this->isJoinQualityLabels = false;
+    }
+
     public function joinProductFamilySectionProperties(bool $addSelect = true): self
     {
         if (!$this->isJoinProductFamilySectionProperties) {
@@ -178,7 +187,8 @@ class ProductFamilyRepositoryQuery extends AbstractRepositoryQuery
 
             $this->innerJoin('.products', 'products');
             if ($addSelect) {
-                $this->addSelect('products');
+                // Décommenté sinon doctrine n'hydrate pas correctement les produits liés au ProductFamily (exemple : un seul sur deux)
+                // $this->addSelect('products');
             }
         }
         return $this;

Resources/views/admin/product/field/product_family_section_properties.html.twig

@@ -1,7 +0,0 @@
-{% import '@LcCaracole/admin/section/macros.html.twig' as macros_section %}
-{% set item = entity.instance %}
-{% for section_property in item.productFamilySectionProperties %}
-    {{ macros_section.section_badge(section_property.section) }}
-{% else %}
-    <span class="badge badge-secondary">Aucune</span>
-{% endfor %}

Resources/views/admin/section/macros.html.twig

@@ -1,4 +1,9 @@
-
 {% macro section_badge(section) %}
     <span class="badge badge-secondary {{ section_container.solver.getHtmlClass(section) }}">{{ section.title }}</span>
+{% endmacro %}
+
+
+
+{% macro section_badge_light_custom(section,title, status= 1) %}
+    <span class="badge badge-secondary {{ status !=1 ? 'stripped'}} {{ section_container.solver.getHtmlClass(section) }}-light">{{ title }}</span>
 {% endmacro %}

Solver/Product/ProductCategorySolver.php

@@ -2,9 +2,23 @@
 
 namespace Lc\CaracoleBundle\Solver\Product;
 
+use Lc\CaracoleBundle\Model\Product\ProductCategoryInterface;
+
 class ProductCategorySolver
 {
 
+    public function isOnline(ProductCategoryInterface $productCategory)
+    {
+        if ($productCategory->getParent()) {
+            if ($productCategory->getStatus() && $productCategory->getParent()->getStatus()) {
+                return true;
+            }
+        } elseif ($productCategory->getStatus()) {
+            return true;
+        }
+        return false;
+    }
+
 }
 
 

Solver/Product/ProductFamilySectionPropertySolver.php

@@ -18,6 +18,7 @@ class ProductFamilySectionPropertySolver
         }
         return null;
     }
+
 }
 
 

Solver/Product/ProductFamilySolver.php

@@ -7,6 +7,7 @@ use Doctrine\Common\Collections\Collection;
 use Lc\CaracoleBundle\Doctrine\Extension\ProductPropertyInterface;
 use Lc\CaracoleBundle\Model\Product\ProductFamilyInterface;
 use Lc\CaracoleBundle\Model\Product\ProductFamilyModel;
+use Lc\CaracoleBundle\Model\Product\ProductFamilySectionPropertyInterface;
 use Lc\CaracoleBundle\Model\Product\ProductInterface;
 use Lc\CaracoleBundle\Model\Reduction\ReductionCatalogInterface;
 use Lc\CaracoleBundle\Model\Section\SectionInterface;
@@ -15,10 +16,14 @@ class ProductFamilySolver
 {
 
     protected ProductSolver $productSolver;
+    protected ProductFamilySectionPropertySolver $productFamilySectionPropertySolver;
+    protected ProductCategorySolver $productCategorySolver;
 
-    public function __construct(ProductSolver $productSolver)
+    public function __construct(ProductSolver $productSolver, ProductFamilySectionPropertySolver $productFamilySectionPropertySolver, ProductCategorySolver $productCategorySolver)
     {
         $this->productSolver = $productSolver;
+        $this->productFamilySectionPropertySolver = $productFamilySectionPropertySolver;
+        $this->productCategorySolver = $productCategorySolver;
     }
 
 
@@ -467,5 +472,17 @@ class ProductFamilySolver
 
         return false;
     }
+
+
+    public function isCategoriesOnlineInSection(ProductFamilyInterface $productFamily, SectionInterface $section):bool
+    {
+        $isCategoriesOnlineInSection =false;
+        foreach ($productFamily->getProductCategories() as $productCatgory){
+            if($productCatgory->getSection() === $section && $this->productCategorySolver->isOnline($productCatgory)){
+                $isCategoriesOnlineInSection = true;
+            }
+        }
+        return $isCategoriesOnlineInSection;
+    }
 }
 

Twig/StoreTwigExtension.php

@@ -113,11 +113,15 @@ class StoreTwigExtension extends AbstractExtension
         return $this->sectionResolver->isOutOfSection();
     }
 
+    private $sections = null;
     public function getSections()
     {
-        return $this->sectionStore
+        if(!$this->sections){
+            $this->sections = $this->sectionStore
                 ->setMerchant($this->merchantResolver->getCurrent())
                 ->getOnline();
+        }
+        return $this->sections;
     }
 
     public function getMerchants()