Fixed Showing Orders of users of same company

application/Order/OrderController.php

@@ -36,7 +36,7 @@ class OrderController extends mfBaseController {
     
     $this->layout->set("filter", $this->request->filter);
     $filter = $this->getPreparedFilter($this->request->filter);
-
+    
     // pagination defaults
     $pagination = [];
     $pagination['start'] = 0;
@@ -83,10 +83,11 @@ class OrderController extends mfBaseController {
       }
       $this->layout()->set("mynetworks", $this->me->my_networks);
     }
+    
     unset($filter['network_id']);
     
     // get Orders in my networks
-    
+    //var_dump($my_networks);exit;
     $my_network_ids = [];
     $orders = [];
     //var_dump($this->me->my_networks);exit;
@@ -111,6 +112,8 @@ class OrderController extends mfBaseController {
       }
     }
     
+    $userIds = $this->me->getAddressOrParent()->getUserIds();
+    //var_dump($userIds);exit;
     if(!array_key_exists("network_linked_status", $order_search)) {
       $lonelyOrders = [];
       unset($order_search["network_id"]);
@@ -121,7 +124,8 @@ class OrderController extends mfBaseController {
           $lonelies = OrderModel::search($order_search);
         }
       } else {
-        $order_search['create_by'] = $this->me->id;
+        $order_search['create_by'] = $userIds;
+        //var_dump($order_search);exit;
         $lonelies = OrderModel::search($order_search);
       }
       foreach($lonelies as $order) {
@@ -138,7 +142,7 @@ class OrderController extends mfBaseController {
           $lonelies = OrderModel::search($order_search);
         }
       } else {
-        $order_search['create_by'] = $this->me->id;
+        $order_search['create_by'] = $userIds;
         $lonelies = OrderModel::search($order_search);
       }
       foreach($lonelies as $order) {

application/Order/OrderModel.php

@@ -265,7 +265,9 @@ class OrderModel {
     
     if(array_key_exists("create_by", $filter)) {
       $create_by = $filter['create_by'];
-      if(is_numeric($create_by)) {
+      if(is_array($create_by)) {
+        $where .= " AND `Order`.create_by IN (".implode(",",$create_by).")";
+      } elseif(is_numeric($create_by)) {
         $where .= " AND `Order`.create_by=$create_by";
       }
     }