Merge branch 'fronkdev' into 'master'

Snopp/Citycom Service Order Api

See merge request fronk/thetool!1643
This commit is contained in:
Frank Schubert
2025-08-18 16:04:48 +00:00
7 changed files with 99 additions and 21 deletions

View File

@@ -134,17 +134,19 @@ class CitycomImporter {
$unit->save();
}
$status_300 = \ADBStatusModel::getFirst(["code" => 300]);
if(!$status_300) {
die("ADB Status 300 not found");
}
if($unit->status->code < 300) {
$status_300 = \ADBStatusModel::getFirst(["code" => 300]);
if(!$status_300) {
die("ADB Status 300 not found");
}
$unit->status_id = $status_300->id;
$unit->save();
}
$status_code_241 = \ADBStatusModel::getFirst(["code" => 241]);
if($hausnummer->status->code < 241) {
$status_code_241 = \ADBStatusModel::getFirst(["code" => 241]);
$hausnummer->status_id = $status_code_241->id;
$hausnummer->save();
}
@@ -216,11 +218,11 @@ class CitycomImporter {
if(!$unit) continue;
$preorder = \PreorderModel::getFirst(["adb_wohneinheit_id" => $unit->id]);
if(!$preorder) continue;
if(!$preorder) {
continue;
}
if(property_exists($service, "ont") && !$service->ont && !$service->ont->id) {
if(property_exists($service, "ont") && $service->ont && $service->ont->id) {
$pco = \PreorderCitycomOan::getFirst(["preorder_id" => $preorder->id]);
if(!$pco) {
$pco = \PreorderCitycomOan::create([
@@ -232,8 +234,8 @@ class CitycomImporter {
$ont_gpid = $service->ont->fsan;
if($ont_sn || $ont_gpid) {
$status_300 = \PreorderstatusModel::getFirst(["code" => 300]);
if($preorder->status->code < 300) {
$status_300 = \PreorderstatusModel::getFirst(["code" => 300]);
$preorder->status_id = $status_300->id;
$preorder->save();
}
@@ -254,11 +256,11 @@ class CitycomImporter {
$ctag = \PreorderCtag::getFirstActive(["preorder_id" => $preorder->id, "stag" => $stag, "service_type" => $stypes[$service->service_type]]);
//echo "====\n";
//echo $preorder->id." - ".$service->service_number." - ".$service->location->sublocation->id." - ".$service->service_type." - $stag\n";
if($ctag->ext_id != $service->service_number) {
if($ctag && $ctag->ext_id != $service->service_number) {
$ctag->ext_id = $service->service_number;
$ctag->save();
}
if($ctag->ext_status != $service->state) {
if($ctag && $ctag->ext_status != $service->state) {
$ctag->ext_status = $service->state;
$ctag->save();
}