Merge branch 'fronkdev' into 'master'
Added code to PLog view See merge request fronk/thetool!128
This commit is contained in:
@@ -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): ?>
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user