Merge branch 'fronkdev' into 'master'
Added Lieboch West1 See merge request fronk/thetool!281
This commit is contained in:
@@ -0,0 +1,28 @@
|
||||
<?php
|
||||
|
||||
namespace ADBRimoImport\ADBAddressHelper\Network;
|
||||
|
||||
/*
|
||||
* Netzgebiet
|
||||
* Premstätten Süd
|
||||
*/
|
||||
class Network_C06110_vorab {
|
||||
|
||||
public function checkAddress($data) {
|
||||
/*
|
||||
* array keys are a reference their original variables and must be manipulated directly
|
||||
*/
|
||||
|
||||
// dererence input array keys into copies
|
||||
foreach(["name", "strasse_name", "hausnummer_name", "addresszusatz", "gem_kz", "gem_name", "ort_name", "plz_name"] as $var) {
|
||||
$$var = $data[$var];
|
||||
}
|
||||
|
||||
// put new values back into original pointer
|
||||
foreach(["name", "strasse_name", "hausnummer_name", "addresszusatz", "gem_kz", "gem_name", "ort_name", "plz_name"] as $var) {
|
||||
$data[$var] = $$var;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
<?php
|
||||
|
||||
namespace ADBRimoImport\ADBAddressHelper\Network;
|
||||
|
||||
/*
|
||||
* Netzgebiet
|
||||
* Premstätten Süd
|
||||
*/
|
||||
class Network_C06110_west1 {
|
||||
|
||||
public function checkAddress($data) {
|
||||
/*
|
||||
* array keys are a reference their original variables and must be manipulated directly
|
||||
*/
|
||||
|
||||
// dererence input array keys into copies
|
||||
foreach(["name", "strasse_name", "hausnummer_name", "addresszusatz", "gem_kz", "gem_name", "ort_name", "plz_name"] as $var) {
|
||||
$$var = $data[$var];
|
||||
}
|
||||
|
||||
|
||||
// put new values back into original pointer
|
||||
foreach(["name", "strasse_name", "hausnummer_name", "addresszusatz", "gem_kz", "gem_name", "ort_name", "plz_name"] as $var) {
|
||||
$data[$var] = $$var;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -272,6 +272,7 @@ class AddressHelper {
|
||||
|
||||
// update hausnummer
|
||||
if($hausnummer->netzgebiet_id != $this->netzgebiet->id) {
|
||||
// only if overwriting netzgebiet_id is allowed in old netzgebiet
|
||||
$dont_overwrite_netzgbiet = $hausnummer->netzgebiet->getOption("hausnummer_dont_overwrite_netzgebiet");
|
||||
if(!$dont_overwrite_netzgbiet) {
|
||||
$hausnummer->netzgebiet_id = $this->netzgebiet->id;
|
||||
@@ -298,7 +299,7 @@ class AddressHelper {
|
||||
}
|
||||
//$hausnummer->freigabe = $this->netzgebiet->default_freigabe;
|
||||
|
||||
//echo ">>>>>>>>>>>>>>>>>>>\nupdating hausnummer:";
|
||||
//echo ">>>>>>>>>>>>>>>>>>>\nupdating hausnummer:\n";
|
||||
//print_r($hausnummer);exit;
|
||||
return $hausnummer;
|
||||
|
||||
|
||||
@@ -117,8 +117,8 @@ foreach($netowners as $apiOwner) {
|
||||
}
|
||||
|
||||
|
||||
if($cluster_rimo_id != "SDISalesCluster_29189625089_1679036889") {
|
||||
// lieboch
|
||||
if($cluster_rimo_id != "SDIRolloutRegion_330545538305_1709728959") {
|
||||
// lieboch vorab
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user