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

Merge branch 'Order/fix-warnings' into 'master'

Browse Source 
fixed php errors/warnings in frontend

See merge request fronk/thetool!1947
This commit is contained in:
Luca Haid
2025-12-10 09:30:13 +00:00
parent 13421c19ad b4af23139c
commit 682b645d53
1 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Layout/default/Order/Index.php
View File

@@ -1,9 +1,13 @@
<?php
$filter = $filter ?? [];
$voice_orders = $voice_orders ?? null;
$special_orders = $special_orders ?? null;
$showSpecial = $showSpecial ?? false;
$showVoice = $showVoice ?? false;
$pagination_baseurl = $this->getUrl($Mod,"Index");
$pagination_baseurl_params = ["filter" => $filter];
$pagination_entity_name = "Bestellungen";
//var_dump($mynetworks);
$sorted_networks = [];
if(is_array($mynetworks) && count($mynetworks)) {
@@ -63,7 +67,7 @@
<?php if(is_array($fnet->sections) && count($fnet->sections)): ?>
<optgroup label="<?=$fnet->name?>">
<?php foreach($fnet->sections as $section): ?>
<option value="<?=$section->id?>" <?=($filter['building_networksection_id'] == $section->id) ? "selected='selected'" : ""?>><?=$section->name?></option>
<option value="<?=$section->id?>" <?=(($filter['building_networksection_id'] ?? null) == $section->id) ? "selected='selected'" : ""?>><?=$section->name?></option>
<?php endforeach; ?>
</optgroup>
<?php endif; ?>
@@ -75,55 +79,55 @@
<label class="form-label" for="filter_status_id">Anschlussstatus</label>
<select name="filter[termination_status]" id="filter_building_status_id" class="form-control">
<option></option>
<option value="pipework_needed" <?=($filter['termination_status'] == "pipework_needed") ? "selected='selected'" : ""?>>Tiefbau ausständig</option>
<option value="building_connected" <?=($filter['termination_status'] == "building_connected") ? "selected='selected'" : ""?>>Tiefbau erledigt</option>
<option value="term_connected" <?=($filter['termination_status'] == "term_connected") ? "selected='selected'" : ""?>>Anschluss passiv erschlossen</option>
<?php if($me->is("Admin")): ?><option value="systemowner_action_status" <?=($filter['termination_status'] == "systemowner_action_status") ? "selected='selected'" : ""?>>Admin Workorder</option><?php endif; ?>
<option value="pipework_needed" <?=(($filter['termination_status'] ?? null) == "pipework_needed") ? "selected='selected'" : ""?>>Tiefbau ausständig</option>
<option value="building_connected" <?=(($filter['termination_status'] ?? null) == "building_connected") ? "selected='selected'" : ""?>>Tiefbau erledigt</option>
<option value="term_connected" <?=(($filter['termination_status'] ?? null) == "term_connected") ? "selected='selected'" : ""?>>Anschluss passiv erschlossen</option>
<?php if($me->is("Admin")): ?><option value="systemowner_action_status" <?=(($filter['termination_status'] ?? null) == "systemowner_action_status") ? "selected='selected'" : ""?>>Admin Workorder</option><?php endif; ?>
</select>
</div>
<div class="col-1">
<label class="form-label" for="filter_building_code">Objekt ID</label>
<input type="text" class="form-control" name="filter[building_code]" id="filter_building_code" value="<?=$filter['building_code']?>" />
<input type="text" class="form-control" name="filter[building_code]" id="filter_building_code" value="<?=$filter['building_code'] ?? ''?>" />
</div>
<div class="col-2">
<label class="form-label" for="filter_building_street">Straße (Anschluss)</label>
<input type="text" class="form-control" name="filter[building_street]" id="filter_building_street" value="<?=$filter['building_street']?>" />
<input type="text" class="form-control" name="filter[building_street]" id="filter_building_street" value="<?=$filter['building_street'] ?? ''?>" />
</div>
<div class="col-1">
<label class="form-label" for="filter_owner">Kunde</label>
<input type="text" class="form-control" name="filter[owner]" id="filter_owner" value="<?=$filter['owner']?>" />
<input type="text" class="form-control" name="filter[owner]" id="filter_owner" value="<?=$filter['owner'] ?? ''?>" />
</div>
<div class="col-2">
<label class="form-label" for="filter_owner">Straße (Kunde)</label>
<input type="text" class="form-control" name="filter[owner_address]" id="filter_owner_address" value="<?=$filter['owner_address']?>" />
<input type="text" class="form-control" name="filter[owner_address]" id="filter_owner_address" value="<?=$filter['owner_address'] ?? ''?>" />
</div>
<div class="col-1">
<label class="form-label" for="filter_partner_number">Partnernummer</label>
<input type="text" class="form-control" name="filter[partner_number]" id="filter_partner_number" value="<?=$filter['partner_number']?>" />
<input type="text" class="form-control" name="filter[partner_number]" id="filter_partner_number" value="<?=$filter['partner_number'] ?? ''?>" />
</div>
<div class="col-2">
<label class="form-label" for="filter_finish_date">Bestellstatus</label>
<select name="filter[finish_date]" id="filter_finish_date" class="form-control">
<option></option>
<option value="0" <?=( (!is_array($filter) || (!array_key_exists("finish_date", $filter) || $filter["finish_date"] != "1")) ? 'selected="selected"' : "")?>>Offen</option>
<option value="1" <?=($filter["finish_date"] == "1" ? 'selected="selected"' : "")?>>Fertiggestellt</option>
<option value="waiting" <?=($filter["finish_date"] == "waiting") ? 'selected="selected"' : ""?>>Wartend / ausgeblendet</option>
<option value="0" <?=(($filter["finish_date"] ?? "0") != "1" ? 'selected="selected"' : "")?>>Offen</option>
<option value="1" <?=(($filter["finish_date"] ?? null) == "1" ? 'selected="selected"' : "")?>>Fertiggestellt</option>
<option value="waiting" <?=(($filter["finish_date"] ?? null) == "waiting") ? 'selected="selected"' : ""?>>Wartend / ausgeblendet</option>
</select>
</div>
<div class="col-1">
<label class="form-label" for="filter_customer_type">Kundentyp</label>
<select name="filter[customer_type]" id="filter_customer_type" class="form-control">
<option></option>
<option value="residential" <?=($filter['customer_type'] == "residential") ? 'selected="selected"' : ""?>>Residential</option>
<option value="business" <?=($filter['customer_type'] == "business") ? 'selected="selected"' : ""?>>Business</option>
<option value="residential" <?=(($filter['customer_type'] ?? null) == "residential") ? 'selected="selected"' : ""?>>Residential</option>
<option value="business" <?=(($filter['customer_type'] ?? null) == "business") ? 'selected="selected"' : ""?>>Business</option>
</select>
</div>
@@ -245,7 +249,7 @@
$cpe_config_finished = true;
}
}
if($hw && $voip_chan && $patched && $cpe_config_finished) {
if($hw && $voip && $patched && $cpe_config_finished) {
break;
}
}
@@ -697,7 +701,7 @@
$cpe_config_finished = true;
}
}
if($hw && $voip_chan && $patched && $cpe_config_finished) {
if($hw && $voip && $patched && $cpe_config_finished) {
break;
}
}