Merge branch 'develop'

Builder/Product/ProductCategoryBuilder.php

@@ -23,16 +23,19 @@ class ProductCategoryBuilder
     public function setOnlineIfOnlineProductfamily(ProductCategoryInterface $productCategory)
     {
         if ($this->productCategorySolver->hasOnlineProductFamily($productCategory)) {
-            $productCategory->setStatus(1);
-            $this->entityManager->update($productCategory);
+            if(!$productCategory->getStatus()) {
+                $productCategory->setStatus(1);
+                $this->entityManager->update($productCategory);
 
-            $this->flashBagTranslator->add('success', 'setOnline','ProductCategory', array('%category%'=> $productCategory, '%section%'=> $productCategory->getSection()));
+                $this->flashBagTranslator->add('success', 'setOnline', 'ProductCategory', array('%category%' => $productCategory, '%section%' => $productCategory->getSection()));
+            }
             // mise à jour du statut du parent
             $productCategoryParent = $productCategory->getParent();
             if ($productCategoryParent) {
-                $productCategoryParent->setStatus(1);
-                $this->entityManager->update($productCategoryParent);
-
+                if(!$productCategory->getStatus()) {
+                    $productCategoryParent->setStatus(1);
+                    $this->entityManager->update($productCategoryParent);
+                }
             }
         }
     }
@@ -41,15 +44,19 @@ class ProductCategoryBuilder
     public function setOfflineIfOfflineProductfamily(ProductCategoryInterface $productCategory)
     {
         if (!$this->productCategorySolver->hasOnlineProductFamily($productCategory)) {
-            $productCategory->setStatus(0);
-            $this->entityManager->update($productCategory);
-            $this->flashBagTranslator->add('info', 'setOffline','ProductCategory', array('%category%'=> $productCategory, '%section%'=> $productCategory->getSection()));
+            if($productCategory->getStatus()) {
 
+                $productCategory->setStatus(0);
+                $this->entityManager->update($productCategory);
+                $this->flashBagTranslator->add('info', 'setOffline', 'ProductCategory', array('%category%' => $productCategory, '%section%' => $productCategory->getSection()));
+            }
             // mise à jour du statut du parent
             $productCategoryParent = $productCategory->getParent();
             if ($productCategoryParent &&  !$this->productCategorySolver->hasOnlineProductFamily($productCategoryParent)) {
-                $productCategoryParent->setStatus(0);
-                $this->entityManager->update($productCategoryParent);
+                if($productCategory->getStatus()) {
+                    $productCategoryParent->setStatus(0);
+                    $this->entityManager->update($productCategoryParent);
+                }
             }
         }
     }

Solver/Section/OpeningSolver.php

@@ -49,7 +49,11 @@ class OpeningSolver
         if($opening) {
             $now = new \DateTime();
             if($weekDay == $now->format('N')) {
-                if($now < $opening->getTimeEnd()) {
+                $timeEnd = $opening->getTimeEnd();
+                $timeStart = $opening->getTimeStart();
+
+                if((($timeEnd && $now < $timeEnd) || !$timeEnd)
+                    && (($timeStart && $now > $timeStart) || !$timeStart) ) {
                     return true;
                 }
             }