diff --git a/public/assets/js/dashboard_map.js b/public/assets/js/dashboard_map.js index aaf6827b..653b0bd7 100644 --- a/public/assets/js/dashboard_map.js +++ b/public/assets/js/dashboard_map.js @@ -147,7 +147,7 @@ class DashboardMap { } } - putMarkerWithLabel(id, name, lat, lng, markers, icon, layer_group, popup_url) { + putMarkerWithLabel(id, lat, lng, markers, icon, layer_group, popup_url) { var my = this; // existing marker if (markers.hasOwnProperty(id)) { @@ -233,7 +233,6 @@ class DashboardMap { putRiderAvailableMarker(id, lat, lng, name) { this.putMarkerWithLabel( id, - name, lat, lng, this.rider_markers, @@ -246,7 +245,6 @@ class DashboardMap { putRiderActiveJOMarker(id, lat, lng, name) { this.putMarkerWithLabel( id, - name, lat, lng, this.rider_markers, @@ -302,7 +300,6 @@ class DashboardMap { $.each(riders, function(id, data) { var lat = data.latitude; var lng = data.longitude; - var name = data.name; if (data.has_jo) my.putRiderActiveJOMarker(id, lat, lng, name); diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php index ffaba318..1a157b78 100644 --- a/src/Controller/HomeController.php +++ b/src/Controller/HomeController.php @@ -58,16 +58,11 @@ class HomeController extends Controller continue; } - // get full name of rider - $name = $rider->getFullName(); - $riders[$rider_id]['name'] = $name; - $jo = $rider->getActiveJobOrder(); if ($jo == null) $riders[$rider_id]['has_jo'] = false; else $riders[$rider_id]['has_jo'] = true; - } // get active JOs and check transaction origin for TransactionOrigin::MOBILE_APP