Rimo Import update

application/ADBWohneinheit/ADBWohneinheitModel.php

@@ -111,7 +111,7 @@ class ADBWohneinheitModel {
     $res = $db->query($sql);
     if($db->num_rows($res)) {
       $data = $db->fetch_object($res);
-      return $data->cnt;
+      return (int)$data->cnt;
     }
     return 0;
   }

scripts/adb-rimo-import/rimo-import.php

@@ -585,11 +585,6 @@ foreach ($clusters as $cluster_data) {
                     }
 
                     if(!in_array($adb_unit->extref, $rimo_home_list)) {
-                        if(count($adb_unit->active_preorders)) {
-                            $adb_unit->save(["no_updates" => 1]);
-                            continue;
-                        }
-
                         if($adb_unit->oaid) {
                             $oaid = \OpenAccessIdModel::getFirstOaid($adb_unit->oaid);
                             $oaid_units_count = \ADBWohneinheitModel::count(["oaid" => $adb_unit->oaid]);
@@ -600,6 +595,12 @@ foreach ($clusters as $cluster_data) {
                             }
 
                         }
+
+                        if(count($adb_unit->active_preorders)) {
+                            $adb_unit->save(["no_updates" => 1]);
+                            continue;
+                        }
+
                         echo "[DD] Deleting Hausnummer ".$adb_unit->hausnummer_id." Wohneinheit ".$adb_unit->id." (extref ".$adb_unit->extref.")\n";
                         $addressErrors[] = "[DD] Deleting Hausnummer ".$adb_unit->hausnummer_id." Wohneinheit ".$adb_unit->id." (extref ".$adb_unit->extref.")";