diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 8c38f4545..cf535ecff 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -61,6 +61,15 @@
+
+
+
+
+
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index d21e67019..ec3f9edf1 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -83,6 +83,14 @@ class PreorderController extends mfBaseController {
$new_filter['add-where'] = " AND (firstname like '%$kunde%' OR lastname like '%$kunde%' OR street like '%$kunde%' OR zip like '%$kunde%' OR city like '%$kunde%')";
}
+ if(array_key_exists("addon_services", $filter)) {
+ if($filter['addon_services'] == 1) {
+ $new_filter['add-where'] = " AND JSON_LENGTH(addon_services) > 0";
+ }
+ if($filter['addon_services'] === 0 || $filter['addon_services'] === "0") {
+ $new_filter['add-where'] = " AND (JSON_LENGTH(addon_services) = 0 OR addon_services IS NULL)";
+ }
+ }
if(is_array($filter) && count($filter)) {
foreach($filter as $name => $value) {
diff --git a/application/Preordercampaign/PreordercampaignController.php b/application/Preordercampaign/PreordercampaignController.php
index 5689cb895..40422cacd 100644
--- a/application/Preordercampaign/PreordercampaignController.php
+++ b/application/Preordercampaign/PreordercampaignController.php
@@ -246,5 +246,38 @@ class PreordercampaignController extends mfBaseController {
$this->redirect("Preordercampaign");
}
-
+
+ protected function downloadAddonServices() {
+ $id = $this->request->preordercampaign_id;
+ if(!is_numeric($id) || !$id) {
+ $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
+ $this->redirect("Preordercampaign");
+ }
+
+ $campaign = new Preordercampaign($id);
+ if(!$campaign->id) {
+ $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
+ $this->redirect("Preordercampaign");
+ }
+
+ $preorders = PreorderModel::search(["preordercampaign_id" => $id, "add-where" => "AND JSON_LENGTH(addon_services) > 1"]);
+
+ $csv = [];
+ foreach($preorders as $preorder) {
+ $sjson = json_decode($preorder->addon_services);
+ if(!$sjson) {
+ continue;
+ }
+
+ // address data and stuff
+ $general = [
+
+ ];
+
+ foreach($sjson as $service) {
+ $services[] = $service->service;
+ }
+ }
+
+ }
}
\ No newline at end of file