diff --git a/public/assets/js/map_mqtt.js b/public/assets/js/map_mqtt.js index 8cf3a6af..0e6bdb31 100644 --- a/public/assets/js/map_mqtt.js +++ b/public/assets/js/map_mqtt.js @@ -45,6 +45,10 @@ class MapEventHandler { // subscribe to jo status console.log('subscribing to ' + my.options.channels.jo_status); my.mqtt.subscribe(my.options.channels.jo_status); + + // subscribe to jo origin + console.log('subscribing to ' + my.options.channels.jo_origin); + my.mqtt.subscribe(my.options.channels.jo_origin); } } @@ -134,6 +138,14 @@ class MapEventHandler { this.dashmap.removeCustomerMarker(id); break; } + break; + case "origin": + console.log("got origin for jo " + payload); + if (payload == 'mobile_app') + { + this.dashmap.switchJobOrderOrigin(chan_split[1], 'mobile'); + } + break; } } } diff --git a/src/EventListener/JobOrderActiveCacheListener.php b/src/EventListener/JobOrderActiveCacheListener.php index 89eedd01..05a6a612 100644 --- a/src/EventListener/JobOrderActiveCacheListener.php +++ b/src/EventListener/JobOrderActiveCacheListener.php @@ -88,7 +88,13 @@ class JobOrderActiveCacheListener // send jo location $this->mqtt->publish( 'jo/' . $jo->getID() . '/location', - $coords->getLatitude() . ':' . $coords->getLongitude() + $coords->getLatitude() . ':' . $coords->getLongitude() + ); + + // send transaction origin + $this->mqtt->publish( + 'jo/' . $jo->getID() . '/origin', + $jo->getSource() ); // TODO: do we still need to send jo status? diff --git a/templates/home.html.twig b/templates/home.html.twig index aa3382eb..61b93de0 100644 --- a/templates/home.html.twig +++ b/templates/home.html.twig @@ -53,7 +53,8 @@ function initEventHandler(dashmap) { 'rider_location': 'rider/+/location', 'rider_status': 'rider/+/status', 'jo_location': 'jo/+/location', - 'jo_status': 'jo/+/status' + 'jo_status': 'jo/+/status', + 'jo_origin': 'jo/+/origin' }, };