diff --git a/Layout/default/Vatgroup/Index.php b/Layout/default/Vatgroup/Index.php
index 3e2fdb458..810d9be3f 100644
--- a/Layout/default/Vatgroup/Index.php
+++ b/Layout/default/Vatgroup/Index.php
@@ -56,7 +56,7 @@
Steuersatz % *
- Steuercode *
+ Steuercode
Rechnungstext
diff --git a/application/ADBNetzgebiet/ADBNetzgebiet.php b/application/ADBNetzgebiet/ADBNetzgebiet.php
index 87bbff249..f21543ac3 100644
--- a/application/ADBNetzgebiet/ADBNetzgebiet.php
+++ b/application/ADBNetzgebiet/ADBNetzgebiet.php
@@ -2,7 +2,8 @@
class ADBNetzgebiet extends mfBaseModel {
private $gemeinden;
-
+ private $json_options;
+
protected function init() {
$this->db = FronkDB::singleton(ADDRESSDB_DBHOST, ADDRESSDB_DBUSER, ADDRESSDB_DBPASS, ADDRESSDB_DBNAME);
$this->table = "Netzgebiet";
@@ -23,6 +24,27 @@ class ADBNetzgebiet extends mfBaseModel {
return true;
}
+ public function getOption($opt) {
+ $options = $this->getOptions();
+ if(!$options) return null;
+ if(property_exists($options, $opt)) {
+ return $options->$opt;
+ }
+ return null;
+
+ }
+
+ public function getOptions() {
+ if(!$this->options) {
+ return false;
+ }
+ $opts = json_decode($this->options);
+ if(json_last_error() != JSON_ERROR_NONE) {
+ return null;
+ }
+ return $opts;
+ }
+
public function getProperty($name) {
if($this->$name == null) {
diff --git a/db/migrations/20240228130020_netzgebiet_add_options.php b/db/migrations/20240228130020_netzgebiet_add_options.php
new file mode 100644
index 000000000..2fcb29d17
--- /dev/null
+++ b/db/migrations/20240228130020_netzgebiet_add_options.php
@@ -0,0 +1,31 @@
+getEnvironment() == "thetool") {
+
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+ $table = $this->table("Netzgebiet");
+ $table->addColumn("options", "json", ["null" => true,"default" => null, "after" => "unit_create_oaid"]);
+ $table->update();
+ }
+ }
+
+ public function down(): void
+ {
+ if($this->getEnvironment() == "thetool") {
+
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+ $this->table("Netzgebiet")->removeColumn("options")->save();
+ }
+ }
+}
diff --git a/scripts/adb-rimo-import/ADBAddressHelper/Network/Network-C06110-lieboch.php b/scripts/adb-rimo-import/ADBAddressHelper/Network/Network-C06110-lieboch.php
new file mode 100644
index 000000000..1e4398e00
--- /dev/null
+++ b/scripts/adb-rimo-import/ADBAddressHelper/Network/Network-C06110-lieboch.php
@@ -0,0 +1,31 @@
+netzgebiet_id != $this->netzgebiet->id) {
- $hausnummer->netzgebiet_id = $this->netzgebiet->id;
- $hausnummer->save();
+ $dont_overwrite_netzgbiet = $hausnummer->netzgebiet->getOption("hausnummer_dont_overwrite_netzgebiet");
+ if(!$dont_overwrite_netzgbiet) {
+ $hausnummer->netzgebiet_id = $this->netzgebiet->id;
+ $hausnummer->save();
+ }
}
if($hausnummer->extref != $name) {
$hausnummer->extref = $name;
diff --git a/scripts/adb-rimo-import/rimo-import-test.php b/scripts/adb-rimo-import/rimo-import-test.php
index 8386dab7a..80b224e48 100755
--- a/scripts/adb-rimo-import/rimo-import-test.php
+++ b/scripts/adb-rimo-import/rimo-import-test.php
@@ -117,10 +117,10 @@ foreach($netowners as $apiOwner) {
}
- /*if($cluster_rimo_id != "SDISalesCluster_85942336257_1707118316") {
- // wettmannstaettten
+ if($cluster_rimo_id != "SDISalesCluster_29189625089_1679036889") {
+ // lieboch
continue;
- }*/
+ }
/*
* get Cluster Outline Coords
diff --git a/scripts/preorder/preorders-split-multiple-connections.php b/scripts/preorder/preorders-split-multiple-connections.php
index 708097fb9..d96c793dc 100755
--- a/scripts/preorder/preorders-split-multiple-connections.php
+++ b/scripts/preorder/preorders-split-multiple-connections.php
@@ -25,6 +25,9 @@ $campaign_ids["kalwang"] = 41;
$campaign_ids["st_stefan_stainz"] = 36;
$campaign_ids["wettmannst"] = 37;
$campaign_ids["mureck"] = 42;
+$campaign_ids["lieboch"] = 35;
+$campaign_ids["lieboch_vorab"] = 49;
+$campaign_ids["lieboch_smart"] = 39;
if(!array_key_exists(1,$argv)) {
@@ -65,14 +68,12 @@ foreach(PreorderModel::searchActive(["preordercampaign_id" => $selected_campaign
//echo "Nicht genug Wohneinheiten - Preorder id ".$preorder->id.": ".count($wohneinheiten)." - need ".$preorder->connection_count."\n";
continue;
}
-
- //if($preorder->id == 920) {var_dump($wohneinheiten);exit;}
-
+
$available_units = [];
$additional_units = []; // to sort non-specific units last
foreach($wohneinheiten as $unit) {
- if($preorder->adb_wohneinheit_id == $unit->id || !PreorderModel::getFirst(["adb_wohneinheit_id" => $unit->id, "deleted" => 0])) {
- if($unit->tuer || preg_match('/^Top\s+\d+$/', $unit->zusatz)) {
+ if($preorder->adb_wohneinheit_id == $unit->id || !PreorderModel::getFirstActive(["adb_wohneinheit_id" => $unit->id])) {
+ if($unit->tuer || preg_match('/^(Top|Tuer|Tür)\s+\d+$/i', $unit->zusatz)) {
$available_units[] = $unit;
} else {
$additional_units[] = $unit;
diff --git a/scripts/preorder/update-preorder-add-unit.php b/scripts/preorder/update-preorder-add-unit.php
index e6c96f012..06cc3a169 100755
--- a/scripts/preorder/update-preorder-add-unit.php
+++ b/scripts/preorder/update-preorder-add-unit.php
@@ -25,6 +25,9 @@ $campaign_ids["kalwang"] = 41;
$campaign_ids["st_stefan_stainz"] = 36;
$campaign_ids["wettmannst"] = 37;
$campaign_ids["mureck"] = 42;
+$campaign_ids["lieboch"] = 35;
+$campaign_ids["lieboch_vorab"] = 49;
+$campaign_ids["lieboch_smart"] = 39;
if(!array_key_exists(1,$argv)) {