Merge branch 'vtk-master'

LitusProject · Nov 24, 2024 · 9cae10d · 9cae10d
2 parents cbde662 + 4ee18c8
commit 9cae10d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/module/CudiBundle/Controller/Admin/ArticleController.php b/module/CudiBundle/Controller/Admin/ArticleController.php
@@ -185,24 +185,6 @@ public function deleteAction()
         );
     }
 
-    public function historyAction()
-    {
-        $article = $this->getArticleEntity();
-        if ($article === null) {
-            return new ViewModel();
-        }
-
-        $history = $this->getEntityManager()
-            ->getRepository('CudiBundle\Entity\Article\History')
-            ->findAllByArticle($article);
-
-        return new ViewModel(
-            array(
-                'history' => $history,
-                'current' => $article,
-            )
-        );
-    }
 
     public function searchAction()
     {

diff --git a/module/CudiBundle/Controller/Admin/Sale/ArticleController.php b/module/CudiBundle/Controller/Admin/Sale/ArticleController.php
@@ -282,6 +282,16 @@ public function deleteAction()
         if ($saleArticle === null) {
             return new ViewModel();
         }
+
+        $bookings = $this->getEntityManager()
+            ->getRepository('CudiBundle\Entity\Sale\Booking')
+            ->findAllActiveByArticleAndPeriod($saleArticle, $this->getActiveStockPeriodEntity());
+
+        $idsCancelled = array();
+        foreach ($bookings as $booking) {
+            $booking->setStatus('canceled', $this->getEntityManager());
+            $idsCancelled[] = $booking->getId();
+        }
 
         $saleArticle->setIsHistory(true);
         $this->getEntityManager()->flush();
@@ -291,6 +301,7 @@ public function deleteAction()
                 'result' => (object) array('status' => 'success'),
             )
         );
+
     }
 
     public function assignAllAction()