diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php index 39d0c109e..d5a61ba9d 100644 --- a/Layout/default/Preorder/Index.php +++ b/Layout/default/Preorder/Index.php @@ -1358,14 +1358,25 @@ $pagination_entity_name = "Vorbestellungen"; /* * Globals for map display */ - var borderpoly = []; - adb_netzgebiet): ?> - borderpoly = adb_netzgebiet->borderpoly) ? $campaign->adb_netzgebiet->borderpoly : "[]"?>; - is("Admin")): ?> - borderpoly = []; - true]) as $bp_netz): ?> - borderpoly.push(borderpoly?>); - + var borderpolies = []; + is("Admin")): ?> + true]) as $bp_netz): ?> + borderpolies.push([borderpoly?>]); + + salesclusters) && count($campaign->salesclusters)) { + $adb_networks = $campaign->salesclusters; + } else { + $adb_networks = [$campaign->adb_netzgebiet]; + } + + if(count($adb_networks)): ?> + + borderpoly = borderpoly) ?: "[]"?>; + borderpolies.push(borderpoly); + + var preorderMap; @@ -1441,17 +1452,20 @@ $pagination_entity_name = "Vorbestellungen"; function addMarkers() { - if(borderpoly) { - var border = L.polygon(borderpoly, { - fillColor: 'blue', - weight: 8, - opacity: 0.5, - color: 'violet', //Outline color - fillOpacity: 0.05 - }).addTo(preorderMap); + if(borderpolies) { + borderpolies.forEach(function(borderpoly) { + var border = L.polygon(borderpoly, { + fillColor: 'blue', + weight: 8, + opacity: 0.5, + color: 'violet', //Outline color + fillOpacity: 0.05 + }).addTo(preorderMap); + }); + } - if(!Array.isArray(preorders) | !preorders.length) { + if(!Array.isArray(preorders) || !preorders.length) { return false; } // draw markers and calculate center position diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php index 2047d3515..2379756eb 100644 --- a/application/Preorder/PreorderController.php +++ b/application/Preorder/PreorderController.php @@ -1565,9 +1565,7 @@ class PreorderController extends mfBaseController { } } - if(!$filter['preordercampaign_id']) $filter['preordercampaign_id'] = 0; - - + if(!array_key_exists("preordercampaign_id", $filter) || !$filter['preordercampaign_id']) $filter['preordercampaign_id'] = 0; if(in_array("preorders", $type)) { $this->log->debug(__METHOD__.": requested preorders");