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

Added Order finish_date

Browse Source
This commit is contained in:
Frank Schubert
2021-09-21 20:37:40 +02:00
parent 6b7bad66a0
commit 2320e1c782
4 changed files with 120 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
application/Order/OrderController.php
View File

@@ -20,10 +20,10 @@ class OrderController extends mfBaseController {
$filter = [];
$this->layout->set("filter", $this->request->filter);
if($this->request->filter) {
//if($this->request->filter) {
$filter = $this->getPreparedFilter($this->request->filter);
}
//}
//var_dump($filter);exit;
// pagination defaults
$pagination = [];
$pagination['start'] = 0;
@@ -100,18 +100,21 @@ class OrderController extends mfBaseController {
$lonelyOrders = [];
if(!count($filter)) {
//if(!count($filter)) {
unset($order_search["network_id"]);
$order_search['product_id'] = null;
if($this->me->isAdmin()) {
$lonelies = OrderModel::search(['product_id' => null]);
$lonelies = OrderModel::search($order_search);
} else {
$lonelies = OrderModel::search(['product_id' => null, 'create_by' => $this->me->id]);
$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;
}
}
}
//}
$this->layout()->set("orders", $orders);
$this->layout()->set("lonelyOrders", $lonelyOrders);
@@ -121,30 +124,43 @@ class OrderController extends mfBaseController {
private function getPreparedFilter($filter) {
$new_filter = [];
if(is_numeric($filter['networksection_id']) && $filter['networksection_id']) {
$section = new Networksection($filter['networksection_id']);
if($section->id) {
$filter['network_id'] = $section->network_id;
}
}
if(array_key_exists("termination_status", $filter)) {
$status = $filter['termination_status'];
if($status == "term_connected") {
$new_filter["termination_status_code"] = ">=".TT_TERMSTATUS_CONNECTED;
if(is_array($filter) && count($filter)) {
if(is_numeric($filter['networksection_id']) && $filter['networksection_id']) {
$section = new Networksection($filter['networksection_id']);
if($section->id) {
$filter['network_id'] = $section->network_id;
}
}
if($status == "building_connected") {
$new_filter["building_status_code"] = ">=".TT_BUILDINGSTATUS_CONNECTED;
}
if($status == "pipework_needed") {
$new_filter["building_status_code"] = "<".TT_BUILDINGSTATUS_CONNECTED;
if(array_key_exists("termination_status", $filter)) {
$status = $filter['termination_status'];
if($status == "term_connected") {
$new_filter["termination_status_code"] = ">=".TT_TERMSTATUS_CONNECTED;
}
if($status == "building_connected") {
$new_filter["building_status_code"] = ">=".TT_BUILDINGSTATUS_CONNECTED;
}
if($status == "pipework_needed") {
$new_filter["building_status_code"] = "<".TT_BUILDINGSTATUS_CONNECTED;
}
}
}
foreach($filter as $name => $value) {
$new_filter[$name] = $value;
if(array_key_exists("finished", $filter)) {
if($filter["finished"] == "1") {
$new_filter["finish_date"] = true;
} else {
$new_filter["finish_date"] = false;
}
}
//var_dump($new_filter);exit;
foreach($filter as $name => $value) {
$new_filter[$name] = $value;
}
} else {
$new_filter["finish_date"] = false;
}
return $new_filter;
@@ -371,7 +387,15 @@ class OrderController extends mfBaseController {
}
$order_data['edit_by'] = $this->me->id;
//var_dump($r);
if($r->order_finished == "1") {
if($r->finish_date) {
$order_data['finish_date'] = Layout::dateToInt($r->finish_date);
} else {
$order_data['finish_date'] = date("U");
}
}
//var_dump($order_data);exit;
if($mode == "add") {
$order = OrderModel::create($order_data);
} else {