diff --git a/application/AddressDB/AddressDB.php b/application/AddressDB/AddressDB.php index bbcd309b1..5d871e5b8 100644 --- a/application/AddressDB/AddressDB.php +++ b/application/AddressDB/AddressDB.php @@ -59,7 +59,7 @@ class AddressDB { left join `Ortschaft` on (`Ortschaft`.`id` = `Hausnummer`.`ortschaft_id`) left join `Gemeinde` on (`Gemeinde`.`id` = `Strasse`.`gemeinde_id`) left join `Wohneinheit` on (`Wohneinheit`.`hausnummer_id` = `Hausnummer`.`id`) - left join `".FRONKDB_DBNAME."`.`Preorder` as tbl_preorder on (tbl_preorder.`adb_wohneinheit_id` = `Wohneinheit`.`id`) + left join `".FRONKDB_DBNAME."`.`Preorder` as tbl_preorder on (tbl_preorder.`adb_wohneinheit_id` = `Wohneinheit`.`id` AND (tbl_preorder.`deleted` = 0 OR tbl_preorder.`deleted` IS NULL)) left join `".FRONKDB_DBNAME."`.`Address` as tbl_address on (tbl_address.`id` = tbl_preorder.partner_id) "; diff --git a/scripts/adb-rimo-import/output/.gitignore b/scripts/adb-rimo-import/output/.gitignore new file mode 100644 index 000000000..d6b7ef32c --- /dev/null +++ b/scripts/adb-rimo-import/output/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/scripts/adb-rimo-import/rimo-import-test.php b/scripts/adb-rimo-import/rimo-import-test.php index c68e86e6a..2df22dac7 100755 --- a/scripts/adb-rimo-import/rimo-import-test.php +++ b/scripts/adb-rimo-import/rimo-import-test.php @@ -113,8 +113,8 @@ foreach(["estmk", "rml"] as $apiOwner) { } - /*if($cluster_rimo_id != "SDISalesCluster_85942336257_1707118316") { - // wettmannst + /*if($cluster_rimo_id != "SDISalesCluster_126657212929_1678961358") { + // prem sued continue; }*/ @@ -479,4 +479,4 @@ function getServiceDnValues($dn) { } return $fields; -} \ No newline at end of file +} diff --git a/scripts/preorder/preorders-split-multiple-connections.php b/scripts/preorder/preorders-split-multiple-connections.php index dfd483bdb..ae7f29c83 100755 --- a/scripts/preorder/preorders-split-multiple-connections.php +++ b/scripts/preorder/preorders-split-multiple-connections.php @@ -23,6 +23,7 @@ $campaign_ids["premsued"] = 6; $campaign_ids["gsf"] = 7; $campaign_ids["kalwang"] = 41; $campaign_ids["st_stefan_stainz"] = 36; +$campaign_ids["wettmannst"] = 37; if(!array_key_exists(1,$argv)) { diff --git a/scripts/preorder/update-preorder-add-unit.php b/scripts/preorder/update-preorder-add-unit.php index 710f65f19..e690b844f 100755 --- a/scripts/preorder/update-preorder-add-unit.php +++ b/scripts/preorder/update-preorder-add-unit.php @@ -23,6 +23,7 @@ $campaign_ids["premsued"] = 6; $campaign_ids["gsf"] = 7; $campaign_ids["kalwang"] = 41; $campaign_ids["st_stefan_stainz"] = 36; +$campaign_ids["wettmannst"] = 37; if(!array_key_exists(1,$argv)) {