Merge branch '788-remove-geofence-message-from-view-jo' into 'master'
Resolve "Remove geofence message from View JO" Closes #788 See merge request jankstudio/resq!900
This commit is contained in:
commit
a5340fbfd6
2 changed files with 4 additions and 1 deletions
|
|
@ -2910,6 +2910,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
||||||
$params['status_cancelled'] = JOStatus::CANCELLED;
|
$params['status_cancelled'] = JOStatus::CANCELLED;
|
||||||
$params['hubs'] = [];
|
$params['hubs'] = [];
|
||||||
|
|
||||||
|
$branch_codes = [];
|
||||||
// format duration and distance into friendly time
|
// format duration and distance into friendly time
|
||||||
foreach ($hubs as $hub) {
|
foreach ($hubs as $hub) {
|
||||||
// duration
|
// duration
|
||||||
|
|
|
||||||
|
|
@ -635,6 +635,8 @@ $(function() {
|
||||||
function selectPoint(lat, lng)
|
function selectPoint(lat, lng)
|
||||||
{
|
{
|
||||||
// check if point is in coverage area
|
// check if point is in coverage area
|
||||||
|
// commenting out the geofence call for CRM
|
||||||
|
/*
|
||||||
$.ajax({
|
$.ajax({
|
||||||
method: "GET",
|
method: "GET",
|
||||||
url: "{{ url('jo_geofence') }}",
|
url: "{{ url('jo_geofence') }}",
|
||||||
|
|
@ -652,7 +654,7 @@ $(function() {
|
||||||
type: 'warning',
|
type: 'warning',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
}); */
|
||||||
|
|
||||||
// clear markers
|
// clear markers
|
||||||
markerLayerGroup.clearLayers();
|
markerLayerGroup.clearLayers();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue