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

Added Journal entry when finishing router config

Browse Source
This commit is contained in:
Frank Schubert
2021-10-19 22:11:28 +02:00
parent ab8686de75
commit c4b776d622
2 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,44 +74,44 @@
<td class="text-pink"><?=$product->order->owner->spin?></td>
<td><?=$product->order->owner->getCompanyOrName()?></td>
<td><?=$product->product->name?></td>
<td><?=$product->product->attributes['bras_type']->value?> - Down: <?=$product->product->attributes["bw_down"]?> / Up: <?=$product->product->attributes["bw_up"]?></td>
<td><?=$product->product->attributes['bras_type']->value?> - Down: <?=$product->product->attributes["bw_down"]->value?> / Up: <?=$product->product->attributes["bw_up"]->value?></td>
<td class="text-monospace">
<?php if($product->termination_id): ?>
<?php if($product->termination->building->pop->vlan_public): ?>
<label class="order-date-pill active pointer">
Public: <strong><?=$product->termination->building->pop->vlan_public?></strong>
<input type="checkbox" name="vlan_inet" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->building->pop->vlan_public?>" />
<input type="checkbox" name="vlan_public" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->building->pop->vlan_public?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php if($product->termination->building->pop->vlan_nat): ?>
<label class="order-date-pill active pointer">
NAT: <strong><?=$product->termination->building->pop->vlan_nat?></strong>
<input type="checkbox" name="vlan_nat" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->building->pop->vlan_nat?>" />
<input type="checkbox" name="vlan_nat" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->building->pop->vlan_nat?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php if($product->termination->building->pop->vlan_ipv6): ?>
<label class="order-date-pill active pointer">
IPv6: <strong><?=$product->termination->building->pop->vlan_ipv6?></strong>
<input type="checkbox" name="vlan_ipv6" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->building->pop->vlan_ipv6?>" />
<input type="checkbox" name="vlan_ipv6" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->building->pop->vlan_ipv6?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php else: ?>
<?php if($product->product->attributes['vlan_default_public']->value): ?>
<label class="order-date-pill active pointer">
Public: <strong><?=$product->product->attributes['vlan_default_public']->value?></strong>
<input type="checkbox" name="vlan_inet" form="cpeprovform-<?=$product->id?>" value="<?=$product->product->attributes['vlan_default_public']->value?>" />
<input type="checkbox" name="vlan_public" form="cpeprovform-<?=$product->id?>" value="<?=$product->product->attributes['vlan_default_public']->value?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php if($product->product->attributes['vlan_default_nat']->value): ?>
<label class="order-date-pill active pointer">
NAT: <strong><?=$product->product->attributes['vlan_default_nat']->value?></strong>
<input type="checkbox" name="vlan_nat" form="cpeprovform-<?=$product->id?>" value="<?=$product->product->attributes['vlan_default_nat']->value?>" />
<input type="checkbox" name="vlan_nat" form="cpeprovform-<?=$product->id?>" value="<?=$product->product->attributes['vlan_default_nat']->value?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php if($product->product->attributes['vlan_default_ipv6']->value): ?>
<label class="order-date-pill active pointer">
IPv6: <strong><?=$product->product->attributes['vlan_default_ipv6']->value?></strong>
<input type="checkbox" name="vlan_ipv6" form="cpeprovform-<?=$product->id?>" value="<?=$product->product->attributes['vlan_default_ipv6']->value?>" />
<input type="checkbox" name="vlan_ipv6" form="cpeprovform-<?=$product->id?>" value="<?=$product->product->attributes['vlan_default_ipv6']->value?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php endif; ?>
@@ -156,6 +156,7 @@
<td colspan="6">
<form method="post" id="cpeprovform-<?=$product->id?>" action="<?=self::getUrl("Cpeprovisioning", "Save")?>">
<input type="hidden" name="id" value="<?=$product->cpeprovisioning->id?>" />
<input type="hidden" name="order_id" value="<?=$product->order_id?>" />
<input type="hidden" name="orderproduct_id" value="<?=$product->id?>" />
<input type="hidden" name="termination_id" value="<?=$product->termination_id?>" />

41
application/Cpeprovisioning/CpeprovisioningController.php
View File

@@ -68,11 +68,11 @@ class CpeprovisioningController extends mfBaseController {
protected function saveAction() {
$r = $this->request;
$id = $r->id;
var_dump($r);
//var_dump($r);
if(is_numeric($id) && $id > 0) {
$mode = "edit";
$cpeprovisioning = new Cpeprovisioning($id);
if(!$building->id) {
if(!$cpeprovisioning->id) {
$this->layout()->setFlash("Eintrag nicht gefunden", "error");
$this->redirect("Cpeprovisioning");
}
@@ -80,6 +80,7 @@ class CpeprovisioningController extends mfBaseController {
$mode = "add";
}
$order_id = $r->order_id;
$termination_id = $r->termination_id;
if(!(is_numeric($termination_id) && $termination_id > 0) && !(is_numeric($order_id) && $order_id > 0)) {
$this->layout()->setFlash("Anschluss oder Bestellung nicht gefunden", "error");
@@ -95,7 +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["vlan_inet"] = (strlen($r->vlan_inet)) ? $r->vlan_inet : null;
$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;
$prov_data["ship_weight"] = $r->ship_weight;
@@ -119,6 +120,40 @@ class CpeprovisioningController extends mfBaseController {
$this->redirect("Cpeprovisioning");
}
// saved successfully, if routerconfig_finished make Journal entry in Order
if($cpeprovisioning->routerconfig_finished) {
$order_product = new OrderProduct($r->orderproduct_id);
if($cpeprovisioning->shipping) {
$text = "CPE zu Produkt \"".$order_product->product->name."\" zum Versand vorbereitet.\n\n";
} else {
$text = "CPE zu Produkt \"".$order_product->product->name."\" vorbereitet für Techniker zur Vorortinstallation.\n\n";
}
$text .= "Router: ".$cpeprovisioning->routertype."\n";
$text .= "Zugangstyp: ".$order_product->product->attributes['bras_type']->value."\n";
if($cpeprovisioning->vlan_public) {
$text .= "Vlan Public: ".$cpeprovisioning->vlan_public."\n";
}
if($cpeprovisioning->vlan_nat) {
$text .= "Vlan NAT: ".$cpeprovisioning->vlan_nat."\n";
}
if($cpeprovisioning->vlan_ipv6) {
$text .= "Vlan IPv6: ".$cpeprovisioning->vlan_ipv6."\n";
}
$journal = new OrderJournal();
$journal->order_id = $order_id;
$journal->text = $text;
$journal->create_by = $this->me->id;
$journal->edit_by = $this->me->id;
$journal_id = $journal->save();
if(!$journal_id) {
$this->layout()->setFlash("Konnte nicht ins Bestelljournal schreiben!", "warning");
}
}
$this->layout()->setFlash("Eintrag erfolgreich gespeichert.", "success");
$this->redirect("Cpeprovisioning");