Merge branch 'develop'

Builder/Order/OrderShopBuilder.php

@@ -323,6 +323,8 @@ class OrderShopBuilder
             $persist = true
     ): OrderShopInterface {
 
+        // @TODO : intégrer la gestion des OrderPackProduct dans cette méthode
+
         // TODO essayer de comprendre pourquoi on doit faire un refresh ici
         $this->entityManager->refresh($orderShop1);
         $this->entityManager->refresh($orderShop2);
@@ -646,5 +648,41 @@ class OrderShopBuilder
         return $productsSalesStatistic->getAsArray();
     }
 
+    public function delete(OrderShopInterface $orderShop)
+    {
+        // delete OrderProduct
+        foreach($orderShop->getOrderProducts() as $orderProduct) {
+            $this->entityManager->delete($orderProduct);
+        }
+
+        // delete OrderPackProduct
+        foreach($orderShop->getOrderPackProducts() as $orderPackProduct) {
+            $this->entityManager->delete($orderPackProduct);
+        }
+
+        // delete OrderPayment
+        foreach($orderShop->getOrderPayments() as $orderPayment) {
+            $this->entityManager->delete($orderPayment);
+        }
+
+        // delete OrderReductionCarts
+        foreach($orderShop->getOrderReductionCarts() as $orderReductionCart) {
+            $this->entityManager->delete($orderReductionCart);
+        }
+
+        // delete OrderReductionCredits
+        foreach($orderShop->getOrderReductionCredits() as $orderReductionCredit) {
+            $this->entityManager->delete($orderReductionCredit);
+        }
+
+        // delete OrderStatusHistory
+        foreach($orderShop->getOrderStatusHistories() as $orderStatusHistory) {
+            $this->entityManager->delete($orderStatusHistory);
+        }
+
+        // delete OrderShop
+        $this->entityManager->delete($orderShop);
 
+        $this->entityManager->flush();
+    }
 }

Resolver/SectionResolver.php

@@ -111,14 +111,20 @@ class SectionResolver
                 }
             }
 
+            /*
+             * /!\ Cache désactivé car génération d'une erreur du type :
+             * "A new entity was found through the relationship 'App\Entity\Order\OrderShop#section' that was not configured to cascade persist operations for entity: Marché"
+             *
+             * Arrive sur les pages générées via le cache HTTP (CacheController.php)
+             */
             if ($sectionCurrent) {
-                $this->cacheSectionCurrent = $sectionCurrent;
+                //$this->cacheSectionCurrent = $sectionCurrent;
                 return $sectionCurrent;
             } elseif ($returnVisitedIfOutOfSection && $currentVisitedSection) {
-                $this->cacheSectionVisited = $currentVisitedSection;
+                //$this->cacheSectionVisited = $currentVisitedSection;
                 return $currentVisitedSection;
             } elseif ($returnDefaultIfOutOfSections && $sectionDefault) {
-                $this->cacheSectionDefault = $sectionDefault;
+                //$this->cacheSectionDefault = $sectionDefault;
                 return $sectionDefault;
             }
 

Resources/views/admin/order/field/distribution.html.twig

@@ -10,8 +10,10 @@
     {% endif %}
 {% endif %}
 
-{% if cycleType == "year" %}
-    A{{ distribution.cycleNumber }}
-{% else %}
-    {{ labelCycleType ~ distribution.cycleNumber }}A{{ distribution.year|slice(2,2) }}
+{% if cycleType is defined %}
+    {% if cycleType == "year" %}
+        A{{ distribution.cycleNumber }}
+    {% else %}
+        {{ labelCycleType ~ distribution.cycleNumber }}A{{ distribution.year|slice(2,2) }}
+    {% endif %}
 {% endif %}

Solver/Order/OrderShopSolver.php

@@ -231,6 +231,11 @@ class OrderShopSolver
         }
         return $arrayComplementaryOrderShops;
     }
+    
+    public function countValidComplementaryOrderShops(OrderShopInterface $orderShop): int
+    {
+        return count($this->getValidComplementaryOrderShops($orderShop));
+    }
 
     public function getOrderStatusHistory(OrderShopInterface $orderShop, OrderStatusInterface $status)
     {