Merge branch 'fronkdev' into 'master'

Not changing status to hausnummer status when saving Preorder in existing orders

See merge request fronk/thetool!1149
This commit is contained in:
Frank Schubert
2025-03-26 15:12:08 +00:00

View File

@@ -399,27 +399,29 @@ class PreorderController extends mfBaseController {
$this->redirect("Preordercampaign");
}
$new_status = false;
if($data['adb_wohneinheit_id']) {
$unit = new ADBWohneinheit($data['adb_wohneinheit_id']);
if ($unit->id) {
$new_status = PreorderstatusModel::getFirst(["code" => $unit->status->code]);
if ($unit->hausnummer->status->code > $unit->status->code) {
$new_status = PreorderstatusModel::getFirst(["code" => $unit->hausnummer->status->code]);
if($mode == "add") {
$new_status = false;
if($data['adb_wohneinheit_id']) {
$unit = new ADBWohneinheit($data['adb_wohneinheit_id']);
if($unit->id) {
$new_status = PreorderstatusModel::getFirst(["code" => $unit->status->code]);
if($unit->hausnummer->status->code > $unit->status->code) {
$new_status = PreorderstatusModel::getFirst(["code" => $unit->hausnummer->status->code]);
}
}
} elseif($data['adb_hausnummer_id']) {
$h = new ADBHausnummer($data['adb_hausnummer_id']);
if($h->id) {
$new_status = PreorderstatusModel::getFirst(["code" => $h->status->code]);
}
}
} elseif($data['adb_hausnummer_id']) {
$h = new ADBHausnummer($data['adb_hausnummer_id']);
if($h->id) {
$new_status = PreorderstatusModel::getFirst(["code" => $h->status->code]);
if($new_status) {
$data["status_id"] = $new_status->id;
} else {
$data["status_id"] = 1;
}
}
if($new_status) {
$data["status_id"] = $new_status->id;
} else {
$data["status_id"] = 1;
}
if($campaign->product_type != "setup_only") {