Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'fronkdev' into 'master'

Browse Source 
added empty check for address in PUT /preorder/{id}

See merge request fronk/thetool!1782
This commit is contained in:
Frank Schubert
2025-09-22 11:30:50 +00:00
parent fc6bf44b50 281fd35500
commit f7dbebacaa
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/ADBHausnummer/ADBHausnummer.php
+4 -1
View File
@@ -65,7 +65,10 @@ class ADBHausnummer extends mfBaseModel {
} }
$update_data = []; $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->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->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; if($this->strasse_id && $this->getProperty("strasse")->gemeinde_id && $this->getProperty("strasse")->gemeinde->name) $update_data["district"] = $this->getProperty("strasse")->gemeinde->name;
application/Api/v1/PreorderApicontroller.php
+3
View File
@@ -384,6 +384,9 @@ class PreorderApicontroller extends mfBaseApicontroller {
if(!$preorder->email) { if(!$preorder->email) {
return mfResponse::BadRequest(["message" => "Cannot leave email empty"]); 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()) { if(!$preorder->save()) {
return mfResponse::InternalServerError(); return mfResponse::InternalServerError();