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

Added mac-address and note to cpeprovisioning

Browse Source
This commit is contained in:
Frank Schubert
2021-10-28 23:40:58 +02:00
parent d81cc73add
commit 5c1d75b239
3 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Layout/default/Cpeprovisioning/Index.php
View File

@@ -152,7 +152,7 @@
<?=($product->order->note) ? "<i class='fas fa-clipboard-list text-purple' title='Kommentar: ".str_replace('"', '&#34;', $product->order->note)."'></i>" : ""?>
</td>
</tr>
<tr class="<?=($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd"?> ">
<tr class="<?=($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd"?> bottom-no-border">
<td colspan="6">
<form method="post" id="cpeprovform-<?=$product->id?>" action="<?=self::getUrl("Cpeprovisioning", "Save")?>">
@@ -188,7 +188,7 @@
</div>
<div class="col-md-1">
<div class="form-group text-center">
<div class="form-group">
<label class="form-label" for="wifi_ssid-<?=$product->id?>">WLAN SSID</label>
<input class="form-control" type="text" name="wifi_ssid" id="router_wifi_ssid-<?=$product->id?>" value="<?=$product->cpeprovisioning->wifi_ssid?>" />
</div>
@@ -246,12 +246,6 @@
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label class="form-label">&nbsp;</label>
<button class="form-control btn btn-primary" type="submit"><i class="fas fa-save"></i> Speichern</button>
</div>
</div>
</div>
</form>
@@ -259,6 +253,38 @@
</td>
<td></td>
</tr>
<tr class="<?=($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd"?> top-no-border">
<td colspan="6">
<div class="row">
<div class="col-md-2 offset-md-2">
<div class="form-group">
<label class="form-label" for="mac-<?=$product->id?>">MAC Adresse</label>
<input class="form-control" form="cpeprovform-<?=$product->id?>" type="text" name="mac" id="mac-<?=$product->id?>" value="<?=$product->cpeprovisioning->mac?>" />
</div>
</div>
<div class="col-md-1"></div>
<div class="col-md-4">
<div class="form-group">
<label class="form-label" for="note-<?=$product->id?>">Kommentar</label>
<textarea class="form-control" form="cpeprovform-<?=$product->id?>" name="note" id="note-<?=$product->id?>"><?=htmlentities($product->cpeprovisioning->note)?></textarea>
</div>
</div>
<div class="col-md-1"></div>
<div class="col-md-2">
<div class="form-group">
<label class="form-label">&nbsp;</label>
<button class="form-control btn btn-primary" form="cpeprovform-<?=$product->id?>" type="submit"><i class="fas fa-save"></i> Speichern</button>
</div>
</div>
</div>
</td>
<td></td>
</tr>
<?php $prov_count++ ?>
<?php endforeach; ?>
</table>

2
application/Cpeprovisioning/CpeprovisioningController.php
View File

@@ -96,6 +96,7 @@ class CpeprovisioningController extends mfBaseController {
$prov_data["shipping"] = ($r->shipping) ? 1 : 0;
$prov_data["wifi_ssid"] = $r->wifi_ssid;
$prov_data["wifi_pass"] = $r->wifi_pass;
$prov_data["mac"] = $r->mac;
$prov_data["vlan_public"] = (strlen($r->vlan_public)) ? $r->vlan_public : null;
$prov_data["vlan_nat"] = (strlen($r->vlan_nat)) ? $r->vlan_nat : null;
$prov_data["vlan_ipv6"] = (strlen($r->vlan_ipv6)) ? $r->vlan_ipv6 : null;
@@ -103,6 +104,7 @@ class CpeprovisioningController extends mfBaseController {
$prov_data["ship_length"] = (strlen($r->ship_length)) ? $r->ship_length : null;
$prov_data["ship_width"] = (strlen($r->ship_width)) ? $r->ship_width : null;
$prov_data["ship_height"] = (strlen($r->ship_height)) ? $r->ship_height : null;
$prov_data["note"] = $r->note;
$prov_data["edit_by"] = $this->me->id;

2
application/Cpeprovisioning/CpeprovisioningModel.php
View File

@@ -9,6 +9,7 @@ class CpeprovisioningModel {
public $shipping;
public $wifi_ssid;
public $wifi_pass;
public $mac;
public $vlan_public;
public $vlan_nat;
public $vlan_ipv6;
@@ -16,6 +17,7 @@ class CpeprovisioningModel {
public $ship_length;
public $ship_width;
public $ship_height;
public $note;
public $create_by = null;
public $edit_by = null;