diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php index 0cee9a285..6b082bcd4 100644 --- a/Layout/default/Order/Index.php +++ b/Layout/default/Order/Index.php @@ -97,7 +97,7 @@
-

Bestellungen ohne Produkt

+

Bestellungen ohne Anschluss

diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php index 2cfd97b20..0eea90c44 100644 --- a/application/Order/OrderController.php +++ b/application/Order/OrderController.php @@ -100,21 +100,22 @@ class OrderController extends mfBaseController { $lonelyOrders = []; - //if(!count($filter)) { unset($order_search["network_id"]); - $order_search['product_id'] = null; - if($this->me->isAdmin()) { - $lonelies = OrderModel::search($order_search); - } else { - $order_search['create_by'] = $this->me->id; - $lonelies = OrderModel::search($order_search); + //$order_search['product_id'] = null; + // all orders without a product or with products without terminations + if($this->me->isAdmin()) { + $lonelies = OrderModel::search($order_search); + } else { + $order_search['create_by'] = $this->me->id; + $lonelies = OrderModel::search($order_search); + } + foreach($lonelies as $order) { + if(!array_key_exists($order->id, $orders)) { + $lonelyOrders[$order->id] = $order; } - foreach($lonelies as $order) { - if(!array_key_exists($order->id, $orders)) { - $lonelyOrders[$order->id] = $order; - } - } - //} + } + + $this->layout()->set("orders", $orders); $this->layout()->set("lonelyOrders", $lonelyOrders); diff --git a/application/Order/OrderModel.php b/application/Order/OrderModel.php index c98ba5088..21cfc37bd 100644 --- a/application/Order/OrderModel.php +++ b/application/Order/OrderModel.php @@ -199,7 +199,7 @@ class OrderModel { GROUP BY `Order`.id ORDER BY `Order`.order_date ASC"; - //mfLoghandler::singleton()->debug($sql); + mfLoghandler::singleton()->debug($sql); if(is_array($limit) && count($limit)) { if(is_numeric($limit['start']) && is_numeric($limit['count'])) {