From 387c4e89112a1244cdd0eb6f4091d03bfa77f2ce Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 14 Mar 2023 16:06:57 +0100
Subject: [PATCH] fixed campaign_id filter in preorder map

---
 Layout/default/Preorder/Index.php                         | 8 ++++----
 application/Preorder/PreorderController.php               | 8 ++++++--
 ...Building__Locations__FTTx_premstaetten_2023-03-07.csv# | 1 +
 3 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 scripts/addressdb/premstaetten/import/.~lock.SDIBuilding__Locations__FTTx_premstaetten_2023-03-07.csv#

diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 3c92ca175..3e5f96097 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -354,13 +354,13 @@
           var gps = [preorder.gps_lat, preorder.gps_long];
           all_coords.push(gps);
 
-          var icon_color = "#2AAD27";
+          var icon_color = "#acf0ab";
           var icon_name = "home";
 
           if(preorder.type == "interest") {
-            icon_color = "#CB2B3E";
+            icon_color = "#ec98a2";
           } else if(preorder.type == "provision") {
-            icon_color = "#CB8427";
+            icon_color = "#ffcd8b";
           }
           
           if(preorder.connection_type.match(/^multi/i) || preorder.count > 1) {
@@ -405,7 +405,7 @@
           filter: filter
         },function(success) {
           if(success.status == "OK") {
-
+            
             if(Array.isArray(success.result.preorders)) {
               preorders = success.result.preorders;
               renderMap();
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index b987fbcf8..f8ec31d57 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -716,9 +716,13 @@ class PreorderController extends mfBaseController {
       }
     }
     
-    $filter['preordercampaign_id'] = $my_campaign_ids;
-    
+    if(array_key_exists("preordercampaign_id", $filter)) {
+      if(!in_array($filter['preordercampaign_id'], $my_campaign_ids)) {
+        $filter['preordercampaign_id'] = $my_campaign_ids;
+      }
+    }
     
+    //var_dump($filter);exit;
     $results = PreorderModel::search($filter);
     
     foreach($results as $preorder) {
diff --git a/scripts/addressdb/premstaetten/import/.~lock.SDIBuilding__Locations__FTTx_premstaetten_2023-03-07.csv# b/scripts/addressdb/premstaetten/import/.~lock.SDIBuilding__Locations__FTTx_premstaetten_2023-03-07.csv#
new file mode 100644
index 000000000..f2850562c
--- /dev/null
+++ b/scripts/addressdb/premstaetten/import/.~lock.SDIBuilding__Locations__FTTx_premstaetten_2023-03-07.csv#
@@ -0,0 +1 @@
+,fronk,fronk-nb,14.03.2023 14:13,file:///home/fronk/.config/libreoffice/4;
\ No newline at end of file