Parcourir la source

Add Do Not Test and Closed variants of customer markers

Alan Lam il y a 7 ans
Parent
commit
a52ee6f260

+ 7 - 0
controllers/map_overview_ajax.php

@@ -121,6 +121,13 @@ if($submit) {
 						}
 						}
 					}
 					}
 
 
+					if($location->do_not_test) {
+						$icon_file = "{$customer_slug}_do_not_test.png";
+					}
+					if($location->closed) {
+						$icon_file = "{$customer_slug}_closed.png";
+					}
+
 					if($icon_file && file_exists("public/img/markers/$icon_file")) {
 					if($icon_file && file_exists("public/img/markers/$icon_file")) {
 						$icon = $icon_file;
 						$icon = $icon_file;
 					}
 					}

BIN
psd/bacta.psd


BIN
psd/city_gaming.psd


BIN
psd/g_t_promotions.psd


BIN
psd/jnc.psd


BIN
psd/playland.psd


BIN
psd/praesepe.psd


BIN
public/img/markers/bacta_closed.png


BIN
public/img/markers/bacta_do_not_test.png


BIN
public/img/markers/city_gaming_closed.png


BIN
public/img/markers/city_gaming_do_not_test.png


BIN
public/img/markers/g_t_promotions_closed.png


BIN
public/img/markers/g_t_promotions_do_not_test.png


BIN
public/img/markers/jnc_closed.png


BIN
public/img/markers/jnc_do_not_test.png


BIN
public/img/markers/playland_closed.png


BIN
public/img/markers/playland_do_not_test.png


BIN
public/img/markers/praesepe_closed.png


BIN
public/img/markers/praesepe_do_not_test.png


+ 7 - 3
public/js/app-map-overview.js

@@ -186,9 +186,13 @@ function addLocationMarker(location) {
 		map: map
 		map: map
 	};
 	};
 
 
-	if(location.icon) options.icon = "/img/markers/" + location.icon;
-	if(location.doNotTest) options.icon = "/img/markers/do_not_test.png";
-	if(location.closed) options.icon = "/img/markers/closed.png";
+	if(location.icon) {
+		options.icon = "/img/markers/" + location.icon;
+	}
+	else {
+		if(location.doNotTest) options.icon = "/img/markers/do_not_test.png";
+		if(location.closed) options.icon = "/img/markers/closed.png";
+	}
 
 
 	infoWindow.setContent("");
 	infoWindow.setContent("");