Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Fixed Showing Orders of users of same company

Browse Source
This commit is contained in:
Frank Schubert
2022-04-27 16:40:47 +02:00
parent 864aa03acc
commit d7192b0378
11 changed files with 422 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
application/Order/OrderController.php
View File

@@ -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) {