- Removed statuses that are NULL from the OrderItemStatus dashboard w…

…idget as they cannot be displayed correctly
marellocommerce · Jul 20, 2020 · 1f318b4 · 1f318b4
1 parent 04a60f8
commit 1f318b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/Marello/Bundle/OrderBundle/Provider/OrderDashboardOrderItemsByStatusProvider.php b/src/Marello/Bundle/OrderBundle/Provider/OrderDashboardOrderItemsByStatusProvider.php
@@ -70,6 +70,7 @@ public function getOrderItemsGroupedByStatus(WidgetOptionBag $widgetOptions)
         $orderitemRepository = $this->registry->getRepository('MarelloOrderBundle:Order');
         $qb = $orderitemRepository->createQueryBuilder('o')
             ->select('IDENTITY (oi.status) status, COUNT(oi.id) as quantity')
+            ->andWhere('IDENTITY (oi.status) IS NOT NULL')
             ->innerJoin('o.items', 'oi')
             ->groupBy('oi.status')
             ->orderBy('quantity', 'DESC');

diff --git a/...o/Bundle/OrderBundle/Tests/Unit/Provider/OrderDashboardOrderItemsByStatusProviderTest.php b/...o/Bundle/OrderBundle/Tests/Unit/Provider/OrderDashboardOrderItemsByStatusProviderTest.php
@@ -148,6 +148,7 @@ public function getOrderItemsGroupedByStatusDQLDataProvider()
                     'SELECT IDENTITY (oi.status) status, COUNT(oi.id) as quantity '
                     . 'FROM MarelloOrderBundle:Order o '
                     . 'INNER JOIN o.items oi '
+                    . 'WHERE IDENTITY (oi.status) IS NOT NULL '
                     . 'GROUP BY oi.status '
                     . 'ORDER BY quantity DESC'
             ],
@@ -160,6 +161,7 @@ public function getOrderItemsGroupedByStatusDQLDataProvider()
                     'SELECT IDENTITY (oi.status) status, COUNT(oi.id) as quantity '
                     . 'FROM MarelloOrderBundle:Order o '
                     . 'INNER JOIN o.items oi '
+                    . 'WHERE IDENTITY (oi.status) IS NOT NULL '
                     . 'GROUP BY oi.status '
                     . 'ORDER BY quantity DESC'
             ],