Merge branch 'fronkdev' into 'master'

Added code to PLog view

See merge request fronk/thetool!128
This commit is contained in:
Frank Schubert
2023-11-23 13:03:53 +00:00
2 changed files with 3 additions and 1 deletions

View File

@@ -100,6 +100,7 @@
<tr>
<th></th>
<th></th>
<th>Status</th>
<th>Versandadresse</th>
<th>OAID</th>
<th>Bestellcode</th>
@@ -115,6 +116,7 @@
onchange="saveSent(<?=$preorder->id?>)" />
</label>
</td>
<td><?=$preorder->status->code?></td>
<td>
<?php if($preorder->adb_hausnummer_id): ?>
<?php if($preorder->company): ?>

View File

@@ -77,7 +77,7 @@ class PreorderlogisticsController extends mfBaseController {
$filter['network_id'] = $my_network_ids;
$filter[">status_code"] = 139;
$filter["<status_code"] = 300;
$filter["<status_code"] = 800;
$filter["connection_type"] = ["single-dwelling", "business"];
$pagination['maxItems'] = PreorderModel::countWithLogistics($filter);
$preorders = PreorderModel::searchWithLogistics($filter, $pagination);