Preorder admin page sorting
This commit is contained in:
Frank Schubert
@@ -25,52 +25,47 @@
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h4>Workorders erstellen</h4>
|
||||
<h4><i class="far fa-fw fa-circle-1 text-primary"></i> Multianschlussbestellungen aufsplitten</h4>
|
||||
<div class="row justify-content-end">
|
||||
<div class="col-10">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
Workorders erstellen für Vorbestellungen, für die noch keine Workorders erstellt wurden. Exportiert OAID und weist sie FTU zu wenn benötigt:
|
||||
Splittet Bestellungen mit mehereren Anschlüssen auf einzelne Bestellungen auf:
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mt-1">
|
||||
<div class="col">
|
||||
<a href="<?=self::getUrl("Preordercampaign","createRimoWorkorders", ["id" => $campaign->id])?>" class="btn btn-primary"><i class="far fa-r"></i> <i class="far fa-gears"></i> Workorders in RIMO erstellen</a><br />
|
||||
<a href="<?=self::getUrl("Preordercampaign","splitMultipleConnections", ["id" => $campaign->id])?>" class="btn btn-primary"><i class="fad fa-copy"></i> Bestellungen Splitten</a><br />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h4>OAIDs in Rimo Home/FTU exportieren</h4>
|
||||
<h4><i class="far fa-fw fa-circle-2 text-primary"></i> Wohneinheiten hinzufügen</h4>
|
||||
<div class="row justify-content-end">
|
||||
<div class="col-10">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
Exportiert OAIDs nach Rimo und weist sie den FTUs der Homes zu:
|
||||
Trägt Wohneinheiten in Bestellungen ein, wenn fehlt:
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mt-1">
|
||||
<div class="col">
|
||||
<a href="<?=self::getUrl("Preordercampaign","exportOaidsToRimo", ["id" => $campaign->id])?>" class="btn btn-primary"><i class="far fa-r"></i> <i class="far fa-fw fa-link-simple"></i> OAIDs zu Homes/FTUs setzen</a><br />
|
||||
<a href="<?=self::getUrl("Preordercampaign","addUnits", ["id" => $campaign->id])?>" class="btn btn-primary"><i class="fas fa-igloo"></i> Wohneinheiten hinzufügen</a><br />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h4>OAIDs vergeben</h4>
|
||||
<h4><i class="far fa-fw fa-circle-3 text-primary"></i> OAIDs vergeben</h4>
|
||||
<div class="row justify-content-end">
|
||||
<div class="col-10">
|
||||
<div class="row mb-2">
|
||||
@@ -98,7 +93,7 @@
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h4>OAIDs auf Wohneinheiten updaten</h4>
|
||||
<h4><i class="far fa-fw fa-circle-4 text-primary"></i> OAIDs auf Wohneinheiten updaten</h4>
|
||||
<div class="row justify-content-end">
|
||||
<div class="col-10">
|
||||
<div class="row">
|
||||
@@ -120,7 +115,7 @@
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h4>OAID-Daten fixen</h4>
|
||||
<h4><i class="far fa-fw fa-circle-5 text-primary"></i> OAID-Daten fixen</h4>
|
||||
<div class="row justify-content-end">
|
||||
<div class="col-10">
|
||||
<div class="row">
|
||||
@@ -142,43 +137,53 @@
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h4>Multianschlussbestellungen aufsplitten</h4>
|
||||
<h4><i class="far fa-fw fa-circle-6 text-primary"></i> Workorders erstellen</h4>
|
||||
<div class="row justify-content-end">
|
||||
<div class="col-10">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
Splittet Bestellungen mit mehereren Anschlüssen auf einzelne Bestellungen auf:
|
||||
Workorders erstellen für Vorbestellungen, für die noch keine Workorders erstellt wurden. Exportiert OAID und weist sie FTU zu wenn benötigt:
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mt-1">
|
||||
<div class="col">
|
||||
<a href="<?=self::getUrl("Preordercampaign","splitMultipleConnections", ["id" => $campaign->id])?>" class="btn btn-primary"><i class="fad fa-copy"></i> Bestellungen Splitten</a><br />
|
||||
<a href="<?=self::getUrl("Preordercampaign","createRimoWorkorders", ["id" => $campaign->id])?>" class="btn btn-primary"><i class="far fa-r"></i> <i class="far fa-gears"></i> Workorders in RIMO erstellen</a><br />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="border border-secondary" />
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h4>Wohneinheiten hinzufügen</h4>
|
||||
<h4>OAIDs in Rimo Home/FTU exportieren</h4>
|
||||
<div class="row justify-content-end">
|
||||
<div class="col-10">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
Trägt Wohneinheiten in Bestellungen ein, wenn fehlt:
|
||||
Exportiert OAIDs nach Rimo und weist sie den FTUs der Homes zu:
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mt-1">
|
||||
<div class="col">
|
||||
<a href="<?=self::getUrl("Preordercampaign","addUnits", ["id" => $campaign->id])?>" class="btn btn-primary"><i class="fas fa-igloo"></i> Wohneinheiten hinzufügen</a><br />
|
||||
<a href="<?=self::getUrl("Preordercampaign","exportOaidsToRimo", ["id" => $campaign->id])?>" class="btn btn-primary"><i class="far fa-r"></i> <i class="far fa-fw fa-link-simple"></i> OAIDs zu Homes/FTUs setzen</a><br />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -918,11 +918,6 @@ class PreordercampaignController extends mfBaseController {
|
||||
$unit_count = count($wohneinheiten);
|
||||
if($unit_count < $preorder->connection_count) {
|
||||
$missing_units++;
|
||||
/*$mu = [];
|
||||
$mu['preorder'] = $preorder;
|
||||
$mu['unit_count'] = $unit_count;
|
||||
$missing_units[] = $mu;*/
|
||||
//echo "Nicht genug Wohneinheiten - Preorder id ".$preorder->id.": ".count($wohneinheiten)." - need ".$preorder->connection_count."\n";
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -944,18 +939,11 @@ class PreordercampaignController extends mfBaseController {
|
||||
|
||||
if($preorder->connection_count > count($available_units)) {
|
||||
$missing_units++;
|
||||
/*$md = [];
|
||||
$md["unit_count"] = $unit_count;
|
||||
$md["door_count"] = count($available_units);
|
||||
$md["preorder"] = $preorder;
|
||||
$missing_doors[] = $md;*/
|
||||
//echo "Not enough units with tuer (hausnummer id ".$preorder->adb_hausnummer_id.") units total: ".count($wohneinheiten)."; units with tuer: ".count($available_units)."; preorder connection count: ".$preorder->connection_count."\n";
|
||||
continue;
|
||||
}
|
||||
|
||||
// create new Preorders with available units
|
||||
// then set original Preorder deleted
|
||||
//echo "Creating ".$preorder->connection_count." new preorders\n";
|
||||
|
||||
for($c = 0; $c < $preorder->connection_count; $c++) {
|
||||
if(!$available_units[$c]->oaid) {
|
||||
@@ -963,20 +951,12 @@ class PreordercampaignController extends mfBaseController {
|
||||
$available_units[$c]->save();
|
||||
}
|
||||
|
||||
/*
|
||||
echo "unit id: ".$available_units[$c]->id."\n";
|
||||
echo "hausnummer ".$available_units[$c]->hausnummer_id." \n";
|
||||
echo $available_units[$c]->extref."\n\n";
|
||||
*/
|
||||
|
||||
$new_preorder = clone($preorder);
|
||||
$new_preorder->ucode = $preorder->ucode.".".($c+1);
|
||||
$new_preorder->connection_count = 1;
|
||||
$new_preorder->adb_wohneinheit_id = $available_units[$c]->id;
|
||||
$new_preorder->oaid = $available_units[$c]->oaid;
|
||||
|
||||
//var_dump($new_preorder);
|
||||
|
||||
$new_preorder->save();
|
||||
}
|
||||
//exit;
|
||||
@@ -989,9 +969,7 @@ class PreordercampaignController extends mfBaseController {
|
||||
$this->layout()->setFlash("$missing_units Bestellungen konnten nicht geteilt werden, da nicht genug Wohneinheiten verfügbar sind.", "warning");
|
||||
}
|
||||
|
||||
if($orders_new) {
|
||||
$this->layout()->setFlash("$orders_split Bestellungen in $orders_new Bestellungen aufgeteilt.", "success");
|
||||
}
|
||||
$this->layout()->setFlash("$orders_split Bestellungen in $orders_new Bestellungen aufgeteilt.", "success");
|
||||
$this->redirect("Preordercampaign", "Admin", ["id" => $id]);
|
||||
}
|
||||
|
||||
@@ -1051,7 +1029,6 @@ class PreordercampaignController extends mfBaseController {
|
||||
}
|
||||
|
||||
// no candidates with door number -> use any
|
||||
|
||||
if(!count($unit_candidates)) {
|
||||
foreach($wohneinheiten as $unit) {
|
||||
$unit_candidates[] = $unit;
|
||||
@@ -1076,9 +1053,7 @@ class PreordercampaignController extends mfBaseController {
|
||||
$this->layout()->setFlash("Für $missing_units Bestellungen wurde keine Wohneinheit gefunden.", "warning");
|
||||
}
|
||||
|
||||
if($units_added) {
|
||||
$this->layout()->setFlash("$units_added Wohneinheiten eingetragen.", "success");
|
||||
}
|
||||
$this->layout()->setFlash("$units_added Wohneinheiten eingetragen.", "success");
|
||||
$this->redirect("Preordercampaign", "Admin", ["id" => $id]);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user