Added wohneinheit data

application/Preordercampaign/PreordercampaignController.php

@@ -263,6 +263,11 @@ class PreordercampaignController extends mfBaseController {
     $this->layout()->set("campaign", $campaign);
     $preorders = PreorderModel::search(["preordercampaign_id" => $id, "add-where" => "AND JSON_LENGTH(addon_services) > 1"]);
     
+    if(!count($preorders)) {
+      $this->layout->setFlash("Keine Vorbestellungen mit bestellten Dienstleistungen gefunden.");
+      $this->redirect("Preorder");
+    }
+    
     $csv = [];
     foreach($preorders as $preorder) {
       $sjson = json_decode($preorder->addon_services);
@@ -277,6 +282,12 @@ class PreordercampaignController extends mfBaseController {
         "plz" => $preorder->adb_hausnummer->plz->plzstring,
         "ortschaft" => $preorder->adb_hausnummer->ortschaft->name,
         "strasse" => $preorder->adb_hausnummer->strasse->name,
+        "hausnummer" => $preorder->adb_hausnummer->hausnummer,
+        "block" => "",
+        "stiege" => "",
+        "stock" => "",
+        "tuer" => "",
+        "zusatz" => "",
         "address_info" => $preorder->address_info,
         "contact_firma" => $preorder->company,
         "contact_uid" => $preorder->uid,
@@ -289,6 +300,14 @@ class PreordercampaignController extends mfBaseController {
         "email" => $preorder->email,
       ];
       
+      if($preorder->adb_wohneinheit_id) {
+        $general["block"] = $preorder->adb_wohneinheit->block;
+        $general["stiege"] = $preorder->adb_wohneinheit->stiege;
+        $general["stock"] = $preorder->adb_wohneinheit->stock;
+        $general["tuer"] = $preorder->adb_wohneinheit->tuer;
+        $general["zusatz"] = $preorder->adb_wohneinheit->zusatz;
+      }
+      
       foreach($sjson as $service) {
         if(!$service->ordered) continue;