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

Fixed showing orders with not required termination

Browse Source
This commit is contained in:
Frank Schubert
2021-10-12 20:23:19 +02:00
parent 77f5931995
commit fa622a72e9
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/Order/OrderController.php
View File

@@ -128,9 +128,11 @@ class OrderController extends mfBaseController {
if(!array_key_exists($order->id, $orders)) {
$o = new Order($order->id);
foreach($o->products as $p) {
//var_dump($p->product->attributes);exit;
if(array_key_exists(TT_ATTRIB_TERMINATION_REQUIRED_NAME, $p->product->attributes)) {
$this->log->debug("found additional order wher termination_required 0");
$attribs = $p->product->attributes;
if(is_array($attribs) && count($attribs)
&& array_key_exists(TT_ATTRIB_TERMINATION_REQUIRED_NAME, $attribs)
&& $$attribs[TT_ATTRIB_TERMINATION_REQUIRED_NAME]->value == 0) {
$this->log->debug("found additional order where termination_required 0");
$lonelyOrders[$order->id] = $order;
break;
}

2
application/Order/OrderModel.php
View File

@@ -286,6 +286,8 @@ class OrderModel {
$termination_id = $filter['termination_id'];
if(is_numeric($termination_id)) {
$where .= " AND OrderProduct.termination_id=$termination_id";
} elseif($termination_id === null) {
$where .= " AND OrderProduct.termination_id IS NULL";
}
}