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

Added contact info and journal link to Cpeprovisioning

Browse Source
This commit is contained in:
Frank Schubert
2021-11-02 21:08:13 +01:00
parent e2925adec5
commit 98525a701e
3 changed files with 56 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/Cpeprovisioning/Index.php
+28 -14
View File
@@ -117,54 +117,56 @@
<th>VLANs</th>
<th></th>
</tr>
<tr class="<?=($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd"?> top-no-border">
<td><?=($product->termination_id) ? $product->termination->building->network->name : $product->order->owner->zip." ".$product->order->owner->city?></td>
<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"]->value?> / Up: <?=$product->product->attributes["bw_up"]->value?></td>
<td class="text-monospace">
<tr class="<?=($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd"?> top-no-border bottom-no-border">
<td class="pb-0">
<?=($product->termination_id) ? $product->termination->building->network->name : $product->order->owner->zip." ".$product->order->owner->city?>
</td>
<td class="text-pink pb-0"><?=$product->order->owner->spin?></td>
<td class="pb-0"><?=$product->order->owner->getCompanyOrName()?></td>
<td class="pb-0"><?=$product->product->name?></td>
<td class="pb-0"><?=$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 pb-0">
<?php if($product->termination_id): ?>
<?php if($product->termination->getPop()->vlan_public): ?>
<label class="order-date-pill active pointer">
<label class="order-date-pill active pointer mb-0">
Public: <strong><?=$product->termination->getPop()->vlan_public?></strong>
<input type="checkbox" name="vlan_public" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->getPop()->vlan_public?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php if($product->termination->getPop()->vlan_nat): ?>
<label class="order-date-pill active pointer">
<label class="order-date-pill active pointer mb-0">
NAT: <strong><?=$product->termination->getPop()->vlan_nat?></strong>
<input type="checkbox" name="vlan_nat" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->getPop()->vlan_nat?>" <?=($product->cpeprovisioning->vlan_nat) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php if($product->termination->getPop()->vlan_ipv6): ?>
<label class="order-date-pill active pointer">
<label class="order-date-pill active pointer mb-0">
IPv6: <strong><?=$product->termination->getPop()->vlan_ipv6?></strong>
<input type="checkbox" name="vlan_ipv6" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->getPop()->vlan_ipv6?>" <?=($product->cpeprovisioning->vlan_ipv6) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php else: ?>
<?php if($product->product->attributes['vlan_default_public']->value): ?>
<label class="order-date-pill active pointer">
<label class="order-date-pill active pointer mb-0">
Public: <strong><?=$product->product->attributes['vlan_default_public']->value?></strong>
<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">
<label class="order-date-pill active pointer mb-0">
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?>" <?=($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">
<label class="order-date-pill active pointer mb-0">
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?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php endif; ?>
</td>
<td style="font-size: 18px; cursor:pointer; min-width: 180px;">
<td class="pb-0" style="cursor:pointer; min-width: 180px;">
<?php
$vot = false;
@@ -200,6 +202,18 @@
<?=($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"?> bottom-no-border top-no-border">
<td>
<?php if($product->termination_id && $product->termination->getPop()): ?>
<strong>POP</strong>: <?=$product->termination->getPop()->name?>
<?php endif; ?>
</td>
<td><strong>Telefon:</strong> <?=$product->order->owner->phone?></td>
<td><strong>Email:</strong> <?=$product->order->owner->email?></td>
<td><a target="_blank" href="<?=self::getUrl("Order", "Index", ["id" => $product->order_id, "addJournal" => 1])?>"><i class="fas fa-scroll"></i> Bestelljournal</a></td>
<td colspan="3"></td>
<tr class="<?=($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd"?> bottom-no-border">
<td colspan="6">
Layout/default/Order/Index.php
+10
View File
@@ -774,6 +774,16 @@
$('html,body').unbind().animate({scrollTop: $(element).offset().top-180},'slow');
};
<?php if($highlight): ?>
toggleOrder(<?=$highlight?>);
scrollToDiv("#order-<?=$highlight?>");
<?php if($addJournal): ?>
$('#new-journal-<?=$highlight?>').toggle()
$('#new-journal-<?=$highlight?> textarea[name=text]').focus();
<?php endif; ?>
<?php endif; ?>
function saveVororttermin(id) {
date = $('#vororttermin-' + id).val();
if(!date) {