From 2c0793dcb82a3eb7bab95cc7ef14cf51b0ccec89 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Fri, 19 Sep 2025 14:45:56 +0200
Subject: [PATCH 1/2] added empty check for address in PUT /preorder/{id}

---
 application/Api/v1/PreorderApicontroller.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/Api/v1/PreorderApicontroller.php b/application/Api/v1/PreorderApicontroller.php
index d1e5f4b24..881d7e9ea 100644
--- a/application/Api/v1/PreorderApicontroller.php
+++ b/application/Api/v1/PreorderApicontroller.php
@@ -384,6 +384,9 @@ class PreorderApicontroller extends mfBaseApicontroller {
         if(!$preorder->email) {
             return mfResponse::BadRequest(["message" => "Cannot leave email empty"]);
         }
+        if(!$preorder->street || !$preorder->zip || !$preorder->city) {
+            return mfResponse::BadRequest(["message" => "Cannot leave address fields empty"]);
+        }
 
         if(!$preorder->save()) {
             return mfResponse::InternalServerError();

From 281fd355008816265e1a5341caa0ed814b5a9b1c Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Mon, 22 Sep 2025 13:29:49 +0200
Subject: [PATCH 2/2] Fixed updateing address without housenumber in AddressDB
 rimo sync

---
 application/ADBHausnummer/ADBHausnummer.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/ADBHausnummer/ADBHausnummer.php b/application/ADBHausnummer/ADBHausnummer.php
index 5e0d38397..5b7f0e612 100644
--- a/application/ADBHausnummer/ADBHausnummer.php
+++ b/application/ADBHausnummer/ADBHausnummer.php
@@ -65,7 +65,10 @@ class ADBHausnummer extends mfBaseModel {
       }
 
       $update_data = [];
-      if($this->strasse_id && $this->getProperty("strasse")->name) $update_data["address"] = $this->getProperty("strasse")->name;
+      if($this->strasse_id && $this->getProperty("strasse")->name) {
+          $update_data["address"] = $this->getProperty("strasse")->name;
+          if(strlen($this->hausnummer)) $update_data["address"] .= " ".$this->hausnummer;
+      }
       if($this->ortschaft_id && $this->getProperty("ortschaft")->name) $update_data["city"] = $this->getProperty("ortschaft")->name;
       if($this->plz_id && $this->getProperty("plz")->plz) $update_data["zipCode"] = $this->getProperty("plz")->plz;
       if($this->strasse_id && $this->getProperty("strasse")->gemeinde_id && $this->getProperty("strasse")->gemeinde->name) $update_data["district"] = $this->getProperty("strasse")->gemeinde->name;