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

Added wohneinheit data

Browse Source
This commit is contained in:
Frank Schubert
2022-11-11 14:19:45 +01:00
parent cf14151e90
commit 85321c168f
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Layout/default/Preordercampaign/services.csv.php
View File

@@ -2,7 +2,7 @@
header("Content-type: text/csv");
header('Content-disposition: attachment; filename="preorder-services-'.$campaign->name.'-'.date("Y-m-d_H-m-s").'.csv"');
?>
Code;Gemeinde;PLZ;Ortschaft;Strasse;Adressinfo;Firma;UID;Vorname;Nachname;Kontakt Strasse;Kontakt PLZ;Kontakt Ort;Telefon;Email;Dienstleistung;Data
Code;Gemeinde;PLZ;Ortschaft;Strasse;Hausnummer;Block;Stiege;Stock;Tuer;Adresszusatz;Adressinfo;Firma;UID;Vorname;Nachname;Kontakt Strasse;Kontakt PLZ;Kontakt Ort;Telefon;Email;Dienstleistung;Data
<?php foreach($csv as $c):?>
"<?=$c["ucode"]?>";"<?=$c["gemeinde"]?>";"<?=$c["plz"]?>";"<?=$c["ortschaft"]?>";"<?=$c["strasse"]?>";"<?=$c["address_info"]?>";"<?=$c["contact_company"]?>";"<?=$c["contact_uid"]?>";"<?=$c["contact_firstname"]?>";"<?=$c["contact_lastname"]?>";"<?=$c["contact_street"]?>";"<?=$c["contact_plz"]?>";"<?=$c["contact_ort"]?>";"<?=$c["phone"]?>";"<?=$c["email"]?>";"<?=$c["service"]?>";"<?=$c["service_data"]?>"
"<?=$c["ucode"]?>";"<?=$c["gemeinde"]?>";"<?=$c["plz"]?>";"<?=$c["ortschaft"]?>";"<?=$c["strasse"]?>";"<?=$c["block"]?>";"<?=$c["stiege"]?>";"<?=$c["stock"]?>";"<?=$c["tuer"]?>";"<?=$c["zusatz"]?>";"<?=$c["address_info"]?>";"<?=$c["contact_company"]?>";"<?=$c["contact_uid"]?>";"<?=$c["contact_firstname"]?>";"<?=$c["contact_lastname"]?>";"<?=$c["contact_street"]?>";"<?=$c["contact_plz"]?>";"<?=$c["contact_ort"]?>";"<?=$c["phone"]?>";"<?=$c["email"]?>";"<?=$c["service"]?>";"<?=$c["service_data"]?>"
<?php endforeach;

19
application/Preordercampaign/PreordercampaignController.php
View File

@@ -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;