conflicting orders fix

LitusProject · Sep 27, 2023 · bd57053 · bd57053
1 parent 823553f
commit bd57053
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/module/LogisticsBundle/Controller/Admin/RequestController.php b/module/LogisticsBundle/Controller/Admin/RequestController.php
@@ -76,14 +76,14 @@ public function viewAction()
 
     public function conflictingAction()
     {
-        $requests = $this->getEntityManager()
-            ->getRepository('LogisticsBundle\Entity\Request')
-            ->findNewRequests();
+        $requests = $this->getUnhandledRequests();
 
         // Gets last order for every request
         $lastOrders = array();
         foreach ($requests as $request) {
-            $lastOrders[] = $this->getLastOrderByRequest($request);
+            if ($this->getLastOrderByRequest($request)) {
+                $lastOrders[] = $this->getLastOrderByRequest($request);
+            }
         }
 
         $mappings = array();

diff --git a/module/LogisticsBundle/Resources/views/logistics/admin/order/view.twig b/module/LogisticsBundle/Resources/views/logistics/admin/order/view.twig
@@ -2,7 +2,7 @@
 {% import 'site/partials/form.twig' as forms %}
 
 {% block content %}
-    {% include 'logistics/admin/order/partials/navigation.twig' %}
+    {% include 'logistics/admin/request/partials/navigation.twig' %}
 
     {% include 'admin/partials/flashMessenger.twig' %}