Fixed Showing Orders of users of same company

This commit is contained in:
Frank Schubert
2022-04-27 16:40:47 +02:00
parent 864aa03acc
commit d7192b0378
11 changed files with 422 additions and 52 deletions

View File

@@ -6,11 +6,11 @@
<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("Building")?>">Vorbestellkampagne</a></li>
<li class="breadcrumb-item"><a href="<?=self::getUrl("Building")?>">Vorbestellung</a></li>
<li class="breadcrumb-item active"><?=($campaign->id) ? "bearbeiten" : "Neu" ?></li>
</ol>
</div>
<h4 class="page-title">Objekte</h4>
<h4 class="page-title">Vorbestellung</h4>
</div>
</div>
</div>
@@ -21,27 +21,31 @@
<div class="card">
<div class="card-body">
<h4 class="header-title mb-2"><?=($campaign->id) ? "Vorbestellkampagne bearbeiten" : "Neue Vorbestellkampagne"?></h4>
<h4 class="header-title mb-2"><?=($preorder->id) ? "Vorbestellung bearbeiten" : "Neue Vorbestellung"?></h4>
<form class="form-horizontal" method="post" action="<?=self::getUrl("Preordercampaign", "save")?>">
<div class="card">
<div class="card-body">
<input type="hidden" name="id" value="<?=$campaign->id?>" />
<input type="hidden" name="id" value="<?=$preorder->id?>" />
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="network_id">Netzgebiet *</label>
<label class="col-lg-2 col-form-label" for="network_id">Vorbestellkampagne</label>
<div class="col-lg-10">
<select class="select2 form-control " name="network_id" id="network_id">
<option></option>
<?php foreach($networks as $network): ?>
<option value="<?=$network->id?>" <?=($campaign->network_id == $network->id) ? "selected='selected'" : ""?>><?=($network->name)?></option>
<?php endforeach; ?>
</select>
<input type="hidden" name="campaign_id" id="campaign_id" value="<?=$campaign->id?>" />
<input type="text" class="form-control" value="<?=$campaign->name?>" readonly="readonly"/>
</div>
</div>
<div id="building-search" class="hidden">
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="network_id">Netzgebiet</label>
<div class="col-lg-10">
<input type="hidden" name="network_id" id="network_id" value="<?=$campaign->network_id?>" />
<input type="text" class="form-control" value="<?=$campaign->network->name?>" readonly="readonly" />
</div>
</div>
<div id="building-search">
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="building_units">Gebäude suchen *</label>
@@ -49,11 +53,13 @@
<input type="text" class="form-control" name="building_id_search" id="building_id_search" />
</div>
</div>
<div class="form-group row" id="building-search-results-section">
<label class="col-lg-2 col-form-label" for="building_units">Gebäude auswählen *</label>
<div class="col-lg-10">
<table class="table table-striped table-hover" id="building-search-results">
<a href="#" class="text-success" onclick="refreshBuildingSearch()"><i class="fas fa-refresh"></i> Aktualisieren</a>
<table class="table table-striped table-hover mb-0" id="building-search-results">
<tr>
<th></th>
<th>Straße</th>
@@ -63,9 +69,11 @@
<th>OAN ID</th>
</tr>
</table>
<a href="#" class="text-success" onclick="refreshBuildingSearch()"><i class="fas fa-refresh"></i> Aktualisieren</a>
<p class="mt-2"><a class="btn btn-sm btn-outline-primary" href="<?=self::getUrl("Building", "add", ["network_id" => $campaign->network_id])?>" target="_blank"><i class="fas fa-plus"></i> Neues Gebäude anlegen</a></p>
</div>
</div>
<div class="form-group row" id="building-search-selected">
<label class="col-lg-2 col-form-label" for="">Ausgewähltes Gebäude</label>
<div class="col-lg-10">
@@ -81,21 +89,38 @@
</div>
<div class="form-group row hidden" id="termination-search-results-section">
<label class="col-lg-2 col-form-label" for="">Anschluss auswählen *</label>
<div class="col-lg-10">
<table class="table table-striped table-hover" id="termination-search-results">
<tr>
<th></th>
<th>Bezeichung</th>
<th>Kontakt</th>
<th>Status</th>
<th>Anschluss ID</th>
</tr>
</table>
<div id="preorder-form">
<h4>Vorbestellung</h4>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="building_units">Vorbestelltyp *</label>
<div class="col-lg-10">
<select class="form-control" name="type" id="type">
<option value="interest">Interessensbekundung</option>
<option value="preorder">Vorsorgeanschluss</option>
<option value="order">Vollanschluss</option>
</select>
</div>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="building_units">Preis Netto *</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="building_id_search" id="building_id_search" />
</div>
</div>
<h4>Kundendaten</h4>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="building_units">Vorname *</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="building_id_search" id="building_id_search" />
</div>
</div>
<div>
</div>
</div>
@@ -184,17 +209,15 @@
return false;
}
$('#building-search-results-section').show();
data.buildings.forEach(function(b) {
var line = '<tr class="result result-' + b.id + ' pointer" onclick="selectBuilding(' + b.id + ')">';
line += '<td><input type="checkbox" readonly="readonly" onclick="selectBuilding(' + b.id + ')" name="building_id" value="' + b.id + '" data-zip="' + b.zip + '" data-city="' + b.city + '" data-street="' + b.street + '" data-code="' + b.code + '" data-oanid="' + b.oan_id + '" /></td>';
line += '<td><input type="checkbox" readonly="readonly" onclick="selectBuilding(' + b.id + ')" name="building_id" value="' + b.id + '" data-zip="' + b.zip + '" data-city="' + b.city + '" data-street="' + b.street + '" data-code="' + b.code + '" data-oanid="' + b.oan_id + '" data-units="' + b.units + '" /></td>';
line += "<td>" + b.street + "</td>";
line += "<td>" + b.zip + "</td>";
line += "<td>" + b.city + "</td>";
line += "<td>" + b.units + "</td>";
line += "<td>" + b.code + "</td>";
line += "<td>" + b.oan_id + "</td>";
@@ -237,28 +260,33 @@
var city = $('input[name=building_id][value=' + id + ']').data("city");
var code = $('input[name=building_id][value=' + id + ']').data("code");
var oan_id = $('input[name=building_id][value=' + id + ']').data("oanid");
var units = $('input[name=building_id][value=' + id + ']').data("units");
var label = street + "<br />" + zip + " " + city;
label += "<br /><div style='font-weight: normal;'>Wohneinheiten: " + units;
if(code || oan_id) {
label += "<br /><div style='font-weight: normal;'>";
if(code) {
label += "<br />Code: " + code;
}
if(oan_id) {
label += "<br />OAN ID: " + oan_id;
}
label += "</div>";
}
label += "</div>";
$('#building-search-selected .label').addClass("font-weight-bold").html(label);
$('#building-search-selected .check-mark i').removeClass().addClass("fas fa-check text-success");
$('#building-search-selected').show();
// get terminatiions
showPreorderForm();
}
}
function showPreorderForm() {
}
function showTerminationSearch() {
}
@@ -270,6 +298,11 @@
$('#building-search-selected .check-mark i').removeClass().addClass("fas fa-question text-warning");
}
function refreshBuildingSearch() {
resetBuildingSearch();
$('#building_id_search').keyup();
}
</script>
<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>