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

Merge branch 'fronkdev' into 'master'

Browse Source 
Preordercampaign pagination & prem nord update

See merge request fronk/thetool!103
This commit is contained in:
Frank Schubert
2023-10-16 09:43:19 +00:00
parent 5da45ad418 e9ca1d5bb7
commit cc736317b4
26 changed files with 3901 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/Preordercampaign/Index.php
+16
View File
@@ -1,3 +1,8 @@
<?php
$pagination_baseurl = $this->getUrl($Mod,"Index");
$pagination_baseurl_params = ["filter" => $filter];
$pagination_entity_name = "Vorbestellkampagnen";
?>
<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
<!-- start page title -->
@@ -82,6 +87,13 @@
<?php endif; ?>
</div>
<div class="row">
<div class="col">
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
</div>
</div>
<table class="table table-striped table-hover">
<tr>
<th></th>
@@ -134,6 +146,10 @@
</tr>
<?php endforeach; ?>
</table>
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
</div>
</div>
Layout/default/Voiceplan/Index.php
+3 -1
View File
@@ -68,6 +68,7 @@
<tr>
<th>Name</th>
<th>Beschreibung</th>
<th>Anzahl Tarifzonen</th>
<th>Anzahl Destinations</th>
<th>Erstellt</th>
<th></th>
@@ -76,7 +77,8 @@
<tr>
<td><a href="<?=self::getUrl("Voiceplan", "view", ['id' => $plan->id])?>"><?=$plan->name?></a></td>
<td><?=$plan->description?></td>
<td><?=VoiceplandestinationModel::count(['voiceplan_id' => $plan->id])?></td>
<td><?=count($plan->zones)?></td>
<td><?=count($plan->destinations)?></td>
<td><?=date("d.m.Y H:i", $plan->create)?> (<?=$plan->creator->name?>)</td>
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
<a href="<?=self::getUrl("Voiceplan", "view", ["id" => $plan->id])?>"><i class="far fa-eyes" title="Anzeigen"></i></a>
Layout/default/Voiceplan/View.php
+14 -14
View File
@@ -16,7 +16,7 @@
<li class="breadcrumb-item active"><?=$plan->name?></li>
</ol>
</div>
<h4 class="page-title">Sprachtarife</h4>
<h4 class="page-title">Tarifzonen</h4>
</div>
</div>
</div>
@@ -30,10 +30,10 @@
<div class="row">
<div class="col-12">
<div class="float-left">
<h4 class="header-title">Destinations für Sprachtarifpaket <?=$plan->name?></h4>
<h4 class="header-title">Tarifzonen für Sprachtarifpaket <?=$plan->name?></h4>
</div>
<div class="float-right">
<a class="btn btn-primary mb-2" href="<?=self::getUrl("Voiceplandestination", "add", ["voiceplan_id" => $plan->id])?>"><i class="fas fa-plus"></i> Neue Destination anlegen</a>
<a class="btn btn-primary mb-2" href="<?=self::getUrl("Voiceplanzone", "add", ["voiceplan_id" => $plan->id])?>"><i class="fas fa-plus"></i> Neue Tarifzone anlegen</a>
</div>
</div>
</div>
@@ -43,8 +43,8 @@
<table class="table table-striped table-hover">
<tr>
<th>Destination</th>
<th>Prefix</th>
<th>Zone</th>
<th>Anzahl Prefixes</th>
<th>Taktung</th>
<th>Einkaufspreis</th>
<th>Verkaufspreis</th>
@@ -52,19 +52,19 @@
<th>Bearbeitet</th>
<th></th>
</tr>
<?php foreach($destinations as $destination): ?>
<?php foreach($zones as $zone): ?>
<tr>
<td><?=$destination->destination?></td>
<td><?=$destination->prefix?></td>
<td><?=($destination->increment_first && $destination->increment) ? "$destination->increment_first"."/".$destination->increment : ""?></td>
<td><?=$destination->purchase_price?></td>
<td><?=$destination->price?></td>
<td><a href="<?=self::getUrl("Voiceplanzone", "view", ["id" => $zone->id])?>"><?=$zone->name?></a></td>
<td><?=count($zone->destinations)?></td>
<td><?=($zone->increment_first && $zone->increment) ? $zone->increment_first."/".$zone->increment : ""?></td>
<td><?=$zone->purchase_price?></td>
<td><?=$zone->price?></td>
<td><?=date("d.m.Y H:i", $plan->create)?> (<?=$plan->creator->name?>)</td>
<td><?=date("d.m.Y H:i", $plan->edit)?> (<?=$plan->editor->name?>)</td>
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
<a href="<?=self::getUrl("Voiceplandestination", "view", ["id" => $destination->id])?>"><i class="far fa-eyes" title="Anzeigen"></i></a>
<a href="<?=self::getUrl("Voiceplandestination", "edit", ["id" => $destination->id])?>"><i class="far fa-edit" title="Bearbeiten"></i></a>
<a href="<?=self::getUrl("Voiceplandestination", "delete", ["id" => $destination->id])?>" onclick="if(!confirm('Destination wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
<a href="<?=self::getUrl("Voiceplanzone", "view", ["id" => $zone->id])?>"><i class="far fa-eyes" title="Prefixes anzeigen"></i></a>
<a href="<?=self::getUrl("Voiceplanzone", "edit", ["id" => $zone->id])?>"><i class="far fa-edit" title="Zone bearbeiten"></i></a>
<a href="<?=self::getUrl("Voiceplanzone", "delete", ["id" => $zone->id])?>" onclick="if(!confirm('Tarifzone wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
</td>
</tr>
<?php endforeach; ?>
Layout/default/Voiceplandestination/Form.php
+11 -34
View File
@@ -7,7 +7,8 @@
<ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
<li class="breadcrumb-item"><a href="<?=self::getUrl("Voiceplan")?>">Sprachtarife</a></li>
<li class="breadcrumb-item"><a href="<?=self::getUrl("Voiceplan", "view", ["id" => $voiceplan->id])?>"></a></li>
<li class="breadcrumb-item"><a href="<?=self::getUrl("Voiceplan", "view", ["id" => $zone->voiceplan_id])?>">Sprachtarif <?=$zone->voiceplan->name?></a></li>
<li class="breadcrumb-item active">Destinationen Tarifzone <?=$zone->name?></li>
<li class="breadcrumb-item active"><?=($plan->id) ? "Destination ".$destination->destination." bearbeiten" : "Neu" ?></li>
</ol>
</div>
@@ -31,19 +32,16 @@
<input type="hidden" name="id" value="<?=$destination->id?>" />
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="voiceplan_id">Tarifpaket</label>
<label class="col-lg-2 col-form-label" for="voiceplanzone_id">Tarifzone</label>
<div class="col-lg-10">
<select name="voiceplan_id" class="form-control">
<option value=""></option>
<?php if($destination && $destination->voiceplan_id): ?>
<?php foreach($voiceplans as $vp): ?>
<option value="<?=$vp->id?>" <?=($destination->voiceplan_id == $vp->id) ? "selected='selected'" : ""?>><?=$vp->name?></option>
<?php endforeach; ?>
<?php elseif($voiceplan): ?>
<?php foreach($voiceplans as $vp): ?>
<option value="<?=$vp->id?>" <?=($vp->id == $voiceplan->id) ? "selected='selected'" : ""?>><?=$vp->name?></option>
<?php endforeach; ?>
<?php endif; ?>
<select name="voiceplanzone_id" class="form-control">
<?php foreach($zones as $zone): ?>
<?php if($destination->id): ?>
<option value="<?=$zone->id?>" <?=($zone->id == $destination->voiceplanzone_id) ? "selected='selected'" : ""?>><?=$zone->voiceplan->name?> - <?=$zone->name?></option>
<?php else: ?>
<option value="<?=$zone->id?>" <?=($zone->id == $zone_id) ? "selected='selected'" : ""?>><?=$zone->voiceplan->name?> - <?=$zone->name?></option>
<?php endif; ?>
<?php endforeach; ?>
</select>
</div>
</div>
@@ -62,27 +60,6 @@
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="purchase_price">Einkaufspreis *</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="purchase_price" id="purchase_price" value="<?=$destination->purchase_price?>" />
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="price">Verkaufspreis *</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="price" id="price" value="<?=$destination->price?>" />
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="name">Taktung *</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="increment" id="increment" value="<?=($destination->increment_first && $destination->increment) ? $destination->increment_first."/".$destination->increment : ""?>" placeholder="60/30" />
</div>
</div>
</div>
</div>
Layout/default/Voiceplanzone/Form.php
+95
View File
@@ -0,0 +1,95 @@
<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
<!-- start page title -->
<div class="row">
<div class="col-12">
<div class="page-title-box">
<div class="page-title-right">
<ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
<li class="breadcrumb-item"><a href="<?=self::getUrl("Voiceplan")?>">Sprachtarife</a></li>
<li class="breadcrumb-item active"><?=($plan->id) ? "Tarifzone ".$destination->destination." bearbeiten" : "Neue Tarifzone" ?></li>
</ol>
</div>
<h4 class="page-title">Sprachtarife</h4>
</div>
</div>
</div>
<!-- end page title -->
<div class="row">
<div class="col-lg-12">
<div class="card">
<div class="card-body">
<h4 class="header-title mb-2"><?=($zone->id) ? "Zone bearbeiten" : "Neue Zone"?></h4>
<form class="form-horizontal" method="post" action="<?=self::getUrl("Voiceplanzone", "save")?>">
<div class="card">
<div class="card-body">
<input type="hidden" name="id" value="<?=$zone->id?>" />
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="name">Sprachtarif *</label>
<div class="col-lg-10">
<select name="voiceplan_id" class="form-control">
<?php foreach(VoiceplanModel::getAll() as $vp): ?>
<?php if($voiceplan_id): ?>
<option value="<?=$vp->id?>" <?=($vp->id == $voiceplan_id) ? "selected='selected'" : ""?>><?=$vp->name?></option>
<?php else: ?>
<option value="<?=$vp->id?>" <?=($vp->id == $zone->voiceplan_id) ? "selected='selected'" : ""?>><?=$vp->name?></option>
<?php endif; ?>
<?php endforeach; ?>
</select>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="name">Tarifzone Name *</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="name" id="name" value="<?=$zone->name?>" />
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="purchase_price">Einkaufspreis *</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="purchase_price" id="purchase_price" value="<?=$zone->purchase_price?>" />
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="price">Verkaufspreis *</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="price" id="price" value="<?=$zone->price?>" />
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="name">Taktung *</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="increment" id="increment" value="<?=($zone->increment_first && $zone->increment) ? $zone->increment_first."/".$zone->increment : ""?>" placeholder="60/30" />
</div>
</div>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2"></label>
<div class="col-lg-10">
<button type="submit" class="btn btn-primary">Speichern</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>
Layout/default/Voiceplanzone/View.php
+99
View File
@@ -0,0 +1,99 @@
<?php
$pagination_baseurl = $this->getUrl($Mod,"View");
$pagination_baseurl_params = ["filter" => $filter, "id" => $zone->id];
$pagination_entity_name = "Destinations";
?>
<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
<!-- start page title -->
<div class="row">
<div class="col-12">
<div class="page-title-box">
<div class="page-title-right">
<ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
<li class="breadcrumb-item"><a href="<?=self::getUrl("Voiceplan")?>">Sprachtarife</a></li>
<li class="breadcrumb-item"><a href="<?=self::getUrl("Voiceplan", "view", ["id" => $zone->voiceplan_id])?>">Sprachtarif <?=$zone->voiceplan->name?></a></li>
<li class="breadcrumb-item active">Destinationen Tarifzone <?=$zone->name?></li>
</ol>
</div>
<h4 class="page-title">Tarifzonen</h4>
</div>
</div>
</div>
<!-- end page title -->
<div class="row">
<div class="col-lg-12">
<div class="card">
<div class="card-body mb-3">
<div class="row">
<div class="col-12">
<div class="float-left">
<h4 class="header-title">Destinations für Sprachtarifzone <?=$zone->name?></h4>
</div>
<div class="float-right">
<a class="btn btn-primary mb-2" href="<?=self::getUrl("Voiceplandestination", "add", ["voiceplanzone_id" => $zone->id])?>"><i class="fas fa-plus"></i> Neue Destination anlegen</a>
</div>
</div>
</div>
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
<table class="table table-striped table-hover">
<tr>
<th>Destination</th>
<th>Prefix</th>
<th>Erstellt</th>
<th>Bearbeitet</th>
<th></th>
</tr>
<?php foreach($destinations as $destination): ?>
<tr>
<td><?=$destination->destination?></td>
<td><?=$destination->prefix?></td>
<td><?=date("d.m.Y H:i", $zone->create)?> (<?=$zone->creator->name?>)</td>
<td><?=date("d.m.Y H:i", $zone->edit)?> (<?=$zone->editor->name?>)</td>
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
<a href="<?=self::getUrl("Voiceplanzone", "edit", ["id" => $zone->id])?>"><i class="far fa-edit" title="Zone bearbeiten"></i></a>
<a href="<?=self::getUrl("Voiceplanzone", "delete", ["id" => $zone->id])?>" onclick="if(!confirm('Tarifzone wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
</td>
</tr>
<?php endforeach; ?>
</table>
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
</div>
</div>
</div>
</div>
<script type="text/javascript">
function toggleBlock(id) {
$('#block-detail-' + id).toggle();
if($('#block-detail-' + id).is(":hidden")) {
$('#block-' + id).removeClass("table-info");
$('#block-' + id).removeClass("text-info");
} else {
$('#block-' + id).addClass("text-info");
$('#block-' + id).addClass("table-info");
}
}
var block;
var hash = window.location.hash.substr(1);
var match = hash.match(/block=(\d+)/);
if(match && match[1]) {
block = match[1]
toggleBlock(block);
}
</script>
<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>
Layout/default/menu.php
+1 -1
View File
@@ -100,7 +100,7 @@
</a>
<ul class="submenu">
<?php if($me->isAdmin() || $me->can("Voipnumbering")): ?><li><a href="<?=self::getUrl("Voicenumberblock")?>"><i class="fad fa-fw fa-phone-office text-info"></i> Rufnummernblöcke</a></li><?php endif; ?>
<?php if($me->isAdmin() || $me->can("Voiceplan")): ?><li><a href="<?=self::getUrl("Voiceplan")?>"><i class="fas fa-fw fa-phone-arrow-up-right text-info"></i> Rufnummernpläne</a></li><?php endif; ?>
<?php if($me->isAdmin() || $me->can("Voiceplan")): ?><li><a href="<?=self::getUrl("Voiceplan")?>"><i class="fas fa-fw fa-phone-arrow-up-right text-info"></i> Sprachtarife</a></li><?php endif; ?>
</ul>
</li>
<?php endif; ?>