Fixed Showing Orders of users of same company

application/User/User.php

@@ -179,8 +179,8 @@ class User extends mfBaseModel {
     foreach($my_networks as $net) {
       //var_dump($net);exit;
       $address_id = $this->address_id;
-      if($this->getProperty("address")->parent_id) {
-        $address_id = $this->getProperty("address")->parent_id;
+      if($this->address->parent_id) {
+        $address_id = $this->address->parent_id;
       }
       $found = NetworkaddressModel::search(['network_id' => $net->id, "addresstype" => [$type], 'address_id' => $address_id]);
       //var_dump($found);exit;
@@ -217,4 +217,26 @@ class User extends mfBaseModel {
     
     return $my_networks;
   }
+  
+  public function getAddressOrParent() {
+    if(!$this->id) {
+      return null;
+    }
+    
+    if(!$this->address->parent_id) {
+      return $this->address;
+    }
+    
+    $parent = $this->address->parent;
+    $p = $parent;
+    while($p) {
+      if(!$p->parent_id) {
+        break;
+      }
+      $parent = $p->parent;
+    }
+
+    return $parent;
+  }
+  
 }